diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 99f1571..0000000 --- a/.gitignore +++ /dev/null @@ -1,233 +0,0 @@ -################# -## Eclipse -################# - -*.pydevproject -.project -.metadata -bin/ -tmp/ -*.tmp -*.bak -*.swp -*~.nib -local.properties -.classpath -.settings/ -.loadpath - -# External tool builders -.externalToolBuilders/ - -# Locally stored "Eclipse launch configurations" -*.launch - -# CDT-specific -.cproject - -# PDT-specific -.buildpath - - -################# -## Visual Studio -################# - -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.sln.docstates - -# Build results - -[Dd]ebug/ -[Rr]elease/ -x64/ -build/ -[Bb]in/ -[Oo]bj/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -*_i.c -*_p.c -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.log -*.scc - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opensdf -*.sdf -*.cachefile - -# Visual Studio profiler -*.psess -*.vsp -*.vspx - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# NCrunch -*.ncrunch* -.*crunch*.local.xml - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.Publish.xml -*.pubxml - -# NuGet Packages Directory -## TODO: If you have NuGet Package Restore enabled, uncomment the next line -#packages/ - -# Windows Azure Build Output -csx -*.build.csdef - -# Windows Store app package directory -AppPackages/ - -# Others -sql/ -*.Cache -ClientBin/ -[Ss]tyle[Cc]op.* -~$* -*~ -*.dbmdl -*.[Pp]ublish.xml -*.pfx -*.publishsettings - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file to a newer -# Visual Studio version. Backup files are not needed, because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -App_Data/*.mdf -App_Data/*.ldf - -############# -## Windows detritus -############# - -# Windows image file caches -Thumbs.db -ehthumbs.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Mac crap -.DS_Store - - -############# -## Python -############# - -*.py[co] - -# Packages -*.egg -*.egg-info -dist/ -build/ -eggs/ -parts/ -var/ -sdist/ -develop-eggs/ -.installed.cfg - -# Installer logs -pip-log.txt - -# Unit test / coverage reports -.coverage -.tox - -#Translations -*.mo - -#Mr Developer -.mr.developer.cfg - -Makefile -Makefile.in -aclocal.m4 -autom4te.cache/* -config.h -config.h.in -config.status -configure -depcomp -install-sh -missing -stamp-h1 -compile -*.opendb -/N3888_RefImpl/src/Debug_Clang_C2/N3888_RefImpl.tlog -*.exe -/N3888_RefImpl/src/Debug_Clang_C2/N3888_RefImpl.res diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..7bd9980 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,11 @@ +cmake_minimum_required(VERSION 2.8.12) + +project(io2d CXX) + +add_subdirectory(io2d/src) +set(IO2D_INCLUDE_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/io2d/include + ${CMAKE_CURRENT_SOURCE_DIR}/io2d/src/3rd-party/cairo/src) +set(IO2D_LIBRARY io2d) + +add_subdirectory(examples/hello-world) diff --git a/GNU-Linux_build_instructions.txt b/GNU-Linux_build_instructions.txt deleted file mode 100644 index 795b9e8..0000000 --- a/GNU-Linux_build_instructions.txt +++ /dev/null @@ -1,23 +0,0 @@ -You will need a relatively recent build of GNU autotools. Any recent distro -should have a reasonably new version available which will fit the needs here. -You will also need cairo, GTK+3, and related libraries; as long as you have -autotools, if you should be able to generate a configure script and it will -tell you if you are missing any other dependencies. - -To build the project, from this directory run the command 'autoreconf -i'. It -should run for a bit then complete silently. If so, you should then run the -generated './configure' script with any necessary parameters. This should -notify you if you are missing any pre-requisites or have an older version that -won't work. If configure completes successfully, you should be able to run the -'make' command and then execute the resulting executable by calling -the './N3888_RefImpl/src/N3888_RefImpl' executable. - -The drawing portion is the same code as in the Windows version. The entry -point uses GTK+3 and is primarily C code. It is patterned after Gnome project -utilities. It has improved significantly and is now essentially on par with -the Windows version. - -Tested on OpenSUSE 13.2 with GCC 4.9.0 using the following configure command: -'./configure CC=gcc-4.9 CXX=g++-4.9 CXXFLAGS="-g -std=c++1y"'. Also tested -with Clang 3.5 using the configure settings found in the -run-configure-with-clang-and-libstdc++.sh shell script. diff --git a/LICENSE.md b/LICENSE.md index ca6544a..50899b3 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -5,12 +5,11 @@ There are several distinct and unique projects in this repository, each with its own licensing terms and conditions. If you wish to use one of these libraries, you must comply with its licensing terms. The maintainer of this repository makes no claims to authorship or ownership of any files in the directories `/cairo`, -`/pixman`, `/libpng16`, or `/zlib-1.2.8`, except as may be documented in the -appropriate location(s) within those directories. Mention of a directory shall -be deemed to include all subdirectories and their subdirectories, etc., within -the mentioned directory. Mention of files in a directory shall be deemed to -include all files located in that directory and in its subdirectories and their -subdirectories, etc. +`/pixman`, except as may be documented in the appropriate location(s) within +those directories. Mention of a directory shall be deemed to include all +subdirectories and their subdirectories, etc., within the mentioned directory. +Mention of files in a directory shall be deemed to include all files located in +that directory and in its subdirectories and their subdirectories, etc. cairo -------------- @@ -24,28 +23,9 @@ The contents of the `/pixman` directory are subject to the licensing terms descr in the `/pixman/COPYING` file. For more information about the pixman library, please see [pixman.org](http://www.pixman.org/) or [cgit.freedesktop.org/pixman/](http://cgit.freedesktop.org/pixman/). -libpng --------------- -The contents of the `/libpng16` directory are subject to the licensing terms -described in the `/libpng16/LICENSE` file. For more information about libpng, -please see [libpng.org](http://www.libpng.org/pub/png/libpng.html). - -zlib --------------- -The contents of the `/zlib-1.2.8` directory are subject to the licensing terms -described in the `/zlib-1.2.8/zlib.h` file. For more information about zlib, -please see [zlib.net](http://zlib.net/). - -win32 --------------- - -With the exception of the files contained in the directories -`/N3888_RefImpl/src/win32/DLLs`, `/N3888_RefImpl/src/win32/include`, and -`/N3888_RefImpl/src/win32/libs`, the following license applies to the files contained -in the `/N3888_RefImpl` directory. - -`The MIT License (MIT) +``` +The MIT License (MIT) Copyright (c) 2014 Michael B. McLaughlin @@ -66,21 +46,7 @@ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.` - The files in `/N3888_RefImpl/src/win32/include` are header files used to interface with the cairo graphics library. Their license is described above under the **cairo** section. - -The files in `/N3888_RefImpl/src/win32/libs` are .lib files used to dynamically -link with: - - * The cairo graphics library in accordance with the terms of the Mozilla - Public License version 1.1, a copy of which can be found at - `/cairo/COPYING-MPL-1.1`. - * The zlib general purpose compression library in accordance with the terms - of its license, which can be found at `/zlib-1.2.8/zlib.h`. - -The files in `/N3888_RefImpl/src/win32/DLLs` are executable code versions of -cairo and zlib in the form of DLL files. These files were built in accordance -with the instructions provided at `/N3888_RefImpl/src/win32/DLL build instructions.txt`. -Their licensing is as described above for the .lib files. +``` diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index f2abd87..0000000 --- a/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS = N3888_RefImpl -ACLOCAL_AMFLAGS = -I m4 diff --git a/N3888_RefImpl/.gitignore b/N3888_RefImpl/.gitignore deleted file mode 100644 index 7e0949a..0000000 --- a/N3888_RefImpl/.gitignore +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -# This .gitignore file was automatically created by Microsoft(R) Visual Studio. -################################################################################ - -/N3888_RefImpl/Debug -*.user -/Debug -/ipch/N3888_RefImpl-e13b5b2c -/N3888_RefImpl.opensdf -/N3888_RefImpl.sdf -/N3888_RefImpl.v12.suo -/N3888_RefImpl/x64/Release/N3888_RefImpl.tlog -/N3888_RefImpl/x64/Release/N3888_RefImpl.log -/N3888_RefImpl/x64/Release/N3888_RefImpl.obj -/N3888_RefImpl/x64/Release/N3888_RefImpl.pch -/N3888_RefImpl/x64/Release/N3888_RefImpl.res -/N3888_RefImpl/x64/Release/context.obj -/N3888_RefImpl/x64/Release/device.obj -/N3888_RefImpl/x64/Release/drawing_exception.obj -/N3888_RefImpl/x64/Release/font_face.obj -/N3888_RefImpl/x64/Release/font_options.obj -/N3888_RefImpl/x64/Release/gradient_pattern.obj -/N3888_RefImpl/x64/Release/image_surface.obj -/N3888_RefImpl/x64/Release/linear_gradient_pattern.obj -/N3888_RefImpl/x64/Release/matrix.obj -/N3888_RefImpl/x64/Release/mesh_pattern.obj -/N3888_RefImpl/x64/Release/pattern.obj -/N3888_RefImpl/x64/Release/pch.obj -/N3888_RefImpl/x64/Release/radial_gradient_pattern.obj -/N3888_RefImpl/x64/Release/raster_source_pattern.obj -/N3888_RefImpl/x64/Release/region.obj -/N3888_RefImpl/x64/Release/scaled_font.obj -/N3888_RefImpl/x64/Release/solid_color_pattern.obj -/N3888_RefImpl/x64/Release/surface.obj -/N3888_RefImpl/x64/Release/surface_pattern.obj -/N3888_RefImpl/x64/Release/toy_font_face.obj -/N3888_RefImpl/x64/Release/user_data_key.obj -/N3888_RefImpl/x64/Release/vc120.pdb -/x64/Release -/N3888_RefImpl/x64/Release -/N3888_RefImpl/x64/Debug/N3888_RefImpl.tlog -/N3888_RefImpl/x64/Debug/N3888_RefImpl.pch -/N3888_RefImpl/x64/Debug/N3888_RefImpl.res -/N3888_RefImpl/x64/Debug/vc120.idb -Makefile -Makefile.in diff --git a/N3888_RefImpl/Debug_Clang_C2/cairo.dll b/N3888_RefImpl/Debug_Clang_C2/cairo.dll deleted file mode 100644 index ef90fab..0000000 Binary files a/N3888_RefImpl/Debug_Clang_C2/cairo.dll and /dev/null differ diff --git a/N3888_RefImpl/Debug_Clang_C2/zlib1.dll b/N3888_RefImpl/Debug_Clang_C2/zlib1.dll deleted file mode 100644 index 271a042..0000000 Binary files a/N3888_RefImpl/Debug_Clang_C2/zlib1.dll and /dev/null differ diff --git a/N3888_RefImpl/Makefile.am b/N3888_RefImpl/Makefile.am deleted file mode 100644 index 280086e..0000000 --- a/N3888_RefImpl/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS = src - diff --git a/N3888_RefImpl/N3888_RefImpl.sln b/N3888_RefImpl/N3888_RefImpl.sln deleted file mode 100644 index 9f06198..0000000 --- a/N3888_RefImpl/N3888_RefImpl.sln +++ /dev/null @@ -1,40 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 -MinimumVisualStudioVersion = 12.0.21005.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "N3888_RefImpl", "src\N3888_RefImpl.vcxproj", "{1B3FB96B-B90D-40B7-B0D9-20D15BE707B8}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_Clang_C2|Win32 = Debug_Clang_C2|Win32 - Debug_Clang_C2|x64 = Debug_Clang_C2|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release_Clang_C2|Win32 = Release_Clang_C2|Win32 - Release_Clang_C2|x64 = Release_Clang_C2|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1B3FB96B-B90D-40B7-B0D9-20D15BE707B8}.Debug_Clang_C2|Win32.ActiveCfg = Debug_Clang_C2|Win32 - {1B3FB96B-B90D-40B7-B0D9-20D15BE707B8}.Debug_Clang_C2|Win32.Build.0 = Debug_Clang_C2|Win32 - {1B3FB96B-B90D-40B7-B0D9-20D15BE707B8}.Debug_Clang_C2|x64.ActiveCfg = Debug_Clang_C2|x64 - {1B3FB96B-B90D-40B7-B0D9-20D15BE707B8}.Debug_Clang_C2|x64.Build.0 = Debug_Clang_C2|x64 - {1B3FB96B-B90D-40B7-B0D9-20D15BE707B8}.Debug|Win32.ActiveCfg = Debug|Win32 - {1B3FB96B-B90D-40B7-B0D9-20D15BE707B8}.Debug|Win32.Build.0 = Debug|Win32 - {1B3FB96B-B90D-40B7-B0D9-20D15BE707B8}.Debug|x64.ActiveCfg = Debug|x64 - {1B3FB96B-B90D-40B7-B0D9-20D15BE707B8}.Debug|x64.Build.0 = Debug|x64 - {1B3FB96B-B90D-40B7-B0D9-20D15BE707B8}.Release_Clang_C2|Win32.ActiveCfg = Release_Clang_C2|Win32 - {1B3FB96B-B90D-40B7-B0D9-20D15BE707B8}.Release_Clang_C2|Win32.Build.0 = Release_Clang_C2|Win32 - {1B3FB96B-B90D-40B7-B0D9-20D15BE707B8}.Release_Clang_C2|x64.ActiveCfg = Release_Clang_C2|x64 - {1B3FB96B-B90D-40B7-B0D9-20D15BE707B8}.Release_Clang_C2|x64.Build.0 = Release_Clang_C2|x64 - {1B3FB96B-B90D-40B7-B0D9-20D15BE707B8}.Release|Win32.ActiveCfg = Release|Win32 - {1B3FB96B-B90D-40B7-B0D9-20D15BE707B8}.Release|Win32.Build.0 = Release|Win32 - {1B3FB96B-B90D-40B7-B0D9-20D15BE707B8}.Release|x64.ActiveCfg = Release|x64 - {1B3FB96B-B90D-40B7-B0D9-20D15BE707B8}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/N3888_RefImpl/src/.gitignore b/N3888_RefImpl/src/.gitignore deleted file mode 100644 index db48325..0000000 --- a/N3888_RefImpl/src/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/.deps/* -/Makefile.in -/N3888_RefImpl -/N3888_RefImpl-*.o -/Makefile diff --git a/N3888_RefImpl/src/Makefile.am b/N3888_RefImpl/src/Makefile.am deleted file mode 100644 index 1fd2e5e..0000000 --- a/N3888_RefImpl/src/Makefile.am +++ /dev/null @@ -1,53 +0,0 @@ -## Process this file with automake to produce Makefile.in - -##resource_Files = @DOLLAR_SIGN@(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/refimpl.gresource.xml) -##refimpl-resources.c: refimpl.gresource.xml $(resource_Files) -## glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name refimpl $(srcdir)/refimpl.gresource.xml -##refimpl-resources.h: refimpl.gresource.xml $(resource_Files) -## glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name refimpl $(srcdir)/refimpl.gresource.xml - -##BUILT_SOURCES = refimpl-resources.c \ -## refimpl-resources.h \ -## $(NULL) - -bin_PROGRAMS = N3888_RefImpl - -N3888_RefImpl_SOURCES = brush.cpp \ - device.cpp \ - display_surface-common.cpp \ - display_surface-xlib.cpp \ - entrypoint.cpp \ - font_extents.cpp \ - font_face.cpp \ - font_options.cpp \ - image_surface.cpp \ - io2d_error_category.cpp \ - linear_brush_factory.cpp \ - mapped_surface.cpp \ - matrix_2d.cpp \ - mesh_brush_factory.cpp \ - path.cpp \ - path_data.cpp \ - path_data_item.cpp \ - path_factory.cpp \ - radial_brush_factory.cpp \ - rectangle.cpp \ - rgba_color.cpp \ - sample_draw.cpp \ - simple_font_face.cpp \ - solid_color_brush_factory.cpp \ - standalone_functions.cpp \ - surface.cpp \ - surface_brush_factory.cpp \ - test_renderer_fill.cpp \ - text_extents.cpp \ - vector_2d.cpp - -N3888_RefImpl_LDADD = @GTKCAIRO_LIBS@ - -N3888_RefImpl_CPPFLAGS = @GTKCAIRO_CFLAGS@ ## -fpermissive - -##if ! [ [ test "$CXX" = "g++" ] || [ test "$CXX" = "gcc" ] ]] -##then -## N3888_RefImpl_LDADD += -fpermissive -##fi diff --git a/N3888_RefImpl/src/N3888_RefImpl.ico b/N3888_RefImpl/src/N3888_RefImpl.ico deleted file mode 100644 index 449296f..0000000 Binary files a/N3888_RefImpl/src/N3888_RefImpl.ico and /dev/null differ diff --git a/N3888_RefImpl/src/N3888_RefImpl.rc b/N3888_RefImpl/src/N3888_RefImpl.rc deleted file mode 100644 index 31fce81..0000000 Binary files a/N3888_RefImpl/src/N3888_RefImpl.rc and /dev/null differ diff --git a/N3888_RefImpl/src/N3888_RefImpl.vcxproj b/N3888_RefImpl/src/N3888_RefImpl.vcxproj deleted file mode 100644 index fdbdfc8..0000000 --- a/N3888_RefImpl/src/N3888_RefImpl.vcxproj +++ /dev/null @@ -1,459 +0,0 @@ - - - - - Debug_Clang_C2 - Win32 - - - Debug_Clang_C2 - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_Clang_C2 - Win32 - - - Release_Clang_C2 - x64 - - - Release - Win32 - - - Release - x64 - - - - {1B3FB96B-B90D-40B7-B0D9-20D15BE707B8} - Win32Proj - N3888_RefImpl - 8.1 - - - - Application - true - v140 - Unicode - - - Application - true - v140_clang_3_7 - Unicode - - - Application - true - v140 - Unicode - - - Application - true - v140_Clang_3_7 - Unicode - - - Application - false - v140 - true - Unicode - - - Application - false - v140_clang_3_7 - true - Unicode - - - Application - false - v140 - true - Unicode - - - Application - false - v140_Clang_3_7 - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - NativeRecommendedRules.ruleset - - - true - NativeRecommendedRules.ruleset - - - true - NativeRecommendedRules.ruleset - - - true - NativeRecommendedRules.ruleset - - - false - NativeRecommendedRules.ruleset - - - false - NativeRecommendedRules.ruleset - - - false - NativeRecommendedRules.ruleset - - - false - NativeRecommendedRules.ruleset - - - - NotUsing - Level4 - Disabled - WIN32;_WIN32_WINNT=0x0600;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - $(ProjectDir)win32\include\;%(AdditionalIncludeDirectories) - /Zc:throwingNew /Zc:strictStrings /Zc:implicitNoexcept - true - - - Windows - true - "$(ProjectDir)win32\lib\$(PlatformTarget)\$(Configuration)\cairo.lib";"$(ProjectDir)win32\lib\$(PlatformTarget)\$(Configuration)\zlib.lib";comctl32.lib;%(AdditionalDependencies) - mainCRTStartup - - - cmd /c copy "$(ProjectDir)win32\DLLs\$(PlatformTarget)\$(Configuration)\cairo.dll" "$(OutputPath)" -cmd /c copy "$(ProjectDir)win32\DLLs\$(PlatformTarget)\$(Configuration)\cairo.pdb" "$(OutputPath)" -cmd /c copy "$(ProjectDir)win32\DLLs\$(PlatformTarget)\$(Configuration)\zlib1.dll" "$(OutputPath)" -cmd /c copy "$(ProjectDir)win32\DLLs\$(PlatformTarget)\$(Configuration)\zlib1.pdb" "$(OutputPath)" - - - - - NotUsing - EnableAllWarnings - Disabled - WIN32;_WIN32_WINNT=0x0600;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - $(ProjectDir)win32\include\;%(AdditionalIncludeDirectories) - -Weverything -Wno-c++98-compat -Wno-covered-switch-default -Wno-c++98-compat-pedantic -Wno-global-constructors -Wno-float-equal -Wno-documentation -Wno-documentation-unknown-command -Wno-padded -Wno-exit-time-destructors -Wno-reserved-id-macro -Wno-language-extension-token - true - Enabled - true - NDEBUG - - - Windows - true - "$(ProjectDir)win32\lib\$(PlatformTarget)\$(Configuration)\cairo.lib";"$(ProjectDir)win32\lib\$(PlatformTarget)\$(Configuration)\zlib.lib";comctl32.lib;%(AdditionalDependencies) - mainCRTStartup - - - cmd /c copy "$(ProjectDir)win32\DLLs\$(PlatformTarget)\$(Configuration)\cairo.dll" "$(OutputPath)" -cmd /c copy "$(ProjectDir)win32\DLLs\$(PlatformTarget)\$(Configuration)\cairo.pdb" "$(OutputPath)" -cmd /c copy "$(ProjectDir)win32\DLLs\$(PlatformTarget)\$(Configuration)\zlib1.dll" "$(OutputPath)" -cmd /c copy "$(ProjectDir)win32\DLLs\$(PlatformTarget)\$(Configuration)\zlib1.pdb" "$(OutputPath)" - - - - - NotUsing - Level4 - Disabled - WIN32;_WIN32_WINNT=0x0600;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - $(ProjectDir)win32\include\;%(AdditionalIncludeDirectories) - /Zc:throwingNew /Zc:strictStrings /Zc:implicitNoexcept - true - - - Windows - true - "$(ProjectDir)win32\lib\$(PlatformTarget)\$(Configuration)\cairo.lib";"$(ProjectDir)win32\lib\$(PlatformTarget)\$(Configuration)\zlib.lib";comctl32.lib;%(AdditionalDependencies) - mainCRTStartup - - - cmd /c copy "$(ProjectDir)win32\DLLs\$(PlatformTarget)\$(Configuration)\cairo.dll" "$(OutputPath)" -cmd /c copy "$(ProjectDir)win32\DLLs\$(PlatformTarget)\$(Configuration)\cairo.pdb" "$(OutputPath)" -cmd /c copy "$(ProjectDir)win32\DLLs\$(PlatformTarget)\$(Configuration)\zlib1.dll" "$(OutputPath)" -cmd /c copy "$(ProjectDir)win32\DLLs\$(PlatformTarget)\$(Configuration)\zlib1.pdb" "$(OutputPath)" - - - - - NotUsing - EnableAllWarnings - Disabled - WIN32;_WIN32_WINNT=0x0600;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - $(ProjectDir)win32\include\;%(AdditionalIncludeDirectories) - -Weverything -Wno-c++98-compat -Wno-covered-switch-default -Wno-c++98-compat-pedantic -Wno-global-constructors -Wno-float-equal -Wno-documentation -Wno-documentation-unknown-command -Wno-padded -Wno-exit-time-destructors -Wno-reserved-id-macro -Wno-language-extension-token - true - Enabled - true - - - Windows - true - "$(ProjectDir)win32\lib\$(PlatformTarget)\$(Configuration)\cairo.lib";"$(ProjectDir)win32\lib\$(PlatformTarget)\$(Configuration)\zlib.lib";comctl32.lib;%(AdditionalDependencies) - mainCRTStartup - - - cmd /c copy "$(ProjectDir)win32\DLLs\$(PlatformTarget)\$(Configuration)\cairo.dll" "$(OutputPath)" -cmd /c copy "$(ProjectDir)win32\DLLs\$(PlatformTarget)\$(Configuration)\cairo.pdb" "$(OutputPath)" -cmd /c copy "$(ProjectDir)win32\DLLs\$(PlatformTarget)\$(Configuration)\zlib1.dll" "$(OutputPath)" -cmd /c copy "$(ProjectDir)win32\DLLs\$(PlatformTarget)\$(Configuration)\zlib1.pdb" "$(OutputPath)" - - - - - Level4 - NotUsing - MaxSpeed - true - true - WIN32;_WIN32_WINNT=0x0600;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - /Zc:throwingNew /Zc:strictStrings /Zc:implicitNoexcept - $(ProjectDir)win32\include\;%(AdditionalIncludeDirectories) - true - true - - - Windows - true - true - true - "$(ProjectDir)win32\lib\$(PlatformTarget)\$(Configuration)\cairo.lib";"$(ProjectDir)win32\lib\$(PlatformTarget)\$(Configuration)\zlib.lib";comctl32.lib;%(AdditionalDependencies) - mainCRTStartup - - - cmd /c copy "$(ProjectDir)win32\DLLs\$(PlatformTarget)\$(Configuration)\cairo.dll" "$(OutputPath)" -cmd /c copy "$(ProjectDir)win32\DLLs\$(PlatformTarget)\$(Configuration)\zlib1.dll" "$(OutputPath)" - - - - - EnableAllWarnings - NotUsing - MaxSpeed - true - true - WIN32;_WIN32_WINNT=0x0600;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - -Weverything -Wno-c++98-compat -Wno-covered-switch-default -Wno-c++98-compat-pedantic -Wno-global-constructors -Wno-float-equal -Wno-documentation -Wno-documentation-unknown-command -Wno-padded -Wno-exit-time-destructors -Wno-reserved-id-macro -Wno-language-extension-token - $(ProjectDir)win32\include\;%(AdditionalIncludeDirectories) - true - true - Enabled - true - - - Windows - true - true - true - "$(ProjectDir)win32\lib\$(PlatformTarget)\$(Configuration)\cairo.lib";"$(ProjectDir)win32\lib\$(PlatformTarget)\$(Configuration)\zlib.lib";comctl32.lib;%(AdditionalDependencies) - mainCRTStartup - - - cmd /c copy "$(ProjectDir)win32\DLLs\$(PlatformTarget)\$(Configuration)\cairo.dll" "$(OutputPath)" -cmd /c copy "$(ProjectDir)win32\DLLs\$(PlatformTarget)\$(Configuration)\zlib1.dll" "$(OutputPath)" - - - - - Level4 - NotUsing - MaxSpeed - true - true - WIN32;_WIN32_WINNT=0x0600;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - /Zc:throwingNew /Zc:strictStrings /Zc:implicitNoexcept - $(ProjectDir)win32\include\;%(AdditionalIncludeDirectories) - true - true - - - Windows - true - true - true - "$(ProjectDir)win32\lib\$(PlatformTarget)\$(Configuration)\cairo.lib";"$(ProjectDir)win32\lib\$(PlatformTarget)\$(Configuration)\zlib.lib";comctl32.lib;%(AdditionalDependencies) - mainCRTStartup - - - cmd /c copy "$(ProjectDir)win32\DLLs\$(PlatformTarget)\$(Configuration)\cairo.dll" "$(OutputPath)" -cmd /c copy "$(ProjectDir)win32\DLLs\$(PlatformTarget)\$(Configuration)\zlib1.dll" "$(OutputPath)" - - - - - EnableAllWarnings - NotUsing - MaxSpeed - true - true - WIN32;_WIN32_WINNT=0x0600;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - -Weverything -Wno-c++98-compat -Wno-covered-switch-default -Wno-c++98-compat-pedantic -Wno-global-constructors -Wno-float-equal -Wno-documentation -Wno-documentation-unknown-command -Wno-padded -Wno-exit-time-destructors -Wno-reserved-id-macro -Wno-language-extension-token - $(ProjectDir)win32\include\;%(AdditionalIncludeDirectories) - true - true - Enabled - true - - - Windows - true - true - true - "$(ProjectDir)win32\lib\$(PlatformTarget)\$(Configuration)\cairo.lib";"$(ProjectDir)win32\lib\$(PlatformTarget)\$(Configuration)\zlib.lib";comctl32.lib;%(AdditionalDependencies) - mainCRTStartup - - - cmd /c copy "$(ProjectDir)win32\DLLs\$(PlatformTarget)\$(Configuration)\cairo.dll" "$(OutputPath)" -cmd /c copy "$(ProjectDir)win32\DLLs\$(PlatformTarget)\$(Configuration)\zlib1.dll" "$(OutputPath)" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - - - - - - \ No newline at end of file diff --git a/N3888_RefImpl/src/N3888_RefImpl.vcxproj.filters b/N3888_RefImpl/src/N3888_RefImpl.vcxproj.filters deleted file mode 100644 index 482493f..0000000 --- a/N3888_RefImpl/src/N3888_RefImpl.vcxproj.filters +++ /dev/null @@ -1,195 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {7cc8518e-643e-4930-bfbc-8174a4bc66d8} - - - - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Resource Files - - - - - Resource Files - - - Resource Files - - - - - DLLs - - - DLLs - - - DLLs - - - DLLs - - - DLLs - - - DLLs - - - DLLs - - - DLLs - - - DLLs - - - DLLs - - - DLLs - - - DLLs - - - \ No newline at end of file diff --git a/N3888_RefImpl/src/entrypoint.cpp b/N3888_RefImpl/src/entrypoint.cpp deleted file mode 100644 index 4552c06..0000000 --- a/N3888_RefImpl/src/entrypoint.cpp +++ /dev/null @@ -1,28 +0,0 @@ -#include "io2d.h" -#include "sample_draw.h" -#include -#include - -using namespace std; -using namespace std::chrono; -using namespace std::experimental::io2d; - -int main() { - assert(steady_clock::is_steady); - auto ds = make_display_surface(1280, 720, format::argb32, scaling::letterbox); - auto radialFactory = radial_brush_factory({ 0.0, 0.0 }, 0.0, { 0.0, 0.0 }, 50.0); - radialFactory.add_color_stop(0.0, rgba_color::orange()); - radialFactory.add_color_stop(1.0, rgba_color::aquamarine()); - auto letterboxBrush = brush(radialFactory); - letterboxBrush.extend(extend::repeat); - ds.letterbox_brush(letterboxBrush); - sample_draw sd; - ds.draw_callback(sd); - //ds.draw_callback([](display_surface& sfc) { - // sfc.paint(rgba_color::cornflower_blue); - // sfc.font_size(48.0); - // sfc.render_text("Hello ISO C++!", { 50.0, 50.0 }, rgba_color::white); - //}); - return ds.show(); -} - diff --git a/N3888_RefImpl/src/font_face.cpp b/N3888_RefImpl/src/font_face.cpp deleted file mode 100644 index 851fd88..0000000 --- a/N3888_RefImpl/src/font_face.cpp +++ /dev/null @@ -1,42 +0,0 @@ -#include "io2d.h" -#include "xio2dhelpers.h" - -using namespace std; -using namespace std::experimental::io2d; - -font_face::native_handle_type font_face::native_handle() const noexcept { - return _Font_face.get(); -} - -font_face::font_face(font_face&& other) noexcept { - _Font_face = move(other._Font_face); - other._Font_face = nullptr; -} - -font_face& font_face::operator=(font_face&& other) noexcept { - if (this != &other) { - _Font_face = move(other._Font_face); - other._Font_face = nullptr; - } - return *this; -} - -font_face::font_face(font_face::native_handle_type nh) { - _Font_face = shared_ptr(nh, &cairo_font_face_destroy); -} - -font_face::font_face(font_face::native_handle_type nh, error_code& ec) noexcept { - try { - _Font_face = shared_ptr(nh, &cairo_font_face_destroy); - } - catch (const bad_alloc&) { - ec = make_error_code(errc::not_enough_memory); - } - catch (const exception&) { - ec = make_error_code(errc::resource_unavailable_try_again); - } - ec.clear(); -} - -font_face::~font_face() { -} diff --git a/N3888_RefImpl/src/simple_font_face.cpp b/N3888_RefImpl/src/simple_font_face.cpp deleted file mode 100644 index bd725a5..0000000 --- a/N3888_RefImpl/src/simple_font_face.cpp +++ /dev/null @@ -1,68 +0,0 @@ -#include "io2d.h" -#include "xio2dhelpers.h" -#include "xcairoenumhelpers.h" - -using namespace std; -using namespace std::experimental::io2d; - -simple_font_face::simple_font_face(const string& family, ::std::experimental::io2d::font_slant fs, ::std::experimental::io2d::font_weight fw) - : font_face(nullptr) { - _Font_face = shared_ptr(cairo_toy_font_face_create(family.c_str(), _Font_slant_to_cairo_font_slant_t(fs), _Font_weight_to_cairo_font_weight_t(fw)), &cairo_font_face_destroy); -} - -simple_font_face::simple_font_face(const string& family, ::std::experimental::io2d::font_slant fs, ::std::experimental::io2d::font_weight fw, error_code& ec) noexcept - : font_face(nullptr, ec) { - if (static_cast(ec)) { - return; - } - try { - _Font_face = shared_ptr(cairo_toy_font_face_create(family.c_str(), _Font_slant_to_cairo_font_slant_t(fs), _Font_weight_to_cairo_font_weight_t(fw)), &cairo_font_face_destroy); - } - catch (const bad_alloc&) { - ec = make_error_code(errc::not_enough_memory); - } - ec.clear(); -} - -simple_font_face::simple_font_face(simple_font_face&& other) noexcept : font_face(nullptr) { - _Font_face = move(other._Font_face); - other._Font_face = nullptr; -} - -simple_font_face& simple_font_face::operator=(simple_font_face&& other) noexcept { - if (this != &other) { - _Font_face = move(other._Font_face); - other._Font_face = nullptr; - } - return *this; -} - -simple_font_face::~simple_font_face() { -} - -string simple_font_face::font_family() const { - return string(cairo_toy_font_face_get_family(_Font_face.get())); -} - -void simple_font_face::font_family(string& str, error_code& ec) const noexcept { - try { - ec.clear(); - str = string(cairo_toy_font_face_get_family(_Font_face.get())); - } - catch (const length_error&) { - str.clear(); - ec = make_error_code(errc::not_enough_memory); - } - catch (const bad_alloc&) { - str.clear(); - ec = make_error_code(errc::not_enough_memory); - } -} - -::std::experimental::io2d::font_slant simple_font_face::font_slant() const noexcept { - return _Cairo_font_slant_t_to_font_slant(cairo_toy_font_face_get_slant(_Font_face.get())); -} - -::std::experimental::io2d::font_weight simple_font_face::font_weight() const noexcept { - return _Cairo_font_weight_t_to_font_weight(cairo_toy_font_face_get_weight(_Font_face.get())); -} diff --git a/N3888_RefImpl/src/win32/DLL build instructions.txt b/N3888_RefImpl/src/win32/DLL build instructions.txt deleted file mode 100644 index 1575152..0000000 --- a/N3888_RefImpl/src/win32/DLL build instructions.txt +++ /dev/null @@ -1,81 +0,0 @@ -DLL build instructions. These are provided "AS IS" with no warranties or guarantees of any kind, express or implied, and confer no rights. - -1. If you do not already have a version of Visual Studio 2013 installed, install one (Visual Studio 2013 Express for Windows Desktop is fine - see: http://www.visualstudio.com/downloads/download-visual-studio-vs ). - -2. Install mozilla-build (see: https://wiki.mozilla.org/MozillaBuild ). - -3. In the mozilla-build directory, create a start-msvc12.bat and start-msvc12-x64.bat by adapting the msvc11 versions (if necessary). The version I installed (1.8.0) did not have these .bat files. - -4. Acquire zlib 1.2.8 (or latest), libpng 1.6 (latest), pixman (I used the master branch as of 2013-11-22 21:01:09 which include the patch from 2013-11-18 but not the one from 2013-11-24 (see: http://cgit.freedesktop.org/pixman/ )), and cairo (I used 1.12.16). Note: Libpng, pixman, and cairo can all be acquired with git. IMPORANT: Make sure all 4 are cloned/unzipped in the same folder (the "Root" folder). (When all is done you should have a folder that contains a "cairo" subfolder, a "pixman" subfolder, a "libpng16" subfolder, and a "zlib-1.2.8" subfolder). - - For cairo I used the following git bash commands: - git clone git://git.cairographics.org/git/cairo - cd cairo - git checkout -b build 1.12.16 - cd .. - - For pixman I used the following git bash command: - git clone git://git.cairographics.org/git/pixman - - For libpng I used the following git bash command: - git clone -b libpng16 git://git.code.sf.net/p/libpng/code libpng16 - - For zlib, I acquired the zip file from - -5. Open a command prompt in the Root folder. Use mklink to create NTFS junction points that alias "zlib" for "zlib-1.2.8" and "libpng" for "libpng16" (or appropriate). Example: - mklink /J zlib zlib-1.2.8 - mklink /J libpng libpng16 - -6. Close the command prompt window. - -7. Open a Visual Studio 2013 command prompt (use the x64 native tools version if you're building 64-bit binaries; I am going to assume that you will continue to use either the 32-bit or the 64-bit versions of any tools for the remainder of the instructions since you should not mix 32-bit and 64-bit). - -8. In the VS 2013 command prompt window, cd to the zlib directory (e.g. if zlib was in C:\Repos, you would use "cd C:\Repos\zlib" to change to the directory). - -9. In the VS 2013 command prompt window, build zlib using the following commands: - nmake -f win32\Makefile.msc clean - nmake -f win32\Makefile.msc LOC=-D_INC_WINAPIFAMILY - -10. In the VS 2013 command prompt window, cd to the libpng directory. - -11. In the VS 2013 command prompt window, build libpng using the following commands: - nmake -f scripts\makefile.vcwin32 clean - nmake -f scripts\makefile.vcwin32 - -12. Close the VS 2013 command prompt window. - -13. Open a Windows Explorer window and navigate to the pixman folder. - -14. Navigate to the pixman subfolder. (So if the pixman folder was in C:\Repos, you would now be in C:\Repos\pixman\pixman). - -15. Copy the "pixman-version.h.in" file to "pixman-version.h". - -16. Open "pixman-version.h" in your preferred text editor. - -17. Find the following lines (they are consecutive; for me they are lines 34-36): - -#define PIXMAN_VERSION_MAJOR @PIXMAN_VERSION_MAJOR@ -#define PIXMAN_VERSION_MINOR @PIXMAN_VERSION_MINOR@ -#define PIXMAN_VERSION_MICRO @PIXMAN_VERSION_MICRO@ - -18. Change them to reflect the version number of pixman that you are working with. You can find the values in configure.ac in the main pixman directory (lines 55-57). I used 0, 33, 1, giving me: - -#define PIXMAN_VERSION_MAJOR 0 -#define PIXMAN_VERSION_MINOR 33 -#define PIXMAN_VERSION_MICRO 1 - -19. Save and close pixman-version.h and any other files you opened. - -20. Run the correct .bat file from the mozilla-build install directory (start-msvc12.bat or start-msvc12-x64.bat). This will open a MinGW32 command prompt window. - -21. In the MinGW32 command prompt window, cd to the pixman directory (note that in this window, directories are separated by a forward slash ("/") rather than a backslash ("\") and that file and folder names are case sensitive. Also your C: drive will be at "/c" and D: at "/d", etc. So if the pixman directory was in C:\Repos, you would use "cd /c/Repos/pixman" to change to the directory). - -22. In the MinGW32 command prompt window, build pixman using the following commands (replace "debug" with "release" when building a release DLL of Cairo): - make -f Makefile.win32 MMX=off SSE2=on SSSE3=off CFG=debug clean - make -f Makefile.win32 MMX=off SSE2=on SSSE3=off CFG=debug - -23. In the MinGW32 command prompt window, cd to the cairo directory. - -24. In the MinGW32 command prompt window, build cairo using the following commands (replace "debug" with "release" when building a release DLL of Cairo): - make -f Makefile.win32 CFG=debug clean - make -f Makefile.win32 CFG=debug - -25. If you get "fatal error LNK1112: module machine type '???' conflicts with target machine type '???'" (with the ??? being either X86 or x64), go into the "cairo/src/debug/win32" folder (replace "debug" with "release" if you are creating a release build) and delete all of the .obj files in that folder. Then run the make command again (the last one without the clean) and it should work fine and finish building. - -25. When cairo finishes building, it will list various files for you to copy. Copy those files to the correct place (it's up to you to decide where that should be). You will also need cairo.lib and zlib.lib in order to link against their respective DLLs. The .lib files should be added as linker inputs in your project's project properties in Visual Studio and the DLL files will need to be copied to the same directory as your program executable after it is built and before it runs in order to ensure that it can run correctly. diff --git a/N3888_RefImpl/src/win32/DLLs/x64/Debug/cairo.dll b/N3888_RefImpl/src/win32/DLLs/x64/Debug/cairo.dll deleted file mode 100644 index d9b6174..0000000 Binary files a/N3888_RefImpl/src/win32/DLLs/x64/Debug/cairo.dll and /dev/null differ diff --git a/N3888_RefImpl/src/win32/DLLs/x64/Debug/cairo.pdb b/N3888_RefImpl/src/win32/DLLs/x64/Debug/cairo.pdb deleted file mode 100644 index 5eadb43..0000000 Binary files a/N3888_RefImpl/src/win32/DLLs/x64/Debug/cairo.pdb and /dev/null differ diff --git a/N3888_RefImpl/src/win32/DLLs/x64/Debug/zlib1.dll b/N3888_RefImpl/src/win32/DLLs/x64/Debug/zlib1.dll deleted file mode 100644 index 22d93aa..0000000 Binary files a/N3888_RefImpl/src/win32/DLLs/x64/Debug/zlib1.dll and /dev/null differ diff --git a/N3888_RefImpl/src/win32/DLLs/x64/Debug/zlib1.pdb b/N3888_RefImpl/src/win32/DLLs/x64/Debug/zlib1.pdb deleted file mode 100644 index 4814c75..0000000 Binary files a/N3888_RefImpl/src/win32/DLLs/x64/Debug/zlib1.pdb and /dev/null differ diff --git a/N3888_RefImpl/src/win32/DLLs/x64/Release/cairo.dll b/N3888_RefImpl/src/win32/DLLs/x64/Release/cairo.dll deleted file mode 100644 index b7385d1..0000000 Binary files a/N3888_RefImpl/src/win32/DLLs/x64/Release/cairo.dll and /dev/null differ diff --git a/N3888_RefImpl/src/win32/DLLs/x64/Release/zlib1.dll b/N3888_RefImpl/src/win32/DLLs/x64/Release/zlib1.dll deleted file mode 100644 index 22d93aa..0000000 Binary files a/N3888_RefImpl/src/win32/DLLs/x64/Release/zlib1.dll and /dev/null differ diff --git a/N3888_RefImpl/src/win32/DLLs/x86/Debug/cairo.dll b/N3888_RefImpl/src/win32/DLLs/x86/Debug/cairo.dll deleted file mode 100644 index ef90fab..0000000 Binary files a/N3888_RefImpl/src/win32/DLLs/x86/Debug/cairo.dll and /dev/null differ diff --git a/N3888_RefImpl/src/win32/DLLs/x86/Debug/cairo.pdb b/N3888_RefImpl/src/win32/DLLs/x86/Debug/cairo.pdb deleted file mode 100644 index 096dbae..0000000 Binary files a/N3888_RefImpl/src/win32/DLLs/x86/Debug/cairo.pdb and /dev/null differ diff --git a/N3888_RefImpl/src/win32/DLLs/x86/Debug/zlib1.dll b/N3888_RefImpl/src/win32/DLLs/x86/Debug/zlib1.dll deleted file mode 100644 index 271a042..0000000 Binary files a/N3888_RefImpl/src/win32/DLLs/x86/Debug/zlib1.dll and /dev/null differ diff --git a/N3888_RefImpl/src/win32/DLLs/x86/Debug/zlib1.pdb b/N3888_RefImpl/src/win32/DLLs/x86/Debug/zlib1.pdb deleted file mode 100644 index f301bf9..0000000 Binary files a/N3888_RefImpl/src/win32/DLLs/x86/Debug/zlib1.pdb and /dev/null differ diff --git a/N3888_RefImpl/src/win32/DLLs/x86/Debug_Clang_C2/cairo.dll b/N3888_RefImpl/src/win32/DLLs/x86/Debug_Clang_C2/cairo.dll deleted file mode 100644 index ef90fab..0000000 Binary files a/N3888_RefImpl/src/win32/DLLs/x86/Debug_Clang_C2/cairo.dll and /dev/null differ diff --git a/N3888_RefImpl/src/win32/DLLs/x86/Debug_Clang_C2/zlib1.dll b/N3888_RefImpl/src/win32/DLLs/x86/Debug_Clang_C2/zlib1.dll deleted file mode 100644 index 271a042..0000000 Binary files a/N3888_RefImpl/src/win32/DLLs/x86/Debug_Clang_C2/zlib1.dll and /dev/null differ diff --git a/N3888_RefImpl/src/win32/DLLs/x86/Release/cairo.dll b/N3888_RefImpl/src/win32/DLLs/x86/Release/cairo.dll deleted file mode 100644 index 79c1514..0000000 Binary files a/N3888_RefImpl/src/win32/DLLs/x86/Release/cairo.dll and /dev/null differ diff --git a/N3888_RefImpl/src/win32/DLLs/x86/Release/zlib1.dll b/N3888_RefImpl/src/win32/DLLs/x86/Release/zlib1.dll deleted file mode 100644 index 271a042..0000000 Binary files a/N3888_RefImpl/src/win32/DLLs/x86/Release/zlib1.dll and /dev/null differ diff --git a/N3888_RefImpl/src/win32/DLLs/x86/Release_Clang_C2/cairo.dll b/N3888_RefImpl/src/win32/DLLs/x86/Release_Clang_C2/cairo.dll deleted file mode 100644 index 79c1514..0000000 Binary files a/N3888_RefImpl/src/win32/DLLs/x86/Release_Clang_C2/cairo.dll and /dev/null differ diff --git a/N3888_RefImpl/src/win32/DLLs/x86/Release_Clang_C2/zlib1.dll b/N3888_RefImpl/src/win32/DLLs/x86/Release_Clang_C2/zlib1.dll deleted file mode 100644 index 271a042..0000000 Binary files a/N3888_RefImpl/src/win32/DLLs/x86/Release_Clang_C2/zlib1.dll and /dev/null differ diff --git a/N3888_RefImpl/src/win32/include/cairo-features.h b/N3888_RefImpl/src/win32/include/cairo-features.h deleted file mode 100644 index 9eae639..0000000 --- a/N3888_RefImpl/src/win32/include/cairo-features.h +++ /dev/null @@ -1,17 +0,0 @@ -/* Generated by Makefile.win32.features-h. Do not edit. */ -#ifndef CAIRO_FEATURES_H -#define CAIRO_FEATURES_H 1 -#define CAIRO_HAS_WIN32_SURFACE 1 -#define CAIRO_HAS_WIN32_FONT 1 -#define CAIRO_HAS_PNG_FUNCTIONS 1 -#define CAIRO_HAS_SCRIPT_SURFACE 1 -#define CAIRO_HAS_PS_SURFACE 1 -#define CAIRO_HAS_PDF_SURFACE 1 -#define CAIRO_HAS_SVG_SURFACE 1 -#define CAIRO_HAS_IMAGE_SURFACE 1 -#define CAIRO_HAS_MIME_SURFACE 1 -#define CAIRO_HAS_RECORDING_SURFACE 1 -#define CAIRO_HAS_OBSERVER_SURFACE 1 -#define CAIRO_HAS_USER_FONT 1 -#define CAIRO_HAS_INTERPRETER 1 -#endif diff --git a/N3888_RefImpl/src/win32/lib/x64/Debug/cairo.lib b/N3888_RefImpl/src/win32/lib/x64/Debug/cairo.lib deleted file mode 100644 index ca8e7c1..0000000 Binary files a/N3888_RefImpl/src/win32/lib/x64/Debug/cairo.lib and /dev/null differ diff --git a/N3888_RefImpl/src/win32/lib/x64/Debug/zlib.lib b/N3888_RefImpl/src/win32/lib/x64/Debug/zlib.lib deleted file mode 100644 index 462495c..0000000 Binary files a/N3888_RefImpl/src/win32/lib/x64/Debug/zlib.lib and /dev/null differ diff --git a/N3888_RefImpl/src/win32/lib/x64/Release/cairo.lib b/N3888_RefImpl/src/win32/lib/x64/Release/cairo.lib deleted file mode 100644 index 31fa453..0000000 Binary files a/N3888_RefImpl/src/win32/lib/x64/Release/cairo.lib and /dev/null differ diff --git a/N3888_RefImpl/src/win32/lib/x64/Release/zlib.lib b/N3888_RefImpl/src/win32/lib/x64/Release/zlib.lib deleted file mode 100644 index 462495c..0000000 Binary files a/N3888_RefImpl/src/win32/lib/x64/Release/zlib.lib and /dev/null differ diff --git a/N3888_RefImpl/src/win32/lib/x86/Debug/cairo.lib b/N3888_RefImpl/src/win32/lib/x86/Debug/cairo.lib deleted file mode 100644 index 1414584..0000000 Binary files a/N3888_RefImpl/src/win32/lib/x86/Debug/cairo.lib and /dev/null differ diff --git a/N3888_RefImpl/src/win32/lib/x86/Debug/zlib.lib b/N3888_RefImpl/src/win32/lib/x86/Debug/zlib.lib deleted file mode 100644 index b2fb110..0000000 Binary files a/N3888_RefImpl/src/win32/lib/x86/Debug/zlib.lib and /dev/null differ diff --git a/N3888_RefImpl/src/win32/lib/x86/Debug_Clang_C2/cairo.lib b/N3888_RefImpl/src/win32/lib/x86/Debug_Clang_C2/cairo.lib deleted file mode 100644 index 1414584..0000000 Binary files a/N3888_RefImpl/src/win32/lib/x86/Debug_Clang_C2/cairo.lib and /dev/null differ diff --git a/N3888_RefImpl/src/win32/lib/x86/Debug_Clang_C2/zlib.lib b/N3888_RefImpl/src/win32/lib/x86/Debug_Clang_C2/zlib.lib deleted file mode 100644 index b2fb110..0000000 Binary files a/N3888_RefImpl/src/win32/lib/x86/Debug_Clang_C2/zlib.lib and /dev/null differ diff --git a/N3888_RefImpl/src/win32/lib/x86/Release/cairo.lib b/N3888_RefImpl/src/win32/lib/x86/Release/cairo.lib deleted file mode 100644 index 60a9a64..0000000 Binary files a/N3888_RefImpl/src/win32/lib/x86/Release/cairo.lib and /dev/null differ diff --git a/N3888_RefImpl/src/win32/lib/x86/Release/zlib.lib b/N3888_RefImpl/src/win32/lib/x86/Release/zlib.lib deleted file mode 100644 index b2fb110..0000000 Binary files a/N3888_RefImpl/src/win32/lib/x86/Release/zlib.lib and /dev/null differ diff --git a/N3888_RefImpl/src/win32/lib/x86/Release_Clang_C2/cairo.lib b/N3888_RefImpl/src/win32/lib/x86/Release_Clang_C2/cairo.lib deleted file mode 100644 index 60a9a64..0000000 Binary files a/N3888_RefImpl/src/win32/lib/x86/Release_Clang_C2/cairo.lib and /dev/null differ diff --git a/N3888_RefImpl/src/win32/lib/x86/Release_Clang_C2/zlib.lib b/N3888_RefImpl/src/win32/lib/x86/Release_Clang_C2/zlib.lib deleted file mode 100644 index b2fb110..0000000 Binary files a/N3888_RefImpl/src/win32/lib/x86/Release_Clang_C2/zlib.lib and /dev/null differ diff --git a/README.md b/README.md index 6fb3093..a4aedf1 100644 --- a/README.md +++ b/README.md @@ -1,51 +1,91 @@ -N4073 Reference Implementation -============= +Note +==== + +In the meantime the original reference implentation referenced below has gain CMake support, and should be preferred to this fork. See more at: [https://github.com/cpp-io2d/P0267_RefImpl](https://github.com/cpp-io2d/P0267_RefImpl) + -Please read the [LICENSE](https://github.com/mikebmcl/N3888_RefImpl/blob/master/LICENSE.md) before cloning or forking the code as there is important information there! +P0267R0: A Proposal to Add 2D Graphics Rendering and Display to C++. Reference Implementation +============= -Please see the [wiki](https://github.com/mikebmcl/N3888_RefImpl/wiki) for links to forks which provide alternate implementations! +Please read the [LICENSE](https://github.com/cristianadam/io2d/blob/master/LICENSE.md) before +cloning or forking the code as there is important information there! Overview ------------- -This is a reference implementations of [N4073: A Proposal to Add 2D Rendering and Display to C++](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4073.pdf). +This is a reference implementation of [P0267R0: A Proposal to Add 2D Graphics Rendering and Display to C++.](http://open-std.org/JTC1/SC22/WG21/docs/papers/2016/p0267r0.pdf). + +This is a fork of [https://github.com/mikebmcl/N3888_RefImpl/](https://github.com/mikebmcl/N3888_RefImpl/). +This fork adds CMake Build support and to the reference implementation. Requirements ------------- -For Windows platforms, it currently requires Visual Studio 2013 (the free Express for Windows Desktop version should suffice) and Windows Vista or newer. - -For GNU/Linux platforms, it currently requires a non-ancient version of GNU autotools, cairo (>= 1.12.16), GTK+3.0 (>= 3.8.0), gmodule-2.0, gobject-2.0, and related libraries (autotools will tell you about any missing dependencies). By default it builds using GCC (>= 4.9.0), but you can configure it to use recent versions of Clang. +[CMake build system](https://cmake.org/). A modern C++ compiler. Discussion ------------- -There are several places to discuss this proposal. You can discuss it on the [std-proposals forum](https://groups.google.com/a/isocpp.org/forum/?fromgroups#!forum/std-proposals), on the [SG 13 forum](https://groups.google.com/a/isocpp.org/forum/?fromgroups#!forum/io), or you can leave a comment on the [the blog post announcing the proposal](http://isocpp.org/blog/2014/07/n4073). Members of the cairo graphics library community are, of course, welcome to discuss the proposal in the cairo mailing list as well if they would prefer that. +There are several places to discuss this proposal. You can discuss it on the [std-proposals forum](https://groups.google.com/a/isocpp.org/forum/?fromgroups#!forum/std-proposals), +on the [SG 13 forum](https://groups.google.com/a/isocpp.org/forum/?fromgroups#!forum/sg13), or you can leave a comment on the +[the blog post announcing the proposal](http://isocpp.org/blog/2014/07/N4073). Members of the cairo graphics library community are, +of course, welcome to discuss the proposal in the cairo mailing list as well if they would prefer that. Feedback ------------- -If you have found a bug in the reference implementation or have a suggestion for improving N3888 please read the following. Note that any contributions must comply with the ISO patent and copyright policy, an overview of which is available in the ISO document [Participating in International Standardization](http://www.iso.org/iso/joining_in_2012.pdf). +If you have found a bug in the reference implementation or have a suggestion for improving P0267R0 please read the following. Note that any +contributions must comply with the ISO patent and copyright policy, an overview of which is available in the ISO +document [Participating in International Standardization](http://www.iso.org/iso/joining_in_2012.pdf). -* If you want to suggest a change to N4073 please file an [issue](https://github.com/mikebmcl/N3888_RefImpl/issues) with the tag [enhancement](https://github.com/mikebmcl/N3888_RefImpl/issues?labels=enhancement&page=1&state=open). We will consider these for future revisions of N4073. Pull requests for suggested changes will not be accepted because this is a reference implementation. +* If you want to suggest a change to P0267R0 please file an [issue](https://github.com/mikebmcl/N3888_RefImpl/issues) with the tag [enhancement](https://github.com/mikebmcl/N3888_RefImpl/issues?labels=enhancement&page=1&state=open). We will consider these for future revisions of P0267R0. Pull requests for suggested changes will not be accepted because this is a reference implementation. * If you have found a bug in the reference implementation, please file an issue with the tag [bug](https://github.com/mikebmcl/N3888_RefImpl/issues?labels=bug&page=1&state=open). Pull requests that fix bugs are welcome. -* If you have found any sort of error in N4073 (be it a typo, an omission, a contradiction, or some other non-subjective problem), please file an issue with the tag [proposal-bug](https://github.com/mikebmcl/N3888_RefImpl/issues?labels=proposal-bug&page=1&state=open). We will do our best to address these in the next revision of N4073. -* If you have created a reference implementation for another platform or tool-chain, please let us know. We welcome these types of pull requests provided that the implementation conforms to N4073 and the licensing terms are acceptable. +* If you have found any sort of error in P0267R0 (be it a typo, an omission, a contradiction, or some other non-subjective problem), please file an issue with the tag [proposal-bug](https://github.com/mikebmcl/N3888_RefImpl/issues?labels=proposal-bug&page=1&state=open). We will do our best to address these in the next revision of P0267R0. +* If you have created a reference implementation for another platform or tool-chain, please let us know. We welcome these types of pull requests provided that the implementation conforms to P0267R0 and the licensing terms are acceptable. -Subsequent revisions to N4073 will be maintained in branches or in separate repositories, depending on which strategy seems appropriate at that time. +Subsequent revisions to P0267R0 will be maintained in branches or in separate repositories, depending on which +strategy seems appropriate at that time. Licenses and Contributions (Important!) ------------- -Any code that you offer as a pull request must be your own work. If your employer or institution has a moonlighting policy, the act of offering a pull request shall be considered a declaration that you complied with the terms of that policy and are free to make the contribution or that your employer or institution has expressly waived any IP rights it or they might have had in your contribution thus freeing you to make the contribution. - -If your contribution makes use of third party libraries it must comply with the licensing terms of those libraries. If the library is licensed under multiple licenses you must indicate which license your contribution is using ("whichever" is not acceptable). The terms of those licenses must be compatible with the terms of the licenses of any existing code. Code licensed under any version of the GPL will not be considered. (Note: LGPL code will be considered, though licenses that give more freedom to other developers are preferred.) - -You must specify a license for your contribution. If it is an original work, we suggest, but do not require, that you choose the MIT License. If the chosen license is unacceptable for some reason, you will be informed that the license is not acceptable. - -If your code is a derivative work of the reference implementation it must be licensed under the terms of the MIT License unless you obtain an express, written waiver from the original author of the reference implementation, Michael B. McLaughlin. (Literally written, as in fixed on paper, signed, and physically mailed to you). - -**If you fail to comply with the terms of any employer or institutional policies, the terms of any licenses, or if you infringe upon any patents, violate any trade secrets, violate any laws or regulations, or, by any act or omission, cause any legal action to be brought against the authors of N4073, the ISO C++ committee (ISO/IEC JTC1/SC22/WG21) or any of its members individually, or any participants in SG13 of the ISO C++ committee, you agree to pay all legal expenses of said persons and entities and indemnify every one of them in full in the event that any legally binding judgment is rendered against them.** - -Intellectual property rights are important. You may not agree with every IP law and regulation out there (I certainly have some suggestions for reforming them), but we cannot ignore them and hope nobody notices. Many of us do things like develop software, do technical writing, or work for companies where that is a big part of what pays the bills. In other words, our livelihoods depend on copyrights and licenses and the such. So I apologize for all the scary language above. But until I go a decade without seeing statements like "I haven't decided on a license yet but here's some code I wrote", I'll continue to write scary statements in hopes of scaring people into taking copyrights and licenses more seriously. And because I really do mean them. I don't want to be facing $50,000+ in lawyers bills plus some large monetary judgment because someone passed off somebody else's code as their own or didn't follow their employer's policies or whatever. I don't know anyone else who'd want to be facing that either. - -I encourage anyone with intellectual property disputes to try to work them out reasonably first, provided that doing so would not prejudice any of your rights in the event that a reasonable agreement cannot be reached. If you have any legal questions you should contact a knowledgeable attorney. +Any code that you offer as a pull request must be your own work. If your employer or institution has a moonlighting policy, +the act of offering a pull request shall be considered a declaration that you complied with the terms of that policy +and are free to make the contribution or that your employer or institution has expressly waived any IP rights +it or they might have had in your contribution thus freeing you to make the contribution. + +If your contribution makes use of third party libraries it must comply with the licensing terms of those +libraries. If the library is licensed under multiple licenses you must indicate which license your +contribution is using ("whichever" is not acceptable). The terms of those licenses must be compatible +with the terms of the licenses of any existing code. Code licensed under any version of the GPL will +not be considered. (Note: LGPL code will be considered, though licenses that give more freedom to other +developers are preferred.) + +You must specify a license for your contribution. If it is an original work, we suggest, but do not require, +that you choose the MIT License. If the chosen license is unacceptable for some reason, you will be informed +that the license is not acceptable. + +If your code is a derivative work of the reference implementation it must be licensed under the terms of the +MIT License unless you obtain an express, written waiver from the original author of the reference implementation, +Michael B. McLaughlin. (Literally written, as in fixed on paper, signed, and physically mailed to you). + +**If you fail to comply with the terms of any employer or institutional policies, the terms of any licenses, +or if you infringe upon any patents, violate any trade secrets, violate any laws or regulations, or, by +any act or omission, cause any legal action to be brought against the authors of P0267R0, the ISO C++ committee +(ISO/IEC JTC1/SC22/WG21) or any of its members individually, or any participants in SG13 of the ISO C++ +committee, you agree to pay all legal expenses of said persons and entities and indemnify every one of +them in full in the event that any legally binding judgment is rendered against them.** + +Intellectual property rights are important. You may not agree with every IP law and regulation out there +(I certainly have some suggestions for reforming them), but we cannot ignore them and hope nobody notices. +Many of us do things like develop software, do technical writing, or work for companies where that is a +big part of what pays the bills. In other words, our livelihoods depend on copyrights and licenses and +the such. So I apologize for all the scary language above. But until I go a decade without seeing +statements like "I haven't decided on a license yet but here's some code I wrote", I'll continue to +write scary statements in hopes of scaring people into taking copyrights and licenses more seriously. +And because I really do mean them. I don't want to be facing $50,000+ in lawyers bills plus some +large monetary judgment because someone passed off somebody else's code as their own or didn't follow +their employer's policies or whatever. I don't know anyone else who'd want to be facing that either. + +I encourage anyone with intellectual property disputes to try to work them out reasonably first, +provided that doing so would not prejudice any of your rights in the event that a reasonable +agreement cannot be reached. If you have any legal questions you should contact a knowledgeable attorney. diff --git a/cairo/cairo-version.h b/cairo/cairo-version.h deleted file mode 100644 index 107df30..0000000 --- a/cairo/cairo-version.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef CAIRO_VERSION_H -#define CAIRO_VERSION_H - -#define CAIRO_VERSION_MAJOR 1 -#define CAIRO_VERSION_MINOR 12 -#define CAIRO_VERSION_MICRO 16 - -#endif diff --git a/cairo/src/cairo-deprecated.h b/cairo/src/cairo-deprecated.h deleted file mode 100644 index 7a56aad..0000000 --- a/cairo/src/cairo-deprecated.h +++ /dev/null @@ -1,123 +0,0 @@ -/* cairo - a vector graphics library with display and print output - * - * Copyright © 2006 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it either under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation - * (the "LGPL") or, at your option, under the terms of the Mozilla - * Public License Version 1.1 (the "MPL"). If you do not alter this - * notice, a recipient may use your version of this file under either - * the MPL or the LGPL. - * - * You should have received a copy of the LGPL along with this library - * in the file COPYING-LGPL-2.1; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA - * You should have received a copy of the MPL along with this library - * in the file COPYING-MPL-1.1 - * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY - * OF ANY KIND, either express or implied. See the LGPL or the MPL for - * the specific language governing rights and limitations. - * - * The Original Code is the cairo graphics library. - * - * The Initial Developer of the Original Code is Red Hat, Inc. - * - * Contributor(s): - * Carl D. Worth - */ - -#ifndef CAIRO_DEPRECATED_H -#define CAIRO_DEPRECATED_H - -#define CAIRO_FONT_TYPE_ATSUI CAIRO_FONT_TYPE_QUARTZ - -/* Obsolete functions. These definitions exist to coerce the compiler - * into providing a little bit of guidance with its error - * messages. The idea is to help users port their old code without - * having to dig through lots of documentation. - * - * The first set of REPLACED_BY functions is for functions whose names - * have just been changed. So fixing these up is mechanical, (and - * automated by means of the cairo/util/cairo-api-update script. - * - * The second set of DEPRECATED_BY functions is for functions where - * the replacement is used in a different way, (ie. different - * arguments, multiple functions instead of one, etc). Fixing these up - * will require a bit more work on the user's part, (and hopefully we - * can get cairo-api-update to find these and print some guiding - * information). - */ -#define cairo_current_font_extents cairo_current_font_extents_REPLACED_BY_cairo_font_extents -#define cairo_get_font_extents cairo_get_font_extents_REPLACED_BY_cairo_font_extents -#define cairo_current_operator cairo_current_operator_REPLACED_BY_cairo_get_operator -#define cairo_current_tolerance cairo_current_tolerance_REPLACED_BY_cairo_get_tolerance -#define cairo_current_point cairo_current_point_REPLACED_BY_cairo_get_current_point -#define cairo_current_fill_rule cairo_current_fill_rule_REPLACED_BY_cairo_get_fill_rule -#define cairo_current_line_width cairo_current_line_width_REPLACED_BY_cairo_get_line_width -#define cairo_current_line_cap cairo_current_line_cap_REPLACED_BY_cairo_get_line_cap -#define cairo_current_line_join cairo_current_line_join_REPLACED_BY_cairo_get_line_join -#define cairo_current_miter_limit cairo_current_miter_limit_REPLACED_BY_cairo_get_miter_limit -#define cairo_current_matrix cairo_current_matrix_REPLACED_BY_cairo_get_matrix -#define cairo_current_target_surface cairo_current_target_surface_REPLACED_BY_cairo_get_target -#define cairo_get_status cairo_get_status_REPLACED_BY_cairo_status -#define cairo_concat_matrix cairo_concat_matrix_REPLACED_BY_cairo_transform -#define cairo_scale_font cairo_scale_font_REPLACED_BY_cairo_set_font_size -#define cairo_select_font cairo_select_font_REPLACED_BY_cairo_select_font_face -#define cairo_transform_font cairo_transform_font_REPLACED_BY_cairo_set_font_matrix -#define cairo_transform_point cairo_transform_point_REPLACED_BY_cairo_user_to_device -#define cairo_transform_distance cairo_transform_distance_REPLACED_BY_cairo_user_to_device_distance -#define cairo_inverse_transform_point cairo_inverse_transform_point_REPLACED_BY_cairo_device_to_user -#define cairo_inverse_transform_distance cairo_inverse_transform_distance_REPLACED_BY_cairo_device_to_user_distance -#define cairo_init_clip cairo_init_clip_REPLACED_BY_cairo_reset_clip -#define cairo_surface_create_for_image cairo_surface_create_for_image_REPLACED_BY_cairo_image_surface_create_for_data -#define cairo_default_matrix cairo_default_matrix_REPLACED_BY_cairo_identity_matrix -#define cairo_matrix_set_affine cairo_matrix_set_affine_REPLACED_BY_cairo_matrix_init -#define cairo_matrix_set_identity cairo_matrix_set_identity_REPLACED_BY_cairo_matrix_init_identity -#define cairo_pattern_add_color_stop cairo_pattern_add_color_stop_REPLACED_BY_cairo_pattern_add_color_stop_rgba -#define cairo_set_rgb_color cairo_set_rgb_color_REPLACED_BY_cairo_set_source_rgb -#define cairo_set_pattern cairo_set_pattern_REPLACED_BY_cairo_set_source -#define cairo_xlib_surface_create_for_pixmap_with_visual cairo_xlib_surface_create_for_pixmap_with_visual_REPLACED_BY_cairo_xlib_surface_create -#define cairo_xlib_surface_create_for_window_with_visual cairo_xlib_surface_create_for_window_with_visual_REPLACED_BY_cairo_xlib_surface_create -#define cairo_xcb_surface_create_for_pixmap_with_visual cairo_xcb_surface_create_for_pixmap_with_visual_REPLACED_BY_cairo_xcb_surface_create -#define cairo_xcb_surface_create_for_window_with_visual cairo_xcb_surface_create_for_window_with_visual_REPLACED_BY_cairo_xcb_surface_create -#define cairo_ps_surface_set_dpi cairo_ps_surface_set_dpi_REPLACED_BY_cairo_surface_set_fallback_resolution -#define cairo_pdf_surface_set_dpi cairo_pdf_surface_set_dpi_REPLACED_BY_cairo_surface_set_fallback_resolution -#define cairo_svg_surface_set_dpi cairo_svg_surface_set_dpi_REPLACED_BY_cairo_surface_set_fallback_resolution -#define cairo_atsui_font_face_create_for_atsu_font_id cairo_atsui_font_face_create_for_atsu_font_id_REPLACED_BY_cairo_quartz_font_face_create_for_atsu_font_id - -#define cairo_current_path cairo_current_path_DEPRECATED_BY_cairo_copy_path -#define cairo_current_path_flat cairo_current_path_flat_DEPRECATED_BY_cairo_copy_path_flat -#define cairo_get_path cairo_get_path_DEPRECATED_BY_cairo_copy_path -#define cairo_get_path_flat cairo_get_path_flat_DEPRECATED_BY_cairo_get_path_flat -#define cairo_set_alpha cairo_set_alpha_DEPRECATED_BY_cairo_set_source_rgba_OR_cairo_paint_with_alpha -#define cairo_show_surface cairo_show_surface_DEPRECATED_BY_cairo_set_source_surface_AND_cairo_paint -#define cairo_copy cairo_copy_DEPRECATED_BY_cairo_create_AND_MANY_INDIVIDUAL_FUNCTIONS -#define cairo_surface_set_repeat cairo_surface_set_repeat_DEPRECATED_BY_cairo_pattern_set_extend -#define cairo_surface_set_matrix cairo_surface_set_matrix_DEPRECATED_BY_cairo_pattern_set_matrix -#define cairo_surface_get_matrix cairo_surface_get_matrix_DEPRECATED_BY_cairo_pattern_get_matrix -#define cairo_surface_set_filter cairo_surface_set_filter_DEPRECATED_BY_cairo_pattern_set_filter -#define cairo_surface_get_filter cairo_surface_get_filter_DEPRECATED_BY_cairo_pattern_get_filter -#define cairo_matrix_create cairo_matrix_create_DEPRECATED_BY_cairo_matrix_t -#define cairo_matrix_destroy cairo_matrix_destroy_DEPRECATED_BY_cairo_matrix_t -#define cairo_matrix_copy cairo_matrix_copy_DEPRECATED_BY_cairo_matrix_t -#define cairo_matrix_get_affine cairo_matrix_get_affine_DEPRECATED_BY_cairo_matrix_t -#define cairo_set_target_surface cairo_set_target_surface_DEPRECATED_BY_cairo_create -#define cairo_set_target_image cairo_set_target_image_DEPRECATED_BY_cairo_image_surface_create_for_data -#define cairo_set_target_pdf cairo_set_target_pdf_DEPRECATED_BY_cairo_pdf_surface_create -#define cairo_set_target_png cairo_set_target_png_DEPRECATED_BY_cairo_surface_write_to_png -#define cairo_set_target_ps cairo_set_target_ps_DEPRECATED_BY_cairo_ps_surface_create -#define cairo_set_target_quartz cairo_set_target_quartz_DEPRECATED_BY_cairo_quartz_surface_create -#define cairo_set_target_win32 cairo_set_target_win32_DEPRECATED_BY_cairo_win32_surface_create -#define cairo_set_target_xcb cairo_set_target_xcb_DEPRECATED_BY_cairo_xcb_surface_create -#define cairo_set_target_drawable cairo_set_target_drawable_DEPRECATED_BY_cairo_xlib_surface_create -#define cairo_get_status_string cairo_get_status_string_DEPRECATED_BY_cairo_status_AND_cairo_status_to_string -#define cairo_status_string cairo_status_string_DEPRECATED_BY_cairo_status_AND_cairo_status_to_string - -#endif /* CAIRO_DEPRECATED_H */ diff --git a/cairo/src/cairo-features.h b/cairo/src/cairo-features.h deleted file mode 100644 index 9eae639..0000000 --- a/cairo/src/cairo-features.h +++ /dev/null @@ -1,17 +0,0 @@ -/* Generated by Makefile.win32.features-h. Do not edit. */ -#ifndef CAIRO_FEATURES_H -#define CAIRO_FEATURES_H 1 -#define CAIRO_HAS_WIN32_SURFACE 1 -#define CAIRO_HAS_WIN32_FONT 1 -#define CAIRO_HAS_PNG_FUNCTIONS 1 -#define CAIRO_HAS_SCRIPT_SURFACE 1 -#define CAIRO_HAS_PS_SURFACE 1 -#define CAIRO_HAS_PDF_SURFACE 1 -#define CAIRO_HAS_SVG_SURFACE 1 -#define CAIRO_HAS_IMAGE_SURFACE 1 -#define CAIRO_HAS_MIME_SURFACE 1 -#define CAIRO_HAS_RECORDING_SURFACE 1 -#define CAIRO_HAS_OBSERVER_SURFACE 1 -#define CAIRO_HAS_USER_FONT 1 -#define CAIRO_HAS_INTERPRETER 1 -#endif diff --git a/cairo/src/cairo-pdf.h b/cairo/src/cairo-pdf.h deleted file mode 100644 index 1bc8524..0000000 --- a/cairo/src/cairo-pdf.h +++ /dev/null @@ -1,94 +0,0 @@ -/* cairo - a vector graphics library with display and print output - * - * Copyright © 2002 University of Southern California - * - * This library is free software; you can redistribute it and/or - * modify it either under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation - * (the "LGPL") or, at your option, under the terms of the Mozilla - * Public License Version 1.1 (the "MPL"). If you do not alter this - * notice, a recipient may use your version of this file under either - * the MPL or the LGPL. - * - * You should have received a copy of the LGPL along with this library - * in the file COPYING-LGPL-2.1; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA - * You should have received a copy of the MPL along with this library - * in the file COPYING-MPL-1.1 - * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY - * OF ANY KIND, either express or implied. See the LGPL or the MPL for - * the specific language governing rights and limitations. - * - * The Original Code is the cairo graphics library. - * - * The Initial Developer of the Original Code is University of Southern - * California. - * - * Contributor(s): - * Carl D. Worth - */ - -#ifndef CAIRO_PDF_H -#define CAIRO_PDF_H - -#include "cairo.h" - -#if CAIRO_HAS_PDF_SURFACE - -CAIRO_BEGIN_DECLS - -/** - * cairo_pdf_version_t: - * @CAIRO_PDF_VERSION_1_4: The version 1.4 of the PDF specification. (Since 1.10) - * @CAIRO_PDF_VERSION_1_5: The version 1.5 of the PDF specification. (Since 1.10) - * - * #cairo_pdf_version_t is used to describe the version number of the PDF - * specification that a generated PDF file will conform to. - * - * Since: 1.10 - **/ -typedef enum _cairo_pdf_version { - CAIRO_PDF_VERSION_1_4, - CAIRO_PDF_VERSION_1_5 -} cairo_pdf_version_t; - -cairo_public cairo_surface_t * -cairo_pdf_surface_create (const char *filename, - double width_in_points, - double height_in_points); - -cairo_public cairo_surface_t * -cairo_pdf_surface_create_for_stream (cairo_write_func_t write_func, - void *closure, - double width_in_points, - double height_in_points); - -cairo_public void -cairo_pdf_surface_restrict_to_version (cairo_surface_t *surface, - cairo_pdf_version_t version); - -cairo_public void -cairo_pdf_get_versions (cairo_pdf_version_t const **versions, - int *num_versions); - -cairo_public const char * -cairo_pdf_version_to_string (cairo_pdf_version_t version); - -cairo_public void -cairo_pdf_surface_set_size (cairo_surface_t *surface, - double width_in_points, - double height_in_points); - -CAIRO_END_DECLS - -#else /* CAIRO_HAS_PDF_SURFACE */ -# error Cairo was not compiled with support for the pdf backend -#endif /* CAIRO_HAS_PDF_SURFACE */ - -#endif /* CAIRO_PDF_H */ diff --git a/cairo/src/cairo-ps.h b/cairo/src/cairo-ps.h deleted file mode 100644 index 33d0e0d..0000000 --- a/cairo/src/cairo-ps.h +++ /dev/null @@ -1,116 +0,0 @@ -/* cairo - a vector graphics library with display and print output - * - * Copyright © 2002 University of Southern California - * - * This library is free software; you can redistribute it and/or - * modify it either under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation - * (the "LGPL") or, at your option, under the terms of the Mozilla - * Public License Version 1.1 (the "MPL"). If you do not alter this - * notice, a recipient may use your version of this file under either - * the MPL or the LGPL. - * - * You should have received a copy of the LGPL along with this library - * in the file COPYING-LGPL-2.1; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA - * You should have received a copy of the MPL along with this library - * in the file COPYING-MPL-1.1 - * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY - * OF ANY KIND, either express or implied. See the LGPL or the MPL for - * the specific language governing rights and limitations. - * - * The Original Code is the cairo graphics library. - * - * The Initial Developer of the Original Code is University of Southern - * California. - * - * Contributor(s): - * Carl D. Worth - */ - -#ifndef CAIRO_PS_H -#define CAIRO_PS_H - -#include "cairo.h" - -#if CAIRO_HAS_PS_SURFACE - -#include - -CAIRO_BEGIN_DECLS - -/* PS-surface functions */ - -/** - * cairo_ps_level_t: - * @CAIRO_PS_LEVEL_2: The language level 2 of the PostScript specification. (Since 1.6) - * @CAIRO_PS_LEVEL_3: The language level 3 of the PostScript specification. (Since 1.6) - * - * #cairo_ps_level_t is used to describe the language level of the - * PostScript Language Reference that a generated PostScript file will - * conform to. - * - * Since: 1.6 - **/ -typedef enum _cairo_ps_level { - CAIRO_PS_LEVEL_2, - CAIRO_PS_LEVEL_3 -} cairo_ps_level_t; - -cairo_public cairo_surface_t * -cairo_ps_surface_create (const char *filename, - double width_in_points, - double height_in_points); - -cairo_public cairo_surface_t * -cairo_ps_surface_create_for_stream (cairo_write_func_t write_func, - void *closure, - double width_in_points, - double height_in_points); - -cairo_public void -cairo_ps_surface_restrict_to_level (cairo_surface_t *surface, - cairo_ps_level_t level); - -cairo_public void -cairo_ps_get_levels (cairo_ps_level_t const **levels, - int *num_levels); - -cairo_public const char * -cairo_ps_level_to_string (cairo_ps_level_t level); - -cairo_public void -cairo_ps_surface_set_eps (cairo_surface_t *surface, - cairo_bool_t eps); - -cairo_public cairo_bool_t -cairo_ps_surface_get_eps (cairo_surface_t *surface); - -cairo_public void -cairo_ps_surface_set_size (cairo_surface_t *surface, - double width_in_points, - double height_in_points); - -cairo_public void -cairo_ps_surface_dsc_comment (cairo_surface_t *surface, - const char *comment); - -cairo_public void -cairo_ps_surface_dsc_begin_setup (cairo_surface_t *surface); - -cairo_public void -cairo_ps_surface_dsc_begin_page_setup (cairo_surface_t *surface); - -CAIRO_END_DECLS - -#else /* CAIRO_HAS_PS_SURFACE */ -# error Cairo was not compiled with support for the ps backend -#endif /* CAIRO_HAS_PS_SURFACE */ - -#endif /* CAIRO_PS_H */ diff --git a/cairo/src/cairo-script.h b/cairo/src/cairo-script.h deleted file mode 100644 index b5a8cf3..0000000 --- a/cairo/src/cairo-script.h +++ /dev/null @@ -1,98 +0,0 @@ -/* cairo - a vector graphics library with display and print output - * - * Copyright © 2008 Chris Wilson - * - * This library is free software; you can redistribute it and/or - * modify it either under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation - * (the "LGPL") or, at your option, under the terms of the Mozilla - * Public License Version 1.1 (the "MPL"). If you do not alter this - * notice, a recipient may use your version of this file under either - * the MPL or the LGPL. - * - * You should have received a copy of the LGPL along with this library - * in the file COPYING-LGPL-2.1; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA - * You should have received a copy of the MPL along with this library - * in the file COPYING-MPL-1.1 - * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY - * OF ANY KIND, either express or implied. See the LGPL or the MPL for - * the specific language governing rights and limitations. - * - * The Original Code is the cairo graphics library. - * - * The Initial Developer of the Original Code is Chris Wilson - * - * Contributor(s): - * Chris Wilson - */ - -#ifndef CAIRO_SCRIPT_H -#define CAIRO_SCRIPT_H - -#include "cairo.h" - -#if CAIRO_HAS_SCRIPT_SURFACE - -CAIRO_BEGIN_DECLS - -/** - * cairo_script_mode_t: - * @CAIRO_SCRIPT_MODE_ASCII: the output will be in readable text (default). (Since 1.12) - * @CAIRO_SCRIPT_MODE_BINARY: the output will use byte codes. (Since 1.12) - * - * A set of script output variants. - * - * Since: 1.12 - **/ -typedef enum { - CAIRO_SCRIPT_MODE_ASCII, - CAIRO_SCRIPT_MODE_BINARY -} cairo_script_mode_t; - -cairo_public cairo_device_t * -cairo_script_create (const char *filename); - -cairo_public cairo_device_t * -cairo_script_create_for_stream (cairo_write_func_t write_func, - void *closure); - -cairo_public void -cairo_script_write_comment (cairo_device_t *script, - const char *comment, - int len); - -cairo_public void -cairo_script_set_mode (cairo_device_t *script, - cairo_script_mode_t mode); - -cairo_public cairo_script_mode_t -cairo_script_get_mode (cairo_device_t *script); - -cairo_public cairo_surface_t * -cairo_script_surface_create (cairo_device_t *script, - cairo_content_t content, - double width, - double height); - -cairo_public cairo_surface_t * -cairo_script_surface_create_for_target (cairo_device_t *script, - cairo_surface_t *target); - -cairo_public cairo_status_t -cairo_script_from_recording_surface (cairo_device_t *script, - cairo_surface_t *recording_surface); - -CAIRO_END_DECLS - -#else /*CAIRO_HAS_SCRIPT_SURFACE*/ -# error Cairo was not compiled with support for the CairoScript backend -#endif /*CAIRO_HAS_SCRIPT_SURFACE*/ - -#endif /*CAIRO_SCRIPT_H*/ diff --git a/cairo/src/cairo-svg.h b/cairo/src/cairo-svg.h deleted file mode 100644 index 592c645..0000000 --- a/cairo/src/cairo-svg.h +++ /dev/null @@ -1,84 +0,0 @@ -/* cairo - a vector graphics library with display and print output - * - * cairo-svg.h - * - * Copyright © 2005 Emmanuel Pacaud - * - * This library is free software; you can redistribute it and/or - * modify it either under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation - * (the "LGPL") or, at your option, under the terms of the Mozilla - * Public License Version 1.1 (the "MPL"). If you do not alter this - * notice, a recipient may use your version of this file under either - * the MPL or the LGPL. - * - * You should have received a copy of the LGPL along with this library - * in the file COPYING-LGPL-2.1; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA - * You should have received a copy of the MPL along with this library - * in the file COPYING-MPL-1.1 - * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY - * OF ANY KIND, either express or implied. See the LGPL or the MPL for - * the specific language governing rights and limitations. - * - */ - -#ifndef CAIRO_SVG_H -#define CAIRO_SVG_H - -#include "cairo.h" - -#if CAIRO_HAS_SVG_SURFACE - -CAIRO_BEGIN_DECLS - -/** - * cairo_svg_version_t: - * @CAIRO_SVG_VERSION_1_1: The version 1.1 of the SVG specification. (Since 1.2) - * @CAIRO_SVG_VERSION_1_2: The version 1.2 of the SVG specification. (Since 1.2) - * - * #cairo_svg_version_t is used to describe the version number of the SVG - * specification that a generated SVG file will conform to. - * - * Since: 1.2 - **/ -typedef enum _cairo_svg_version { - CAIRO_SVG_VERSION_1_1, - CAIRO_SVG_VERSION_1_2 -} cairo_svg_version_t; - -cairo_public cairo_surface_t * -cairo_svg_surface_create (const char *filename, - double width_in_points, - double height_in_points); - -cairo_public cairo_surface_t * -cairo_svg_surface_create_for_stream (cairo_write_func_t write_func, - void *closure, - double width_in_points, - double height_in_points); - -cairo_public void -cairo_svg_surface_restrict_to_version (cairo_surface_t *surface, - cairo_svg_version_t version); - -cairo_public void -cairo_svg_get_versions (cairo_svg_version_t const **versions, - int *num_versions); - -cairo_public const char * -cairo_svg_version_to_string (cairo_svg_version_t version); - -CAIRO_END_DECLS - -#else /* CAIRO_HAS_SVG_SURFACE */ -# error Cairo was not compiled with support for the svg backend -#endif /* CAIRO_HAS_SVG_SURFACE */ - -#endif /* CAIRO_SVG_H */ diff --git a/cairo/src/cairo-win32.h b/cairo/src/cairo-win32.h deleted file mode 100644 index 3d2e1c6..0000000 --- a/cairo/src/cairo-win32.h +++ /dev/null @@ -1,112 +0,0 @@ -/* -*- Mode: c; tab-width: 8; c-basic-offset: 4; indent-tabs-mode: t; -*- */ -/* cairo - a vector graphics library with display and print output - * - * Copyright © 2005 Red Hat, Inc - * - * This library is free software; you can redistribute it and/or - * modify it either under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation - * (the "LGPL") or, at your option, under the terms of the Mozilla - * Public License Version 1.1 (the "MPL"). If you do not alter this - * notice, a recipient may use your version of this file under either - * the MPL or the LGPL. - * - * You should have received a copy of the LGPL along with this library - * in the file COPYING-LGPL-2.1; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA - * You should have received a copy of the MPL along with this library - * in the file COPYING-MPL-1.1 - * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY - * OF ANY KIND, either express or implied. See the LGPL or the MPL for - * the specific language governing rights and limitations. - * - * The Original Code is the cairo graphics library. - * - * The Initial Developer of the Original Code is Red Hat, Inc. - * - * Contributor(s): - * Owen Taylor - */ - -#ifndef _CAIRO_WIN32_H_ -#define _CAIRO_WIN32_H_ - -#include "cairo.h" - -#if CAIRO_HAS_WIN32_SURFACE - -#include - -CAIRO_BEGIN_DECLS - -cairo_public cairo_surface_t * -cairo_win32_surface_create (HDC hdc); - -cairo_public cairo_surface_t * -cairo_win32_printing_surface_create (HDC hdc); - -cairo_public cairo_surface_t * -cairo_win32_surface_create_with_ddb (HDC hdc, - cairo_format_t format, - int width, - int height); - -cairo_public cairo_surface_t * -cairo_win32_surface_create_with_dib (cairo_format_t format, - int width, - int height); - -cairo_public HDC -cairo_win32_surface_get_dc (cairo_surface_t *surface); - -cairo_public cairo_surface_t * -cairo_win32_surface_get_image (cairo_surface_t *surface); - -#if CAIRO_HAS_WIN32_FONT - -/* - * Win32 font support - */ - -cairo_public cairo_font_face_t * -cairo_win32_font_face_create_for_logfontw (LOGFONTW *logfont); - -cairo_public cairo_font_face_t * -cairo_win32_font_face_create_for_hfont (HFONT font); - -cairo_public cairo_font_face_t * -cairo_win32_font_face_create_for_logfontw_hfont (LOGFONTW *logfont, HFONT font); - -cairo_public cairo_status_t -cairo_win32_scaled_font_select_font (cairo_scaled_font_t *scaled_font, - HDC hdc); - -cairo_public void -cairo_win32_scaled_font_done_font (cairo_scaled_font_t *scaled_font); - -cairo_public double -cairo_win32_scaled_font_get_metrics_factor (cairo_scaled_font_t *scaled_font); - -cairo_public void -cairo_win32_scaled_font_get_logical_to_device (cairo_scaled_font_t *scaled_font, - cairo_matrix_t *logical_to_device); - -cairo_public void -cairo_win32_scaled_font_get_device_to_logical (cairo_scaled_font_t *scaled_font, - cairo_matrix_t *device_to_logical); - -#endif /* CAIRO_HAS_WIN32_FONT */ - -CAIRO_END_DECLS - -#else /* CAIRO_HAS_WIN32_SURFACE */ -# error Cairo was not compiled with support for the win32 backend -#endif /* CAIRO_HAS_WIN32_SURFACE */ - -#endif /* _CAIRO_WIN32_H_ */ diff --git a/cairo/src/cairo.h b/cairo/src/cairo.h deleted file mode 100644 index a2f5aa3..0000000 --- a/cairo/src/cairo.h +++ /dev/null @@ -1,3117 +0,0 @@ -/* cairo - a vector graphics library with display and print output - * - * Copyright © 2002 University of Southern California - * Copyright © 2005 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it either under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation - * (the "LGPL") or, at your option, under the terms of the Mozilla - * Public License Version 1.1 (the "MPL"). If you do not alter this - * notice, a recipient may use your version of this file under either - * the MPL or the LGPL. - * - * You should have received a copy of the LGPL along with this library - * in the file COPYING-LGPL-2.1; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA - * You should have received a copy of the MPL along with this library - * in the file COPYING-MPL-1.1 - * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY - * OF ANY KIND, either express or implied. See the LGPL or the MPL for - * the specific language governing rights and limitations. - * - * The Original Code is the cairo graphics library. - * - * The Initial Developer of the Original Code is University of Southern - * California. - * - * Contributor(s): - * Carl D. Worth - */ - -#ifndef CAIRO_H -#define CAIRO_H - -#include "cairo-version.h" -#include "cairo-features.h" -#include "cairo-deprecated.h" - -#ifdef __cplusplus -# define CAIRO_BEGIN_DECLS extern "C" { -# define CAIRO_END_DECLS } -#else -# define CAIRO_BEGIN_DECLS -# define CAIRO_END_DECLS -#endif - -#ifndef cairo_public -# if defined (_MSC_VER) && ! defined (CAIRO_WIN32_STATIC_BUILD) -# define cairo_public __declspec(dllimport) -# else -# define cairo_public -# endif -#endif - -CAIRO_BEGIN_DECLS - -#define CAIRO_VERSION_ENCODE(major, minor, micro) ( \ - ((major) * 10000) \ - + ((minor) * 100) \ - + ((micro) * 1)) - -#define CAIRO_VERSION CAIRO_VERSION_ENCODE( \ - CAIRO_VERSION_MAJOR, \ - CAIRO_VERSION_MINOR, \ - CAIRO_VERSION_MICRO) - - -#define CAIRO_VERSION_STRINGIZE_(major, minor, micro) \ - #major"."#minor"."#micro -#define CAIRO_VERSION_STRINGIZE(major, minor, micro) \ - CAIRO_VERSION_STRINGIZE_(major, minor, micro) - -#define CAIRO_VERSION_STRING CAIRO_VERSION_STRINGIZE( \ - CAIRO_VERSION_MAJOR, \ - CAIRO_VERSION_MINOR, \ - CAIRO_VERSION_MICRO) - - -cairo_public int -cairo_version (void); - -cairo_public const char* -cairo_version_string (void); - -/** - * cairo_bool_t: - * - * #cairo_bool_t is used for boolean values. Returns of type - * #cairo_bool_t will always be either 0 or 1, but testing against - * these values explicitly is not encouraged; just use the - * value as a boolean condition. - * - * - * if (cairo_in_stroke (cr, x, y)) { - * /* do something */ - * } - * - * - * Since: 1.0 - **/ -typedef int cairo_bool_t; - -/** - * cairo_t: - * - * A #cairo_t contains the current state of the rendering device, - * including coordinates of yet to be drawn shapes. - * - * Cairo contexts, as #cairo_t objects are named, are central to - * cairo and all drawing with cairo is always done to a #cairo_t - * object. - * - * Memory management of #cairo_t is done with - * cairo_reference() and cairo_destroy(). - * - * Since: 1.0 - **/ -typedef struct _cairo cairo_t; - -/** - * cairo_surface_t: - * - * A #cairo_surface_t represents an image, either as the destination - * of a drawing operation or as source when drawing onto another - * surface. To draw to a #cairo_surface_t, create a cairo context - * with the surface as the target, using cairo_create(). - * - * There are different subtypes of #cairo_surface_t for - * different drawing backends; for example, cairo_image_surface_create() - * creates a bitmap image in memory. - * The type of a surface can be queried with cairo_surface_get_type(). - * - * The initial contents of a surface after creation depend upon the manner - * of its creation. If cairo creates the surface and backing storage for - * the user, it will be initially cleared; for example, - * cairo_image_surface_create() and cairo_surface_create_similar(). - * Alternatively, if the user passes in a reference to some backing storage - * and asks cairo to wrap that in a #cairo_surface_t, then the contents are - * not modified; for example, cairo_image_surface_create_for_data() and - * cairo_xlib_surface_create(). - * - * Memory management of #cairo_surface_t is done with - * cairo_surface_reference() and cairo_surface_destroy(). - * - * Since: 1.0 - **/ -typedef struct _cairo_surface cairo_surface_t; - -/** - * cairo_device_t: - * - * A #cairo_device_t represents the driver interface for drawing - * operations to a #cairo_surface_t. There are different subtypes of - * #cairo_device_t for different drawing backends; for example, - * cairo_egl_device_create() creates a device that wraps an EGL display and - * context. - * - * The type of a device can be queried with cairo_device_get_type(). - * - * Memory management of #cairo_device_t is done with - * cairo_device_reference() and cairo_device_destroy(). - * - * Since: 1.10 - **/ -typedef struct _cairo_device cairo_device_t; - -/** - * cairo_matrix_t: - * @xx: xx component of the affine transformation - * @yx: yx component of the affine transformation - * @xy: xy component of the affine transformation - * @yy: yy component of the affine transformation - * @x0: X translation component of the affine transformation - * @y0: Y translation component of the affine transformation - * - * A #cairo_matrix_t holds an affine transformation, such as a scale, - * rotation, shear, or a combination of those. The transformation of - * a point (x, y) is given by: - * - * x_new = xx * x + xy * y + x0; - * y_new = yx * x + yy * y + y0; - * - * - * Since: 1.0 - **/ -typedef struct _cairo_matrix { - double xx; double yx; - double xy; double yy; - double x0; double y0; -} cairo_matrix_t; - -/** - * cairo_pattern_t: - * - * A #cairo_pattern_t represents a source when drawing onto a - * surface. There are different subtypes of #cairo_pattern_t, - * for different types of sources; for example, - * cairo_pattern_create_rgb() creates a pattern for a solid - * opaque color. - * - * Other than various - * cairo_pattern_create_type() - * functions, some of the pattern types can be implicitly created using various - * cairo_set_source_type() functions; - * for example cairo_set_source_rgb(). - * - * The type of a pattern can be queried with cairo_pattern_get_type(). - * - * Memory management of #cairo_pattern_t is done with - * cairo_pattern_reference() and cairo_pattern_destroy(). - * - * Since: 1.0 - **/ -typedef struct _cairo_pattern cairo_pattern_t; - -/** - * cairo_destroy_func_t: - * @data: The data element being destroyed. - * - * #cairo_destroy_func_t the type of function which is called when a - * data element is destroyed. It is passed the pointer to the data - * element and should free any memory and resources allocated for it. - * - * Since: 1.0 - **/ -typedef void (*cairo_destroy_func_t) (void *data); - -/** - * cairo_user_data_key_t: - * @unused: not used; ignore. - * - * #cairo_user_data_key_t is used for attaching user data to cairo - * data structures. The actual contents of the struct is never used, - * and there is no need to initialize the object; only the unique - * address of a #cairo_data_key_t object is used. Typically, you - * would just use the address of a static #cairo_data_key_t object. - * - * Since: 1.0 - **/ -typedef struct _cairo_user_data_key { - int unused; -} cairo_user_data_key_t; - -/** - * cairo_status_t: - * @CAIRO_STATUS_SUCCESS: no error has occurred (Since 1.0) - * @CAIRO_STATUS_NO_MEMORY: out of memory (Since 1.0) - * @CAIRO_STATUS_INVALID_RESTORE: cairo_restore() called without matching cairo_save() (Since 1.0) - * @CAIRO_STATUS_INVALID_POP_GROUP: no saved group to pop, i.e. cairo_pop_group() without matching cairo_push_group() (Since 1.0) - * @CAIRO_STATUS_NO_CURRENT_POINT: no current point defined (Since 1.0) - * @CAIRO_STATUS_INVALID_MATRIX: invalid matrix (not invertible) (Since 1.0) - * @CAIRO_STATUS_INVALID_STATUS: invalid value for an input #cairo_status_t (Since 1.0) - * @CAIRO_STATUS_NULL_POINTER: %NULL pointer (Since 1.0) - * @CAIRO_STATUS_INVALID_STRING: input string not valid UTF-8 (Since 1.0) - * @CAIRO_STATUS_INVALID_PATH_DATA: input path data not valid (Since 1.0) - * @CAIRO_STATUS_READ_ERROR: error while reading from input stream (Since 1.0) - * @CAIRO_STATUS_WRITE_ERROR: error while writing to output stream (Since 1.0) - * @CAIRO_STATUS_SURFACE_FINISHED: target surface has been finished (Since 1.0) - * @CAIRO_STATUS_SURFACE_TYPE_MISMATCH: the surface type is not appropriate for the operation (Since 1.0) - * @CAIRO_STATUS_PATTERN_TYPE_MISMATCH: the pattern type is not appropriate for the operation (Since 1.0) - * @CAIRO_STATUS_INVALID_CONTENT: invalid value for an input #cairo_content_t (Since 1.0) - * @CAIRO_STATUS_INVALID_FORMAT: invalid value for an input #cairo_format_t (Since 1.0) - * @CAIRO_STATUS_INVALID_VISUAL: invalid value for an input Visual* (Since 1.0) - * @CAIRO_STATUS_FILE_NOT_FOUND: file not found (Since 1.0) - * @CAIRO_STATUS_INVALID_DASH: invalid value for a dash setting (Since 1.0) - * @CAIRO_STATUS_INVALID_DSC_COMMENT: invalid value for a DSC comment (Since 1.2) - * @CAIRO_STATUS_INVALID_INDEX: invalid index passed to getter (Since 1.4) - * @CAIRO_STATUS_CLIP_NOT_REPRESENTABLE: clip region not representable in desired format (Since 1.4) - * @CAIRO_STATUS_TEMP_FILE_ERROR: error creating or writing to a temporary file (Since 1.6) - * @CAIRO_STATUS_INVALID_STRIDE: invalid value for stride (Since 1.6) - * @CAIRO_STATUS_FONT_TYPE_MISMATCH: the font type is not appropriate for the operation (Since 1.8) - * @CAIRO_STATUS_USER_FONT_IMMUTABLE: the user-font is immutable (Since 1.8) - * @CAIRO_STATUS_USER_FONT_ERROR: error occurred in a user-font callback function (Since 1.8) - * @CAIRO_STATUS_NEGATIVE_COUNT: negative number used where it is not allowed (Since 1.8) - * @CAIRO_STATUS_INVALID_CLUSTERS: input clusters do not represent the accompanying text and glyph array (Since 1.8) - * @CAIRO_STATUS_INVALID_SLANT: invalid value for an input #cairo_font_slant_t (Since 1.8) - * @CAIRO_STATUS_INVALID_WEIGHT: invalid value for an input #cairo_font_weight_t (Since 1.8) - * @CAIRO_STATUS_INVALID_SIZE: invalid value (typically too big) for the size of the input (surface, pattern, etc.) (Since 1.10) - * @CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED: user-font method not implemented (Since 1.10) - * @CAIRO_STATUS_DEVICE_TYPE_MISMATCH: the device type is not appropriate for the operation (Since 1.10) - * @CAIRO_STATUS_DEVICE_ERROR: an operation to the device caused an unspecified error (Since 1.10) - * @CAIRO_STATUS_INVALID_MESH_CONSTRUCTION: a mesh pattern - * construction operation was used outside of a - * cairo_mesh_pattern_begin_patch()/cairo_mesh_pattern_end_patch() - * pair (Since 1.12) - * @CAIRO_STATUS_DEVICE_FINISHED: target device has been finished (Since 1.12) - * @CAIRO_STATUS_LAST_STATUS: this is a special value indicating the number of - * status values defined in this enumeration. When using this value, note - * that the version of cairo at run-time may have additional status values - * defined than the value of this symbol at compile-time. (Since 1.10) - * - * #cairo_status_t is used to indicate errors that can occur when - * using Cairo. In some cases it is returned directly by functions. - * but when using #cairo_t, the last error, if any, is stored in - * the context and can be retrieved with cairo_status(). - * - * New entries may be added in future versions. Use cairo_status_to_string() - * to get a human-readable representation of an error message. - * - * Since: 1.0 - **/ -typedef enum _cairo_status { - CAIRO_STATUS_SUCCESS = 0, - - CAIRO_STATUS_NO_MEMORY, - CAIRO_STATUS_INVALID_RESTORE, - CAIRO_STATUS_INVALID_POP_GROUP, - CAIRO_STATUS_NO_CURRENT_POINT, - CAIRO_STATUS_INVALID_MATRIX, - CAIRO_STATUS_INVALID_STATUS, - CAIRO_STATUS_NULL_POINTER, - CAIRO_STATUS_INVALID_STRING, - CAIRO_STATUS_INVALID_PATH_DATA, - CAIRO_STATUS_READ_ERROR, - CAIRO_STATUS_WRITE_ERROR, - CAIRO_STATUS_SURFACE_FINISHED, - CAIRO_STATUS_SURFACE_TYPE_MISMATCH, - CAIRO_STATUS_PATTERN_TYPE_MISMATCH, - CAIRO_STATUS_INVALID_CONTENT, - CAIRO_STATUS_INVALID_FORMAT, - CAIRO_STATUS_INVALID_VISUAL, - CAIRO_STATUS_FILE_NOT_FOUND, - CAIRO_STATUS_INVALID_DASH, - CAIRO_STATUS_INVALID_DSC_COMMENT, - CAIRO_STATUS_INVALID_INDEX, - CAIRO_STATUS_CLIP_NOT_REPRESENTABLE, - CAIRO_STATUS_TEMP_FILE_ERROR, - CAIRO_STATUS_INVALID_STRIDE, - CAIRO_STATUS_FONT_TYPE_MISMATCH, - CAIRO_STATUS_USER_FONT_IMMUTABLE, - CAIRO_STATUS_USER_FONT_ERROR, - CAIRO_STATUS_NEGATIVE_COUNT, - CAIRO_STATUS_INVALID_CLUSTERS, - CAIRO_STATUS_INVALID_SLANT, - CAIRO_STATUS_INVALID_WEIGHT, - CAIRO_STATUS_INVALID_SIZE, - CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED, - CAIRO_STATUS_DEVICE_TYPE_MISMATCH, - CAIRO_STATUS_DEVICE_ERROR, - CAIRO_STATUS_INVALID_MESH_CONSTRUCTION, - CAIRO_STATUS_DEVICE_FINISHED, - - CAIRO_STATUS_LAST_STATUS -} cairo_status_t; - -/** - * cairo_content_t: - * @CAIRO_CONTENT_COLOR: The surface will hold color content only. (Since 1.0) - * @CAIRO_CONTENT_ALPHA: The surface will hold alpha content only. (Since 1.0) - * @CAIRO_CONTENT_COLOR_ALPHA: The surface will hold color and alpha content. (Since 1.0) - * - * #cairo_content_t is used to describe the content that a surface will - * contain, whether color information, alpha information (translucence - * vs. opacity), or both. - * - * Note: The large values here are designed to keep #cairo_content_t - * values distinct from #cairo_format_t values so that the - * implementation can detect the error if users confuse the two types. - * - * Since: 1.0 - **/ -typedef enum _cairo_content { - CAIRO_CONTENT_COLOR = 0x1000, - CAIRO_CONTENT_ALPHA = 0x2000, - CAIRO_CONTENT_COLOR_ALPHA = 0x3000 -} cairo_content_t; - -/** - * cairo_format_t: - * @CAIRO_FORMAT_INVALID: no such format exists or is supported. - * @CAIRO_FORMAT_ARGB32: each pixel is a 32-bit quantity, with - * alpha in the upper 8 bits, then red, then green, then blue. - * The 32-bit quantities are stored native-endian. Pre-multiplied - * alpha is used. (That is, 50% transparent red is 0x80800000, - * not 0x80ff0000.) (Since 1.0) - * @CAIRO_FORMAT_RGB24: each pixel is a 32-bit quantity, with - * the upper 8 bits unused. Red, Green, and Blue are stored - * in the remaining 24 bits in that order. (Since 1.0) - * @CAIRO_FORMAT_A8: each pixel is a 8-bit quantity holding - * an alpha value. (Since 1.0) - * @CAIRO_FORMAT_A1: each pixel is a 1-bit quantity holding - * an alpha value. Pixels are packed together into 32-bit - * quantities. The ordering of the bits matches the - * endianess of the platform. On a big-endian machine, the - * first pixel is in the uppermost bit, on a little-endian - * machine the first pixel is in the least-significant bit. (Since 1.0) - * @CAIRO_FORMAT_RGB16_565: each pixel is a 16-bit quantity - * with red in the upper 5 bits, then green in the middle - * 6 bits, and blue in the lower 5 bits. (Since 1.2) - * @CAIRO_FORMAT_RGB30: like RGB24 but with 10bpc. (Since 1.12) - * - * #cairo_format_t is used to identify the memory format of - * image data. - * - * New entries may be added in future versions. - * - * Since: 1.0 - **/ -typedef enum _cairo_format { - CAIRO_FORMAT_INVALID = -1, - CAIRO_FORMAT_ARGB32 = 0, - CAIRO_FORMAT_RGB24 = 1, - CAIRO_FORMAT_A8 = 2, - CAIRO_FORMAT_A1 = 3, - CAIRO_FORMAT_RGB16_565 = 4, - CAIRO_FORMAT_RGB30 = 5 -} cairo_format_t; - - -/** - * cairo_write_func_t: - * @closure: the output closure - * @data: the buffer containing the data to write - * @length: the amount of data to write - * - * #cairo_write_func_t is the type of function which is called when a - * backend needs to write data to an output stream. It is passed the - * closure which was specified by the user at the time the write - * function was registered, the data to write and the length of the - * data in bytes. The write function should return - * %CAIRO_STATUS_SUCCESS if all the data was successfully written, - * %CAIRO_STATUS_WRITE_ERROR otherwise. - * - * Returns: the status code of the write operation - * - * Since: 1.0 - **/ -typedef cairo_status_t (*cairo_write_func_t) (void *closure, - const unsigned char *data, - unsigned int length); - -/** - * cairo_read_func_t: - * @closure: the input closure - * @data: the buffer into which to read the data - * @length: the amount of data to read - * - * #cairo_read_func_t is the type of function which is called when a - * backend needs to read data from an input stream. It is passed the - * closure which was specified by the user at the time the read - * function was registered, the buffer to read the data into and the - * length of the data in bytes. The read function should return - * %CAIRO_STATUS_SUCCESS if all the data was successfully read, - * %CAIRO_STATUS_READ_ERROR otherwise. - * - * Returns: the status code of the read operation - * - * Since: 1.0 - **/ -typedef cairo_status_t (*cairo_read_func_t) (void *closure, - unsigned char *data, - unsigned int length); - -/** - * cairo_rectangle_int_t: - * @x: X coordinate of the left side of the rectangle - * @y: Y coordinate of the the top side of the rectangle - * @width: width of the rectangle - * @height: height of the rectangle - * - * A data structure for holding a rectangle with integer coordinates. - * - * Since: 1.10 - **/ - -typedef struct _cairo_rectangle_int { - int x, y; - int width, height; -} cairo_rectangle_int_t; - - -/* Functions for manipulating state objects */ -cairo_public cairo_t * -cairo_create (cairo_surface_t *target); - -cairo_public cairo_t * -cairo_reference (cairo_t *cr); - -cairo_public void -cairo_destroy (cairo_t *cr); - -cairo_public unsigned int -cairo_get_reference_count (cairo_t *cr); - -cairo_public void * -cairo_get_user_data (cairo_t *cr, - const cairo_user_data_key_t *key); - -cairo_public cairo_status_t -cairo_set_user_data (cairo_t *cr, - const cairo_user_data_key_t *key, - void *user_data, - cairo_destroy_func_t destroy); - -cairo_public void -cairo_save (cairo_t *cr); - -cairo_public void -cairo_restore (cairo_t *cr); - -cairo_public void -cairo_push_group (cairo_t *cr); - -cairo_public void -cairo_push_group_with_content (cairo_t *cr, cairo_content_t content); - -cairo_public cairo_pattern_t * -cairo_pop_group (cairo_t *cr); - -cairo_public void -cairo_pop_group_to_source (cairo_t *cr); - -/* Modify state */ - -/** - * cairo_operator_t: - * @CAIRO_OPERATOR_CLEAR: clear destination layer (bounded) (Since 1.0) - * @CAIRO_OPERATOR_SOURCE: replace destination layer (bounded) (Since 1.0) - * @CAIRO_OPERATOR_OVER: draw source layer on top of destination layer - * (bounded) (Since 1.0) - * @CAIRO_OPERATOR_IN: draw source where there was destination content - * (unbounded) (Since 1.0) - * @CAIRO_OPERATOR_OUT: draw source where there was no destination - * content (unbounded) (Since 1.0) - * @CAIRO_OPERATOR_ATOP: draw source on top of destination content and - * only there (Since 1.0) - * @CAIRO_OPERATOR_DEST: ignore the source (Since 1.0) - * @CAIRO_OPERATOR_DEST_OVER: draw destination on top of source (Since 1.0) - * @CAIRO_OPERATOR_DEST_IN: leave destination only where there was - * source content (unbounded) (Since 1.0) - * @CAIRO_OPERATOR_DEST_OUT: leave destination only where there was no - * source content (Since 1.0) - * @CAIRO_OPERATOR_DEST_ATOP: leave destination on top of source content - * and only there (unbounded) (Since 1.0) - * @CAIRO_OPERATOR_XOR: source and destination are shown where there is only - * one of them (Since 1.0) - * @CAIRO_OPERATOR_ADD: source and destination layers are accumulated (Since 1.0) - * @CAIRO_OPERATOR_SATURATE: like over, but assuming source and dest are - * disjoint geometries (Since 1.0) - * @CAIRO_OPERATOR_MULTIPLY: source and destination layers are multiplied. - * This causes the result to be at least as dark as the darker inputs. (Since 1.10) - * @CAIRO_OPERATOR_SCREEN: source and destination are complemented and - * multiplied. This causes the result to be at least as light as the lighter - * inputs. (Since 1.10) - * @CAIRO_OPERATOR_OVERLAY: multiplies or screens, depending on the - * lightness of the destination color. (Since 1.10) - * @CAIRO_OPERATOR_DARKEN: replaces the destination with the source if it - * is darker, otherwise keeps the source. (Since 1.10) - * @CAIRO_OPERATOR_LIGHTEN: replaces the destination with the source if it - * is lighter, otherwise keeps the source. (Since 1.10) - * @CAIRO_OPERATOR_COLOR_DODGE: brightens the destination color to reflect - * the source color. (Since 1.10) - * @CAIRO_OPERATOR_COLOR_BURN: darkens the destination color to reflect - * the source color. (Since 1.10) - * @CAIRO_OPERATOR_HARD_LIGHT: Multiplies or screens, dependent on source - * color. (Since 1.10) - * @CAIRO_OPERATOR_SOFT_LIGHT: Darkens or lightens, dependent on source - * color. (Since 1.10) - * @CAIRO_OPERATOR_DIFFERENCE: Takes the difference of the source and - * destination color. (Since 1.10) - * @CAIRO_OPERATOR_EXCLUSION: Produces an effect similar to difference, but - * with lower contrast. (Since 1.10) - * @CAIRO_OPERATOR_HSL_HUE: Creates a color with the hue of the source - * and the saturation and luminosity of the target. (Since 1.10) - * @CAIRO_OPERATOR_HSL_SATURATION: Creates a color with the saturation - * of the source and the hue and luminosity of the target. Painting with - * this mode onto a gray area produces no change. (Since 1.10) - * @CAIRO_OPERATOR_HSL_COLOR: Creates a color with the hue and saturation - * of the source and the luminosity of the target. This preserves the gray - * levels of the target and is useful for coloring monochrome images or - * tinting color images. (Since 1.10) - * @CAIRO_OPERATOR_HSL_LUMINOSITY: Creates a color with the luminosity of - * the source and the hue and saturation of the target. This produces an - * inverse effect to @CAIRO_OPERATOR_HSL_COLOR. (Since 1.10) - * - * #cairo_operator_t is used to set the compositing operator for all cairo - * drawing operations. - * - * The default operator is %CAIRO_OPERATOR_OVER. - * - * The operators marked as unbounded modify their - * destination even outside of the mask layer (that is, their effect is not - * bound by the mask layer). However, their effect can still be limited by - * way of clipping. - * - * To keep things simple, the operator descriptions here - * document the behavior for when both source and destination are either fully - * transparent or fully opaque. The actual implementation works for - * translucent layers too. - * For a more detailed explanation of the effects of each operator, including - * the mathematical definitions, see - * http://cairographics.org/operators/. - * - * Since: 1.0 - **/ -typedef enum _cairo_operator { - CAIRO_OPERATOR_CLEAR, - - CAIRO_OPERATOR_SOURCE, - CAIRO_OPERATOR_OVER, - CAIRO_OPERATOR_IN, - CAIRO_OPERATOR_OUT, - CAIRO_OPERATOR_ATOP, - - CAIRO_OPERATOR_DEST, - CAIRO_OPERATOR_DEST_OVER, - CAIRO_OPERATOR_DEST_IN, - CAIRO_OPERATOR_DEST_OUT, - CAIRO_OPERATOR_DEST_ATOP, - - CAIRO_OPERATOR_XOR, - CAIRO_OPERATOR_ADD, - CAIRO_OPERATOR_SATURATE, - - CAIRO_OPERATOR_MULTIPLY, - CAIRO_OPERATOR_SCREEN, - CAIRO_OPERATOR_OVERLAY, - CAIRO_OPERATOR_DARKEN, - CAIRO_OPERATOR_LIGHTEN, - CAIRO_OPERATOR_COLOR_DODGE, - CAIRO_OPERATOR_COLOR_BURN, - CAIRO_OPERATOR_HARD_LIGHT, - CAIRO_OPERATOR_SOFT_LIGHT, - CAIRO_OPERATOR_DIFFERENCE, - CAIRO_OPERATOR_EXCLUSION, - CAIRO_OPERATOR_HSL_HUE, - CAIRO_OPERATOR_HSL_SATURATION, - CAIRO_OPERATOR_HSL_COLOR, - CAIRO_OPERATOR_HSL_LUMINOSITY -} cairo_operator_t; - -cairo_public void -cairo_set_operator (cairo_t *cr, cairo_operator_t op); - -cairo_public void -cairo_set_source (cairo_t *cr, cairo_pattern_t *source); - -cairo_public void -cairo_set_source_rgb (cairo_t *cr, double red, double green, double blue); - -cairo_public void -cairo_set_source_rgba (cairo_t *cr, - double red, double green, double blue, - double alpha); - -cairo_public void -cairo_set_source_surface (cairo_t *cr, - cairo_surface_t *surface, - double x, - double y); - -cairo_public void -cairo_set_tolerance (cairo_t *cr, double tolerance); - -/** - * cairo_antialias_t: - * @CAIRO_ANTIALIAS_DEFAULT: Use the default antialiasing for - * the subsystem and target device, since 1.0 - * @CAIRO_ANTIALIAS_NONE: Use a bilevel alpha mask, since 1.0 - * @CAIRO_ANTIALIAS_GRAY: Perform single-color antialiasing (using - * shades of gray for black text on a white background, for example), since 1.0 - * @CAIRO_ANTIALIAS_SUBPIXEL: Perform antialiasing by taking - * advantage of the order of subpixel elements on devices - * such as LCD panels, since 1.0 - * @CAIRO_ANTIALIAS_FAST: Hint that the backend should perform some - * antialiasing but prefer speed over quality, since 1.12 - * @CAIRO_ANTIALIAS_GOOD: The backend should balance quality against - * performance, since 1.12 - * @CAIRO_ANTIALIAS_BEST: Hint that the backend should render at the highest - * quality, sacrificing speed if necessary, since 1.12 - * - * Specifies the type of antialiasing to do when rendering text or shapes. - * - * As it is not necessarily clear from the above what advantages a particular - * antialias method provides, since 1.12, there is also a set of hints: - * @CAIRO_ANTIALIAS_FAST: Allow the backend to degrade raster quality for speed - * @CAIRO_ANTIALIAS_GOOD: A balance between speed and quality - * @CAIRO_ANTIALIAS_BEST: A high-fidelity, but potentially slow, raster mode - * - * These make no guarantee on how the backend will perform its rasterisation - * (if it even rasterises!), nor that they have any differing effect other - * than to enable some form of antialiasing. In the case of glyph rendering, - * @CAIRO_ANTIALIAS_FAST and @CAIRO_ANTIALIAS_GOOD will be mapped to - * @CAIRO_ANTIALIAS_GRAY, with @CAIRO_ANTALIAS_BEST being equivalent to - * @CAIRO_ANTIALIAS_SUBPIXEL. - * - * The interpretation of @CAIRO_ANTIALIAS_DEFAULT is left entirely up to - * the backend, typically this will be similar to @CAIRO_ANTIALIAS_GOOD. - * - * Since: 1.0 - **/ -typedef enum _cairo_antialias { - CAIRO_ANTIALIAS_DEFAULT, - - /* method */ - CAIRO_ANTIALIAS_NONE, - CAIRO_ANTIALIAS_GRAY, - CAIRO_ANTIALIAS_SUBPIXEL, - - /* hints */ - CAIRO_ANTIALIAS_FAST, - CAIRO_ANTIALIAS_GOOD, - CAIRO_ANTIALIAS_BEST -} cairo_antialias_t; - -cairo_public void -cairo_set_antialias (cairo_t *cr, cairo_antialias_t antialias); - -/** - * cairo_fill_rule_t: - * @CAIRO_FILL_RULE_WINDING: If the path crosses the ray from - * left-to-right, counts +1. If the path crosses the ray - * from right to left, counts -1. (Left and right are determined - * from the perspective of looking along the ray from the starting - * point.) If the total count is non-zero, the point will be filled. (Since 1.0) - * @CAIRO_FILL_RULE_EVEN_ODD: Counts the total number of - * intersections, without regard to the orientation of the contour. If - * the total number of intersections is odd, the point will be - * filled. (Since 1.0) - * - * #cairo_fill_rule_t is used to select how paths are filled. For both - * fill rules, whether or not a point is included in the fill is - * determined by taking a ray from that point to infinity and looking - * at intersections with the path. The ray can be in any direction, - * as long as it doesn't pass through the end point of a segment - * or have a tricky intersection such as intersecting tangent to the path. - * (Note that filling is not actually implemented in this way. This - * is just a description of the rule that is applied.) - * - * The default fill rule is %CAIRO_FILL_RULE_WINDING. - * - * New entries may be added in future versions. - * - * Since: 1.0 - **/ -typedef enum _cairo_fill_rule { - CAIRO_FILL_RULE_WINDING, - CAIRO_FILL_RULE_EVEN_ODD -} cairo_fill_rule_t; - -cairo_public void -cairo_set_fill_rule (cairo_t *cr, cairo_fill_rule_t fill_rule); - -cairo_public void -cairo_set_line_width (cairo_t *cr, double width); - -/** - * cairo_line_cap_t: - * @CAIRO_LINE_CAP_BUTT: start(stop) the line exactly at the start(end) point (Since 1.0) - * @CAIRO_LINE_CAP_ROUND: use a round ending, the center of the circle is the end point (Since 1.0) - * @CAIRO_LINE_CAP_SQUARE: use squared ending, the center of the square is the end point (Since 1.0) - * - * Specifies how to render the endpoints of the path when stroking. - * - * The default line cap style is %CAIRO_LINE_CAP_BUTT. - * - * Since: 1.0 - **/ -typedef enum _cairo_line_cap { - CAIRO_LINE_CAP_BUTT, - CAIRO_LINE_CAP_ROUND, - CAIRO_LINE_CAP_SQUARE -} cairo_line_cap_t; - -cairo_public void -cairo_set_line_cap (cairo_t *cr, cairo_line_cap_t line_cap); - -/** - * cairo_line_join_t: - * @CAIRO_LINE_JOIN_MITER: use a sharp (angled) corner, see - * cairo_set_miter_limit() (Since 1.0) - * @CAIRO_LINE_JOIN_ROUND: use a rounded join, the center of the circle is the - * joint point (Since 1.0) - * @CAIRO_LINE_JOIN_BEVEL: use a cut-off join, the join is cut off at half - * the line width from the joint point (Since 1.0) - * - * Specifies how to render the junction of two lines when stroking. - * - * The default line join style is %CAIRO_LINE_JOIN_MITER. - * - * Since: 1.0 - **/ -typedef enum _cairo_line_join { - CAIRO_LINE_JOIN_MITER, - CAIRO_LINE_JOIN_ROUND, - CAIRO_LINE_JOIN_BEVEL -} cairo_line_join_t; - -cairo_public void -cairo_set_line_join (cairo_t *cr, cairo_line_join_t line_join); - -cairo_public void -cairo_set_dash (cairo_t *cr, - const double *dashes, - int num_dashes, - double offset); - -cairo_public void -cairo_set_miter_limit (cairo_t *cr, double limit); - -cairo_public void -cairo_translate (cairo_t *cr, double tx, double ty); - -cairo_public void -cairo_scale (cairo_t *cr, double sx, double sy); - -cairo_public void -cairo_rotate (cairo_t *cr, double angle); - -cairo_public void -cairo_transform (cairo_t *cr, - const cairo_matrix_t *matrix); - -cairo_public void -cairo_set_matrix (cairo_t *cr, - const cairo_matrix_t *matrix); - -cairo_public void -cairo_identity_matrix (cairo_t *cr); - -cairo_public void -cairo_user_to_device (cairo_t *cr, double *x, double *y); - -cairo_public void -cairo_user_to_device_distance (cairo_t *cr, double *dx, double *dy); - -cairo_public void -cairo_device_to_user (cairo_t *cr, double *x, double *y); - -cairo_public void -cairo_device_to_user_distance (cairo_t *cr, double *dx, double *dy); - -/* Path creation functions */ -cairo_public void -cairo_new_path (cairo_t *cr); - -cairo_public void -cairo_move_to (cairo_t *cr, double x, double y); - -cairo_public void -cairo_new_sub_path (cairo_t *cr); - -cairo_public void -cairo_line_to (cairo_t *cr, double x, double y); - -cairo_public void -cairo_curve_to (cairo_t *cr, - double x1, double y1, - double x2, double y2, - double x3, double y3); - -cairo_public void -cairo_arc (cairo_t *cr, - double xc, double yc, - double radius, - double angle1, double angle2); - -cairo_public void -cairo_arc_negative (cairo_t *cr, - double xc, double yc, - double radius, - double angle1, double angle2); - -/* XXX: NYI -cairo_public void -cairo_arc_to (cairo_t *cr, - double x1, double y1, - double x2, double y2, - double radius); -*/ - -cairo_public void -cairo_rel_move_to (cairo_t *cr, double dx, double dy); - -cairo_public void -cairo_rel_line_to (cairo_t *cr, double dx, double dy); - -cairo_public void -cairo_rel_curve_to (cairo_t *cr, - double dx1, double dy1, - double dx2, double dy2, - double dx3, double dy3); - -cairo_public void -cairo_rectangle (cairo_t *cr, - double x, double y, - double width, double height); - -/* XXX: NYI -cairo_public void -cairo_stroke_to_path (cairo_t *cr); -*/ - -cairo_public void -cairo_close_path (cairo_t *cr); - -cairo_public void -cairo_path_extents (cairo_t *cr, - double *x1, double *y1, - double *x2, double *y2); - -/* Painting functions */ -cairo_public void -cairo_paint (cairo_t *cr); - -cairo_public void -cairo_paint_with_alpha (cairo_t *cr, - double alpha); - -cairo_public void -cairo_mask (cairo_t *cr, - cairo_pattern_t *pattern); - -cairo_public void -cairo_mask_surface (cairo_t *cr, - cairo_surface_t *surface, - double surface_x, - double surface_y); - -cairo_public void -cairo_stroke (cairo_t *cr); - -cairo_public void -cairo_stroke_preserve (cairo_t *cr); - -cairo_public void -cairo_fill (cairo_t *cr); - -cairo_public void -cairo_fill_preserve (cairo_t *cr); - -cairo_public void -cairo_copy_page (cairo_t *cr); - -cairo_public void -cairo_show_page (cairo_t *cr); - -/* Insideness testing */ -cairo_public cairo_bool_t -cairo_in_stroke (cairo_t *cr, double x, double y); - -cairo_public cairo_bool_t -cairo_in_fill (cairo_t *cr, double x, double y); - -cairo_public cairo_bool_t -cairo_in_clip (cairo_t *cr, double x, double y); - -/* Rectangular extents */ -cairo_public void -cairo_stroke_extents (cairo_t *cr, - double *x1, double *y1, - double *x2, double *y2); - -cairo_public void -cairo_fill_extents (cairo_t *cr, - double *x1, double *y1, - double *x2, double *y2); - -/* Clipping */ -cairo_public void -cairo_reset_clip (cairo_t *cr); - -cairo_public void -cairo_clip (cairo_t *cr); - -cairo_public void -cairo_clip_preserve (cairo_t *cr); - -cairo_public void -cairo_clip_extents (cairo_t *cr, - double *x1, double *y1, - double *x2, double *y2); - -/** - * cairo_rectangle_t: - * @x: X coordinate of the left side of the rectangle - * @y: Y coordinate of the the top side of the rectangle - * @width: width of the rectangle - * @height: height of the rectangle - * - * A data structure for holding a rectangle. - * - * Since: 1.4 - **/ -typedef struct _cairo_rectangle { - double x, y, width, height; -} cairo_rectangle_t; - -/** - * cairo_rectangle_list_t: - * @status: Error status of the rectangle list - * @rectangles: Array containing the rectangles - * @num_rectangles: Number of rectangles in this list - * - * A data structure for holding a dynamically allocated - * array of rectangles. - * - * Since: 1.4 - **/ -typedef struct _cairo_rectangle_list { - cairo_status_t status; - cairo_rectangle_t *rectangles; - int num_rectangles; -} cairo_rectangle_list_t; - -cairo_public cairo_rectangle_list_t * -cairo_copy_clip_rectangle_list (cairo_t *cr); - -cairo_public void -cairo_rectangle_list_destroy (cairo_rectangle_list_t *rectangle_list); - -/* Font/Text functions */ - -/** - * cairo_scaled_font_t: - * - * A #cairo_scaled_font_t is a font scaled to a particular size and device - * resolution. A #cairo_scaled_font_t is most useful for low-level font - * usage where a library or application wants to cache a reference - * to a scaled font to speed up the computation of metrics. - * - * There are various types of scaled fonts, depending on the - * font backend they use. The type of a - * scaled font can be queried using cairo_scaled_font_get_type(). - * - * Memory management of #cairo_scaled_font_t is done with - * cairo_scaled_font_reference() and cairo_scaled_font_destroy(). - * - * Since: 1.0 - **/ -typedef struct _cairo_scaled_font cairo_scaled_font_t; - -/** - * cairo_font_face_t: - * - * A #cairo_font_face_t specifies all aspects of a font other - * than the size or font matrix (a font matrix is used to distort - * a font by sheering it or scaling it unequally in the two - * directions) . A font face can be set on a #cairo_t by using - * cairo_set_font_face(); the size and font matrix are set with - * cairo_set_font_size() and cairo_set_font_matrix(). - * - * There are various types of font faces, depending on the - * font backend they use. The type of a - * font face can be queried using cairo_font_face_get_type(). - * - * Memory management of #cairo_font_face_t is done with - * cairo_font_face_reference() and cairo_font_face_destroy(). - * - * Since: 1.0 - **/ -typedef struct _cairo_font_face cairo_font_face_t; - -/** - * cairo_glyph_t: - * @index: glyph index in the font. The exact interpretation of the - * glyph index depends on the font technology being used. - * @x: the offset in the X direction between the origin used for - * drawing or measuring the string and the origin of this glyph. - * @y: the offset in the Y direction between the origin used for - * drawing or measuring the string and the origin of this glyph. - * - * The #cairo_glyph_t structure holds information about a single glyph - * when drawing or measuring text. A font is (in simple terms) a - * collection of shapes used to draw text. A glyph is one of these - * shapes. There can be multiple glyphs for a single character - * (alternates to be used in different contexts, for example), or a - * glyph can be a ligature of multiple - * characters. Cairo doesn't expose any way of converting input text - * into glyphs, so in order to use the Cairo interfaces that take - * arrays of glyphs, you must directly access the appropriate - * underlying font system. - * - * Note that the offsets given by @x and @y are not cumulative. When - * drawing or measuring text, each glyph is individually positioned - * with respect to the overall origin - * - * Since: 1.0 - **/ -typedef struct { - unsigned long index; - double x; - double y; -} cairo_glyph_t; - -cairo_public cairo_glyph_t * -cairo_glyph_allocate (int num_glyphs); - -cairo_public void -cairo_glyph_free (cairo_glyph_t *glyphs); - -/** - * cairo_text_cluster_t: - * @num_bytes: the number of bytes of UTF-8 text covered by cluster - * @num_glyphs: the number of glyphs covered by cluster - * - * The #cairo_text_cluster_t structure holds information about a single - * text cluster. A text cluster is a minimal - * mapping of some glyphs corresponding to some UTF-8 text. - * - * For a cluster to be valid, both @num_bytes and @num_glyphs should - * be non-negative, and at least one should be non-zero. - * Note that clusters with zero glyphs are not as well supported as - * normal clusters. For example, PDF rendering applications typically - * ignore those clusters when PDF text is being selected. - * - * See cairo_show_text_glyphs() for how clusters are used in advanced - * text operations. - * - * Since: 1.8 - **/ -typedef struct { - int num_bytes; - int num_glyphs; -} cairo_text_cluster_t; - -cairo_public cairo_text_cluster_t * -cairo_text_cluster_allocate (int num_clusters); - -cairo_public void -cairo_text_cluster_free (cairo_text_cluster_t *clusters); - -/** - * cairo_text_cluster_flags_t: - * @CAIRO_TEXT_CLUSTER_FLAG_BACKWARD: The clusters in the cluster array - * map to glyphs in the glyph array from end to start. (Since 1.8) - * - * Specifies properties of a text cluster mapping. - * - * Since: 1.8 - **/ -typedef enum _cairo_text_cluster_flags { - CAIRO_TEXT_CLUSTER_FLAG_BACKWARD = 0x00000001 -} cairo_text_cluster_flags_t; - -/** - * cairo_text_extents_t: - * @x_bearing: the horizontal distance from the origin to the - * leftmost part of the glyphs as drawn. Positive if the - * glyphs lie entirely to the right of the origin. - * @y_bearing: the vertical distance from the origin to the - * topmost part of the glyphs as drawn. Positive only if the - * glyphs lie completely below the origin; will usually be - * negative. - * @width: width of the glyphs as drawn - * @height: height of the glyphs as drawn - * @x_advance:distance to advance in the X direction - * after drawing these glyphs - * @y_advance: distance to advance in the Y direction - * after drawing these glyphs. Will typically be zero except - * for vertical text layout as found in East-Asian languages. - * - * The #cairo_text_extents_t structure stores the extents of a single - * glyph or a string of glyphs in user-space coordinates. Because text - * extents are in user-space coordinates, they are mostly, but not - * entirely, independent of the current transformation matrix. If you call - * cairo_scale(cr, 2.0, 2.0), text will - * be drawn twice as big, but the reported text extents will not be - * doubled. They will change slightly due to hinting (so you can't - * assume that metrics are independent of the transformation matrix), - * but otherwise will remain unchanged. - * - * Since: 1.0 - **/ -typedef struct { - double x_bearing; - double y_bearing; - double width; - double height; - double x_advance; - double y_advance; -} cairo_text_extents_t; - -/** - * cairo_font_extents_t: - * @ascent: the distance that the font extends above the baseline. - * Note that this is not always exactly equal to the maximum - * of the extents of all the glyphs in the font, but rather - * is picked to express the font designer's intent as to - * how the font should align with elements above it. - * @descent: the distance that the font extends below the baseline. - * This value is positive for typical fonts that include - * portions below the baseline. Note that this is not always - * exactly equal to the maximum of the extents of all the - * glyphs in the font, but rather is picked to express the - * font designer's intent as to how the font should - * align with elements below it. - * @height: the recommended vertical distance between baselines when - * setting consecutive lines of text with the font. This - * is greater than @ascent+@descent by a - * quantity known as the line spacing - * or external leading. When space - * is at a premium, most fonts can be set with only - * a distance of @ascent+@descent between lines. - * @max_x_advance: the maximum distance in the X direction that - * the origin is advanced for any glyph in the font. - * @max_y_advance: the maximum distance in the Y direction that - * the origin is advanced for any glyph in the font. - * This will be zero for normal fonts used for horizontal - * writing. (The scripts of East Asia are sometimes written - * vertically.) - * - * The #cairo_font_extents_t structure stores metric information for - * a font. Values are given in the current user-space coordinate - * system. - * - * Because font metrics are in user-space coordinates, they are - * mostly, but not entirely, independent of the current transformation - * matrix. If you call cairo_scale(cr, 2.0, 2.0), - * text will be drawn twice as big, but the reported text extents will - * not be doubled. They will change slightly due to hinting (so you - * can't assume that metrics are independent of the transformation - * matrix), but otherwise will remain unchanged. - * - * Since: 1.0 - **/ -typedef struct { - double ascent; - double descent; - double height; - double max_x_advance; - double max_y_advance; -} cairo_font_extents_t; - -/** - * cairo_font_slant_t: - * @CAIRO_FONT_SLANT_NORMAL: Upright font style, since 1.0 - * @CAIRO_FONT_SLANT_ITALIC: Italic font style, since 1.0 - * @CAIRO_FONT_SLANT_OBLIQUE: Oblique font style, since 1.0 - * - * Specifies variants of a font face based on their slant. - * - * Since: 1.0 - **/ -typedef enum _cairo_font_slant { - CAIRO_FONT_SLANT_NORMAL, - CAIRO_FONT_SLANT_ITALIC, - CAIRO_FONT_SLANT_OBLIQUE -} cairo_font_slant_t; - -/** - * cairo_font_weight_t: - * @CAIRO_FONT_WEIGHT_NORMAL: Normal font weight, since 1.0 - * @CAIRO_FONT_WEIGHT_BOLD: Bold font weight, since 1.0 - * - * Specifies variants of a font face based on their weight. - * - * Since: 1.0 - **/ -typedef enum _cairo_font_weight { - CAIRO_FONT_WEIGHT_NORMAL, - CAIRO_FONT_WEIGHT_BOLD -} cairo_font_weight_t; - -/** - * cairo_subpixel_order_t: - * @CAIRO_SUBPIXEL_ORDER_DEFAULT: Use the default subpixel order for - * for the target device, since 1.0 - * @CAIRO_SUBPIXEL_ORDER_RGB: Subpixel elements are arranged horizontally - * with red at the left, since 1.0 - * @CAIRO_SUBPIXEL_ORDER_BGR: Subpixel elements are arranged horizontally - * with blue at the left, since 1.0 - * @CAIRO_SUBPIXEL_ORDER_VRGB: Subpixel elements are arranged vertically - * with red at the top, since 1.0 - * @CAIRO_SUBPIXEL_ORDER_VBGR: Subpixel elements are arranged vertically - * with blue at the top, since 1.0 - * - * The subpixel order specifies the order of color elements within - * each pixel on the display device when rendering with an - * antialiasing mode of %CAIRO_ANTIALIAS_SUBPIXEL. - * - * Since: 1.0 - **/ -typedef enum _cairo_subpixel_order { - CAIRO_SUBPIXEL_ORDER_DEFAULT, - CAIRO_SUBPIXEL_ORDER_RGB, - CAIRO_SUBPIXEL_ORDER_BGR, - CAIRO_SUBPIXEL_ORDER_VRGB, - CAIRO_SUBPIXEL_ORDER_VBGR -} cairo_subpixel_order_t; - -/** - * cairo_hint_style_t: - * @CAIRO_HINT_STYLE_DEFAULT: Use the default hint style for - * font backend and target device, since 1.0 - * @CAIRO_HINT_STYLE_NONE: Do not hint outlines, since 1.0 - * @CAIRO_HINT_STYLE_SLIGHT: Hint outlines slightly to improve - * contrast while retaining good fidelity to the original - * shapes, since 1.0 - * @CAIRO_HINT_STYLE_MEDIUM: Hint outlines with medium strength - * giving a compromise between fidelity to the original shapes - * and contrast, since 1.0 - * @CAIRO_HINT_STYLE_FULL: Hint outlines to maximize contrast, since 1.0 - * - * Specifies the type of hinting to do on font outlines. Hinting - * is the process of fitting outlines to the pixel grid in order - * to improve the appearance of the result. Since hinting outlines - * involves distorting them, it also reduces the faithfulness - * to the original outline shapes. Not all of the outline hinting - * styles are supported by all font backends. - * - * New entries may be added in future versions. - * - * Since: 1.0 - **/ -typedef enum _cairo_hint_style { - CAIRO_HINT_STYLE_DEFAULT, - CAIRO_HINT_STYLE_NONE, - CAIRO_HINT_STYLE_SLIGHT, - CAIRO_HINT_STYLE_MEDIUM, - CAIRO_HINT_STYLE_FULL -} cairo_hint_style_t; - -/** - * cairo_hint_metrics_t: - * @CAIRO_HINT_METRICS_DEFAULT: Hint metrics in the default - * manner for the font backend and target device, since 1.0 - * @CAIRO_HINT_METRICS_OFF: Do not hint font metrics, since 1.0 - * @CAIRO_HINT_METRICS_ON: Hint font metrics, since 1.0 - * - * Specifies whether to hint font metrics; hinting font metrics - * means quantizing them so that they are integer values in - * device space. Doing this improves the consistency of - * letter and line spacing, however it also means that text - * will be laid out differently at different zoom factors. - * - * Since: 1.0 - **/ -typedef enum _cairo_hint_metrics { - CAIRO_HINT_METRICS_DEFAULT, - CAIRO_HINT_METRICS_OFF, - CAIRO_HINT_METRICS_ON -} cairo_hint_metrics_t; - -/** - * cairo_font_options_t: - * - * An opaque structure holding all options that are used when - * rendering fonts. - * - * Individual features of a #cairo_font_options_t can be set or - * accessed using functions named - * cairo_font_options_set_feature_name() and - * cairo_font_options_get_feature_name(), like - * cairo_font_options_set_antialias() and - * cairo_font_options_get_antialias(). - * - * New features may be added to a #cairo_font_options_t in the - * future. For this reason, cairo_font_options_copy(), - * cairo_font_options_equal(), cairo_font_options_merge(), and - * cairo_font_options_hash() should be used to copy, check - * for equality, merge, or compute a hash value of - * #cairo_font_options_t objects. - * - * Since: 1.0 - **/ -typedef struct _cairo_font_options cairo_font_options_t; - -cairo_public cairo_font_options_t * -cairo_font_options_create (void); - -cairo_public cairo_font_options_t * -cairo_font_options_copy (const cairo_font_options_t *original); - -cairo_public void -cairo_font_options_destroy (cairo_font_options_t *options); - -cairo_public cairo_status_t -cairo_font_options_status (cairo_font_options_t *options); - -cairo_public void -cairo_font_options_merge (cairo_font_options_t *options, - const cairo_font_options_t *other); -cairo_public cairo_bool_t -cairo_font_options_equal (const cairo_font_options_t *options, - const cairo_font_options_t *other); - -cairo_public unsigned long -cairo_font_options_hash (const cairo_font_options_t *options); - -cairo_public void -cairo_font_options_set_antialias (cairo_font_options_t *options, - cairo_antialias_t antialias); -cairo_public cairo_antialias_t -cairo_font_options_get_antialias (const cairo_font_options_t *options); - -cairo_public void -cairo_font_options_set_subpixel_order (cairo_font_options_t *options, - cairo_subpixel_order_t subpixel_order); -cairo_public cairo_subpixel_order_t -cairo_font_options_get_subpixel_order (const cairo_font_options_t *options); - -cairo_public void -cairo_font_options_set_hint_style (cairo_font_options_t *options, - cairo_hint_style_t hint_style); -cairo_public cairo_hint_style_t -cairo_font_options_get_hint_style (const cairo_font_options_t *options); - -cairo_public void -cairo_font_options_set_hint_metrics (cairo_font_options_t *options, - cairo_hint_metrics_t hint_metrics); -cairo_public cairo_hint_metrics_t -cairo_font_options_get_hint_metrics (const cairo_font_options_t *options); - -/* This interface is for dealing with text as text, not caring about the - font object inside the the cairo_t. */ - -cairo_public void -cairo_select_font_face (cairo_t *cr, - const char *family, - cairo_font_slant_t slant, - cairo_font_weight_t weight); - -cairo_public void -cairo_set_font_size (cairo_t *cr, double size); - -cairo_public void -cairo_set_font_matrix (cairo_t *cr, - const cairo_matrix_t *matrix); - -cairo_public void -cairo_get_font_matrix (cairo_t *cr, - cairo_matrix_t *matrix); - -cairo_public void -cairo_set_font_options (cairo_t *cr, - const cairo_font_options_t *options); - -cairo_public void -cairo_get_font_options (cairo_t *cr, - cairo_font_options_t *options); - -cairo_public void -cairo_set_font_face (cairo_t *cr, cairo_font_face_t *font_face); - -cairo_public cairo_font_face_t * -cairo_get_font_face (cairo_t *cr); - -cairo_public void -cairo_set_scaled_font (cairo_t *cr, - const cairo_scaled_font_t *scaled_font); - -cairo_public cairo_scaled_font_t * -cairo_get_scaled_font (cairo_t *cr); - -cairo_public void -cairo_show_text (cairo_t *cr, const char *utf8); - -cairo_public void -cairo_show_glyphs (cairo_t *cr, const cairo_glyph_t *glyphs, int num_glyphs); - -cairo_public void -cairo_show_text_glyphs (cairo_t *cr, - const char *utf8, - int utf8_len, - const cairo_glyph_t *glyphs, - int num_glyphs, - const cairo_text_cluster_t *clusters, - int num_clusters, - cairo_text_cluster_flags_t cluster_flags); - -cairo_public void -cairo_text_path (cairo_t *cr, const char *utf8); - -cairo_public void -cairo_glyph_path (cairo_t *cr, const cairo_glyph_t *glyphs, int num_glyphs); - -cairo_public void -cairo_text_extents (cairo_t *cr, - const char *utf8, - cairo_text_extents_t *extents); - -cairo_public void -cairo_glyph_extents (cairo_t *cr, - const cairo_glyph_t *glyphs, - int num_glyphs, - cairo_text_extents_t *extents); - -cairo_public void -cairo_font_extents (cairo_t *cr, - cairo_font_extents_t *extents); - -/* Generic identifier for a font style */ - -cairo_public cairo_font_face_t * -cairo_font_face_reference (cairo_font_face_t *font_face); - -cairo_public void -cairo_font_face_destroy (cairo_font_face_t *font_face); - -cairo_public unsigned int -cairo_font_face_get_reference_count (cairo_font_face_t *font_face); - -cairo_public cairo_status_t -cairo_font_face_status (cairo_font_face_t *font_face); - - -/** - * cairo_font_type_t: - * @CAIRO_FONT_TYPE_TOY: The font was created using cairo's toy font api (Since: 1.2) - * @CAIRO_FONT_TYPE_FT: The font is of type FreeType (Since: 1.2) - * @CAIRO_FONT_TYPE_WIN32: The font is of type Win32 (Since: 1.2) - * @CAIRO_FONT_TYPE_QUARTZ: The font is of type Quartz (Since: 1.6, in 1.2 and - * 1.4 it was named CAIRO_FONT_TYPE_ATSUI) - * @CAIRO_FONT_TYPE_USER: The font was create using cairo's user font api (Since: 1.8) - * - * #cairo_font_type_t is used to describe the type of a given font - * face or scaled font. The font types are also known as "font - * backends" within cairo. - * - * The type of a font face is determined by the function used to - * create it, which will generally be of the form - * cairo_type_font_face_create(). - * The font face type can be queried with cairo_font_face_get_type() - * - * The various #cairo_font_face_t functions can be used with a font face - * of any type. - * - * The type of a scaled font is determined by the type of the font - * face passed to cairo_scaled_font_create(). The scaled font type can - * be queried with cairo_scaled_font_get_type() - * - * The various #cairo_scaled_font_t functions can be used with scaled - * fonts of any type, but some font backends also provide - * type-specific functions that must only be called with a scaled font - * of the appropriate type. These functions have names that begin with - * cairo_type_scaled_font() - * such as cairo_ft_scaled_font_lock_face(). - * - * The behavior of calling a type-specific function with a scaled font - * of the wrong type is undefined. - * - * New entries may be added in future versions. - * - * Since: 1.2 - **/ -typedef enum _cairo_font_type { - CAIRO_FONT_TYPE_TOY, - CAIRO_FONT_TYPE_FT, - CAIRO_FONT_TYPE_WIN32, - CAIRO_FONT_TYPE_QUARTZ, - CAIRO_FONT_TYPE_USER -} cairo_font_type_t; - -cairo_public cairo_font_type_t -cairo_font_face_get_type (cairo_font_face_t *font_face); - -cairo_public void * -cairo_font_face_get_user_data (cairo_font_face_t *font_face, - const cairo_user_data_key_t *key); - -cairo_public cairo_status_t -cairo_font_face_set_user_data (cairo_font_face_t *font_face, - const cairo_user_data_key_t *key, - void *user_data, - cairo_destroy_func_t destroy); - -/* Portable interface to general font features. */ - -cairo_public cairo_scaled_font_t * -cairo_scaled_font_create (cairo_font_face_t *font_face, - const cairo_matrix_t *font_matrix, - const cairo_matrix_t *ctm, - const cairo_font_options_t *options); - -cairo_public cairo_scaled_font_t * -cairo_scaled_font_reference (cairo_scaled_font_t *scaled_font); - -cairo_public void -cairo_scaled_font_destroy (cairo_scaled_font_t *scaled_font); - -cairo_public unsigned int -cairo_scaled_font_get_reference_count (cairo_scaled_font_t *scaled_font); - -cairo_public cairo_status_t -cairo_scaled_font_status (cairo_scaled_font_t *scaled_font); - -cairo_public cairo_font_type_t -cairo_scaled_font_get_type (cairo_scaled_font_t *scaled_font); - -cairo_public void * -cairo_scaled_font_get_user_data (cairo_scaled_font_t *scaled_font, - const cairo_user_data_key_t *key); - -cairo_public cairo_status_t -cairo_scaled_font_set_user_data (cairo_scaled_font_t *scaled_font, - const cairo_user_data_key_t *key, - void *user_data, - cairo_destroy_func_t destroy); - -cairo_public void -cairo_scaled_font_extents (cairo_scaled_font_t *scaled_font, - cairo_font_extents_t *extents); - -cairo_public void -cairo_scaled_font_text_extents (cairo_scaled_font_t *scaled_font, - const char *utf8, - cairo_text_extents_t *extents); - -cairo_public void -cairo_scaled_font_glyph_extents (cairo_scaled_font_t *scaled_font, - const cairo_glyph_t *glyphs, - int num_glyphs, - cairo_text_extents_t *extents); - -cairo_public cairo_status_t -cairo_scaled_font_text_to_glyphs (cairo_scaled_font_t *scaled_font, - double x, - double y, - const char *utf8, - int utf8_len, - cairo_glyph_t **glyphs, - int *num_glyphs, - cairo_text_cluster_t **clusters, - int *num_clusters, - cairo_text_cluster_flags_t *cluster_flags); - -cairo_public cairo_font_face_t * -cairo_scaled_font_get_font_face (cairo_scaled_font_t *scaled_font); - -cairo_public void -cairo_scaled_font_get_font_matrix (cairo_scaled_font_t *scaled_font, - cairo_matrix_t *font_matrix); - -cairo_public void -cairo_scaled_font_get_ctm (cairo_scaled_font_t *scaled_font, - cairo_matrix_t *ctm); - -cairo_public void -cairo_scaled_font_get_scale_matrix (cairo_scaled_font_t *scaled_font, - cairo_matrix_t *scale_matrix); - -cairo_public void -cairo_scaled_font_get_font_options (cairo_scaled_font_t *scaled_font, - cairo_font_options_t *options); - - -/* Toy fonts */ - -cairo_public cairo_font_face_t * -cairo_toy_font_face_create (const char *family, - cairo_font_slant_t slant, - cairo_font_weight_t weight); - -cairo_public const char * -cairo_toy_font_face_get_family (cairo_font_face_t *font_face); - -cairo_public cairo_font_slant_t -cairo_toy_font_face_get_slant (cairo_font_face_t *font_face); - -cairo_public cairo_font_weight_t -cairo_toy_font_face_get_weight (cairo_font_face_t *font_face); - - -/* User fonts */ - -cairo_public cairo_font_face_t * -cairo_user_font_face_create (void); - -/* User-font method signatures */ - -/** - * cairo_user_scaled_font_init_func_t: - * @scaled_font: the scaled-font being created - * @cr: a cairo context, in font space - * @extents: font extents to fill in, in font space - * - * #cairo_user_scaled_font_init_func_t is the type of function which is - * called when a scaled-font needs to be created for a user font-face. - * - * The cairo context @cr is not used by the caller, but is prepared in font - * space, similar to what the cairo contexts passed to the render_glyph - * method will look like. The callback can use this context for extents - * computation for example. After the callback is called, @cr is checked - * for any error status. - * - * The @extents argument is where the user font sets the font extents for - * @scaled_font. It is in font space, which means that for most cases its - * ascent and descent members should add to 1.0. @extents is preset to - * hold a value of 1.0 for ascent, height, and max_x_advance, and 0.0 for - * descent and max_y_advance members. - * - * The callback is optional. If not set, default font extents as described - * in the previous paragraph will be used. - * - * Note that @scaled_font is not fully initialized at this - * point and trying to use it for text operations in the callback will result - * in deadlock. - * - * Returns: %CAIRO_STATUS_SUCCESS upon success, or an error status on error. - * - * Since: 1.8 - **/ -typedef cairo_status_t (*cairo_user_scaled_font_init_func_t) (cairo_scaled_font_t *scaled_font, - cairo_t *cr, - cairo_font_extents_t *extents); - -/** - * cairo_user_scaled_font_render_glyph_func_t: - * @scaled_font: user scaled-font - * @glyph: glyph code to render - * @cr: cairo context to draw to, in font space - * @extents: glyph extents to fill in, in font space - * - * #cairo_user_scaled_font_render_glyph_func_t is the type of function which - * is called when a user scaled-font needs to render a glyph. - * - * The callback is mandatory, and expected to draw the glyph with code @glyph to - * the cairo context @cr. @cr is prepared such that the glyph drawing is done in - * font space. That is, the matrix set on @cr is the scale matrix of @scaled_font, - * The @extents argument is where the user font sets the font extents for - * @scaled_font. However, if user prefers to draw in user space, they can - * achieve that by changing the matrix on @cr. All cairo rendering operations - * to @cr are permitted, however, the result is undefined if any source other - * than the default source on @cr is used. That means, glyph bitmaps should - * be rendered using cairo_mask() instead of cairo_paint(). - * - * Other non-default settings on @cr include a font size of 1.0 (given that - * it is set up to be in font space), and font options corresponding to - * @scaled_font. - * - * The @extents argument is preset to have x_bearing, - * width, and y_advance of zero, - * y_bearing set to -font_extents.ascent, - * height to font_extents.ascent+font_extents.descent, - * and x_advance to font_extents.max_x_advance. - * The only field user needs to set in majority of cases is - * x_advance. - * If the width field is zero upon the callback returning - * (which is its preset value), the glyph extents are automatically computed - * based on the drawings done to @cr. This is in most cases exactly what the - * desired behavior is. However, if for any reason the callback sets the - * extents, it must be ink extents, and include the extents of all drawing - * done to @cr in the callback. - * - * Returns: %CAIRO_STATUS_SUCCESS upon success, or - * %CAIRO_STATUS_USER_FONT_ERROR or any other error status on error. - * - * Since: 1.8 - **/ -typedef cairo_status_t (*cairo_user_scaled_font_render_glyph_func_t) (cairo_scaled_font_t *scaled_font, - unsigned long glyph, - cairo_t *cr, - cairo_text_extents_t *extents); - -/** - * cairo_user_scaled_font_text_to_glyphs_func_t: - * @scaled_font: the scaled-font being created - * @utf8: a string of text encoded in UTF-8 - * @utf8_len: length of @utf8 in bytes - * @glyphs: pointer to array of glyphs to fill, in font space - * @num_glyphs: pointer to number of glyphs - * @clusters: pointer to array of cluster mapping information to fill, or %NULL - * @num_clusters: pointer to number of clusters - * @cluster_flags: pointer to location to store cluster flags corresponding to the - * output @clusters - * - * #cairo_user_scaled_font_text_to_glyphs_func_t is the type of function which - * is called to convert input text to an array of glyphs. This is used by the - * cairo_show_text() operation. - * - * Using this callback the user-font has full control on glyphs and their - * positions. That means, it allows for features like ligatures and kerning, - * as well as complex shaping required for scripts like - * Arabic and Indic. - * - * The @num_glyphs argument is preset to the number of glyph entries available - * in the @glyphs buffer. If the @glyphs buffer is %NULL, the value of - * @num_glyphs will be zero. If the provided glyph array is too short for - * the conversion (or for convenience), a new glyph array may be allocated - * using cairo_glyph_allocate() and placed in @glyphs. Upon return, - * @num_glyphs should contain the number of generated glyphs. If the value - * @glyphs points at has changed after the call, the caller will free the - * allocated glyph array using cairo_glyph_free(). The caller will also free - * the original value of @glyphs, so the callback shouldn't do so. - * The callback should populate the glyph indices and positions (in font space) - * assuming that the text is to be shown at the origin. - * - * If @clusters is not %NULL, @num_clusters and @cluster_flags are also - * non-%NULL, and cluster mapping should be computed. The semantics of how - * cluster array allocation works is similar to the glyph array. That is, - * if @clusters initially points to a non-%NULL value, that array may be used - * as a cluster buffer, and @num_clusters points to the number of cluster - * entries available there. If the provided cluster array is too short for - * the conversion (or for convenience), a new cluster array may be allocated - * using cairo_text_cluster_allocate() and placed in @clusters. In this case, - * the original value of @clusters will still be freed by the caller. Upon - * return, @num_clusters should contain the number of generated clusters. - * If the value @clusters points at has changed after the call, the caller - * will free the allocated cluster array using cairo_text_cluster_free(). - * - * The callback is optional. If @num_glyphs is negative upon - * the callback returning or if the return value - * is %CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED, the unicode_to_glyph callback - * is tried. See #cairo_user_scaled_font_unicode_to_glyph_func_t. - * - * Note: While cairo does not impose any limitation on glyph indices, - * some applications may assume that a glyph index fits in a 16-bit - * unsigned integer. As such, it is advised that user-fonts keep their - * glyphs in the 0 to 65535 range. Furthermore, some applications may - * assume that glyph 0 is a special glyph-not-found glyph. User-fonts - * are advised to use glyph 0 for such purposes and do not use that - * glyph value for other purposes. - * - * Returns: %CAIRO_STATUS_SUCCESS upon success, - * %CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED if fallback options should be tried, - * or %CAIRO_STATUS_USER_FONT_ERROR or any other error status on error. - * - * Since: 1.8 - **/ -typedef cairo_status_t (*cairo_user_scaled_font_text_to_glyphs_func_t) (cairo_scaled_font_t *scaled_font, - const char *utf8, - int utf8_len, - cairo_glyph_t **glyphs, - int *num_glyphs, - cairo_text_cluster_t **clusters, - int *num_clusters, - cairo_text_cluster_flags_t *cluster_flags); - -/** - * cairo_user_scaled_font_unicode_to_glyph_func_t: - * @scaled_font: the scaled-font being created - * @unicode: input unicode character code-point - * @glyph_index: output glyph index - * - * #cairo_user_scaled_font_unicode_to_glyph_func_t is the type of function which - * is called to convert an input Unicode character to a single glyph. - * This is used by the cairo_show_text() operation. - * - * This callback is used to provide the same functionality as the - * text_to_glyphs callback does (see #cairo_user_scaled_font_text_to_glyphs_func_t) - * but has much less control on the output, - * in exchange for increased ease of use. The inherent assumption to using - * this callback is that each character maps to one glyph, and that the - * mapping is context independent. It also assumes that glyphs are positioned - * according to their advance width. These mean no ligatures, kerning, or - * complex scripts can be implemented using this callback. - * - * The callback is optional, and only used if text_to_glyphs callback is not - * set or fails to return glyphs. If this callback is not set or if it returns - * %CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED, an identity mapping from Unicode - * code-points to glyph indices is assumed. - * - * Note: While cairo does not impose any limitation on glyph indices, - * some applications may assume that a glyph index fits in a 16-bit - * unsigned integer. As such, it is advised that user-fonts keep their - * glyphs in the 0 to 65535 range. Furthermore, some applications may - * assume that glyph 0 is a special glyph-not-found glyph. User-fonts - * are advised to use glyph 0 for such purposes and do not use that - * glyph value for other purposes. - * - * Returns: %CAIRO_STATUS_SUCCESS upon success, - * %CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED if fallback options should be tried, - * or %CAIRO_STATUS_USER_FONT_ERROR or any other error status on error. - * - * Since: 1.8 - **/ -typedef cairo_status_t (*cairo_user_scaled_font_unicode_to_glyph_func_t) (cairo_scaled_font_t *scaled_font, - unsigned long unicode, - unsigned long *glyph_index); - -/* User-font method setters */ - -cairo_public void -cairo_user_font_face_set_init_func (cairo_font_face_t *font_face, - cairo_user_scaled_font_init_func_t init_func); - -cairo_public void -cairo_user_font_face_set_render_glyph_func (cairo_font_face_t *font_face, - cairo_user_scaled_font_render_glyph_func_t render_glyph_func); - -cairo_public void -cairo_user_font_face_set_text_to_glyphs_func (cairo_font_face_t *font_face, - cairo_user_scaled_font_text_to_glyphs_func_t text_to_glyphs_func); - -cairo_public void -cairo_user_font_face_set_unicode_to_glyph_func (cairo_font_face_t *font_face, - cairo_user_scaled_font_unicode_to_glyph_func_t unicode_to_glyph_func); - -/* User-font method getters */ - -cairo_public cairo_user_scaled_font_init_func_t -cairo_user_font_face_get_init_func (cairo_font_face_t *font_face); - -cairo_public cairo_user_scaled_font_render_glyph_func_t -cairo_user_font_face_get_render_glyph_func (cairo_font_face_t *font_face); - -cairo_public cairo_user_scaled_font_text_to_glyphs_func_t -cairo_user_font_face_get_text_to_glyphs_func (cairo_font_face_t *font_face); - -cairo_public cairo_user_scaled_font_unicode_to_glyph_func_t -cairo_user_font_face_get_unicode_to_glyph_func (cairo_font_face_t *font_face); - - -/* Query functions */ - -cairo_public cairo_operator_t -cairo_get_operator (cairo_t *cr); - -cairo_public cairo_pattern_t * -cairo_get_source (cairo_t *cr); - -cairo_public double -cairo_get_tolerance (cairo_t *cr); - -cairo_public cairo_antialias_t -cairo_get_antialias (cairo_t *cr); - -cairo_public cairo_bool_t -cairo_has_current_point (cairo_t *cr); - -cairo_public void -cairo_get_current_point (cairo_t *cr, double *x, double *y); - -cairo_public cairo_fill_rule_t -cairo_get_fill_rule (cairo_t *cr); - -cairo_public double -cairo_get_line_width (cairo_t *cr); - -cairo_public cairo_line_cap_t -cairo_get_line_cap (cairo_t *cr); - -cairo_public cairo_line_join_t -cairo_get_line_join (cairo_t *cr); - -cairo_public double -cairo_get_miter_limit (cairo_t *cr); - -cairo_public int -cairo_get_dash_count (cairo_t *cr); - -cairo_public void -cairo_get_dash (cairo_t *cr, double *dashes, double *offset); - -cairo_public void -cairo_get_matrix (cairo_t *cr, cairo_matrix_t *matrix); - -cairo_public cairo_surface_t * -cairo_get_target (cairo_t *cr); - -cairo_public cairo_surface_t * -cairo_get_group_target (cairo_t *cr); - -/** - * cairo_path_data_type_t: - * @CAIRO_PATH_MOVE_TO: A move-to operation, since 1.0 - * @CAIRO_PATH_LINE_TO: A line-to operation, since 1.0 - * @CAIRO_PATH_CURVE_TO: A curve-to operation, since 1.0 - * @CAIRO_PATH_CLOSE_PATH: A close-path operation, since 1.0 - * - * #cairo_path_data_t is used to describe the type of one portion - * of a path when represented as a #cairo_path_t. - * See #cairo_path_data_t for details. - * - * Since: 1.0 - **/ -typedef enum _cairo_path_data_type { - CAIRO_PATH_MOVE_TO, - CAIRO_PATH_LINE_TO, - CAIRO_PATH_CURVE_TO, - CAIRO_PATH_CLOSE_PATH -} cairo_path_data_type_t; - -/** - * cairo_path_data_t: - * - * #cairo_path_data_t is used to represent the path data inside a - * #cairo_path_t. - * - * The data structure is designed to try to balance the demands of - * efficiency and ease-of-use. A path is represented as an array of - * #cairo_path_data_t, which is a union of headers and points. - * - * Each portion of the path is represented by one or more elements in - * the array, (one header followed by 0 or more points). The length - * value of the header is the number of array elements for the current - * portion including the header, (ie. length == 1 + # of points), and - * where the number of points for each element type is as follows: - * - * - * %CAIRO_PATH_MOVE_TO: 1 point - * %CAIRO_PATH_LINE_TO: 1 point - * %CAIRO_PATH_CURVE_TO: 3 points - * %CAIRO_PATH_CLOSE_PATH: 0 points - * - * - * The semantics and ordering of the coordinate values are consistent - * with cairo_move_to(), cairo_line_to(), cairo_curve_to(), and - * cairo_close_path(). - * - * Here is sample code for iterating through a #cairo_path_t: - * - * - * int i; - * cairo_path_t *path; - * cairo_path_data_t *data; - *   - * path = cairo_copy_path (cr); - *   - * for (i=0; i < path->num_data; i += path->data[i].header.length) { - * data = &path->data[i]; - * switch (data->header.type) { - * case CAIRO_PATH_MOVE_TO: - * do_move_to_things (data[1].point.x, data[1].point.y); - * break; - * case CAIRO_PATH_LINE_TO: - * do_line_to_things (data[1].point.x, data[1].point.y); - * break; - * case CAIRO_PATH_CURVE_TO: - * do_curve_to_things (data[1].point.x, data[1].point.y, - * data[2].point.x, data[2].point.y, - * data[3].point.x, data[3].point.y); - * break; - * case CAIRO_PATH_CLOSE_PATH: - * do_close_path_things (); - * break; - * } - * } - * cairo_path_destroy (path); - * - * - * As of cairo 1.4, cairo does not mind if there are more elements in - * a portion of the path than needed. Such elements can be used by - * users of the cairo API to hold extra values in the path data - * structure. For this reason, it is recommended that applications - * always use data->header.length to - * iterate over the path data, instead of hardcoding the number of - * elements for each element type. - * - * Since: 1.0 - **/ -typedef union _cairo_path_data_t cairo_path_data_t; -union _cairo_path_data_t { - struct { - cairo_path_data_type_t type; - int length; - } header; - struct { - double x, y; - } point; -}; - -/** - * cairo_path_t: - * @status: the current error status - * @data: the elements in the path - * @num_data: the number of elements in the data array - * - * A data structure for holding a path. This data structure serves as - * the return value for cairo_copy_path() and - * cairo_copy_path_flat() as well the input value for - * cairo_append_path(). - * - * See #cairo_path_data_t for hints on how to iterate over the - * actual data within the path. - * - * The num_data member gives the number of elements in the data - * array. This number is larger than the number of independent path - * portions (defined in #cairo_path_data_type_t), since the data - * includes both headers and coordinates for each portion. - * - * Since: 1.0 - **/ -typedef struct cairo_path { - cairo_status_t status; - cairo_path_data_t *data; - int num_data; -} cairo_path_t; - -cairo_public cairo_path_t * -cairo_copy_path (cairo_t *cr); - -cairo_public cairo_path_t * -cairo_copy_path_flat (cairo_t *cr); - -cairo_public void -cairo_append_path (cairo_t *cr, - const cairo_path_t *path); - -cairo_public void -cairo_path_destroy (cairo_path_t *path); - -/* Error status queries */ - -cairo_public cairo_status_t -cairo_status (cairo_t *cr); - -cairo_public const char * -cairo_status_to_string (cairo_status_t status); - -/* Backend device manipulation */ - -cairo_public cairo_device_t * -cairo_device_reference (cairo_device_t *device); - -/** - * cairo_device_type_t: - * @CAIRO_DEVICE_TYPE_DRM: The device is of type Direct Render Manager, since 1.10 - * @CAIRO_DEVICE_TYPE_GL: The device is of type OpenGL, since 1.10 - * @CAIRO_DEVICE_TYPE_SCRIPT: The device is of type script, since 1.10 - * @CAIRO_DEVICE_TYPE_XCB: The device is of type xcb, since 1.10 - * @CAIRO_DEVICE_TYPE_XLIB: The device is of type xlib, since 1.10 - * @CAIRO_DEVICE_TYPE_XML: The device is of type XML, since 1.10 - * @CAIRO_DEVICE_TYPE_COGL: The device is of type cogl, since 1.12 - * @CAIRO_DEVICE_TYPE_WIN32: The device is of type win32, since 1.12 - * @CAIRO_DEVICE_TYPE_INVALID: The device is invalid, since 1.10 - * - * #cairo_device_type_t is used to describe the type of a given - * device. The devices types are also known as "backends" within cairo. - * - * The device type can be queried with cairo_device_get_type() - * - * The various #cairo_device_t functions can be used with devices of - * any type, but some backends also provide type-specific functions - * that must only be called with a device of the appropriate - * type. These functions have names that begin with - * cairo_type_device such as - * cairo_xcb_device_debug_cap_xrender_version(). - * - * The behavior of calling a type-specific function with a device of - * the wrong type is undefined. - * - * New entries may be added in future versions. - * - * Since: 1.10 - **/ -typedef enum _cairo_device_type { - CAIRO_DEVICE_TYPE_DRM, - CAIRO_DEVICE_TYPE_GL, - CAIRO_DEVICE_TYPE_SCRIPT, - CAIRO_DEVICE_TYPE_XCB, - CAIRO_DEVICE_TYPE_XLIB, - CAIRO_DEVICE_TYPE_XML, - CAIRO_DEVICE_TYPE_COGL, - CAIRO_DEVICE_TYPE_WIN32, - - CAIRO_DEVICE_TYPE_INVALID = -1 -} cairo_device_type_t; - -cairo_public cairo_device_type_t -cairo_device_get_type (cairo_device_t *device); - -cairo_public cairo_status_t -cairo_device_status (cairo_device_t *device); - -cairo_public cairo_status_t -cairo_device_acquire (cairo_device_t *device); - -cairo_public void -cairo_device_release (cairo_device_t *device); - -cairo_public void -cairo_device_flush (cairo_device_t *device); - -cairo_public void -cairo_device_finish (cairo_device_t *device); - -cairo_public void -cairo_device_destroy (cairo_device_t *device); - -cairo_public unsigned int -cairo_device_get_reference_count (cairo_device_t *device); - -cairo_public void * -cairo_device_get_user_data (cairo_device_t *device, - const cairo_user_data_key_t *key); - -cairo_public cairo_status_t -cairo_device_set_user_data (cairo_device_t *device, - const cairo_user_data_key_t *key, - void *user_data, - cairo_destroy_func_t destroy); - - -/* Surface manipulation */ - -cairo_public cairo_surface_t * -cairo_surface_create_similar (cairo_surface_t *other, - cairo_content_t content, - int width, - int height); - -cairo_public cairo_surface_t * -cairo_surface_create_similar_image (cairo_surface_t *other, - cairo_format_t format, - int width, - int height); - -cairo_public cairo_surface_t * -cairo_surface_map_to_image (cairo_surface_t *surface, - const cairo_rectangle_int_t *extents); - -cairo_public void -cairo_surface_unmap_image (cairo_surface_t *surface, - cairo_surface_t *image); - -cairo_public cairo_surface_t * -cairo_surface_create_for_rectangle (cairo_surface_t *target, - double x, - double y, - double width, - double height); - -typedef enum { - CAIRO_SURFACE_OBSERVER_NORMAL = 0, - CAIRO_SURFACE_OBSERVER_RECORD_OPERATIONS = 0x1 -} cairo_surface_observer_mode_t; - -cairo_public cairo_surface_t * -cairo_surface_create_observer (cairo_surface_t *target, - cairo_surface_observer_mode_t mode); - -typedef void (*cairo_surface_observer_callback_t) (cairo_surface_t *observer, - cairo_surface_t *target, - void *data); - -cairo_public cairo_status_t -cairo_surface_observer_add_paint_callback (cairo_surface_t *abstract_surface, - cairo_surface_observer_callback_t func, - void *data); - -cairo_public cairo_status_t -cairo_surface_observer_add_mask_callback (cairo_surface_t *abstract_surface, - cairo_surface_observer_callback_t func, - void *data); - -cairo_public cairo_status_t -cairo_surface_observer_add_fill_callback (cairo_surface_t *abstract_surface, - cairo_surface_observer_callback_t func, - void *data); - -cairo_public cairo_status_t -cairo_surface_observer_add_stroke_callback (cairo_surface_t *abstract_surface, - cairo_surface_observer_callback_t func, - void *data); - -cairo_public cairo_status_t -cairo_surface_observer_add_glyphs_callback (cairo_surface_t *abstract_surface, - cairo_surface_observer_callback_t func, - void *data); - -cairo_public cairo_status_t -cairo_surface_observer_add_flush_callback (cairo_surface_t *abstract_surface, - cairo_surface_observer_callback_t func, - void *data); - -cairo_public cairo_status_t -cairo_surface_observer_add_finish_callback (cairo_surface_t *abstract_surface, - cairo_surface_observer_callback_t func, - void *data); - -cairo_public cairo_status_t -cairo_surface_observer_print (cairo_surface_t *surface, - cairo_write_func_t write_func, - void *closure); -cairo_public double -cairo_surface_observer_elapsed (cairo_surface_t *surface); - -cairo_public cairo_status_t -cairo_device_observer_print (cairo_device_t *device, - cairo_write_func_t write_func, - void *closure); - -cairo_public double -cairo_device_observer_elapsed (cairo_device_t *device); - -cairo_public double -cairo_device_observer_paint_elapsed (cairo_device_t *device); - -cairo_public double -cairo_device_observer_mask_elapsed (cairo_device_t *device); - -cairo_public double -cairo_device_observer_fill_elapsed (cairo_device_t *device); - -cairo_public double -cairo_device_observer_stroke_elapsed (cairo_device_t *device); - -cairo_public double -cairo_device_observer_glyphs_elapsed (cairo_device_t *device); - -cairo_public cairo_surface_t * -cairo_surface_reference (cairo_surface_t *surface); - -cairo_public void -cairo_surface_finish (cairo_surface_t *surface); - -cairo_public void -cairo_surface_destroy (cairo_surface_t *surface); - -cairo_public cairo_device_t * -cairo_surface_get_device (cairo_surface_t *surface); - -cairo_public unsigned int -cairo_surface_get_reference_count (cairo_surface_t *surface); - -cairo_public cairo_status_t -cairo_surface_status (cairo_surface_t *surface); - -/** - * cairo_surface_type_t: - * @CAIRO_SURFACE_TYPE_IMAGE: The surface is of type image, since 1.2 - * @CAIRO_SURFACE_TYPE_PDF: The surface is of type pdf, since 1.2 - * @CAIRO_SURFACE_TYPE_PS: The surface is of type ps, since 1.2 - * @CAIRO_SURFACE_TYPE_XLIB: The surface is of type xlib, since 1.2 - * @CAIRO_SURFACE_TYPE_XCB: The surface is of type xcb, since 1.2 - * @CAIRO_SURFACE_TYPE_GLITZ: The surface is of type glitz, since 1.2 - * @CAIRO_SURFACE_TYPE_QUARTZ: The surface is of type quartz, since 1.2 - * @CAIRO_SURFACE_TYPE_WIN32: The surface is of type win32, since 1.2 - * @CAIRO_SURFACE_TYPE_BEOS: The surface is of type beos, since 1.2 - * @CAIRO_SURFACE_TYPE_DIRECTFB: The surface is of type directfb, since 1.2 - * @CAIRO_SURFACE_TYPE_SVG: The surface is of type svg, since 1.2 - * @CAIRO_SURFACE_TYPE_OS2: The surface is of type os2, since 1.4 - * @CAIRO_SURFACE_TYPE_WIN32_PRINTING: The surface is a win32 printing surface, since 1.6 - * @CAIRO_SURFACE_TYPE_QUARTZ_IMAGE: The surface is of type quartz_image, since 1.6 - * @CAIRO_SURFACE_TYPE_SCRIPT: The surface is of type script, since 1.10 - * @CAIRO_SURFACE_TYPE_QT: The surface is of type Qt, since 1.10 - * @CAIRO_SURFACE_TYPE_RECORDING: The surface is of type recording, since 1.10 - * @CAIRO_SURFACE_TYPE_VG: The surface is a OpenVG surface, since 1.10 - * @CAIRO_SURFACE_TYPE_GL: The surface is of type OpenGL, since 1.10 - * @CAIRO_SURFACE_TYPE_DRM: The surface is of type Direct Render Manager, since 1.10 - * @CAIRO_SURFACE_TYPE_TEE: The surface is of type 'tee' (a multiplexing surface), since 1.10 - * @CAIRO_SURFACE_TYPE_XML: The surface is of type XML (for debugging), since 1.10 - * @CAIRO_SURFACE_TYPE_SKIA: The surface is of type Skia, since 1.10 - * @CAIRO_SURFACE_TYPE_SUBSURFACE: The surface is a subsurface created with - * cairo_surface_create_for_rectangle(), since 1.10 - * @CAIRO_SURFACE_TYPE_COGL: This surface is of type Cogl, since 1.12 - * - * #cairo_surface_type_t is used to describe the type of a given - * surface. The surface types are also known as "backends" or "surface - * backends" within cairo. - * - * The type of a surface is determined by the function used to create - * it, which will generally be of the form - * cairo_type_surface_create(), - * (though see cairo_surface_create_similar() as well). - * - * The surface type can be queried with cairo_surface_get_type() - * - * The various #cairo_surface_t functions can be used with surfaces of - * any type, but some backends also provide type-specific functions - * that must only be called with a surface of the appropriate - * type. These functions have names that begin with - * cairo_type_surface such as cairo_image_surface_get_width(). - * - * The behavior of calling a type-specific function with a surface of - * the wrong type is undefined. - * - * New entries may be added in future versions. - * - * Since: 1.2 - **/ -typedef enum _cairo_surface_type { - CAIRO_SURFACE_TYPE_IMAGE, - CAIRO_SURFACE_TYPE_PDF, - CAIRO_SURFACE_TYPE_PS, - CAIRO_SURFACE_TYPE_XLIB, - CAIRO_SURFACE_TYPE_XCB, - CAIRO_SURFACE_TYPE_GLITZ, - CAIRO_SURFACE_TYPE_QUARTZ, - CAIRO_SURFACE_TYPE_WIN32, - CAIRO_SURFACE_TYPE_BEOS, - CAIRO_SURFACE_TYPE_DIRECTFB, - CAIRO_SURFACE_TYPE_SVG, - CAIRO_SURFACE_TYPE_OS2, - CAIRO_SURFACE_TYPE_WIN32_PRINTING, - CAIRO_SURFACE_TYPE_QUARTZ_IMAGE, - CAIRO_SURFACE_TYPE_SCRIPT, - CAIRO_SURFACE_TYPE_QT, - CAIRO_SURFACE_TYPE_RECORDING, - CAIRO_SURFACE_TYPE_VG, - CAIRO_SURFACE_TYPE_GL, - CAIRO_SURFACE_TYPE_DRM, - CAIRO_SURFACE_TYPE_TEE, - CAIRO_SURFACE_TYPE_XML, - CAIRO_SURFACE_TYPE_SKIA, - CAIRO_SURFACE_TYPE_SUBSURFACE, - CAIRO_SURFACE_TYPE_COGL -} cairo_surface_type_t; - -cairo_public cairo_surface_type_t -cairo_surface_get_type (cairo_surface_t *surface); - -cairo_public cairo_content_t -cairo_surface_get_content (cairo_surface_t *surface); - -#if CAIRO_HAS_PNG_FUNCTIONS - -cairo_public cairo_status_t -cairo_surface_write_to_png (cairo_surface_t *surface, - const char *filename); - -cairo_public cairo_status_t -cairo_surface_write_to_png_stream (cairo_surface_t *surface, - cairo_write_func_t write_func, - void *closure); - -#endif - -cairo_public void * -cairo_surface_get_user_data (cairo_surface_t *surface, - const cairo_user_data_key_t *key); - -cairo_public cairo_status_t -cairo_surface_set_user_data (cairo_surface_t *surface, - const cairo_user_data_key_t *key, - void *user_data, - cairo_destroy_func_t destroy); - -#define CAIRO_MIME_TYPE_JPEG "image/jpeg" -#define CAIRO_MIME_TYPE_PNG "image/png" -#define CAIRO_MIME_TYPE_JP2 "image/jp2" -#define CAIRO_MIME_TYPE_URI "text/x-uri" -#define CAIRO_MIME_TYPE_UNIQUE_ID "application/x-cairo.uuid" - -cairo_public void -cairo_surface_get_mime_data (cairo_surface_t *surface, - const char *mime_type, - const unsigned char **data, - unsigned long *length); - -cairo_public cairo_status_t -cairo_surface_set_mime_data (cairo_surface_t *surface, - const char *mime_type, - const unsigned char *data, - unsigned long length, - cairo_destroy_func_t destroy, - void *closure); - -cairo_public cairo_bool_t -cairo_surface_supports_mime_type (cairo_surface_t *surface, - const char *mime_type); - -cairo_public void -cairo_surface_get_font_options (cairo_surface_t *surface, - cairo_font_options_t *options); - -cairo_public void -cairo_surface_flush (cairo_surface_t *surface); - -cairo_public void -cairo_surface_mark_dirty (cairo_surface_t *surface); - -cairo_public void -cairo_surface_mark_dirty_rectangle (cairo_surface_t *surface, - int x, - int y, - int width, - int height); - -cairo_public void -cairo_surface_set_device_offset (cairo_surface_t *surface, - double x_offset, - double y_offset); - -cairo_public void -cairo_surface_get_device_offset (cairo_surface_t *surface, - double *x_offset, - double *y_offset); - -cairo_public void -cairo_surface_set_fallback_resolution (cairo_surface_t *surface, - double x_pixels_per_inch, - double y_pixels_per_inch); - -cairo_public void -cairo_surface_get_fallback_resolution (cairo_surface_t *surface, - double *x_pixels_per_inch, - double *y_pixels_per_inch); - -cairo_public void -cairo_surface_copy_page (cairo_surface_t *surface); - -cairo_public void -cairo_surface_show_page (cairo_surface_t *surface); - -cairo_public cairo_bool_t -cairo_surface_has_show_text_glyphs (cairo_surface_t *surface); - -/* Image-surface functions */ - -cairo_public cairo_surface_t * -cairo_image_surface_create (cairo_format_t format, - int width, - int height); - -cairo_public int -cairo_format_stride_for_width (cairo_format_t format, - int width); - -cairo_public cairo_surface_t * -cairo_image_surface_create_for_data (unsigned char *data, - cairo_format_t format, - int width, - int height, - int stride); - -cairo_public unsigned char * -cairo_image_surface_get_data (cairo_surface_t *surface); - -cairo_public cairo_format_t -cairo_image_surface_get_format (cairo_surface_t *surface); - -cairo_public int -cairo_image_surface_get_width (cairo_surface_t *surface); - -cairo_public int -cairo_image_surface_get_height (cairo_surface_t *surface); - -cairo_public int -cairo_image_surface_get_stride (cairo_surface_t *surface); - -#if CAIRO_HAS_PNG_FUNCTIONS - -cairo_public cairo_surface_t * -cairo_image_surface_create_from_png (const char *filename); - -cairo_public cairo_surface_t * -cairo_image_surface_create_from_png_stream (cairo_read_func_t read_func, - void *closure); - -#endif - -/* Recording-surface functions */ - -cairo_public cairo_surface_t * -cairo_recording_surface_create (cairo_content_t content, - const cairo_rectangle_t *extents); - -cairo_public void -cairo_recording_surface_ink_extents (cairo_surface_t *surface, - double *x0, - double *y0, - double *width, - double *height); - -cairo_public cairo_bool_t -cairo_recording_surface_get_extents (cairo_surface_t *surface, - cairo_rectangle_t *extents); - -/* raster-source pattern (callback) functions */ - -/** - * cairo_raster_source_acquire_func_t: - * @pattern: the pattern being rendered from - * @callback_data: the user data supplied during creation - * @target: the rendering target surface - * @extents: rectangular region of interest in pixels in sample space - * - * #cairo_raster_source_acquire_func_t is the type of function which is - * called when a pattern is being rendered from. It should create a surface - * that provides the pixel data for the region of interest as defined by - * extents, though the surface itself does not have to be limited to that - * area. For convenience the surface should probably be of image type, - * created with cairo_surface_create_similar_image() for the target (which - * enables the number of copies to be reduced during transfer to the - * device). Another option, might be to return a similar surface to the - * target for explicit handling by the application of a set of cached sources - * on the device. The region of sample data provided should be defined using - * cairo_surface_set_device_offset() to specify the top-left corner of the - * sample data (along with width and height of the surface). - * - * Returns: a #cairo_surface_t - * - * Since: 1.12 - **/ -typedef cairo_surface_t * -(*cairo_raster_source_acquire_func_t) (cairo_pattern_t *pattern, - void *callback_data, - cairo_surface_t *target, - const cairo_rectangle_int_t *extents); - -/** - * cairo_raster_source_release_func_t: - * @pattern: the pattern being rendered from - * @callback_data: the user data supplied during creation - * @surface: the surface created during acquire - * - * #cairo_raster_source_release_func_t is the type of function which is - * called when the pixel data is no longer being access by the pattern - * for the rendering operation. Typically this function will simply - * destroy the surface created during acquire. - * - * Since: 1.12 - **/ -typedef void -(*cairo_raster_source_release_func_t) (cairo_pattern_t *pattern, - void *callback_data, - cairo_surface_t *surface); - -/** - * cairo_raster_source_snapshot_func_t: - * @pattern: the pattern being rendered from - * @callback_data: the user data supplied during creation - * - * #cairo_raster_source_snapshot_func_t is the type of function which is - * called when the pixel data needs to be preserved for later use - * during printing. This pattern will be accessed again later, and it - * is expected to provide the pixel data that was current at the time - * of snapshotting. - * - * Return value: CAIRO_STATUS_SUCCESS on success, or one of the - * #cairo_status_t error codes for failure. - * - * Since: 1.12 - **/ -typedef cairo_status_t -(*cairo_raster_source_snapshot_func_t) (cairo_pattern_t *pattern, - void *callback_data); - -/** - * cairo_raster_source_copy_func_t: - * @pattern: the #cairo_pattern_t that was copied to - * @callback_data: the user data supplied during creation - * @other: the #cairo_pattern_t being used as the source for the copy - * - * #cairo_raster_source_copy_func_t is the type of function which is - * called when the pattern gets copied as a normal part of rendering. - * - * Return value: CAIRO_STATUS_SUCCESS on success, or one of the - * #cairo_status_t error codes for failure. - * - * Since: 1.12 - **/ -typedef cairo_status_t -(*cairo_raster_source_copy_func_t) (cairo_pattern_t *pattern, - void *callback_data, - const cairo_pattern_t *other); - -/** - * cairo_raster_source_finish_func_t: - * @pattern: the pattern being rendered from - * @callback_data: the user data supplied during creation - * - * #cairo_raster_source_finish_func_t is the type of function which is - * called when the pattern (or a copy thereof) is no longer required. - * - * Since: 1.12 - **/ -typedef void -(*cairo_raster_source_finish_func_t) (cairo_pattern_t *pattern, - void *callback_data); - -cairo_public cairo_pattern_t * -cairo_pattern_create_raster_source (void *user_data, - cairo_content_t content, - int width, int height); - -cairo_public void -cairo_raster_source_pattern_set_callback_data (cairo_pattern_t *pattern, - void *data); - -cairo_public void * -cairo_raster_source_pattern_get_callback_data (cairo_pattern_t *pattern); - -cairo_public void -cairo_raster_source_pattern_set_acquire (cairo_pattern_t *pattern, - cairo_raster_source_acquire_func_t acquire, - cairo_raster_source_release_func_t release); - -cairo_public void -cairo_raster_source_pattern_get_acquire (cairo_pattern_t *pattern, - cairo_raster_source_acquire_func_t *acquire, - cairo_raster_source_release_func_t *release); -cairo_public void -cairo_raster_source_pattern_set_snapshot (cairo_pattern_t *pattern, - cairo_raster_source_snapshot_func_t snapshot); - -cairo_public cairo_raster_source_snapshot_func_t -cairo_raster_source_pattern_get_snapshot (cairo_pattern_t *pattern); - -cairo_public void -cairo_raster_source_pattern_set_copy (cairo_pattern_t *pattern, - cairo_raster_source_copy_func_t copy); - -cairo_public cairo_raster_source_copy_func_t -cairo_raster_source_pattern_get_copy (cairo_pattern_t *pattern); - -cairo_public void -cairo_raster_source_pattern_set_finish (cairo_pattern_t *pattern, - cairo_raster_source_finish_func_t finish); - -cairo_public cairo_raster_source_finish_func_t -cairo_raster_source_pattern_get_finish (cairo_pattern_t *pattern); - -/* Pattern creation functions */ - -cairo_public cairo_pattern_t * -cairo_pattern_create_rgb (double red, double green, double blue); - -cairo_public cairo_pattern_t * -cairo_pattern_create_rgba (double red, double green, double blue, - double alpha); - -cairo_public cairo_pattern_t * -cairo_pattern_create_for_surface (cairo_surface_t *surface); - -cairo_public cairo_pattern_t * -cairo_pattern_create_linear (double x0, double y0, - double x1, double y1); - -cairo_public cairo_pattern_t * -cairo_pattern_create_radial (double cx0, double cy0, double radius0, - double cx1, double cy1, double radius1); - -cairo_public cairo_pattern_t * -cairo_pattern_create_mesh (void); - -cairo_public cairo_pattern_t * -cairo_pattern_reference (cairo_pattern_t *pattern); - -cairo_public void -cairo_pattern_destroy (cairo_pattern_t *pattern); - -cairo_public unsigned int -cairo_pattern_get_reference_count (cairo_pattern_t *pattern); - -cairo_public cairo_status_t -cairo_pattern_status (cairo_pattern_t *pattern); - -cairo_public void * -cairo_pattern_get_user_data (cairo_pattern_t *pattern, - const cairo_user_data_key_t *key); - -cairo_public cairo_status_t -cairo_pattern_set_user_data (cairo_pattern_t *pattern, - const cairo_user_data_key_t *key, - void *user_data, - cairo_destroy_func_t destroy); - -/** - * cairo_pattern_type_t: - * @CAIRO_PATTERN_TYPE_SOLID: The pattern is a solid (uniform) - * color. It may be opaque or translucent, since 1.2. - * @CAIRO_PATTERN_TYPE_SURFACE: The pattern is a based on a surface (an image), since 1.2. - * @CAIRO_PATTERN_TYPE_LINEAR: The pattern is a linear gradient, since 1.2. - * @CAIRO_PATTERN_TYPE_RADIAL: The pattern is a radial gradient, since 1.2. - * @CAIRO_PATTERN_TYPE_MESH: The pattern is a mesh, since 1.12. - * @CAIRO_PATTERN_TYPE_RASTER_SOURCE: The pattern is a user pattern providing raster data, since 1.12. - * - * #cairo_pattern_type_t is used to describe the type of a given pattern. - * - * The type of a pattern is determined by the function used to create - * it. The cairo_pattern_create_rgb() and cairo_pattern_create_rgba() - * functions create SOLID patterns. The remaining - * cairo_pattern_create functions map to pattern types in obvious - * ways. - * - * The pattern type can be queried with cairo_pattern_get_type() - * - * Most #cairo_pattern_t functions can be called with a pattern of any - * type, (though trying to change the extend or filter for a solid - * pattern will have no effect). A notable exception is - * cairo_pattern_add_color_stop_rgb() and - * cairo_pattern_add_color_stop_rgba() which must only be called with - * gradient patterns (either LINEAR or RADIAL). Otherwise the pattern - * will be shutdown and put into an error state. - * - * New entries may be added in future versions. - * - * Since: 1.2 - **/ -typedef enum _cairo_pattern_type { - CAIRO_PATTERN_TYPE_SOLID, - CAIRO_PATTERN_TYPE_SURFACE, - CAIRO_PATTERN_TYPE_LINEAR, - CAIRO_PATTERN_TYPE_RADIAL, - CAIRO_PATTERN_TYPE_MESH, - CAIRO_PATTERN_TYPE_RASTER_SOURCE -} cairo_pattern_type_t; - -cairo_public cairo_pattern_type_t -cairo_pattern_get_type (cairo_pattern_t *pattern); - -cairo_public void -cairo_pattern_add_color_stop_rgb (cairo_pattern_t *pattern, - double offset, - double red, double green, double blue); - -cairo_public void -cairo_pattern_add_color_stop_rgba (cairo_pattern_t *pattern, - double offset, - double red, double green, double blue, - double alpha); - -cairo_public void -cairo_mesh_pattern_begin_patch (cairo_pattern_t *pattern); - -cairo_public void -cairo_mesh_pattern_end_patch (cairo_pattern_t *pattern); - -cairo_public void -cairo_mesh_pattern_curve_to (cairo_pattern_t *pattern, - double x1, double y1, - double x2, double y2, - double x3, double y3); - -cairo_public void -cairo_mesh_pattern_line_to (cairo_pattern_t *pattern, - double x, double y); - -cairo_public void -cairo_mesh_pattern_move_to (cairo_pattern_t *pattern, - double x, double y); - -cairo_public void -cairo_mesh_pattern_set_control_point (cairo_pattern_t *pattern, - unsigned int point_num, - double x, double y); - -cairo_public void -cairo_mesh_pattern_set_corner_color_rgb (cairo_pattern_t *pattern, - unsigned int corner_num, - double red, double green, double blue); - -cairo_public void -cairo_mesh_pattern_set_corner_color_rgba (cairo_pattern_t *pattern, - unsigned int corner_num, - double red, double green, double blue, - double alpha); - -cairo_public void -cairo_pattern_set_matrix (cairo_pattern_t *pattern, - const cairo_matrix_t *matrix); - -cairo_public void -cairo_pattern_get_matrix (cairo_pattern_t *pattern, - cairo_matrix_t *matrix); - -/** - * cairo_extend_t: - * @CAIRO_EXTEND_NONE: pixels outside of the source pattern - * are fully transparent (Since 1.0) - * @CAIRO_EXTEND_REPEAT: the pattern is tiled by repeating (Since 1.0) - * @CAIRO_EXTEND_REFLECT: the pattern is tiled by reflecting - * at the edges (Since 1.0; but only implemented for surface patterns since 1.6) - * @CAIRO_EXTEND_PAD: pixels outside of the pattern copy - * the closest pixel from the source (Since 1.2; but only - * implemented for surface patterns since 1.6) - * - * #cairo_extend_t is used to describe how pattern color/alpha will be - * determined for areas "outside" the pattern's natural area, (for - * example, outside the surface bounds or outside the gradient - * geometry). - * - * Mesh patterns are not affected by the extend mode. - * - * The default extend mode is %CAIRO_EXTEND_NONE for surface patterns - * and %CAIRO_EXTEND_PAD for gradient patterns. - * - * New entries may be added in future versions. - * - * Since: 1.0 - **/ -typedef enum _cairo_extend { - CAIRO_EXTEND_NONE, - CAIRO_EXTEND_REPEAT, - CAIRO_EXTEND_REFLECT, - CAIRO_EXTEND_PAD -} cairo_extend_t; - -cairo_public void -cairo_pattern_set_extend (cairo_pattern_t *pattern, cairo_extend_t extend); - -cairo_public cairo_extend_t -cairo_pattern_get_extend (cairo_pattern_t *pattern); - -/** - * cairo_filter_t: - * @CAIRO_FILTER_FAST: A high-performance filter, with quality similar - * to %CAIRO_FILTER_NEAREST (Since 1.0) - * @CAIRO_FILTER_GOOD: A reasonable-performance filter, with quality - * similar to %CAIRO_FILTER_BILINEAR (Since 1.0) - * @CAIRO_FILTER_BEST: The highest-quality available, performance may - * not be suitable for interactive use. (Since 1.0) - * @CAIRO_FILTER_NEAREST: Nearest-neighbor filtering (Since 1.0) - * @CAIRO_FILTER_BILINEAR: Linear interpolation in two dimensions (Since 1.0) - * @CAIRO_FILTER_GAUSSIAN: This filter value is currently - * unimplemented, and should not be used in current code. (Since 1.0) - * - * #cairo_filter_t is used to indicate what filtering should be - * applied when reading pixel values from patterns. See - * cairo_pattern_set_filter() for indicating the desired filter to be - * used with a particular pattern. - * - * Since: 1.0 - **/ -typedef enum _cairo_filter { - CAIRO_FILTER_FAST, - CAIRO_FILTER_GOOD, - CAIRO_FILTER_BEST, - CAIRO_FILTER_NEAREST, - CAIRO_FILTER_BILINEAR, - CAIRO_FILTER_GAUSSIAN -} cairo_filter_t; - -cairo_public void -cairo_pattern_set_filter (cairo_pattern_t *pattern, cairo_filter_t filter); - -cairo_public cairo_filter_t -cairo_pattern_get_filter (cairo_pattern_t *pattern); - -cairo_public cairo_status_t -cairo_pattern_get_rgba (cairo_pattern_t *pattern, - double *red, double *green, - double *blue, double *alpha); - -cairo_public cairo_status_t -cairo_pattern_get_surface (cairo_pattern_t *pattern, - cairo_surface_t **surface); - - -cairo_public cairo_status_t -cairo_pattern_get_color_stop_rgba (cairo_pattern_t *pattern, - int index, double *offset, - double *red, double *green, - double *blue, double *alpha); - -cairo_public cairo_status_t -cairo_pattern_get_color_stop_count (cairo_pattern_t *pattern, - int *count); - -cairo_public cairo_status_t -cairo_pattern_get_linear_points (cairo_pattern_t *pattern, - double *x0, double *y0, - double *x1, double *y1); - -cairo_public cairo_status_t -cairo_pattern_get_radial_circles (cairo_pattern_t *pattern, - double *x0, double *y0, double *r0, - double *x1, double *y1, double *r1); - -cairo_public cairo_status_t -cairo_mesh_pattern_get_patch_count (cairo_pattern_t *pattern, - unsigned int *count); - -cairo_public cairo_path_t * -cairo_mesh_pattern_get_path (cairo_pattern_t *pattern, - unsigned int patch_num); - -cairo_public cairo_status_t -cairo_mesh_pattern_get_corner_color_rgba (cairo_pattern_t *pattern, - unsigned int patch_num, - unsigned int corner_num, - double *red, double *green, - double *blue, double *alpha); - -cairo_public cairo_status_t -cairo_mesh_pattern_get_control_point (cairo_pattern_t *pattern, - unsigned int patch_num, - unsigned int point_num, - double *x, double *y); - -/* Matrix functions */ - -cairo_public void -cairo_matrix_init (cairo_matrix_t *matrix, - double xx, double yx, - double xy, double yy, - double x0, double y0); - -cairo_public void -cairo_matrix_init_identity (cairo_matrix_t *matrix); - -cairo_public void -cairo_matrix_init_translate (cairo_matrix_t *matrix, - double tx, double ty); - -cairo_public void -cairo_matrix_init_scale (cairo_matrix_t *matrix, - double sx, double sy); - -cairo_public void -cairo_matrix_init_rotate (cairo_matrix_t *matrix, - double radians); - -cairo_public void -cairo_matrix_translate (cairo_matrix_t *matrix, double tx, double ty); - -cairo_public void -cairo_matrix_scale (cairo_matrix_t *matrix, double sx, double sy); - -cairo_public void -cairo_matrix_rotate (cairo_matrix_t *matrix, double radians); - -cairo_public cairo_status_t -cairo_matrix_invert (cairo_matrix_t *matrix); - -cairo_public void -cairo_matrix_multiply (cairo_matrix_t *result, - const cairo_matrix_t *a, - const cairo_matrix_t *b); - -cairo_public void -cairo_matrix_transform_distance (const cairo_matrix_t *matrix, - double *dx, double *dy); - -cairo_public void -cairo_matrix_transform_point (const cairo_matrix_t *matrix, - double *x, double *y); - -/* Region functions */ - -/** - * cairo_region_t: - * - * A #cairo_region_t represents a set of integer-aligned rectangles. - * - * It allows set-theoretical operations like cairo_region_union() and - * cairo_region_intersect() to be performed on them. - * - * Memory management of #cairo_region_t is done with - * cairo_region_reference() and cairo_region_destroy(). - * - * Since: 1.10 - **/ -typedef struct _cairo_region cairo_region_t; - -typedef enum _cairo_region_overlap { - CAIRO_REGION_OVERLAP_IN, /* completely inside region */ - CAIRO_REGION_OVERLAP_OUT, /* completely outside region */ - CAIRO_REGION_OVERLAP_PART /* partly inside region */ -} cairo_region_overlap_t; - -cairo_public cairo_region_t * -cairo_region_create (void); - -cairo_public cairo_region_t * -cairo_region_create_rectangle (const cairo_rectangle_int_t *rectangle); - -cairo_public cairo_region_t * -cairo_region_create_rectangles (const cairo_rectangle_int_t *rects, - int count); - -cairo_public cairo_region_t * -cairo_region_copy (const cairo_region_t *original); - -cairo_public cairo_region_t * -cairo_region_reference (cairo_region_t *region); - -cairo_public void -cairo_region_destroy (cairo_region_t *region); - -cairo_public cairo_bool_t -cairo_region_equal (const cairo_region_t *a, const cairo_region_t *b); - -cairo_public cairo_status_t -cairo_region_status (const cairo_region_t *region); - -cairo_public void -cairo_region_get_extents (const cairo_region_t *region, - cairo_rectangle_int_t *extents); - -cairo_public int -cairo_region_num_rectangles (const cairo_region_t *region); - -cairo_public void -cairo_region_get_rectangle (const cairo_region_t *region, - int nth, - cairo_rectangle_int_t *rectangle); - -cairo_public cairo_bool_t -cairo_region_is_empty (const cairo_region_t *region); - -cairo_public cairo_region_overlap_t -cairo_region_contains_rectangle (const cairo_region_t *region, - const cairo_rectangle_int_t *rectangle); - -cairo_public cairo_bool_t -cairo_region_contains_point (const cairo_region_t *region, int x, int y); - -cairo_public void -cairo_region_translate (cairo_region_t *region, int dx, int dy); - -cairo_public cairo_status_t -cairo_region_subtract (cairo_region_t *dst, const cairo_region_t *other); - -cairo_public cairo_status_t -cairo_region_subtract_rectangle (cairo_region_t *dst, - const cairo_rectangle_int_t *rectangle); - -cairo_public cairo_status_t -cairo_region_intersect (cairo_region_t *dst, const cairo_region_t *other); - -cairo_public cairo_status_t -cairo_region_intersect_rectangle (cairo_region_t *dst, - const cairo_rectangle_int_t *rectangle); - -cairo_public cairo_status_t -cairo_region_union (cairo_region_t *dst, const cairo_region_t *other); - -cairo_public cairo_status_t -cairo_region_union_rectangle (cairo_region_t *dst, - const cairo_rectangle_int_t *rectangle); - -cairo_public cairo_status_t -cairo_region_xor (cairo_region_t *dst, const cairo_region_t *other); - -cairo_public cairo_status_t -cairo_region_xor_rectangle (cairo_region_t *dst, - const cairo_rectangle_int_t *rectangle); - -/* Functions to be used while debugging (not intended for use in production code) */ -cairo_public void -cairo_debug_reset_static_data (void); - - -CAIRO_END_DECLS - -#endif /* CAIRO_H */ diff --git a/configure.ac b/configure.ac deleted file mode 100644 index e41cb41..0000000 --- a/configure.ac +++ /dev/null @@ -1,15 +0,0 @@ -AC_INIT([amN3888_RefImpl], [1.0], [mikebmcl@gmail.com]) -AM_INIT_AUTOMAKE([foreign -Wall -Werror]) -AC_PROG_CC -AM_PROG_CC_C_O -AC_PROG_CXX -AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_FILES([Makefile N3888_RefImpl/Makefile N3888_RefImpl/src/Makefile]) -AC_CONFIG_MACRO_DIR([m4]) -AC_LANG([C++]) -AX_CXX_COMPILE_STDCXX_11([noext], [mandatory]) -AX_CFLAGS_WARN_ALL -AX_CXXFLAGS_WARN_ALL -PKG_CHECK_MODULES([GTKCAIRO], [gtk+-3.0 >= 3.8.0 gmodule-2.0 gobject-2.0 cairo >= 1.12.16 x11]) -AC_SUBST([DOLLAR_SIGN],[$]) -AC_OUTPUT diff --git a/doc/p0267r0.pdf b/doc/p0267r0.pdf new file mode 100644 index 0000000..07d943d Binary files /dev/null and b/doc/p0267r0.pdf differ diff --git a/examples/hello-world/CMakeLists.txt b/examples/hello-world/CMakeLists.txt new file mode 100644 index 0000000..72f1682 --- /dev/null +++ b/examples/hello-world/CMakeLists.txt @@ -0,0 +1,11 @@ +cmake_minimum_required(VERSION 2.8.12) + +project(hello CXX) + +set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_EXTENSIONS OFF) + +add_executable(hello hello.cpp) + +target_link_libraries(hello ${IO2D_LIBRARY}) +target_include_directories(hello PRIVATE ${IO2D_INCLUDE_DIR}) diff --git a/examples/hello-world/hello.cpp b/examples/hello-world/hello.cpp new file mode 100644 index 0000000..d73a6a7 --- /dev/null +++ b/examples/hello-world/hello.cpp @@ -0,0 +1,40 @@ +#include + +#include +#include "tga_header.h" + +namespace io2d = std::experimental::io2d; + +void save_surface_to_tga_file(io2d::image_surface& surface, + std::string const& fileName) +{ + tga::header tga_header; + tga_header.image_type = tga::image_type::true_color; + tga_header.image_spec.width = surface.width(); + tga_header.image_spec.height = surface.height(); + tga_header.image_spec.depth = 32; + tga_header.image_spec.descriptor.top = 1; + + std::ofstream ofs(fileName, std::ofstream::binary); + ofs.write(reinterpret_cast(&tga_header), + sizeof(tga_header)); + + auto bytes = surface.data(); + ofs.write(reinterpret_cast(&bytes[0]), + bytes.size()); +} + +int main () +{ + io2d::image_surface image(io2d::format::argb32, 240, 80); + + image.font_resource("Consolas", 32.0, io2d::font_slant::normal, + io2d::font_weight::bold); + + io2d::brush cyan(io2d::rgba_color::cyan()); + image.brush(cyan); + + image.render_text("Hello World", {20.0, 50.0}); + + save_surface_to_tga_file(image, "hello.tga"); +} diff --git a/examples/hello-world/tga_header.h b/examples/hello-world/tga_header.h new file mode 100644 index 0000000..9344b63 --- /dev/null +++ b/examples/hello-world/tga_header.h @@ -0,0 +1,63 @@ +#pragma once + +#include + +// http://stackoverflow.com/questions/14025735/problems-displaying-targa-tga +namespace tga +{ + enum class color_map_type : uint8_t + { + absent = 0, + present = 1, + }; + + enum class image_type : uint8_t + { + none = 0, + color_mapped = 1, + true_color = 2, + black_white = 3, + rle_color_mapped = 9, + rle_true_color = 10, + rle_black_white = 11, + }; + + #pragma pack(1) + struct color_map_spec + { + uint16_t first_entry_index {0}; + uint16_t length {0}; + uint8_t entry_size {0}; + }; + static_assert(sizeof(color_map_spec) == 5, "bad size"); + + struct image_descriptor + { + uint8_t alpha : 4; + uint8_t right : 1; + uint8_t top : 1; + uint8_t reserved : 2; + }; + static_assert(sizeof(image_descriptor) == 1, "bad size"); + + struct image_spec + { + uint16_t x_origin {0}; + uint16_t y_origin {0}; + uint16_t width {0}; + uint16_t height {0}; + uint8_t depth {0}; + image_descriptor descriptor {0}; + }; + static_assert(sizeof(image_spec) == 10, "bad size"); + + struct header + { + uint8_t id_length {0}; + tga::color_map_type color_map_type {tga::color_map_type::absent }; + tga::image_type image_type; + tga::color_map_spec color_map_spec; + tga::image_spec image_spec; + }; + static_assert(sizeof(header) == 18, "bad size"); +} diff --git a/N3888_RefImpl/src/io2d.h b/io2d/include/io2d.h similarity index 83% rename from N3888_RefImpl/src/io2d.h rename to io2d/include/io2d.h index 2beefc0..ea1dda2 100644 --- a/N3888_RefImpl/src/io2d.h +++ b/io2d/include/io2d.h @@ -15,12 +15,15 @@ #include #include #include +#include #ifdef _WIN32_WINNT #define NOMINMAX #define WIN32_LEAN_AND_MEAN #include -#else +#elif defined(USE_XCB) +#include +#elif defined(USE_XLIB) #include #include #include @@ -30,81 +33,6 @@ #define noexcept #endif -//namespace std { -// namespace experimental { -// ////// From C++ Extensions for Library Fundamentals, N4335 -// //struct nullopt_t { -// // constexpr explicit nullopt_t(int) noexcept { -// // } -// //}; -// //constexpr nullopt_t nullopt{ 0 }; -// -//// namespace io2d { -////#if _Inline_namespace_conditional_support_test -//// inline namespace v1 { -////#endif -//// enum class io2d_error; -//// enum class antialias; -//// enum class content; -//// enum class fill_rule; -//// enum class line_cap; -//// enum class line_join; -//// enum class compositing_operator; -//// enum class format; -//// enum class extend; -//// enum class filter; -//// enum class brush_type; -//// enum class font_slant; -//// enum class font_weight; -//// enum class subpixel_order; -//// enum class path_data_type; -//// enum class scaling; -//// class io2d_error_category; -//// class rectangle; -//// class rgba_color; -//// class vector_2d; -//// class font_extents; -//// class text_extents; -//// class matrix_2d; -//// //class path_data; -//// class _Point; -//// //class move_to; -//// //class line_to; -//// //class rel_move_to; -//// //class rel_line_to; -//// class _Curve_to; -//// //class curve_to; -//// //class rel_curve_to; -//// class _Arc; -//// //class arc; -//// //class arc_negative; -//// //class new_sub_path; -//// //class close_path; -//// //class change_matrix; -//// //class change_origin; -//// class path; -//// class path_factory; -//// class device; -//// class font_options; -//// class font_face; -//// class simple_font_face; -//// class brush; -//// class solid_color_brush_factory; -//// class linear_brush_factory; -//// class radial_brush_factory; -//// //class mesh_brush_factory; -//// struct _Surface_native_handles; -//// class surface; -//// class image_surface; -//// class display_surface; -//// class surface_brush_factory; -////#if _Inline_namespace_conditional_support_test -//// } -////#endif -//// } -// } -//} - namespace std { namespace experimental { @@ -283,6 +211,12 @@ namespace std { none // Do not scale. }; + enum class refresh_rate { + as_needed, + as_fast_as_possible, + fixed + }; + // I don't know why Clang/C2 is complaining about weak vtables here since the at least one virtual function is always anchored but for now silence the warnings. I've never seen this using Clang on OpenSUSE. #ifdef _WIN32 #ifdef __clang__ @@ -1391,6 +1325,10 @@ namespace std { path& operator=(path&& other) noexcept; }; + // Forward declaration + class font_resource; + class glyph_run; + class path_factory { friend path; ::std::vector _Data; @@ -1438,6 +1376,10 @@ namespace std { void change_origin(const vector_2d& pt); void change_origin(const vector_2d& pt, ::std::error_code& ec) noexcept; void clear() noexcept; + void add_text(const font_resource& fr, const ::std::string& utf8, const vector_2d& pt); + void add_text(const font_resource& fr, const ::std::string& utf8, const vector_2d& pt, ::std::error_code& ec) noexcept; + void add_glyph_run(const font_resource& fr, const glyph_run& gr); + void add_glyph_run(const font_resource& fr, const glyph_run& gr, ::std::error_code& ec) noexcept; // Observers ::std::experimental::io2d::rectangle path_extents() const; @@ -1500,72 +1442,182 @@ namespace std { ::std::experimental::io2d::subpixel_order subpixel_order() const noexcept; }; - // I don't know why Clang/C2 is complaining about weak vtables here since the at least one virtual function is always anchored but for now silence the warnings. I've never seen this using Clang on OpenSUSE. -#ifdef _WIN32 -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wweak-vtables" -#endif -#endif + class font_resource_factory { + ::std::string _Family; + ::std::experimental::io2d::font_slant _Font_slant = ::std::experimental::io2d::font_slant::normal; + ::std::experimental::io2d::font_weight _Font_weight = ::std::experimental::io2d::font_weight::normal; + ::std::experimental::io2d::font_options _Font_options; + matrix_2d _Font_matrix = matrix_2d::init_scale({ 16.0, 16.0 }); + matrix_2d _Surface_matrix; - class font_face { - friend surface; public: - typedef cairo_font_face_t* native_handle_type; - protected: - ::std::shared_ptr _Font_face; - explicit font_face(native_handle_type nh); - font_face(native_handle_type nh, ::std::error_code& ec) noexcept; - public: - native_handle_type native_handle() const noexcept; + font_resource_factory() = default; + font_resource_factory(const font_resource_factory&) = default; + font_resource_factory& operator=(const font_resource_factory&) = default; + font_resource_factory(font_resource_factory&&) noexcept = default; + font_resource_factory& operator=(font_resource_factory&&) noexcept; + explicit font_resource_factory(const ::std::string& family, + ::std::experimental::io2d::font_slant fs = ::std::experimental::io2d::font_slant::normal, + ::std::experimental::io2d::font_weight fw = ::std::experimental::io2d::font_weight::normal, + const matrix_2d& fm = matrix_2d::init_scale({ 16.0, 16.0 }), + const ::std::experimental::io2d::font_options& fo = ::std::experimental::io2d::font_options(), + const matrix_2d& sm = matrix_2d::init_identity()); + font_resource_factory(const ::std::string& family, + ::std::error_code& ec, + ::std::experimental::io2d::font_slant fs = ::std::experimental::io2d::font_slant::normal, + ::std::experimental::io2d::font_weight fw = ::std::experimental::io2d::font_weight::normal, + const matrix_2d& fm = matrix_2d::init_scale({ 16.0, 16.0 }), + const ::std::experimental::io2d::font_options& fo = ::std::experimental::io2d::font_options(), + const matrix_2d& sm = matrix_2d::init_identity()) noexcept; + + // Modifiers + void font_family(const ::std::string& f); + void font_family(const ::std::string& f, ::std::error_code& ec) noexcept; + void font_slant(const ::std::experimental::io2d::font_slant fs); + void font_slant(const ::std::experimental::io2d::font_slant fs, ::std::error_code& ec) noexcept; + void font_weight(::std::experimental::io2d::font_weight fw); + void font_weight(::std::experimental::io2d::font_weight fw, ::std::error_code& ec) noexcept; + void font_options(const ::std::experimental::io2d::font_options& fo) noexcept; + void font_matrix(const matrix_2d& m) noexcept; + void surface_matrix(const matrix_2d& m) noexcept; - font_face() = delete; - font_face(const font_face&) noexcept = default; - font_face& operator=(const font_face&) noexcept = default; - font_face(font_face&& other) noexcept; - font_face& operator=(font_face&& other) noexcept; - virtual ~font_face(); + // Observers + ::std::string font_family() const; + ::std::string font_family(::std::error_code& ec) const noexcept; + ::std::experimental::io2d::font_slant font_slant() const noexcept; + ::std::experimental::io2d::font_weight font_weight() const noexcept; + ::std::experimental::io2d::font_options font_options() const noexcept; + matrix_2d font_matrix() const noexcept; + matrix_2d surface_matrix() const noexcept; }; - // I don't know why Clang/C2 is complaining about weak vtables here since the at least one virtual function is always anchored but for now silence the warnings. I've never seen this using Clang on OpenSUSE. -#ifdef _WIN32 -#ifdef __clang__ -#pragma clang diagnostic pop -#endif -#endif + //Forward declaration + class glyph_run; + class path_factory; - // I don't know why Clang/C2 is complaining about weak vtables here since the at least one virtual function is always anchored but for now silence the warnings. I've never seen this using Clang on OpenSUSE. -#ifdef _WIN32 -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wweak-vtables" -#endif -#endif + class font_resource { + friend surface; + friend glyph_run; + friend path_factory; + + ::std::shared_ptr _Scaled_font; + ::std::shared_ptr<::std::string> _Font_family; + ::std::experimental::io2d::font_slant _Font_slant; + ::std::experimental::io2d::font_weight _Font_weight; + ::std::shared_ptr _Font_options; - class simple_font_face : public font_face { public: - simple_font_face() = delete; - simple_font_face(const simple_font_face&) noexcept = default; - simple_font_face& operator=(const simple_font_face&) noexcept = default; - simple_font_face(const ::std::string& family, ::std::experimental::io2d::font_slant fs, ::std::experimental::io2d::font_weight fw); - simple_font_face(const ::std::string& family, ::std::experimental::io2d::font_slant fs, ::std::experimental::io2d::font_weight fw, ::std::error_code& ec) noexcept; - simple_font_face(simple_font_face&& other) noexcept; - simple_font_face& operator=(simple_font_face&& other) noexcept; - virtual ~simple_font_face(); + font_resource() = delete; + font_resource(const font_resource&) noexcept = default; + font_resource& operator=(const font_resource&) noexcept = default; + font_resource(font_resource&&) noexcept = default; + font_resource& operator=(font_resource&&) noexcept = default; + explicit font_resource(const font_resource_factory& f); + font_resource(const font_resource_factory& f, ::std::error_code& ec) noexcept; // Observers ::std::string font_family() const; - void font_family(::std::string& str, ::std::error_code& ec) const noexcept; + ::std::string font_family(::std::error_code& ec) const noexcept; ::std::experimental::io2d::font_slant font_slant() const noexcept; ::std::experimental::io2d::font_weight font_weight() const noexcept; + ::std::experimental::io2d::font_options font_options() const noexcept; + matrix_2d font_matrix() const noexcept; + matrix_2d surface_matrix() const noexcept; + ::std::experimental::io2d::font_extents font_extents() const noexcept; + ::std::experimental::io2d::text_extents text_extents(const ::std::string& utf8) const noexcept; + glyph_run make_glyph_run(const ::std::string& utf8, const vector_2d& pos) const; + glyph_run make_glyph_run(const ::std::string& utf8, const vector_2d& pos, ::std::error_code& ec) const noexcept; }; - // I don't know why Clang/C2 is complaining about weak vtables here since the at least one virtual function is always anchored but for now silence the warnings. I've never seen this using Clang on OpenSUSE. -#ifdef _WIN32 -#ifdef __clang__ -#pragma clang diagnostic pop -#endif -#endif + class glyph_run { + friend ::std::experimental::io2d::font_resource; + friend surface; + friend path_factory; + + public: + class glyph { + friend glyph_run; + public: + typedef unsigned long index_type; // impldef + private: + index_type _Index = 0; + double _X = 0.0; + double _Y = 0.0; + cairo_glyph_t* _Native_glyph = nullptr; + public: + glyph() noexcept = default; + glyph(const glyph&) noexcept = default; + glyph& operator=(const glyph&) noexcept = default; + glyph(glyph&&) noexcept = default; + glyph& operator=(glyph&&) noexcept = default; + glyph(index_type i, double x, double y) noexcept; + + // Modifiers + void index(index_type i) noexcept; + void x(double val) noexcept; + void y(double val) noexcept; + + // Observers + index_type index() const noexcept; + double x() const noexcept; + double y() const noexcept; + }; + + class cluster { + friend glyph_run; + // Clusters are useful when dealing with ligatures and ordering in scripts that require complex text layout. + int _Glyph_count = 0; // Note: It's possible that processing could result in a cluster where one or more characters map to zero glyphs due to the previous or next cluster. + int _Byte_count = 0; // Note: UTF-8 is variable byte length. A single cluster can map to multiple characters. Lastly, it's possible that processing could result in a cluster with one or more glyphs map to zero characters due to the previous or next cluster. + cairo_text_cluster_t* _Native_cluster = nullptr; + public: + cluster() noexcept = default; + cluster(const cluster&) noexcept = default; + cluster& operator=(const cluster&) noexcept = default; + cluster(cluster&&) noexcept = default; + cluster& operator=(cluster&&) noexcept = default; + cluster(int glyphs, int bytes) noexcept; + + // Modifiers + void glyph_count(int count) noexcept; + void byte_count(int count) noexcept; + + // Observers + int glyph_count() const noexcept; + int byte_count() const noexcept; + }; + + private: + ::std::string _Text_string; + ::std::experimental::io2d::font_resource _Font_resource; + ::std::vector _Glyphs; + ::std::vector _Clusters; + ::std::shared_ptr _Cairo_glyphs; + ::std::shared_ptr _Cairo_text_clusters; + vector_2d _Position; + cairo_text_cluster_flags_t _Text_cluster_flags; + + glyph_run(const ::std::experimental::io2d::font_resource& fr, const ::std::string& utf8, const vector_2d& pos); + glyph_run(const ::std::experimental::io2d::font_resource& fr, const ::std::string& utf8, const vector_2d& pos, ::std::error_code& ec) noexcept; + + public: + glyph_run(const glyph_run&) = default; + glyph_run& operator=(const glyph_run&) = default; + glyph_run(glyph_run&&) noexcept = default; + glyph_run& operator=(glyph_run&&) noexcept; + + // Modifiers + ::std::vector& glyphs() noexcept; + ::std::vector& clusters() noexcept; + + // Observers + const ::std::string& original_text() const noexcept; + const ::std::vector& glyphs() const noexcept; + const ::std::vector& clusters() const noexcept; + const ::std::experimental::io2d::font_resource& font_resource() const noexcept; + bool reversed_clusters() const noexcept; + vector_2d position() const noexcept; + text_extents extents() const noexcept; + }; // Forward declaration. class linear_brush_factory; @@ -1818,10 +1870,7 @@ namespace std { ::std::experimental::io2d::path_factory _Immediate_path; typedef matrix_2d _Transform_matrix_type; _Transform_matrix_type _Transform_matrix; - ::std::shared_ptr<::std::experimental::io2d::font_face> _Font_face; - typedef matrix_2d _Font_matrix_type; - _Font_matrix_type _Font_matrix; // Covers both font size and full font matrix - font size is just a uniform scale matrix. - ::std::experimental::io2d::font_options _Font_options; + ::std::experimental::io2d::font_resource _Font_resource; // Relies on C++17 noexcept guarantee for vector default ctor (N4258, adopted 2014-11). ::std::stack<::std::tuple< @@ -1837,9 +1886,7 @@ namespace std { ::std::shared_ptr<::std::experimental::io2d::path>, ::std::experimental::io2d::path_factory, _Transform_matrix_type, - ::std::shared_ptr<::std::experimental::io2d::font_face>, - _Font_matrix_type, - ::std::experimental::io2d::font_options + ::std::experimental::io2d::font_resource >, ::std::vector<::std::tuple< ::std::experimental::io2d::brush, ::std::experimental::io2d::antialias, @@ -1853,9 +1900,7 @@ namespace std { ::std::shared_ptr<::std::experimental::io2d::path>, ::std::experimental::io2d::path_factory, _Transform_matrix_type, - ::std::shared_ptr<::std::experimental::io2d::font_face>, - _Font_matrix_type, - ::std::experimental::io2d::font_options>>> _Saved_state; + ::std::experimental::io2d::font_resource>>> _Saved_state; void _Ensure_state(); void _Ensure_state(::std::error_code& ec) noexcept; @@ -1935,60 +1980,48 @@ namespace std { void fill(const rgba_color& c, ::std::error_code& ec) noexcept; void fill(const ::std::experimental::io2d::brush& b); void fill(const ::std::experimental::io2d::brush& b, ::std::error_code& ec) noexcept; - void fill(const surface& s, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good); - void fill(const surface& s, ::std::error_code& ec, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good) noexcept; - void fill(const surface& s, const matrix_2d& m, extend e = extend::none, filter f = filter::good); - void fill(const surface& s, const matrix_2d& m, ::std::error_code& ec, extend e = extend::none, filter f = filter::good) noexcept; + void fill(const surface& s, const matrix_2d& m = matrix_2d::init_identity(), extend e = extend::none, filter f = filter::good); + void fill(const surface& s, ::std::error_code& ec, const matrix_2d& m = matrix_2d::init_identity(), extend e = extend::none, filter f = filter::good) noexcept; void fill_immediate(); void fill_immediate(::std::error_code& ec) noexcept; void fill_immediate(const rgba_color& c); void fill_immediate(const rgba_color& c, ::std::error_code& ec) noexcept; void fill_immediate(const ::std::experimental::io2d::brush& b); void fill_immediate(const ::std::experimental::io2d::brush& b, ::std::error_code& ec) noexcept; - void fill_immediate(const surface& s, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good); - void fill_immediate(const surface& s, ::std::error_code& ec, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good) noexcept; - void fill_immediate(const surface& s, const matrix_2d& m, extend e = extend::none, filter f = filter::good); - void fill_immediate(const surface& s, const matrix_2d& m, ::std::error_code& ec, extend e = extend::none, filter f = filter::good) noexcept; + void fill_immediate(const surface& s, const matrix_2d& m = matrix_2d::init_identity(), extend e = extend::none, filter f = filter::good); + void fill_immediate(const surface& s, ::std::error_code& ec, const matrix_2d& m = matrix_2d::init_identity(), extend e = extend::none, filter f = filter::good) noexcept; void paint(); void paint(::std::error_code& ec) noexcept; void paint(const rgba_color& c); void paint(const rgba_color& c, ::std::error_code& ec) noexcept; void paint(const ::std::experimental::io2d::brush& b); void paint(const ::std::experimental::io2d::brush& b, ::std::error_code& ec) noexcept; - void paint(const surface& s, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good); - void paint(const surface& s, ::std::error_code& ec, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good) noexcept; - void paint(const surface& s, const matrix_2d& m, extend e = extend::none, filter f = filter::good); - void paint(const surface& s, const matrix_2d& m, ::std::error_code& ec, extend e = extend::none, filter f = filter::good) noexcept; + void paint(const surface& s, const matrix_2d& m = matrix_2d::init_identity(), extend e = extend::none, filter f = filter::good); + void paint(const surface& s, ::std::error_code& ec, const matrix_2d& m = matrix_2d::init_identity(), extend e = extend::none, filter f = filter::good) noexcept; void paint(double alpha); void paint(double alpha, ::std::error_code& ec) noexcept; void paint(const rgba_color& c, double alpha); void paint(const rgba_color& c, double alpha, ::std::error_code& ec) noexcept; void paint(const ::std::experimental::io2d::brush& b, double alpha); void paint(const ::std::experimental::io2d::brush& b, double alpha, ::std::error_code& ec) noexcept; - void paint(const surface& s, double alpha, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good); - void paint(const surface& s, double alpha, ::std::error_code& ec, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good) noexcept; - void paint(const surface& s, double alpha, const matrix_2d& m, extend e = extend::none, filter f = filter::good); - void paint(const surface& s, double alpha, const matrix_2d& m, ::std::error_code& ec, extend e = extend::none, filter f = filter::good) noexcept; + void paint(const surface& s, double alpha, const matrix_2d& m = matrix_2d::init_identity(), extend e = extend::none, filter f = filter::good); + void paint(const surface& s, double alpha, ::std::error_code& ec, const matrix_2d& m = matrix_2d::init_identity(), extend e = extend::none, filter f = filter::good) noexcept; void stroke(); void stroke(::std::error_code& ec) noexcept; void stroke(const rgba_color& c); void stroke(const rgba_color& c, ::std::error_code& ec) noexcept; void stroke(const ::std::experimental::io2d::brush& b); void stroke(const ::std::experimental::io2d::brush& b, ::std::error_code& ec) noexcept; - void stroke(const surface& s, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good); - void stroke(const surface& s, ::std::error_code& ec, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good) noexcept; - void stroke(const surface& s, const matrix_2d& m, extend e = extend::none, filter f = filter::good); - void stroke(const surface& s, const matrix_2d& m, ::std::error_code& ec, extend e = extend::none, filter f = filter::good) noexcept; + void stroke(const surface& s, const matrix_2d& m = matrix_2d::init_identity(), extend e = extend::none, filter f = filter::good); + void stroke(const surface& s, ::std::error_code& ec, const matrix_2d& m = matrix_2d::init_identity(), extend e = extend::none, filter f = filter::good) noexcept; void stroke_immediate(); void stroke_immediate(::std::error_code& ec) noexcept; void stroke_immediate(const rgba_color& c); void stroke_immediate(const rgba_color& c, ::std::error_code& ec) noexcept; void stroke_immediate(const ::std::experimental::io2d::brush& b); void stroke_immediate(const ::std::experimental::io2d::brush& b, ::std::error_code& ec) noexcept; - void stroke_immediate(const surface& s, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good); - void stroke_immediate(const surface& s, ::std::error_code& ec, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good) noexcept; - void stroke_immediate(const surface& s, const matrix_2d& m, extend e = extend::none, filter f = filter::good); - void stroke_immediate(const surface& s, const matrix_2d& m, ::std::error_code& ec, extend e = extend::none, filter f = filter::good) noexcept; + void stroke_immediate(const surface& s, const matrix_2d& m = matrix_2d::init_identity(), extend e = extend::none, filter f = filter::good); + void stroke_immediate(const surface& s, ::std::error_code& ec, const matrix_2d& m = matrix_2d::init_identity(), extend e = extend::none, filter f = filter::good) noexcept; // \ref{\iotwod.surface.modifiers.maskrender}, mask render modifiers: void mask(const ::std::experimental::io2d::brush& maskBrush); @@ -1997,60 +2030,32 @@ namespace std { void mask(const ::std::experimental::io2d::brush& maskBrush, const rgba_color& c, ::std::error_code& ec) noexcept; void mask(const ::std::experimental::io2d::brush& maskBrush, const ::std::experimental::io2d::brush& b); void mask(const ::std::experimental::io2d::brush& maskBrush, const ::std::experimental::io2d::brush& b, ::std::error_code& ec) noexcept; - void mask(const ::std::experimental::io2d::brush& maskBrush, const surface& s, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good); - void mask(const ::std::experimental::io2d::brush& maskBrush, const surface& s, ::std::error_code& ec, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good) noexcept; - void mask(const ::std::experimental::io2d::brush& maskBrush, const surface& s, const matrix_2d& m, extend e = extend::none, filter f = filter::good); - void mask(const ::std::experimental::io2d::brush& maskBrush, const surface& s, const matrix_2d& m, ::std::error_code& ec, extend e = extend::none, filter f = filter::good) noexcept; - void mask(const surface& maskSurface); - void mask(const surface& maskSurface, ::std::error_code& ec) noexcept; - void mask(const surface& maskSurface, const rgba_color& c); - void mask(const surface& maskSurface, const rgba_color& c, ::std::error_code& ec) noexcept; - void mask(const surface& maskSurface, const ::std::experimental::io2d::brush& b); - void mask(const surface& maskSurface, const ::std::experimental::io2d::brush& b, ::std::error_code& ec) noexcept; - void mask(const surface& maskSurface, const surface& s, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good); - void mask(const surface& maskSurface, const surface& s, ::std::error_code& ec, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good) noexcept; - void mask(const surface& maskSurface, const surface& s, const matrix_2d& m, extend e = extend::none, filter f = filter::good); - void mask(const surface& maskSurface, const surface& s, const matrix_2d& m, ::std::error_code& ec, extend e = extend::none, filter f = filter::good) noexcept; - void mask(const surface& maskSurface, const vector_2d& maskOrigin); - void mask(const surface& maskSurface, const vector_2d& maskOrigin, ::std::error_code& ec) noexcept; - void mask(const surface& maskSurface, const vector_2d& maskOrigin, const rgba_color& c); - void mask(const surface& maskSurface, const vector_2d& maskOrigin, const rgba_color& c, ::std::error_code& ec) noexcept; - void mask(const surface& maskSurface, const vector_2d& maskOrigin, const ::std::experimental::io2d::brush& b); - void mask(const surface& maskSurface, const vector_2d& maskOrigin, const ::std::experimental::io2d::brush& b, ::std::error_code& ec) noexcept; - void mask(const surface& maskSurface, const vector_2d& maskOrigin, const surface& s, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good); - void mask(const surface& maskSurface, const vector_2d& maskOrigin, const surface& s, ::std::error_code& ec, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good) noexcept; - void mask(const surface& maskSurface, const vector_2d& maskOrigin, const surface& s, const matrix_2d& m, extend e = extend::none, filter f = filter::good); - void mask(const surface& maskSurface, const vector_2d& maskOrigin, const surface& s, const matrix_2d& m, ::std::error_code& ec, extend e = extend::none, filter f = filter::good) noexcept; + void mask(const ::std::experimental::io2d::brush& maskBrush, const surface& s, const matrix_2d& m = matrix_2d::init_identity(), extend e = extend::none, filter f = filter::good); + void mask(const ::std::experimental::io2d::brush& maskBrush, const surface& s, ::std::error_code& ec, const matrix_2d& m = matrix_2d::init_identity(), extend e = extend::none, filter f = filter::good) noexcept; + void mask(surface& maskSurface, const matrix_2d& maskMatrix = matrix_2d::init_identity(), extend maskExtend = extend::none, filter maskFilter = filter::good); + void mask(surface& maskSurface, ::std::error_code& ec, const matrix_2d& maskMatrix = matrix_2d::init_identity(), extend maskExtend = extend::none, filter maskFilter = filter::good) noexcept; + void mask(surface& maskSurface, const rgba_color& c, const matrix_2d& maskMatrix = matrix_2d::init_identity(), extend maskExtend = extend::none, filter maskFilter = filter::good); + void mask(surface& maskSurface, const rgba_color& c, ::std::error_code& ec, const matrix_2d& maskMatrix = matrix_2d::init_identity(), extend maskExtend = extend::none, filter maskFilter = filter::good) noexcept; + void mask(surface& maskSurface, const ::std::experimental::io2d::brush& b, const matrix_2d& maskMatrix = matrix_2d::init_identity(), extend maskExtend = extend::none, filter maskFilter = filter::good); + void mask(surface& maskSurface, const ::std::experimental::io2d::brush& b, ::std::error_code& ec, const matrix_2d& maskMatrix = matrix_2d::init_identity(), extend maskExtend = extend::none, filter maskFilter = filter::good) noexcept; + void mask(surface& maskSurface, const surface& s, const matrix_2d& maskMatrix = matrix_2d::init_identity(), const matrix_2d& m = matrix_2d::init_identity(), extend maskExtend = extend::none, extend e = extend::none, filter maskFilter = filter::good, filter f = filter::good); + void mask(surface& maskSurface, const surface& s, ::std::error_code& ec, const matrix_2d& maskMatrix = matrix_2d::init_identity(), const matrix_2d& m = matrix_2d::init_identity(), extend maskExtend = extend::none, extend e = extend::none, filter maskFilter = filter::good, filter f = filter::good) noexcept; void mask_immediate(const ::std::experimental::io2d::brush& maskBrush); void mask_immediate(const ::std::experimental::io2d::brush& maskBrush, ::std::error_code& ec) noexcept; void mask_immediate(const ::std::experimental::io2d::brush& maskBrush, const rgba_color& c); void mask_immediate(const ::std::experimental::io2d::brush& maskBrush, const rgba_color& c, ::std::error_code& ec) noexcept; void mask_immediate(const ::std::experimental::io2d::brush& maskBrush, const ::std::experimental::io2d::brush& b); void mask_immediate(const ::std::experimental::io2d::brush& maskBrush, const ::std::experimental::io2d::brush& b, ::std::error_code& ec) noexcept; - void mask_immediate(const ::std::experimental::io2d::brush& maskBrush, const surface& s, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good); - void mask_immediate(const ::std::experimental::io2d::brush& maskBrush, const surface& s, ::std::error_code& ec, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good) noexcept; - void mask_immediate(const ::std::experimental::io2d::brush& maskBrush, const surface& s, const matrix_2d& m, extend e = extend::none, filter f = filter::good); - void mask_immediate(const ::std::experimental::io2d::brush& maskBrush, const surface& s, const matrix_2d& m, ::std::error_code& ec, extend e = extend::none, filter f = filter::good) noexcept; - void mask_immediate(const surface& maskSurface); - void mask_immediate(const surface& maskSurface, ::std::error_code& ec) noexcept; - void mask_immediate(const surface& maskSurface, const rgba_color& c); - void mask_immediate(const surface& maskSurface, const rgba_color& c, ::std::error_code& ec) noexcept; - void mask_immediate(const surface& maskSurface, const ::std::experimental::io2d::brush& b); - void mask_immediate(const surface& maskSurface, const ::std::experimental::io2d::brush& b, ::std::error_code& ec) noexcept; - void mask_immediate(const surface& maskSurface, const surface& s, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good); - void mask_immediate(const surface& maskSurface, const surface& s, ::std::error_code& ec, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good) noexcept; - void mask_immediate(const surface& maskSurface, const surface& s, const matrix_2d& m, extend e = extend::none, filter f = filter::good); - void mask_immediate(const surface& maskSurface, const surface& s, const matrix_2d& m, ::std::error_code& ec, extend e = extend::none, filter f = filter::good) noexcept; - void mask_immediate(const surface& maskSurface, const vector_2d& maskOrigin); - void mask_immediate(const surface& maskSurface, const vector_2d& maskOrigin, ::std::error_code& ec) noexcept; - void mask_immediate(const surface& maskSurface, const vector_2d& maskOrigin, const rgba_color& c); - void mask_immediate(const surface& maskSurface, const vector_2d& maskOrigin, const rgba_color& c, ::std::error_code& ec) noexcept; - void mask_immediate(const surface& maskSurface, const vector_2d& maskOrigin, const ::std::experimental::io2d::brush& b); - void mask_immediate(const surface& maskSurface, const vector_2d& maskOrigin, const ::std::experimental::io2d::brush& b, ::std::error_code& ec) noexcept; - void mask_immediate(const surface& maskSurface, const vector_2d& maskOrigin, const surface& s, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good); - void mask_immediate(const surface& maskSurface, const vector_2d& maskOrigin, const surface& s, ::std::error_code& ec, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good) noexcept; - void mask_immediate(const surface& maskSurface, const vector_2d& maskOrigin, const surface& s, const matrix_2d& m, extend e = extend::none, filter f = filter::good); - void mask_immediate(const surface& maskSurface, const vector_2d& maskOrigin, const surface& s, const matrix_2d& m, ::std::error_code& ec, extend e = extend::none, filter f = filter::good) noexcept; + void mask_immediate(const ::std::experimental::io2d::brush& maskBrush, const surface& s, const matrix_2d& m = matrix_2d::init_identity(), extend e = extend::none, filter f = filter::good); + void mask_immediate(const ::std::experimental::io2d::brush& maskBrush, const surface& s, ::std::error_code& ec, const matrix_2d& m = matrix_2d::init_identity(), extend e = extend::none, filter f = filter::good) noexcept; + void mask_immediate(surface& maskSurface, const matrix_2d& maskMatrix = matrix_2d::init_identity(), extend maskExtend = extend::none, filter maskFilter = filter::good); + void mask_immediate(surface& maskSurface, ::std::error_code& ec, const matrix_2d& maskMatrix = matrix_2d::init_identity(), extend maskExtend = extend::none, filter maskFilter = filter::good) noexcept; + void mask_immediate(surface& maskSurface, const rgba_color& c, const matrix_2d& maskMatrix = matrix_2d::init_identity(), extend maskExtend = extend::none, filter maskFilter = filter::good); + void mask_immediate(surface& maskSurface, const rgba_color& c, ::std::error_code& ec, const matrix_2d& maskMatrix = matrix_2d::init_identity(), extend maskExtend = extend::none, filter maskFilter = filter::good) noexcept; + void mask_immediate(surface& maskSurface, const ::std::experimental::io2d::brush& b, const matrix_2d& maskMatrix = matrix_2d::init_identity(), extend maskExtend = extend::none, filter maskFilter = filter::good); + void mask_immediate(surface& maskSurface, const ::std::experimental::io2d::brush& b, ::std::error_code& ec, const matrix_2d& maskMatrix = matrix_2d::init_identity(), extend maskExtend = extend::none, filter maskFilter = filter::good) noexcept; + void mask_immediate(surface& maskSurface, const surface& s, const matrix_2d& maskMatrix = matrix_2d::init_identity(), const matrix_2d& m = matrix_2d::init_identity(), extend maskExtend = extend::none, extend e = extend::none, filter maskFilter = filter::good, filter f = filter::good); + void mask_immediate(surface& maskSurface, const surface& s, ::std::error_code& ec, const matrix_2d& maskMatrix = matrix_2d::init_identity(), const matrix_2d& m = matrix_2d::init_identity(), extend maskExtend = extend::none, extend e = extend::none, filter maskFilter = filter::good, filter f = filter::good) noexcept; // \ref{\iotwod.surface.modifiers.textrender}, text render modifiers: vector_2d render_text(const ::std::string& utf8, const vector_2d& position); @@ -2059,25 +2064,32 @@ namespace std { vector_2d render_text(const ::std::string& utf8, const vector_2d& position, const rgba_color& c, ::std::error_code& ec) noexcept; vector_2d render_text(const ::std::string& utf8, const vector_2d& position, const ::std::experimental::io2d::brush& b); vector_2d render_text(const ::std::string& utf8, const vector_2d& position, const ::std::experimental::io2d::brush& b, ::std::error_code& ec) noexcept; - vector_2d render_text(const ::std::string& utf8, const vector_2d& position, const surface& s, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good); - vector_2d render_text(const ::std::string& utf8, const vector_2d& position, const surface& s, ::std::error_code& ec, const vector_2d& origin = vector_2d{ 0.0, 0.0 }, extend e = extend::none, filter f = filter::good) noexcept; - vector_2d render_text(const ::std::string& utf8, const vector_2d& position, const surface& s, const matrix_2d& m, extend e = extend::none, filter f = filter::good); - vector_2d render_text(const ::std::string& utf8, const vector_2d& position, const surface& s, const matrix_2d& m, ::std::error_code& ec, extend e = extend::none, filter f = filter::good) noexcept; + vector_2d render_text(const ::std::string& utf8, const vector_2d& position, const surface& s, const matrix_2d& m = matrix_2d::init_identity(), extend e = extend::none, filter f = filter::good); + vector_2d render_text(const ::std::string& utf8, const vector_2d& position, const surface& s, ::std::error_code& ec, const matrix_2d& m = matrix_2d::init_identity(), extend e = extend::none, filter f = filter::good) noexcept; + void render_glyph_run(const glyph_run& gr); + void render_glyph_run(const glyph_run& gr, ::std::error_code& ec) noexcept; + void render_glyph_run(const glyph_run& gr, const rgba_color& c); + void render_glyph_run(const glyph_run& gr, const rgba_color& c, ::std::error_code& ec) noexcept; + void render_glyph_run(const glyph_run& gr, const ::std::experimental::io2d::brush& b); + void render_glyph_run(const glyph_run& gr, const ::std::experimental::io2d::brush& b, ::std::error_code& ec) noexcept; + void render_glyph_run(const glyph_run& gr, const surface& s, const matrix_2d& m = matrix_2d::init_identity(), extend e = extend::none, filter f = filter::good); + void render_glyph_run(const glyph_run& gr, const surface& s, ::std::error_code& ec, const matrix_2d& m = matrix_2d::init_identity(), extend e = extend::none, filter f = filter::good) noexcept; // \ref{\iotwod.surface.modifiers.transform}, transformation modifiers: void matrix(const matrix_2d& matrix); void matrix(const matrix_2d& matrix, ::std::error_code& ec) noexcept; // \ref{\iotwod.surface.modifiers.font}, font modifiers: - void font_face(const ::std::string& family, font_slant sl, font_weight w); - void font_face(const ::std::string& family, font_slant sl, font_weight w, ::std::error_code& ec) noexcept; - void font_face(const ::std::experimental::io2d::font_face& f); - void font_face(const ::std::experimental::io2d::font_face& f, ::std::error_code& ec) noexcept; - void font_size(double s); - void font_size(double s, ::std::error_code& ec) noexcept; - void font_matrix(const matrix_2d& m); - void font_matrix(const matrix_2d& m, ::std::error_code& ec) noexcept; - void font_options(const font_options& fo) noexcept; + void font_resource(const ::std::experimental::io2d::font_resource& f) noexcept; + void font_resource(const ::std::string& family, double size, font_slant sl = font_slant::normal, font_weight w = font_weight::normal); + void font_resource(const ::std::string& family, double size, ::std::error_code& ec, font_slant sl = font_slant::normal, font_weight w = font_weight::normal) noexcept; + //void font_face(const ::std::experimental::io2d::font_face& f); + //void font_face(const ::std::experimental::io2d::font_face& f, ::std::error_code& ec) noexcept; + //void font_size(double s); + //void font_size(double s, ::std::error_code& ec) noexcept; + //void font_matrix(const matrix_2d& m); + //void font_matrix(const matrix_2d& m, ::std::error_code& ec) noexcept; + //void font_options(const font_options& fo) noexcept; // \ref{\iotwod.surface.observers.state}, state observers: bool is_finished() const noexcept; @@ -2120,10 +2132,12 @@ namespace std { vector_2d surface_to_user_distance(const vector_2d& dpt, ::std::error_code& ec) const noexcept; // \ref{\iotwod.surface.observers.font}, font observers: - matrix_2d font_matrix() const noexcept; - ::std::experimental::io2d::font_options font_options() const noexcept; - ::std::experimental::io2d::font_face font_face() const; - ::std::experimental::io2d::font_face font_face(::std::error_code& ec) const noexcept; + ::std::experimental::io2d::font_resource font_resource() const noexcept; + + //matrix_2d font_matrix() const noexcept; + //::std::experimental::io2d::font_options font_options() const noexcept; + //::std::experimental::io2d::font_face font_face() const; + //::std::experimental::io2d::font_face font_face(::std::error_code& ec) const noexcept; }; // I don't know why Clang/C2 is complaining about weak vtables here since the at least one virtual function is always anchored but for now silence the warnings. I've never seen this using Clang on OpenSUSE. @@ -2230,7 +2244,17 @@ namespace std { const int _Display_surface_ptr_window_data_byte_offset = 0; LRESULT CALLBACK _RefImplWindowProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); -#else +#elif defined(USE_XCB) + struct _Xcb_display_surface_native_handle { + _Surface_native_handles sfc_nh; + _Surface_native_handles display_sfc_nh; + xcb_connection_t* connection; + ::std::mutex& connection_mutex; + int& connection_ref_count; + xcb_screen_t* screen; + xcb_window_t wndw; + }; +#elif defined(USE_XLIB) struct _Xlib_display_surface_native_handle { _Surface_native_handles sfc_nh; Display* display; @@ -2286,7 +2310,15 @@ namespace std { HWND _Hwnd; LRESULT _Window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); -#else +#elif defined(USE_XCB) + static ::std::mutex _Connection_mutex; + static ::std::unique_ptr _Connection; + static int _Connection_ref_count; + xcb_screen_t* _Screen; + xcb_window_t _Wndw; + bool _Can_draw = false; + const uint16_t _Window_border_width = 4; +#elif defined(USE_XLIB) static ::std::mutex _Display_mutex; static ::std::unique_ptr> _Display; static int _Display_ref_count; @@ -2295,6 +2327,12 @@ namespace std { static Bool _X11_if_event_pred(Display* display, XEvent* event, XPointer arg); #endif + ::std::experimental::io2d::refresh_rate _Refresh_rate; + double _Desired_frame_rate; + ::std::atomic _Redraw_requested; + double _Elapsed_draw_time; + const double _Minimum_frame_rate = 0.01; + const double _Maximum_frame_rate = 120.0; ::std::unique_ptr> _Native_surface; ::std::unique_ptr> _Native_context; @@ -2312,7 +2350,9 @@ namespace std { public: #ifdef _WIN32_WINNT typedef _Win32_display_surface_native_handle native_handle_type; -#else +#elif defined(USE_XCB) + typedef _Xcb_display_surface_native_handle native_handle_type; +#elif defined(USE_XLIB) typedef _Xlib_display_surface_native_handle native_handle_type; #endif native_handle_type native_handle() const; @@ -2324,16 +2364,16 @@ namespace std { display_surface& operator=(display_surface&& other) noexcept; display_surface(int preferredWidth, int preferredHeight, ::std::experimental::io2d::format preferredFormat, - ::std::experimental::io2d::scaling scl = ::std::experimental::io2d::scaling::letterbox); + ::std::experimental::io2d::scaling scl = ::std::experimental::io2d::scaling::letterbox, ::std::experimental::io2d::refresh_rate rr = ::std::experimental::io2d::refresh_rate::as_fast_as_possible, double fps = 30.0); display_surface(int preferredWidth, int preferredHeight, ::std::experimental::io2d::format preferredFormat, ::std::error_code& ec, - ::std::experimental::io2d::scaling scl = ::std::experimental::io2d::scaling::letterbox) noexcept; + ::std::experimental::io2d::scaling scl = ::std::experimental::io2d::scaling::letterbox, ::std::experimental::io2d::refresh_rate rr = ::std::experimental::io2d::refresh_rate::as_fast_as_possible, double fps = 30.0) noexcept; display_surface(int preferredWidth, int preferredHeight, ::std::experimental::io2d::format preferredFormat, int preferredDisplayWidth, int preferredDisplayHeight, - ::std::experimental::io2d::scaling scl = ::std::experimental::io2d::scaling::letterbox); + ::std::experimental::io2d::scaling scl = ::std::experimental::io2d::scaling::letterbox, ::std::experimental::io2d::refresh_rate rr = ::std::experimental::io2d::refresh_rate::as_fast_as_possible, double fps = 30.0); display_surface(int preferredWidth, int preferredHeight, ::std::experimental::io2d::format preferredFormat, int preferredDisplayWidth, int preferredDisplayHeight, ::std::error_code& ec, - ::std::experimental::io2d::scaling scl = ::std::experimental::io2d::scaling::letterbox) noexcept; + ::std::experimental::io2d::scaling scl = ::std::experimental::io2d::scaling::letterbox, ::std::experimental::io2d::refresh_rate rr = ::std::experimental::io2d::refresh_rate::as_fast_as_possible, double fps = 30.0) noexcept; virtual ~display_surface(); @@ -2367,6 +2407,10 @@ namespace std { void letterbox_brush(const ::std::experimental::io2d::brush& b); void letterbox_brush(const ::std::experimental::io2d::brush& b, ::std::error_code& ec) noexcept; void auto_clear(bool val) noexcept; + void refresh_rate(::std::experimental::io2d::refresh_rate rr) noexcept; + bool desired_frame_rate(double fps) noexcept; + void redraw_required() noexcept; + int show(); int show(::std::error_code& ec); // Not noexcept because if the user-provided functions throw they will propagate, but otherwise is non-throwing. void exit_show(int ms) noexcept; @@ -2383,6 +2427,9 @@ namespace std { ::std::function<::std::experimental::io2d::rectangle(const display_surface&, bool&)> user_scaling_callback(::std::error_code& ec) const noexcept; ::std::experimental::io2d::brush letterbox_brush() const noexcept; bool auto_clear() const noexcept; + ::std::experimental::io2d::refresh_rate refresh_rate() const noexcept; + double desired_frame_rate() const noexcept; + double elapsed_draw_time() const noexcept; }; // I don't know why Clang/C2 is complaining about weak vtables here since the at least one virtual function is always anchored but for now silence the warnings. I've never seen this using Clang on OpenSUSE. @@ -2414,25 +2461,25 @@ namespace std { bool has_surface() const noexcept; const image_surface& surface() const; }; -#if _Variable_templates_condition_support_test +#if _Variable_templates_conditional_support_test template - constexpr T pi = T(3.14159265358979323846264338327950288419716939937510L); + constexpr T pi = T(3.14159265358979323846264338327950288L); template - constexpr T two_pi = T(6.28318530717958647692528676655900576839433879875020L); + constexpr T two_pi = T(6.28318530717958647692528676655900576L); template - constexpr T half_pi = T(1.57079632679489661923132169163975144209858469968755L); + constexpr T half_pi = T(1.57079632679489661923132169163975144L); template - constexpr T three_pi_over_two = T(4.71238898038468985769396507491925432629575409906265L); + constexpr T three_pi_over_two = T(4.71238898038468985769396507491925432L); #else template #if _Constexpr_conditional_support_test constexpr #endif T pi() noexcept { - return static_cast(3.14159265358979323846264338327950288419716939937510L); + return static_cast(3.14159265358979323846264338327950288L); } template @@ -2440,7 +2487,7 @@ namespace std { constexpr #endif T two_pi() noexcept { - return static_cast(6.28318530717958647692528676655900576839433879875020L); + return static_cast(6.28318530717958647692528676655900576L); } template @@ -2448,7 +2495,7 @@ namespace std { constexpr #endif T half_pi() noexcept { - return static_cast(1.57079632679489661923132169163975144209858469968755L); + return static_cast(1.57079632679489661923132169163975144L); } template @@ -2456,15 +2503,15 @@ namespace std { constexpr #endif T three_pi_over_two() noexcept { - return static_cast(4.71238898038468985769396507491925432629575409906265L); + return static_cast(4.71238898038468985769396507491925432L); } #endif int format_stride_for_width(format format, int width) noexcept; - display_surface make_display_surface(int preferredWidth, int preferredHeight, format preferredFormat, scaling scl = scaling::letterbox); - display_surface make_display_surface(int preferredWidth, int preferredHeight, format preferredFormat, ::std::error_code& ec, scaling scl = scaling::letterbox) noexcept; - display_surface make_display_surface(int preferredWidth, int preferredHeight, format preferredFormat, int preferredDisplayWidth, int preferredDisplayHeight, scaling scl = scaling::letterbox); + display_surface make_display_surface(int preferredWidth, int preferredHeight, format preferredFormat, scaling scl = scaling::letterbox, refresh_rate rr = refresh_rate::as_fast_as_possible, double desiredFramerate = 30.0); + display_surface make_display_surface(int preferredWidth, int preferredHeight, format preferredFormat, ::std::error_code& ec, scaling scl = scaling::letterbox, refresh_rate rr = refresh_rate::as_fast_as_possible, double desiredFramerate = 30.0) noexcept; + display_surface make_display_surface(int preferredWidth, int preferredHeight, format preferredFormat, int preferredDisplayWidth, int preferredDisplayHeight, scaling scl = scaling::letterbox, refresh_rate rr = refresh_rate::as_fast_as_possible, double desiredFramerate = 30.0); display_surface make_display_surface(int preferredWidth, int preferredHeight, format preferredFormat, - int preferredDisplayWidth, int preferredDisplayHeight, ::std::error_code& ec, scaling scl = scaling::letterbox) noexcept; + int preferredDisplayWidth, int preferredDisplayHeight, ::std::error_code& ec, scaling scl = scaling::letterbox, refresh_rate rr = refresh_rate::as_fast_as_possible, double desiredFramerate = 30.0) noexcept; image_surface make_image_surface(format format, int width, int height); image_surface make_image_surface(format format, int width, int height, ::std::error_code& ec) noexcept; #if _Inline_namespace_conditional_support_test diff --git a/N3888_RefImpl/src/throw_helpers.h b/io2d/include/throw_helpers.h similarity index 100% rename from N3888_RefImpl/src/throw_helpers.h rename to io2d/include/throw_helpers.h diff --git a/N3888_RefImpl/src/xcairoenumhelpers.h b/io2d/include/xcairoenumhelpers.h similarity index 100% rename from N3888_RefImpl/src/xcairoenumhelpers.h rename to io2d/include/xcairoenumhelpers.h diff --git a/N3888_RefImpl/src/xio2d.h b/io2d/include/xio2d.h similarity index 96% rename from N3888_RefImpl/src/xio2d.h rename to io2d/include/xio2d.h index 176f66e..8b6143a 100644 --- a/N3888_RefImpl/src/xio2d.h +++ b/io2d/include/xio2d.h @@ -32,5 +32,5 @@ // Designed to be used to conditionally define compiler support for constexpr using a #if #define _Constexpr_conditional_support_test ((__cplusplus >= 201103L) || (_MSC_FULL_VER >= 190022203)) -#define _Variable_templates_conditional_support_test ((__cplusplus >= 201402L) || _MSC_FULL_VER > 190023506) +#define _Variable_templates_conditional_support_test ((__cplusplus >= 201402L) || _MSC_FULL_VER >= 190023918) #endif diff --git a/N3888_RefImpl/src/xio2dhelpers.h b/io2d/include/xio2dhelpers.h similarity index 86% rename from N3888_RefImpl/src/xio2dhelpers.h rename to io2d/include/xio2dhelpers.h index d062102..54e7e1a 100644 --- a/N3888_RefImpl/src/xio2dhelpers.h +++ b/io2d/include/xio2dhelpers.h @@ -374,6 +374,93 @@ namespace std { rgba_color operator*(const rgba_color& lhs, double rhs); rgba_color operator*(double lhs, const rgba_color& rhs); rgba_color& operator*=(rgba_color& lhs, double rhs); + + inline ::std::vector _Cairo_path_data_t_array_to_path_data_item_vector(const cairo_path_t& cpt) { + ::std::vector vec; + _Throw_if_failed_cairo_status_t(cpt.status); + for (auto i = 0; i < cpt.num_data; i += cpt.data[i].header.length) { + auto type = cpt.data[i].header.type; + switch (type) + { + case CAIRO_PATH_CLOSE_PATH: + { + vec.emplace_back(path_data_item::close_path()); + } break; + case CAIRO_PATH_CURVE_TO: + { + vec.emplace_back(path_data_item::curve_to({ cpt.data[i + 1].point.x, cpt.data[i + 1].point.y }, { cpt.data[i + 2].point.x, cpt.data[i + 2].point.y }, { cpt.data[i + 3].point.x, cpt.data[i + 3].point.y })); + } break; + case CAIRO_PATH_LINE_TO: + { + vec.emplace_back(path_data_item::line_to({ cpt.data[i + 1].point.x, cpt.data[i + 1].point.y })); + } break; + case CAIRO_PATH_MOVE_TO: + { + vec.emplace_back(path_data_item::move_to({ cpt.data[i + 1].point.x, cpt.data[i + 1].point.y })); + } break; + default: + { + _Throw_if_failed_cairo_status_t(CAIRO_STATUS_INVALID_PATH_DATA); + } break; + } + } + + return vec; + } + + inline ::std::vector _Cairo_path_data_t_array_to_path_data_item_vector(const cairo_path_t& cpt, ::std::error_code& ec) noexcept { + ::std::vector vec; + ec = _Cairo_status_t_to_std_error_code(cpt.status); + if (static_cast(ec)) { + return vec; + } + ::std::vector::size_type reqSize{}; + for (auto i = 0; i < cpt.num_data; i += cpt.data[i].header.length) { + reqSize++; + } + try { + vec.reserve(reqSize); + } + catch (const ::std::length_error&) { + ec = ::std::make_error_code(::std::errc::not_enough_memory); + return vec; + } + catch (const ::std::bad_alloc&) { + ec = ::std::make_error_code(::std::errc::not_enough_memory); + return vec; + } + + for (auto i = 0; i < cpt.num_data; i += cpt.data[i].header.length) { + auto type = cpt.data[i].header.type; + switch (type) + { + case CAIRO_PATH_CLOSE_PATH: + { + vec.emplace_back(path_data_item::close_path()); + } break; + case CAIRO_PATH_CURVE_TO: + { + vec.emplace_back(path_data_item::curve_to({ cpt.data[i + 1].point.x, cpt.data[i + 1].point.y }, { cpt.data[i + 2].point.x, cpt.data[i + 2].point.y }, { cpt.data[i + 3].point.x, cpt.data[i + 3].point.y })); + } break; + case CAIRO_PATH_LINE_TO: + { + vec.emplace_back(path_data_item::line_to({ cpt.data[i + 1].point.x, cpt.data[i + 1].point.y })); + } break; + case CAIRO_PATH_MOVE_TO: + { + vec.emplace_back(path_data_item::move_to({ cpt.data[i + 1].point.x, cpt.data[i + 1].point.y })); + } break; + default: + { + ec = _Cairo_status_t_to_std_error_code(CAIRO_STATUS_INVALID_PATH_DATA); + return vec; + } break; + } + } + + ec.clear(); + return vec; + } #if _Inline_namespace_conditional_support_test } #endif diff --git a/io2d/src/3rd-party/CMakeLists.txt b/io2d/src/3rd-party/CMakeLists.txt new file mode 100644 index 0000000..a15c97f --- /dev/null +++ b/io2d/src/3rd-party/CMakeLists.txt @@ -0,0 +1,9 @@ +cmake_minimum_required(VERSION 2.8.12) + +add_subdirectory(pixman) +set(PIXMAN_INCLUDE_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/pixman/pixman + ${CMAKE_CURRENT_BINARY_DIR}/pixman) +set(PIXMAN_LIBRARY pixman) + +add_subdirectory(cairo) diff --git a/cairo/.gitignore b/io2d/src/3rd-party/cairo/.gitignore similarity index 100% rename from cairo/.gitignore rename to io2d/src/3rd-party/cairo/.gitignore diff --git a/cairo/AUTHORS b/io2d/src/3rd-party/cairo/AUTHORS similarity index 100% rename from cairo/AUTHORS rename to io2d/src/3rd-party/cairo/AUTHORS diff --git a/cairo/BIBLIOGRAPHY b/io2d/src/3rd-party/cairo/BIBLIOGRAPHY similarity index 100% rename from cairo/BIBLIOGRAPHY rename to io2d/src/3rd-party/cairo/BIBLIOGRAPHY diff --git a/cairo/BUGS b/io2d/src/3rd-party/cairo/BUGS similarity index 100% rename from cairo/BUGS rename to io2d/src/3rd-party/cairo/BUGS diff --git a/io2d/src/3rd-party/cairo/CMakeLists.txt b/io2d/src/3rd-party/cairo/CMakeLists.txt new file mode 100644 index 0000000..55046f6 --- /dev/null +++ b/io2d/src/3rd-party/cairo/CMakeLists.txt @@ -0,0 +1,131 @@ +cmake_minimum_required(VERSION 2.8.12) + +project(cairo C) + +include(CheckIncludeFiles) +include(CheckTypeSize) + +check_include_files(stdint.h HAVE_STDINT_H) +check_include_files(inttypes.h HAVE_INTTYPES_H) +check_include_files(sys/int_types.h HAVE_SYS_INT_TYPES_H) +check_include_files(pthread.h CAIRO_HAS_PTHREAD) +check_include_files(xcb/xcb.h CAIRO_HAS_XCB_SURFACE) + +set(CAIRO_SRC + src/cairo-analysis-surface.c src/cairo-arc.c + src/cairo-array.c src/cairo-atomic.c + src/cairo-base64-stream.c src/cairo-base85-stream.c + src/cairo-bentley-ottmann.c src/cairo-bentley-ottmann-rectangular.c + src/cairo-bentley-ottmann-rectilinear.c src/cairo-botor-scan-converter.c + src/cairo-boxes.c src/cairo-boxes-intersect.c + src/cairo.c src/cairo-cache.c + src/cairo-clip.c src/cairo-clip-boxes.c + src/cairo-clip-polygon.c src/cairo-clip-region.c + src/cairo-clip-surface.c src/cairo-color.c + src/cairo-composite-rectangles.c src/cairo-compositor.c + src/cairo-contour.c src/cairo-damage.c + src/cairo-debug.c src/cairo-default-context.c + src/cairo-device.c src/cairo-error.c + src/cairo-fallback-compositor.c src/cairo-fixed.c + src/cairo-font-face.c src/cairo-font-face-twin.c + src/cairo-font-face-twin-data.c src/cairo-font-options.c + src/cairo-freelist.c src/cairo-freed-pool.c + src/cairo-gstate.c src/cairo-hash.c + src/cairo-hull.c src/cairo-image-compositor.c + src/cairo-image-info.c src/cairo-image-source.c + src/cairo-image-surface.c src/cairo-lzw.c + src/cairo-matrix.c src/cairo-mask-compositor.c + src/cairo-mesh-pattern-rasterizer.c src/cairo-mempool.c + src/cairo-misc.c src/cairo-mono-scan-converter.c + src/cairo-mutex.c src/cairo-no-compositor.c + src/cairo-observer.c src/cairo-output-stream.c + src/cairo-paginated-surface.c src/cairo-path-bounds.c + src/cairo-path.c src/cairo-path-fill.c + src/cairo-path-fixed.c src/cairo-path-in-fill.c + src/cairo-path-stroke.c src/cairo-path-stroke-boxes.c + src/cairo-path-stroke-polygon.c src/cairo-path-stroke-traps.c + src/cairo-path-stroke-tristrip.c src/cairo-pattern.c + src/cairo-pen.c src/cairo-polygon.c + src/cairo-polygon-intersect.c src/cairo-polygon-reduce.c + src/cairo-raster-source-pattern.c src/cairo-recording-surface.c + src/cairo-rectangle.c src/cairo-rectangular-scan-converter.c + src/cairo-region.c src/cairo-rtree.c + src/cairo-scaled-font.c src/cairo-shape-mask-compositor.c + src/cairo-slope.c src/cairo-spans.c + src/cairo-spans-compositor.c src/cairo-spline.c + src/cairo-stroke-dash.c src/cairo-stroke-style.c + src/cairo-surface.c src/cairo-surface-clipper.c + src/cairo-surface-fallback.c src/cairo-surface-observer.c + src/cairo-surface-offset.c src/cairo-surface-snapshot.c + src/cairo-surface-subsurface.c src/cairo-surface-wrapper.c + src/cairo-time.c src/cairo-tor-scan-converter.c + src/cairo-tor22-scan-converter.c src/cairo-clip-tor-scan-converter.c + src/cairo-toy-font-face.c src/cairo-traps.c + src/cairo-tristrip.c src/cairo-traps-compositor.c + src/cairo-unicode.c src/cairo-user-font.c + src/cairo-version.c src/cairo-wideint.c + + src/cairo-script-surface.c + + src/cairo-cff-subset.c src/cairo-scaled-font-subsets.c + src/cairo-truetype-subset.c src/cairo-type1-fallback.c + src/cairo-type1-glyph-names.c src/cairo-type1-subset.c +) + +if (WIN32) + set(CAIRO_HAS_WIN32_SURFACE 1) + set(CAIRO_HAS_WIN32_FONT 1) + + set(CAIRO_SRC_WIN32 + src/win32/cairo-win32-debug.c src/win32/cairo-win32-device.c + src/win32/cairo-win32-gdi-compositor.c src/win32/cairo-win32-system.c + src/win32/cairo-win32-surface.c src/win32/cairo-win32-display-surface.c + src/win32/cairo-win32-printing-surface.c src/win32/cairo-win32-font.c + ) + list(APPEND CAIRO_SRC ${CAIRO_SRC_WIN32}) + set(CAIRO_EXTRA_LIBRARIES msimg32) +endif() + +if (CAIRO_HAS_XCB_SURFACE) + set(HAVE_INTEL_ATOMIC_PRIMITIVES 1) + set(CAIRO_SRC_XCB + src/cairo-xcb-connection.c src/cairo-xcb-connection-core.c + src/cairo-xcb-connection-render.c src/cairo-xcb-connection-shm.c + src/cairo-xcb-screen.c src/cairo-xcb-shm.c + src/cairo-xcb-surface.c src/cairo-xcb-surface-core.c + src/cairo-xcb-surface-render.c + ) + list(APPEND CAIRO_SRC ${CAIRO_SRC_XCB}) + set(CAIRO_EXTRA_LIBRARIES -lxcb -lxcb-render -lpthread) +endif() + +add_library(cairo ${CAIRO_SRC}) +target_link_libraries(cairo + ${CAIRO_EXTRA_LIBRARIES} + ${PIXMAN_LIBRARY} +) + +target_compile_definitions(cairo PRIVATE HAVE_CONFIG_H) +target_compile_definitions(cairo INTERFACE CAIRO_HAS_XCB_SURFACE) + +target_include_directories(cairo PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/src + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${PIXMAN_INCLUDE_DIR} +) + +target_include_directories(cairo INTERFACE + ${CMAKE_CURRENT_BINARY_DIR} +) + +check_type_size("uint64_t" SIZEOF_UINT64_T) +if(SIZEOF_UINT64_T) + set(HAVE_UINT64_T 1) +endif() + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/config.h) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cairo-features.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/cairo-features.h) diff --git a/cairo/CODING_STYLE b/io2d/src/3rd-party/cairo/CODING_STYLE similarity index 100% rename from cairo/CODING_STYLE rename to io2d/src/3rd-party/cairo/CODING_STYLE diff --git a/cairo/COPYING b/io2d/src/3rd-party/cairo/COPYING similarity index 100% rename from cairo/COPYING rename to io2d/src/3rd-party/cairo/COPYING diff --git a/cairo/COPYING-LGPL-2.1 b/io2d/src/3rd-party/cairo/COPYING-LGPL-2.1 similarity index 100% rename from cairo/COPYING-LGPL-2.1 rename to io2d/src/3rd-party/cairo/COPYING-LGPL-2.1 diff --git a/cairo/COPYING-MPL-1.1 b/io2d/src/3rd-party/cairo/COPYING-MPL-1.1 similarity index 100% rename from cairo/COPYING-MPL-1.1 rename to io2d/src/3rd-party/cairo/COPYING-MPL-1.1 diff --git a/cairo/HACKING b/io2d/src/3rd-party/cairo/HACKING similarity index 100% rename from cairo/HACKING rename to io2d/src/3rd-party/cairo/HACKING diff --git a/cairo/INSTALL b/io2d/src/3rd-party/cairo/INSTALL similarity index 100% rename from cairo/INSTALL rename to io2d/src/3rd-party/cairo/INSTALL diff --git a/cairo/KNOWN_ISSUES b/io2d/src/3rd-party/cairo/KNOWN_ISSUES similarity index 100% rename from cairo/KNOWN_ISSUES rename to io2d/src/3rd-party/cairo/KNOWN_ISSUES diff --git a/cairo/Makefile.am b/io2d/src/3rd-party/cairo/Makefile.am similarity index 100% rename from cairo/Makefile.am rename to io2d/src/3rd-party/cairo/Makefile.am diff --git a/cairo/Makefile.win32 b/io2d/src/3rd-party/cairo/Makefile.win32 similarity index 100% rename from cairo/Makefile.win32 rename to io2d/src/3rd-party/cairo/Makefile.win32 diff --git a/cairo/NEWS b/io2d/src/3rd-party/cairo/NEWS similarity index 100% rename from cairo/NEWS rename to io2d/src/3rd-party/cairo/NEWS diff --git a/cairo/PORTING_GUIDE b/io2d/src/3rd-party/cairo/PORTING_GUIDE similarity index 100% rename from cairo/PORTING_GUIDE rename to io2d/src/3rd-party/cairo/PORTING_GUIDE diff --git a/cairo/README b/io2d/src/3rd-party/cairo/README similarity index 100% rename from cairo/README rename to io2d/src/3rd-party/cairo/README diff --git a/cairo/README.win32 b/io2d/src/3rd-party/cairo/README.win32 similarity index 100% rename from cairo/README.win32 rename to io2d/src/3rd-party/cairo/README.win32 diff --git a/cairo/RELEASING b/io2d/src/3rd-party/cairo/RELEASING similarity index 100% rename from cairo/RELEASING rename to io2d/src/3rd-party/cairo/RELEASING diff --git a/cairo/acinclude.m4 b/io2d/src/3rd-party/cairo/acinclude.m4 similarity index 100% rename from cairo/acinclude.m4 rename to io2d/src/3rd-party/cairo/acinclude.m4 diff --git a/cairo/autogen.sh b/io2d/src/3rd-party/cairo/autogen.sh similarity index 100% rename from cairo/autogen.sh rename to io2d/src/3rd-party/cairo/autogen.sh diff --git a/cairo/boilerplate/.gitignore b/io2d/src/3rd-party/cairo/boilerplate/.gitignore similarity index 100% rename from cairo/boilerplate/.gitignore rename to io2d/src/3rd-party/cairo/boilerplate/.gitignore diff --git a/cairo/boilerplate/Makefile.am b/io2d/src/3rd-party/cairo/boilerplate/Makefile.am similarity index 100% rename from cairo/boilerplate/Makefile.am rename to io2d/src/3rd-party/cairo/boilerplate/Makefile.am diff --git a/cairo/boilerplate/Makefile.sources b/io2d/src/3rd-party/cairo/boilerplate/Makefile.sources similarity index 100% rename from cairo/boilerplate/Makefile.sources rename to io2d/src/3rd-party/cairo/boilerplate/Makefile.sources diff --git a/cairo/boilerplate/Makefile.win32 b/io2d/src/3rd-party/cairo/boilerplate/Makefile.win32 similarity index 100% rename from cairo/boilerplate/Makefile.win32 rename to io2d/src/3rd-party/cairo/boilerplate/Makefile.win32 diff --git a/cairo/boilerplate/Makefile.win32.features b/io2d/src/3rd-party/cairo/boilerplate/Makefile.win32.features similarity index 100% rename from cairo/boilerplate/Makefile.win32.features rename to io2d/src/3rd-party/cairo/boilerplate/Makefile.win32.features diff --git a/cairo/boilerplate/README b/io2d/src/3rd-party/cairo/boilerplate/README similarity index 100% rename from cairo/boilerplate/README rename to io2d/src/3rd-party/cairo/boilerplate/README diff --git a/cairo/boilerplate/cairo-boilerplate-beos.cpp b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-beos.cpp similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-beos.cpp rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-beos.cpp diff --git a/cairo/boilerplate/cairo-boilerplate-cogl.c b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-cogl.c similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-cogl.c rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-cogl.c diff --git a/cairo/boilerplate/cairo-boilerplate-directfb.c b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-directfb.c similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-directfb.c rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-directfb.c diff --git a/cairo/boilerplate/cairo-boilerplate-drm.c b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-drm.c similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-drm.c rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-drm.c diff --git a/cairo/boilerplate/cairo-boilerplate-egl.c b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-egl.c similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-egl.c rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-egl.c diff --git a/cairo/boilerplate/cairo-boilerplate-getopt.c b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-getopt.c similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-getopt.c rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-getopt.c diff --git a/cairo/boilerplate/cairo-boilerplate-getopt.h b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-getopt.h similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-getopt.h rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-getopt.h diff --git a/cairo/boilerplate/cairo-boilerplate-glx.c b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-glx.c similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-glx.c rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-glx.c diff --git a/cairo/boilerplate/cairo-boilerplate-pdf.c b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-pdf.c similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-pdf.c rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-pdf.c diff --git a/cairo/boilerplate/cairo-boilerplate-private.h b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-private.h similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-private.h rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-private.h diff --git a/cairo/boilerplate/cairo-boilerplate-ps.c b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-ps.c similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-ps.c rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-ps.c diff --git a/cairo/boilerplate/cairo-boilerplate-qt.cpp b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-qt.cpp similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-qt.cpp rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-qt.cpp diff --git a/cairo/boilerplate/cairo-boilerplate-quartz.c b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-quartz.c similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-quartz.c rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-quartz.c diff --git a/cairo/boilerplate/cairo-boilerplate-scaled-font.h b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-scaled-font.h similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-scaled-font.h rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-scaled-font.h diff --git a/cairo/boilerplate/cairo-boilerplate-script.c b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-script.c similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-script.c rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-script.c diff --git a/cairo/boilerplate/cairo-boilerplate-skia.c b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-skia.c similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-skia.c rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-skia.c diff --git a/cairo/boilerplate/cairo-boilerplate-svg.c b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-svg.c similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-svg.c rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-svg.c diff --git a/cairo/boilerplate/cairo-boilerplate-system.c b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-system.c similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-system.c rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-system.c diff --git a/cairo/boilerplate/cairo-boilerplate-system.h b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-system.h similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-system.h rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-system.h diff --git a/cairo/boilerplate/cairo-boilerplate-test-surfaces.c b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-test-surfaces.c similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-test-surfaces.c rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-test-surfaces.c diff --git a/cairo/boilerplate/cairo-boilerplate-vg.c b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-vg.c similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-vg.c rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-vg.c diff --git a/cairo/boilerplate/cairo-boilerplate-wgl.c b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-wgl.c similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-wgl.c rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-wgl.c diff --git a/cairo/boilerplate/cairo-boilerplate-win32-printing.c b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-win32-printing.c similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-win32-printing.c rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-win32-printing.c diff --git a/cairo/boilerplate/cairo-boilerplate-win32.c b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-win32.c similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-win32.c rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-win32.c diff --git a/cairo/boilerplate/cairo-boilerplate-xcb.c b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-xcb.c similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-xcb.c rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-xcb.c diff --git a/cairo/boilerplate/cairo-boilerplate-xlib.c b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-xlib.c similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-xlib.c rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-xlib.c diff --git a/cairo/boilerplate/cairo-boilerplate-xlib.h b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-xlib.h similarity index 100% rename from cairo/boilerplate/cairo-boilerplate-xlib.h rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate-xlib.h diff --git a/cairo/boilerplate/cairo-boilerplate.c b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate.c similarity index 100% rename from cairo/boilerplate/cairo-boilerplate.c rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate.c diff --git a/cairo/boilerplate/cairo-boilerplate.h b/io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate.h similarity index 100% rename from cairo/boilerplate/cairo-boilerplate.h rename to io2d/src/3rd-party/cairo/boilerplate/cairo-boilerplate.h diff --git a/cairo/boilerplate/check-link.c b/io2d/src/3rd-party/cairo/boilerplate/check-link.c similarity index 100% rename from cairo/boilerplate/check-link.c rename to io2d/src/3rd-party/cairo/boilerplate/check-link.c diff --git a/cairo/boilerplate/make-cairo-boilerplate-constructors.sh b/io2d/src/3rd-party/cairo/boilerplate/make-cairo-boilerplate-constructors.sh similarity index 100% rename from cairo/boilerplate/make-cairo-boilerplate-constructors.sh rename to io2d/src/3rd-party/cairo/boilerplate/make-cairo-boilerplate-constructors.sh diff --git a/cairo/build/.gitignore b/io2d/src/3rd-party/cairo/build/.gitignore similarity index 100% rename from cairo/build/.gitignore rename to io2d/src/3rd-party/cairo/build/.gitignore diff --git a/cairo/build/Makefile.am.analysis b/io2d/src/3rd-party/cairo/build/Makefile.am.analysis similarity index 100% rename from cairo/build/Makefile.am.analysis rename to io2d/src/3rd-party/cairo/build/Makefile.am.analysis diff --git a/cairo/build/Makefile.am.changelog b/io2d/src/3rd-party/cairo/build/Makefile.am.changelog similarity index 100% rename from cairo/build/Makefile.am.changelog rename to io2d/src/3rd-party/cairo/build/Makefile.am.changelog diff --git a/cairo/build/Makefile.am.common b/io2d/src/3rd-party/cairo/build/Makefile.am.common similarity index 100% rename from cairo/build/Makefile.am.common rename to io2d/src/3rd-party/cairo/build/Makefile.am.common diff --git a/cairo/build/Makefile.am.gtk-doc b/io2d/src/3rd-party/cairo/build/Makefile.am.gtk-doc similarity index 100% rename from cairo/build/Makefile.am.gtk-doc rename to io2d/src/3rd-party/cairo/build/Makefile.am.gtk-doc diff --git a/cairo/build/Makefile.am.releasing b/io2d/src/3rd-party/cairo/build/Makefile.am.releasing similarity index 100% rename from cairo/build/Makefile.am.releasing rename to io2d/src/3rd-party/cairo/build/Makefile.am.releasing diff --git a/cairo/build/Makefile.win32.common b/io2d/src/3rd-party/cairo/build/Makefile.win32.common similarity index 100% rename from cairo/build/Makefile.win32.common rename to io2d/src/3rd-party/cairo/build/Makefile.win32.common diff --git a/cairo/build/Makefile.win32.features b/io2d/src/3rd-party/cairo/build/Makefile.win32.features similarity index 100% rename from cairo/build/Makefile.win32.features rename to io2d/src/3rd-party/cairo/build/Makefile.win32.features diff --git a/cairo/build/Makefile.win32.features-h b/io2d/src/3rd-party/cairo/build/Makefile.win32.features-h similarity index 100% rename from cairo/build/Makefile.win32.features-h rename to io2d/src/3rd-party/cairo/build/Makefile.win32.features-h diff --git a/cairo/build/Makefile.win32.inform b/io2d/src/3rd-party/cairo/build/Makefile.win32.inform similarity index 100% rename from cairo/build/Makefile.win32.inform rename to io2d/src/3rd-party/cairo/build/Makefile.win32.inform diff --git a/cairo/build/aclocal.cairo.m4 b/io2d/src/3rd-party/cairo/build/aclocal.cairo.m4 similarity index 100% rename from cairo/build/aclocal.cairo.m4 rename to io2d/src/3rd-party/cairo/build/aclocal.cairo.m4 diff --git a/cairo/build/aclocal.compare.m4 b/io2d/src/3rd-party/cairo/build/aclocal.compare.m4 similarity index 100% rename from cairo/build/aclocal.compare.m4 rename to io2d/src/3rd-party/cairo/build/aclocal.compare.m4 diff --git a/cairo/build/aclocal.enable.m4 b/io2d/src/3rd-party/cairo/build/aclocal.enable.m4 similarity index 100% rename from cairo/build/aclocal.enable.m4 rename to io2d/src/3rd-party/cairo/build/aclocal.enable.m4 diff --git a/cairo/build/aclocal.float.m4 b/io2d/src/3rd-party/cairo/build/aclocal.float.m4 similarity index 100% rename from cairo/build/aclocal.float.m4 rename to io2d/src/3rd-party/cairo/build/aclocal.float.m4 diff --git a/cairo/build/aclocal.gtk-doc.m4 b/io2d/src/3rd-party/cairo/build/aclocal.gtk-doc.m4 similarity index 100% rename from cairo/build/aclocal.gtk-doc.m4 rename to io2d/src/3rd-party/cairo/build/aclocal.gtk-doc.m4 diff --git a/cairo/build/aclocal.makefile.m4 b/io2d/src/3rd-party/cairo/build/aclocal.makefile.m4 similarity index 100% rename from cairo/build/aclocal.makefile.m4 rename to io2d/src/3rd-party/cairo/build/aclocal.makefile.m4 diff --git a/cairo/build/aclocal.pkg.m4 b/io2d/src/3rd-party/cairo/build/aclocal.pkg.m4 similarity index 100% rename from cairo/build/aclocal.pkg.m4 rename to io2d/src/3rd-party/cairo/build/aclocal.pkg.m4 diff --git a/cairo/build/configure.ac.analysis b/io2d/src/3rd-party/cairo/build/configure.ac.analysis similarity index 100% rename from cairo/build/configure.ac.analysis rename to io2d/src/3rd-party/cairo/build/configure.ac.analysis diff --git a/cairo/build/configure.ac.features b/io2d/src/3rd-party/cairo/build/configure.ac.features similarity index 100% rename from cairo/build/configure.ac.features rename to io2d/src/3rd-party/cairo/build/configure.ac.features diff --git a/cairo/build/configure.ac.noversion b/io2d/src/3rd-party/cairo/build/configure.ac.noversion similarity index 100% rename from cairo/build/configure.ac.noversion rename to io2d/src/3rd-party/cairo/build/configure.ac.noversion diff --git a/cairo/build/configure.ac.pthread b/io2d/src/3rd-party/cairo/build/configure.ac.pthread similarity index 100% rename from cairo/build/configure.ac.pthread rename to io2d/src/3rd-party/cairo/build/configure.ac.pthread diff --git a/cairo/build/configure.ac.system b/io2d/src/3rd-party/cairo/build/configure.ac.system similarity index 100% rename from cairo/build/configure.ac.system rename to io2d/src/3rd-party/cairo/build/configure.ac.system diff --git a/cairo/build/configure.ac.tools b/io2d/src/3rd-party/cairo/build/configure.ac.tools similarity index 100% rename from cairo/build/configure.ac.tools rename to io2d/src/3rd-party/cairo/build/configure.ac.tools diff --git a/cairo/build/configure.ac.version b/io2d/src/3rd-party/cairo/build/configure.ac.version similarity index 100% rename from cairo/build/configure.ac.version rename to io2d/src/3rd-party/cairo/build/configure.ac.version diff --git a/cairo/build/configure.ac.warnings b/io2d/src/3rd-party/cairo/build/configure.ac.warnings similarity index 100% rename from cairo/build/configure.ac.warnings rename to io2d/src/3rd-party/cairo/build/configure.ac.warnings diff --git a/io2d/src/3rd-party/cairo/cairo-features.h.cmake b/io2d/src/3rd-party/cairo/cairo-features.h.cmake new file mode 100644 index 0000000..7a4ebfb --- /dev/null +++ b/io2d/src/3rd-party/cairo/cairo-features.h.cmake @@ -0,0 +1,14 @@ +#define CAIRO_FEATURES_H 1 +#cmakedefine CAIRO_HAS_WIN32_SURFACE @CAIRO_HAS_WIN32_SURFACE@ +#cmakedefine CAIRO_HAS_WIN32_FONT @CAIRO_HAS_WIN32_FONT@ +#cmakedefine CAIRO_HAS_PNG_FUNCTIONS 0 +#define CAIRO_HAS_SCRIPT_SURFACE 1 +#cmakedefine CAIRO_HAS_PS_SURFACE 0 +#cmakedefine CAIRO_HAS_PDF_SURFACE 0 +#cmakedefine CAIRO_HAS_SVG_SURFACE 0 +#cmakedefine CAIRO_HAS_IMAGE_SURFACE 1 +#cmakedefine CAIRO_HAS_MIME_SURFACE 0 +#cmakedefine CAIRO_HAS_RECORDING_SURFACE 1 +#cmakedefine CAIRO_HAS_OBSERVER_SURFACE 1 +#cmakedefine CAIRO_HAS_USER_FONT 1 +#cmakedefine CAIRO_HAS_INTERPRETER 1 diff --git a/N3888_RefImpl/src/win32/include/cairo-version.h b/io2d/src/3rd-party/cairo/cairo-version.h similarity index 100% rename from N3888_RefImpl/src/win32/include/cairo-version.h rename to io2d/src/3rd-party/cairo/cairo-version.h diff --git a/io2d/src/3rd-party/cairo/config.h.cmake b/io2d/src/3rd-party/cairo/config.h.cmake new file mode 100644 index 0000000..69df7a6 --- /dev/null +++ b/io2d/src/3rd-party/cairo/config.h.cmake @@ -0,0 +1,7 @@ +#cmakedefine HAVE_STDINT_H 1 +#cmakedefine HAVE_INTTYPES_H 1 +#cmakedefine HAVE_SYS_INT_TYPES_H 1 +#cmakedefine HAVE_UINT64_T @HAVE_UINT64_T@ +#cmakedefine CAIRO_HAS_PTHREAD 1 +#cmakedefine CAIRO_HAS_XCB_SURFACE 1 +#cmakedefine HAVE_INTEL_ATOMIC_PRIMITIVES @HAVE_INTEL_ATOMIC_PRIMITIVES@ diff --git a/cairo/configure.ac b/io2d/src/3rd-party/cairo/configure.ac similarity index 100% rename from cairo/configure.ac rename to io2d/src/3rd-party/cairo/configure.ac diff --git a/cairo/doc/.gitignore b/io2d/src/3rd-party/cairo/doc/.gitignore similarity index 100% rename from cairo/doc/.gitignore rename to io2d/src/3rd-party/cairo/doc/.gitignore diff --git a/cairo/doc/Makefile.am b/io2d/src/3rd-party/cairo/doc/Makefile.am similarity index 100% rename from cairo/doc/Makefile.am rename to io2d/src/3rd-party/cairo/doc/Makefile.am diff --git a/cairo/doc/public/.gitignore b/io2d/src/3rd-party/cairo/doc/public/.gitignore similarity index 100% rename from cairo/doc/public/.gitignore rename to io2d/src/3rd-party/cairo/doc/public/.gitignore diff --git a/cairo/doc/public/Makefile.am b/io2d/src/3rd-party/cairo/doc/public/Makefile.am similarity index 100% rename from cairo/doc/public/Makefile.am rename to io2d/src/3rd-party/cairo/doc/public/Makefile.am diff --git a/cairo/doc/public/README b/io2d/src/3rd-party/cairo/doc/public/README similarity index 100% rename from cairo/doc/public/README rename to io2d/src/3rd-party/cairo/doc/public/README diff --git a/cairo/doc/public/cairo-docs.xml b/io2d/src/3rd-party/cairo/doc/public/cairo-docs.xml similarity index 100% rename from cairo/doc/public/cairo-docs.xml rename to io2d/src/3rd-party/cairo/doc/public/cairo-docs.xml diff --git a/cairo/doc/public/cairo-overrides.txt b/io2d/src/3rd-party/cairo/doc/public/cairo-overrides.txt similarity index 100% rename from cairo/doc/public/cairo-overrides.txt rename to io2d/src/3rd-party/cairo/doc/public/cairo-overrides.txt diff --git a/cairo/doc/public/cairo-sections.txt b/io2d/src/3rd-party/cairo/doc/public/cairo-sections.txt similarity index 100% rename from cairo/doc/public/cairo-sections.txt rename to io2d/src/3rd-party/cairo/doc/public/cairo-sections.txt diff --git a/cairo/doc/public/cairo.types b/io2d/src/3rd-party/cairo/doc/public/cairo.types similarity index 100% rename from cairo/doc/public/cairo.types rename to io2d/src/3rd-party/cairo/doc/public/cairo.types diff --git a/cairo/doc/public/check-doc-coverage.sh b/io2d/src/3rd-party/cairo/doc/public/check-doc-coverage.sh similarity index 100% rename from cairo/doc/public/check-doc-coverage.sh rename to io2d/src/3rd-party/cairo/doc/public/check-doc-coverage.sh diff --git a/cairo/doc/public/check-doc-syntax.sh b/io2d/src/3rd-party/cairo/doc/public/check-doc-syntax.sh similarity index 100% rename from cairo/doc/public/check-doc-syntax.sh rename to io2d/src/3rd-party/cairo/doc/public/check-doc-syntax.sh diff --git a/cairo/doc/public/language-bindings.xml b/io2d/src/3rd-party/cairo/doc/public/language-bindings.xml similarity index 100% rename from cairo/doc/public/language-bindings.xml rename to io2d/src/3rd-party/cairo/doc/public/language-bindings.xml diff --git a/cairo/doc/tutorial/slides/.gitignore b/io2d/src/3rd-party/cairo/doc/tutorial/slides/.gitignore similarity index 100% rename from cairo/doc/tutorial/slides/.gitignore rename to io2d/src/3rd-party/cairo/doc/tutorial/slides/.gitignore diff --git a/cairo/doc/tutorial/slides/Makefile b/io2d/src/3rd-party/cairo/doc/tutorial/slides/Makefile similarity index 100% rename from cairo/doc/tutorial/slides/Makefile rename to io2d/src/3rd-party/cairo/doc/tutorial/slides/Makefile diff --git a/cairo/doc/tutorial/slides/cairo-blank.svg b/io2d/src/3rd-party/cairo/doc/tutorial/slides/cairo-blank.svg similarity index 100% rename from cairo/doc/tutorial/slides/cairo-blank.svg rename to io2d/src/3rd-party/cairo/doc/tutorial/slides/cairo-blank.svg diff --git a/cairo/doc/tutorial/slides/cairo-code.svg b/io2d/src/3rd-party/cairo/doc/tutorial/slides/cairo-code.svg similarity index 100% rename from cairo/doc/tutorial/slides/cairo-code.svg rename to io2d/src/3rd-party/cairo/doc/tutorial/slides/cairo-code.svg diff --git a/cairo/doc/tutorial/slides/cairo-large-content.svg b/io2d/src/3rd-party/cairo/doc/tutorial/slides/cairo-large-content.svg similarity index 100% rename from cairo/doc/tutorial/slides/cairo-large-content.svg rename to io2d/src/3rd-party/cairo/doc/tutorial/slides/cairo-large-content.svg diff --git a/cairo/doc/tutorial/slides/cairo-separator.svg b/io2d/src/3rd-party/cairo/doc/tutorial/slides/cairo-separator.svg similarity index 100% rename from cairo/doc/tutorial/slides/cairo-separator.svg rename to io2d/src/3rd-party/cairo/doc/tutorial/slides/cairo-separator.svg diff --git a/cairo/doc/tutorial/slides/cairo-title.svg b/io2d/src/3rd-party/cairo/doc/tutorial/slides/cairo-title.svg similarity index 100% rename from cairo/doc/tutorial/slides/cairo-title.svg rename to io2d/src/3rd-party/cairo/doc/tutorial/slides/cairo-title.svg diff --git a/cairo/doc/tutorial/slides/cairo.svg b/io2d/src/3rd-party/cairo/doc/tutorial/slides/cairo.svg similarity index 100% rename from cairo/doc/tutorial/slides/cairo.svg rename to io2d/src/3rd-party/cairo/doc/tutorial/slides/cairo.svg diff --git a/cairo/doc/tutorial/slides/circle-cairo-large.png b/io2d/src/3rd-party/cairo/doc/tutorial/slides/circle-cairo-large.png similarity index 100% rename from cairo/doc/tutorial/slides/circle-cairo-large.png rename to io2d/src/3rd-party/cairo/doc/tutorial/slides/circle-cairo-large.png diff --git a/cairo/doc/tutorial/slides/circle-cairo.png b/io2d/src/3rd-party/cairo/doc/tutorial/slides/circle-cairo.png similarity index 100% rename from cairo/doc/tutorial/slides/circle-cairo.png rename to io2d/src/3rd-party/cairo/doc/tutorial/slides/circle-cairo.png diff --git a/cairo/doc/tutorial/slides/circle-ooo-large.png b/io2d/src/3rd-party/cairo/doc/tutorial/slides/circle-ooo-large.png similarity index 100% rename from cairo/doc/tutorial/slides/circle-ooo-large.png rename to io2d/src/3rd-party/cairo/doc/tutorial/slides/circle-ooo-large.png diff --git a/cairo/doc/tutorial/slides/circle-ooo.png b/io2d/src/3rd-party/cairo/doc/tutorial/slides/circle-ooo.png similarity index 100% rename from cairo/doc/tutorial/slides/circle-ooo.png rename to io2d/src/3rd-party/cairo/doc/tutorial/slides/circle-ooo.png diff --git a/cairo/doc/tutorial/slides/expander-fuzzy-large.png b/io2d/src/3rd-party/cairo/doc/tutorial/slides/expander-fuzzy-large.png similarity index 100% rename from cairo/doc/tutorial/slides/expander-fuzzy-large.png rename to io2d/src/3rd-party/cairo/doc/tutorial/slides/expander-fuzzy-large.png diff --git a/cairo/doc/tutorial/slides/expander-fuzzy.png b/io2d/src/3rd-party/cairo/doc/tutorial/slides/expander-fuzzy.png similarity index 100% rename from cairo/doc/tutorial/slides/expander-fuzzy.png rename to io2d/src/3rd-party/cairo/doc/tutorial/slides/expander-fuzzy.png diff --git a/cairo/doc/tutorial/slides/expander-sharp-large.png b/io2d/src/3rd-party/cairo/doc/tutorial/slides/expander-sharp-large.png similarity index 100% rename from cairo/doc/tutorial/slides/expander-sharp-large.png rename to io2d/src/3rd-party/cairo/doc/tutorial/slides/expander-sharp-large.png diff --git a/cairo/doc/tutorial/slides/expander-sharp.png b/io2d/src/3rd-party/cairo/doc/tutorial/slides/expander-sharp.png similarity index 100% rename from cairo/doc/tutorial/slides/expander-sharp.png rename to io2d/src/3rd-party/cairo/doc/tutorial/slides/expander-sharp.png diff --git a/cairo/doc/tutorial/slides/fuzzies.svg b/io2d/src/3rd-party/cairo/doc/tutorial/slides/fuzzies.svg similarity index 100% rename from cairo/doc/tutorial/slides/fuzzies.svg rename to io2d/src/3rd-party/cairo/doc/tutorial/slides/fuzzies.svg diff --git a/cairo/doc/tutorial/slides/jaggies.svg b/io2d/src/3rd-party/cairo/doc/tutorial/slides/jaggies.svg similarity index 100% rename from cairo/doc/tutorial/slides/jaggies.svg rename to io2d/src/3rd-party/cairo/doc/tutorial/slides/jaggies.svg diff --git a/cairo/doc/tutorial/slides/rendering-model.png b/io2d/src/3rd-party/cairo/doc/tutorial/slides/rendering-model.png similarity index 100% rename from cairo/doc/tutorial/slides/rendering-model.png rename to io2d/src/3rd-party/cairo/doc/tutorial/slides/rendering-model.png diff --git a/cairo/doc/tutorial/slides/tutorial.xml b/io2d/src/3rd-party/cairo/doc/tutorial/slides/tutorial.xml similarity index 100% rename from cairo/doc/tutorial/slides/tutorial.xml rename to io2d/src/3rd-party/cairo/doc/tutorial/slides/tutorial.xml diff --git a/cairo/doc/tutorial/src/.gitignore b/io2d/src/3rd-party/cairo/doc/tutorial/src/.gitignore similarity index 100% rename from cairo/doc/tutorial/src/.gitignore rename to io2d/src/3rd-party/cairo/doc/tutorial/src/.gitignore diff --git a/cairo/doc/tutorial/src/Makefile b/io2d/src/3rd-party/cairo/doc/tutorial/src/Makefile similarity index 100% rename from cairo/doc/tutorial/src/Makefile rename to io2d/src/3rd-party/cairo/doc/tutorial/src/Makefile diff --git a/cairo/doc/tutorial/src/README b/io2d/src/3rd-party/cairo/doc/tutorial/src/README similarity index 100% rename from cairo/doc/tutorial/src/README rename to io2d/src/3rd-party/cairo/doc/tutorial/src/README diff --git a/cairo/doc/tutorial/src/circle.c b/io2d/src/3rd-party/cairo/doc/tutorial/src/circle.c similarity index 100% rename from cairo/doc/tutorial/src/circle.c rename to io2d/src/3rd-party/cairo/doc/tutorial/src/circle.c diff --git a/cairo/doc/tutorial/src/include/cairo-tutorial-gtk.h b/io2d/src/3rd-party/cairo/doc/tutorial/src/include/cairo-tutorial-gtk.h similarity index 100% rename from cairo/doc/tutorial/src/include/cairo-tutorial-gtk.h rename to io2d/src/3rd-party/cairo/doc/tutorial/src/include/cairo-tutorial-gtk.h diff --git a/cairo/doc/tutorial/src/include/cairo-tutorial-pdf.h b/io2d/src/3rd-party/cairo/doc/tutorial/src/include/cairo-tutorial-pdf.h similarity index 100% rename from cairo/doc/tutorial/src/include/cairo-tutorial-pdf.h rename to io2d/src/3rd-party/cairo/doc/tutorial/src/include/cairo-tutorial-pdf.h diff --git a/cairo/doc/tutorial/src/include/cairo-tutorial-png.h b/io2d/src/3rd-party/cairo/doc/tutorial/src/include/cairo-tutorial-png.h similarity index 100% rename from cairo/doc/tutorial/src/include/cairo-tutorial-png.h rename to io2d/src/3rd-party/cairo/doc/tutorial/src/include/cairo-tutorial-png.h diff --git a/cairo/doc/tutorial/src/include/cairo-tutorial-xlib.h b/io2d/src/3rd-party/cairo/doc/tutorial/src/include/cairo-tutorial-xlib.h similarity index 100% rename from cairo/doc/tutorial/src/include/cairo-tutorial-xlib.h rename to io2d/src/3rd-party/cairo/doc/tutorial/src/include/cairo-tutorial-xlib.h diff --git a/cairo/doc/tutorial/src/include/cairo-tutorial.h b/io2d/src/3rd-party/cairo/doc/tutorial/src/include/cairo-tutorial.h similarity index 100% rename from cairo/doc/tutorial/src/include/cairo-tutorial.h rename to io2d/src/3rd-party/cairo/doc/tutorial/src/include/cairo-tutorial.h diff --git a/cairo/doc/tutorial/src/lca.c b/io2d/src/3rd-party/cairo/doc/tutorial/src/lca.c similarity index 100% rename from cairo/doc/tutorial/src/lca.c rename to io2d/src/3rd-party/cairo/doc/tutorial/src/lca.c diff --git a/cairo/doc/tutorial/src/singular.c b/io2d/src/3rd-party/cairo/doc/tutorial/src/singular.c similarity index 100% rename from cairo/doc/tutorial/src/singular.c rename to io2d/src/3rd-party/cairo/doc/tutorial/src/singular.c diff --git a/cairo/doc/tutorial/src/twin.c b/io2d/src/3rd-party/cairo/doc/tutorial/src/twin.c similarity index 100% rename from cairo/doc/tutorial/src/twin.c rename to io2d/src/3rd-party/cairo/doc/tutorial/src/twin.c diff --git a/cairo/perf/.gitignore b/io2d/src/3rd-party/cairo/perf/.gitignore similarity index 100% rename from cairo/perf/.gitignore rename to io2d/src/3rd-party/cairo/perf/.gitignore diff --git a/cairo/perf/COPYING b/io2d/src/3rd-party/cairo/perf/COPYING similarity index 100% rename from cairo/perf/COPYING rename to io2d/src/3rd-party/cairo/perf/COPYING diff --git a/cairo/perf/Makefile.am b/io2d/src/3rd-party/cairo/perf/Makefile.am similarity index 100% rename from cairo/perf/Makefile.am rename to io2d/src/3rd-party/cairo/perf/Makefile.am diff --git a/cairo/perf/Makefile.sources b/io2d/src/3rd-party/cairo/perf/Makefile.sources similarity index 100% rename from cairo/perf/Makefile.sources rename to io2d/src/3rd-party/cairo/perf/Makefile.sources diff --git a/cairo/perf/Makefile.win32 b/io2d/src/3rd-party/cairo/perf/Makefile.win32 similarity index 100% rename from cairo/perf/Makefile.win32 rename to io2d/src/3rd-party/cairo/perf/Makefile.win32 diff --git a/cairo/perf/README b/io2d/src/3rd-party/cairo/perf/README similarity index 100% rename from cairo/perf/README rename to io2d/src/3rd-party/cairo/perf/README diff --git a/cairo/perf/cairo-analyse-trace.c b/io2d/src/3rd-party/cairo/perf/cairo-analyse-trace.c similarity index 100% rename from cairo/perf/cairo-analyse-trace.c rename to io2d/src/3rd-party/cairo/perf/cairo-analyse-trace.c diff --git a/cairo/perf/cairo-perf-chart.c b/io2d/src/3rd-party/cairo/perf/cairo-perf-chart.c similarity index 100% rename from cairo/perf/cairo-perf-chart.c rename to io2d/src/3rd-party/cairo/perf/cairo-perf-chart.c diff --git a/cairo/perf/cairo-perf-compare-backends.c b/io2d/src/3rd-party/cairo/perf/cairo-perf-compare-backends.c similarity index 100% rename from cairo/perf/cairo-perf-compare-backends.c rename to io2d/src/3rd-party/cairo/perf/cairo-perf-compare-backends.c diff --git a/cairo/perf/cairo-perf-diff b/io2d/src/3rd-party/cairo/perf/cairo-perf-diff similarity index 100% rename from cairo/perf/cairo-perf-diff rename to io2d/src/3rd-party/cairo/perf/cairo-perf-diff diff --git a/cairo/perf/cairo-perf-diff-files.c b/io2d/src/3rd-party/cairo/perf/cairo-perf-diff-files.c similarity index 100% rename from cairo/perf/cairo-perf-diff-files.c rename to io2d/src/3rd-party/cairo/perf/cairo-perf-diff-files.c diff --git a/cairo/perf/cairo-perf-graph b/io2d/src/3rd-party/cairo/perf/cairo-perf-graph similarity index 100% rename from cairo/perf/cairo-perf-graph rename to io2d/src/3rd-party/cairo/perf/cairo-perf-graph diff --git a/cairo/perf/cairo-perf-graph-files.c b/io2d/src/3rd-party/cairo/perf/cairo-perf-graph-files.c similarity index 100% rename from cairo/perf/cairo-perf-graph-files.c rename to io2d/src/3rd-party/cairo/perf/cairo-perf-graph-files.c diff --git a/cairo/perf/cairo-perf-graph-widget.c b/io2d/src/3rd-party/cairo/perf/cairo-perf-graph-widget.c similarity index 100% rename from cairo/perf/cairo-perf-graph-widget.c rename to io2d/src/3rd-party/cairo/perf/cairo-perf-graph-widget.c diff --git a/cairo/perf/cairo-perf-graph.h b/io2d/src/3rd-party/cairo/perf/cairo-perf-graph.h similarity index 100% rename from cairo/perf/cairo-perf-graph.h rename to io2d/src/3rd-party/cairo/perf/cairo-perf-graph.h diff --git a/cairo/perf/cairo-perf-micro.c b/io2d/src/3rd-party/cairo/perf/cairo-perf-micro.c similarity index 100% rename from cairo/perf/cairo-perf-micro.c rename to io2d/src/3rd-party/cairo/perf/cairo-perf-micro.c diff --git a/cairo/perf/cairo-perf-print.c b/io2d/src/3rd-party/cairo/perf/cairo-perf-print.c similarity index 100% rename from cairo/perf/cairo-perf-print.c rename to io2d/src/3rd-party/cairo/perf/cairo-perf-print.c diff --git a/cairo/perf/cairo-perf-report.c b/io2d/src/3rd-party/cairo/perf/cairo-perf-report.c similarity index 100% rename from cairo/perf/cairo-perf-report.c rename to io2d/src/3rd-party/cairo/perf/cairo-perf-report.c diff --git a/cairo/perf/cairo-perf-trace.c b/io2d/src/3rd-party/cairo/perf/cairo-perf-trace.c similarity index 100% rename from cairo/perf/cairo-perf-trace.c rename to io2d/src/3rd-party/cairo/perf/cairo-perf-trace.c diff --git a/cairo/perf/cairo-perf.c b/io2d/src/3rd-party/cairo/perf/cairo-perf.c similarity index 100% rename from cairo/perf/cairo-perf.c rename to io2d/src/3rd-party/cairo/perf/cairo-perf.c diff --git a/cairo/perf/cairo-perf.h b/io2d/src/3rd-party/cairo/perf/cairo-perf.h similarity index 100% rename from cairo/perf/cairo-perf.h rename to io2d/src/3rd-party/cairo/perf/cairo-perf.h diff --git a/cairo/perf/cairo-stats.c b/io2d/src/3rd-party/cairo/perf/cairo-stats.c similarity index 100% rename from cairo/perf/cairo-stats.c rename to io2d/src/3rd-party/cairo/perf/cairo-stats.c diff --git a/cairo/perf/cairo-stats.h b/io2d/src/3rd-party/cairo/perf/cairo-stats.h similarity index 100% rename from cairo/perf/cairo-stats.h rename to io2d/src/3rd-party/cairo/perf/cairo-stats.h diff --git a/cairo/perf/dirent-win32.h b/io2d/src/3rd-party/cairo/perf/dirent-win32.h similarity index 100% rename from cairo/perf/dirent-win32.h rename to io2d/src/3rd-party/cairo/perf/dirent-win32.h diff --git a/cairo/perf/make-html.py b/io2d/src/3rd-party/cairo/perf/make-html.py similarity index 100% rename from cairo/perf/make-html.py rename to io2d/src/3rd-party/cairo/perf/make-html.py diff --git a/cairo/perf/micro/Makefile.am b/io2d/src/3rd-party/cairo/perf/micro/Makefile.am similarity index 100% rename from cairo/perf/micro/Makefile.am rename to io2d/src/3rd-party/cairo/perf/micro/Makefile.am diff --git a/cairo/perf/micro/Makefile.sources b/io2d/src/3rd-party/cairo/perf/micro/Makefile.sources similarity index 100% rename from cairo/perf/micro/Makefile.sources rename to io2d/src/3rd-party/cairo/perf/micro/Makefile.sources diff --git a/cairo/perf/micro/Makefile.win32 b/io2d/src/3rd-party/cairo/perf/micro/Makefile.win32 similarity index 100% rename from cairo/perf/micro/Makefile.win32 rename to io2d/src/3rd-party/cairo/perf/micro/Makefile.win32 diff --git a/cairo/perf/micro/a1-curve.c b/io2d/src/3rd-party/cairo/perf/micro/a1-curve.c similarity index 100% rename from cairo/perf/micro/a1-curve.c rename to io2d/src/3rd-party/cairo/perf/micro/a1-curve.c diff --git a/cairo/perf/micro/a1-line.c b/io2d/src/3rd-party/cairo/perf/micro/a1-line.c similarity index 100% rename from cairo/perf/micro/a1-line.c rename to io2d/src/3rd-party/cairo/perf/micro/a1-line.c diff --git a/cairo/perf/micro/box-outline.c b/io2d/src/3rd-party/cairo/perf/micro/box-outline.c similarity index 100% rename from cairo/perf/micro/box-outline.c rename to io2d/src/3rd-party/cairo/perf/micro/box-outline.c diff --git a/cairo/perf/micro/cairo-perf-cover.c b/io2d/src/3rd-party/cairo/perf/micro/cairo-perf-cover.c similarity index 100% rename from cairo/perf/micro/cairo-perf-cover.c rename to io2d/src/3rd-party/cairo/perf/micro/cairo-perf-cover.c diff --git a/cairo/perf/micro/composite-checker.c b/io2d/src/3rd-party/cairo/perf/micro/composite-checker.c similarity index 100% rename from cairo/perf/micro/composite-checker.c rename to io2d/src/3rd-party/cairo/perf/micro/composite-checker.c diff --git a/cairo/perf/micro/curve.c b/io2d/src/3rd-party/cairo/perf/micro/curve.c similarity index 100% rename from cairo/perf/micro/curve.c rename to io2d/src/3rd-party/cairo/perf/micro/curve.c diff --git a/cairo/perf/micro/disjoint.c b/io2d/src/3rd-party/cairo/perf/micro/disjoint.c similarity index 100% rename from cairo/perf/micro/disjoint.c rename to io2d/src/3rd-party/cairo/perf/micro/disjoint.c diff --git a/cairo/perf/micro/dragon.c b/io2d/src/3rd-party/cairo/perf/micro/dragon.c similarity index 100% rename from cairo/perf/micro/dragon.c rename to io2d/src/3rd-party/cairo/perf/micro/dragon.c diff --git a/cairo/perf/micro/fill-clip.c b/io2d/src/3rd-party/cairo/perf/micro/fill-clip.c similarity index 100% rename from cairo/perf/micro/fill-clip.c rename to io2d/src/3rd-party/cairo/perf/micro/fill-clip.c diff --git a/cairo/perf/micro/fill.c b/io2d/src/3rd-party/cairo/perf/micro/fill.c similarity index 100% rename from cairo/perf/micro/fill.c rename to io2d/src/3rd-party/cairo/perf/micro/fill.c diff --git a/cairo/perf/micro/glyphs.c b/io2d/src/3rd-party/cairo/perf/micro/glyphs.c similarity index 100% rename from cairo/perf/micro/glyphs.c rename to io2d/src/3rd-party/cairo/perf/micro/glyphs.c diff --git a/cairo/perf/micro/hash-table.c b/io2d/src/3rd-party/cairo/perf/micro/hash-table.c similarity index 100% rename from cairo/perf/micro/hash-table.c rename to io2d/src/3rd-party/cairo/perf/micro/hash-table.c diff --git a/cairo/perf/micro/hatching.c b/io2d/src/3rd-party/cairo/perf/micro/hatching.c similarity index 100% rename from cairo/perf/micro/hatching.c rename to io2d/src/3rd-party/cairo/perf/micro/hatching.c diff --git a/cairo/perf/micro/intersections.c b/io2d/src/3rd-party/cairo/perf/micro/intersections.c similarity index 100% rename from cairo/perf/micro/intersections.c rename to io2d/src/3rd-party/cairo/perf/micro/intersections.c diff --git a/cairo/perf/micro/line.c b/io2d/src/3rd-party/cairo/perf/micro/line.c similarity index 100% rename from cairo/perf/micro/line.c rename to io2d/src/3rd-party/cairo/perf/micro/line.c diff --git a/cairo/perf/micro/long-dashed-lines.c b/io2d/src/3rd-party/cairo/perf/micro/long-dashed-lines.c similarity index 100% rename from cairo/perf/micro/long-dashed-lines.c rename to io2d/src/3rd-party/cairo/perf/micro/long-dashed-lines.c diff --git a/cairo/perf/micro/long-lines.c b/io2d/src/3rd-party/cairo/perf/micro/long-lines.c similarity index 100% rename from cairo/perf/micro/long-lines.c rename to io2d/src/3rd-party/cairo/perf/micro/long-lines.c diff --git a/cairo/perf/micro/many-curves.c b/io2d/src/3rd-party/cairo/perf/micro/many-curves.c similarity index 100% rename from cairo/perf/micro/many-curves.c rename to io2d/src/3rd-party/cairo/perf/micro/many-curves.c diff --git a/cairo/perf/micro/many-fills.c b/io2d/src/3rd-party/cairo/perf/micro/many-fills.c similarity index 100% rename from cairo/perf/micro/many-fills.c rename to io2d/src/3rd-party/cairo/perf/micro/many-fills.c diff --git a/cairo/perf/micro/many-strokes.c b/io2d/src/3rd-party/cairo/perf/micro/many-strokes.c similarity index 100% rename from cairo/perf/micro/many-strokes.c rename to io2d/src/3rd-party/cairo/perf/micro/many-strokes.c diff --git a/cairo/perf/micro/mask.c b/io2d/src/3rd-party/cairo/perf/micro/mask.c similarity index 100% rename from cairo/perf/micro/mask.c rename to io2d/src/3rd-party/cairo/perf/micro/mask.c diff --git a/cairo/perf/micro/mosaic.c b/io2d/src/3rd-party/cairo/perf/micro/mosaic.c similarity index 100% rename from cairo/perf/micro/mosaic.c rename to io2d/src/3rd-party/cairo/perf/micro/mosaic.c diff --git a/cairo/perf/micro/mosaic.h b/io2d/src/3rd-party/cairo/perf/micro/mosaic.h similarity index 100% rename from cairo/perf/micro/mosaic.h rename to io2d/src/3rd-party/cairo/perf/micro/mosaic.h diff --git a/cairo/perf/micro/paint-with-alpha.c b/io2d/src/3rd-party/cairo/perf/micro/paint-with-alpha.c similarity index 100% rename from cairo/perf/micro/paint-with-alpha.c rename to io2d/src/3rd-party/cairo/perf/micro/paint-with-alpha.c diff --git a/cairo/perf/micro/paint.c b/io2d/src/3rd-party/cairo/perf/micro/paint.c similarity index 100% rename from cairo/perf/micro/paint.c rename to io2d/src/3rd-party/cairo/perf/micro/paint.c diff --git a/cairo/perf/micro/pattern_create_radial.c b/io2d/src/3rd-party/cairo/perf/micro/pattern_create_radial.c similarity index 100% rename from cairo/perf/micro/pattern_create_radial.c rename to io2d/src/3rd-party/cairo/perf/micro/pattern_create_radial.c diff --git a/cairo/perf/micro/pixel.c b/io2d/src/3rd-party/cairo/perf/micro/pixel.c similarity index 100% rename from cairo/perf/micro/pixel.c rename to io2d/src/3rd-party/cairo/perf/micro/pixel.c diff --git a/cairo/perf/micro/pythagoras-tree.c b/io2d/src/3rd-party/cairo/perf/micro/pythagoras-tree.c similarity index 100% rename from cairo/perf/micro/pythagoras-tree.c rename to io2d/src/3rd-party/cairo/perf/micro/pythagoras-tree.c diff --git a/cairo/perf/micro/rectangles.c b/io2d/src/3rd-party/cairo/perf/micro/rectangles.c similarity index 100% rename from cairo/perf/micro/rectangles.c rename to io2d/src/3rd-party/cairo/perf/micro/rectangles.c diff --git a/cairo/perf/micro/rounded-rectangles.c b/io2d/src/3rd-party/cairo/perf/micro/rounded-rectangles.c similarity index 100% rename from cairo/perf/micro/rounded-rectangles.c rename to io2d/src/3rd-party/cairo/perf/micro/rounded-rectangles.c diff --git a/cairo/perf/micro/sierpinski.c b/io2d/src/3rd-party/cairo/perf/micro/sierpinski.c similarity index 100% rename from cairo/perf/micro/sierpinski.c rename to io2d/src/3rd-party/cairo/perf/micro/sierpinski.c diff --git a/cairo/perf/micro/spiral.c b/io2d/src/3rd-party/cairo/perf/micro/spiral.c similarity index 100% rename from cairo/perf/micro/spiral.c rename to io2d/src/3rd-party/cairo/perf/micro/spiral.c diff --git a/cairo/perf/micro/stroke.c b/io2d/src/3rd-party/cairo/perf/micro/stroke.c similarity index 100% rename from cairo/perf/micro/stroke.c rename to io2d/src/3rd-party/cairo/perf/micro/stroke.c diff --git a/cairo/perf/micro/subimage_copy.c b/io2d/src/3rd-party/cairo/perf/micro/subimage_copy.c similarity index 100% rename from cairo/perf/micro/subimage_copy.c rename to io2d/src/3rd-party/cairo/perf/micro/subimage_copy.c diff --git a/cairo/perf/micro/tessellate.c b/io2d/src/3rd-party/cairo/perf/micro/tessellate.c similarity index 100% rename from cairo/perf/micro/tessellate.c rename to io2d/src/3rd-party/cairo/perf/micro/tessellate.c diff --git a/cairo/perf/micro/text.c b/io2d/src/3rd-party/cairo/perf/micro/text.c similarity index 100% rename from cairo/perf/micro/text.c rename to io2d/src/3rd-party/cairo/perf/micro/text.c diff --git a/cairo/perf/micro/tiger.c b/io2d/src/3rd-party/cairo/perf/micro/tiger.c similarity index 100% rename from cairo/perf/micro/tiger.c rename to io2d/src/3rd-party/cairo/perf/micro/tiger.c diff --git a/cairo/perf/micro/twin.c b/io2d/src/3rd-party/cairo/perf/micro/twin.c similarity index 100% rename from cairo/perf/micro/twin.c rename to io2d/src/3rd-party/cairo/perf/micro/twin.c diff --git a/cairo/perf/micro/unaligned-clip.c b/io2d/src/3rd-party/cairo/perf/micro/unaligned-clip.c similarity index 100% rename from cairo/perf/micro/unaligned-clip.c rename to io2d/src/3rd-party/cairo/perf/micro/unaligned-clip.c diff --git a/cairo/perf/micro/wave.c b/io2d/src/3rd-party/cairo/perf/micro/wave.c similarity index 100% rename from cairo/perf/micro/wave.c rename to io2d/src/3rd-party/cairo/perf/micro/wave.c diff --git a/cairo/perf/micro/wide-fills.c b/io2d/src/3rd-party/cairo/perf/micro/wide-fills.c similarity index 100% rename from cairo/perf/micro/wide-fills.c rename to io2d/src/3rd-party/cairo/perf/micro/wide-fills.c diff --git a/cairo/perf/micro/wide-strokes.c b/io2d/src/3rd-party/cairo/perf/micro/wide-strokes.c similarity index 100% rename from cairo/perf/micro/wide-strokes.c rename to io2d/src/3rd-party/cairo/perf/micro/wide-strokes.c diff --git a/cairo/perf/micro/world-map.c b/io2d/src/3rd-party/cairo/perf/micro/world-map.c similarity index 100% rename from cairo/perf/micro/world-map.c rename to io2d/src/3rd-party/cairo/perf/micro/world-map.c diff --git a/cairo/perf/micro/world-map.h b/io2d/src/3rd-party/cairo/perf/micro/world-map.h similarity index 100% rename from cairo/perf/micro/world-map.h rename to io2d/src/3rd-party/cairo/perf/micro/world-map.h diff --git a/cairo/perf/micro/zrusin-another.h b/io2d/src/3rd-party/cairo/perf/micro/zrusin-another.h similarity index 100% rename from cairo/perf/micro/zrusin-another.h rename to io2d/src/3rd-party/cairo/perf/micro/zrusin-another.h diff --git a/cairo/perf/micro/zrusin.c b/io2d/src/3rd-party/cairo/perf/micro/zrusin.c similarity index 100% rename from cairo/perf/micro/zrusin.c rename to io2d/src/3rd-party/cairo/perf/micro/zrusin.c diff --git a/cairo/src/.gitignore b/io2d/src/3rd-party/cairo/src/.gitignore similarity index 100% rename from cairo/src/.gitignore rename to io2d/src/3rd-party/cairo/src/.gitignore diff --git a/cairo/src/Makefile.am b/io2d/src/3rd-party/cairo/src/Makefile.am similarity index 100% rename from cairo/src/Makefile.am rename to io2d/src/3rd-party/cairo/src/Makefile.am diff --git a/cairo/src/Makefile.am.analysis b/io2d/src/3rd-party/cairo/src/Makefile.am.analysis similarity index 100% rename from cairo/src/Makefile.am.analysis rename to io2d/src/3rd-party/cairo/src/Makefile.am.analysis diff --git a/cairo/src/Makefile.sources b/io2d/src/3rd-party/cairo/src/Makefile.sources similarity index 100% rename from cairo/src/Makefile.sources rename to io2d/src/3rd-party/cairo/src/Makefile.sources diff --git a/cairo/src/Makefile.win32 b/io2d/src/3rd-party/cairo/src/Makefile.win32 similarity index 100% rename from cairo/src/Makefile.win32 rename to io2d/src/3rd-party/cairo/src/Makefile.win32 diff --git a/cairo/src/Makefile.win32.features b/io2d/src/3rd-party/cairo/src/Makefile.win32.features similarity index 100% rename from cairo/src/Makefile.win32.features rename to io2d/src/3rd-party/cairo/src/Makefile.win32.features diff --git a/cairo/src/README b/io2d/src/3rd-party/cairo/src/README similarity index 100% rename from cairo/src/README rename to io2d/src/3rd-party/cairo/src/README diff --git a/cairo/src/cairo-analysis-surface-private.h b/io2d/src/3rd-party/cairo/src/cairo-analysis-surface-private.h similarity index 100% rename from cairo/src/cairo-analysis-surface-private.h rename to io2d/src/3rd-party/cairo/src/cairo-analysis-surface-private.h diff --git a/cairo/src/cairo-analysis-surface.c b/io2d/src/3rd-party/cairo/src/cairo-analysis-surface.c similarity index 100% rename from cairo/src/cairo-analysis-surface.c rename to io2d/src/3rd-party/cairo/src/cairo-analysis-surface.c diff --git a/cairo/src/cairo-arc-private.h b/io2d/src/3rd-party/cairo/src/cairo-arc-private.h similarity index 100% rename from cairo/src/cairo-arc-private.h rename to io2d/src/3rd-party/cairo/src/cairo-arc-private.h diff --git a/cairo/src/cairo-arc.c b/io2d/src/3rd-party/cairo/src/cairo-arc.c similarity index 100% rename from cairo/src/cairo-arc.c rename to io2d/src/3rd-party/cairo/src/cairo-arc.c diff --git a/cairo/src/cairo-array-private.h b/io2d/src/3rd-party/cairo/src/cairo-array-private.h similarity index 100% rename from cairo/src/cairo-array-private.h rename to io2d/src/3rd-party/cairo/src/cairo-array-private.h diff --git a/cairo/src/cairo-array.c b/io2d/src/3rd-party/cairo/src/cairo-array.c similarity index 100% rename from cairo/src/cairo-array.c rename to io2d/src/3rd-party/cairo/src/cairo-array.c diff --git a/cairo/src/cairo-atomic-private.h b/io2d/src/3rd-party/cairo/src/cairo-atomic-private.h similarity index 100% rename from cairo/src/cairo-atomic-private.h rename to io2d/src/3rd-party/cairo/src/cairo-atomic-private.h diff --git a/cairo/src/cairo-atomic.c b/io2d/src/3rd-party/cairo/src/cairo-atomic.c similarity index 100% rename from cairo/src/cairo-atomic.c rename to io2d/src/3rd-party/cairo/src/cairo-atomic.c diff --git a/cairo/src/cairo-backend-private.h b/io2d/src/3rd-party/cairo/src/cairo-backend-private.h similarity index 100% rename from cairo/src/cairo-backend-private.h rename to io2d/src/3rd-party/cairo/src/cairo-backend-private.h diff --git a/cairo/src/cairo-base64-stream.c b/io2d/src/3rd-party/cairo/src/cairo-base64-stream.c similarity index 100% rename from cairo/src/cairo-base64-stream.c rename to io2d/src/3rd-party/cairo/src/cairo-base64-stream.c diff --git a/cairo/src/cairo-base85-stream.c b/io2d/src/3rd-party/cairo/src/cairo-base85-stream.c similarity index 100% rename from cairo/src/cairo-base85-stream.c rename to io2d/src/3rd-party/cairo/src/cairo-base85-stream.c diff --git a/cairo/src/cairo-bentley-ottmann-rectangular.c b/io2d/src/3rd-party/cairo/src/cairo-bentley-ottmann-rectangular.c similarity index 100% rename from cairo/src/cairo-bentley-ottmann-rectangular.c rename to io2d/src/3rd-party/cairo/src/cairo-bentley-ottmann-rectangular.c diff --git a/cairo/src/cairo-bentley-ottmann-rectilinear.c b/io2d/src/3rd-party/cairo/src/cairo-bentley-ottmann-rectilinear.c similarity index 100% rename from cairo/src/cairo-bentley-ottmann-rectilinear.c rename to io2d/src/3rd-party/cairo/src/cairo-bentley-ottmann-rectilinear.c diff --git a/cairo/src/cairo-bentley-ottmann.c b/io2d/src/3rd-party/cairo/src/cairo-bentley-ottmann.c similarity index 100% rename from cairo/src/cairo-bentley-ottmann.c rename to io2d/src/3rd-party/cairo/src/cairo-bentley-ottmann.c diff --git a/cairo/src/cairo-beos-surface.cpp b/io2d/src/3rd-party/cairo/src/cairo-beos-surface.cpp similarity index 100% rename from cairo/src/cairo-beos-surface.cpp rename to io2d/src/3rd-party/cairo/src/cairo-beos-surface.cpp diff --git a/cairo/src/cairo-beos.h b/io2d/src/3rd-party/cairo/src/cairo-beos.h similarity index 100% rename from cairo/src/cairo-beos.h rename to io2d/src/3rd-party/cairo/src/cairo-beos.h diff --git a/cairo/src/cairo-botor-scan-converter.c b/io2d/src/3rd-party/cairo/src/cairo-botor-scan-converter.c similarity index 100% rename from cairo/src/cairo-botor-scan-converter.c rename to io2d/src/3rd-party/cairo/src/cairo-botor-scan-converter.c diff --git a/cairo/src/cairo-box-inline.h b/io2d/src/3rd-party/cairo/src/cairo-box-inline.h similarity index 100% rename from cairo/src/cairo-box-inline.h rename to io2d/src/3rd-party/cairo/src/cairo-box-inline.h diff --git a/cairo/src/cairo-boxes-intersect.c b/io2d/src/3rd-party/cairo/src/cairo-boxes-intersect.c similarity index 100% rename from cairo/src/cairo-boxes-intersect.c rename to io2d/src/3rd-party/cairo/src/cairo-boxes-intersect.c diff --git a/cairo/src/cairo-boxes-private.h b/io2d/src/3rd-party/cairo/src/cairo-boxes-private.h similarity index 100% rename from cairo/src/cairo-boxes-private.h rename to io2d/src/3rd-party/cairo/src/cairo-boxes-private.h diff --git a/cairo/src/cairo-boxes.c b/io2d/src/3rd-party/cairo/src/cairo-boxes.c similarity index 100% rename from cairo/src/cairo-boxes.c rename to io2d/src/3rd-party/cairo/src/cairo-boxes.c diff --git a/cairo/src/cairo-cache-private.h b/io2d/src/3rd-party/cairo/src/cairo-cache-private.h similarity index 100% rename from cairo/src/cairo-cache-private.h rename to io2d/src/3rd-party/cairo/src/cairo-cache-private.h diff --git a/cairo/src/cairo-cache.c b/io2d/src/3rd-party/cairo/src/cairo-cache.c similarity index 100% rename from cairo/src/cairo-cache.c rename to io2d/src/3rd-party/cairo/src/cairo-cache.c diff --git a/cairo/src/cairo-cff-subset.c b/io2d/src/3rd-party/cairo/src/cairo-cff-subset.c similarity index 100% rename from cairo/src/cairo-cff-subset.c rename to io2d/src/3rd-party/cairo/src/cairo-cff-subset.c diff --git a/cairo/src/cairo-clip-boxes.c b/io2d/src/3rd-party/cairo/src/cairo-clip-boxes.c similarity index 100% rename from cairo/src/cairo-clip-boxes.c rename to io2d/src/3rd-party/cairo/src/cairo-clip-boxes.c diff --git a/cairo/src/cairo-clip-inline.h b/io2d/src/3rd-party/cairo/src/cairo-clip-inline.h similarity index 100% rename from cairo/src/cairo-clip-inline.h rename to io2d/src/3rd-party/cairo/src/cairo-clip-inline.h diff --git a/cairo/src/cairo-clip-polygon.c b/io2d/src/3rd-party/cairo/src/cairo-clip-polygon.c similarity index 100% rename from cairo/src/cairo-clip-polygon.c rename to io2d/src/3rd-party/cairo/src/cairo-clip-polygon.c diff --git a/cairo/src/cairo-clip-private.h b/io2d/src/3rd-party/cairo/src/cairo-clip-private.h similarity index 100% rename from cairo/src/cairo-clip-private.h rename to io2d/src/3rd-party/cairo/src/cairo-clip-private.h diff --git a/cairo/src/cairo-clip-region.c b/io2d/src/3rd-party/cairo/src/cairo-clip-region.c similarity index 100% rename from cairo/src/cairo-clip-region.c rename to io2d/src/3rd-party/cairo/src/cairo-clip-region.c diff --git a/cairo/src/cairo-clip-surface.c b/io2d/src/3rd-party/cairo/src/cairo-clip-surface.c similarity index 100% rename from cairo/src/cairo-clip-surface.c rename to io2d/src/3rd-party/cairo/src/cairo-clip-surface.c diff --git a/cairo/src/cairo-clip-tor-scan-converter.c b/io2d/src/3rd-party/cairo/src/cairo-clip-tor-scan-converter.c similarity index 100% rename from cairo/src/cairo-clip-tor-scan-converter.c rename to io2d/src/3rd-party/cairo/src/cairo-clip-tor-scan-converter.c diff --git a/cairo/src/cairo-clip.c b/io2d/src/3rd-party/cairo/src/cairo-clip.c similarity index 100% rename from cairo/src/cairo-clip.c rename to io2d/src/3rd-party/cairo/src/cairo-clip.c diff --git a/cairo/src/cairo-cogl-context-private.h b/io2d/src/3rd-party/cairo/src/cairo-cogl-context-private.h similarity index 100% rename from cairo/src/cairo-cogl-context-private.h rename to io2d/src/3rd-party/cairo/src/cairo-cogl-context-private.h diff --git a/cairo/src/cairo-cogl-context.c b/io2d/src/3rd-party/cairo/src/cairo-cogl-context.c similarity index 100% rename from cairo/src/cairo-cogl-context.c rename to io2d/src/3rd-party/cairo/src/cairo-cogl-context.c diff --git a/cairo/src/cairo-cogl-gradient-private.h b/io2d/src/3rd-party/cairo/src/cairo-cogl-gradient-private.h similarity index 100% rename from cairo/src/cairo-cogl-gradient-private.h rename to io2d/src/3rd-party/cairo/src/cairo-cogl-gradient-private.h diff --git a/cairo/src/cairo-cogl-gradient.c b/io2d/src/3rd-party/cairo/src/cairo-cogl-gradient.c similarity index 100% rename from cairo/src/cairo-cogl-gradient.c rename to io2d/src/3rd-party/cairo/src/cairo-cogl-gradient.c diff --git a/cairo/src/cairo-cogl-private.h b/io2d/src/3rd-party/cairo/src/cairo-cogl-private.h similarity index 100% rename from cairo/src/cairo-cogl-private.h rename to io2d/src/3rd-party/cairo/src/cairo-cogl-private.h diff --git a/cairo/src/cairo-cogl-surface.c b/io2d/src/3rd-party/cairo/src/cairo-cogl-surface.c similarity index 100% rename from cairo/src/cairo-cogl-surface.c rename to io2d/src/3rd-party/cairo/src/cairo-cogl-surface.c diff --git a/cairo/src/cairo-cogl-utils-private.h b/io2d/src/3rd-party/cairo/src/cairo-cogl-utils-private.h similarity index 100% rename from cairo/src/cairo-cogl-utils-private.h rename to io2d/src/3rd-party/cairo/src/cairo-cogl-utils-private.h diff --git a/cairo/src/cairo-cogl-utils.c b/io2d/src/3rd-party/cairo/src/cairo-cogl-utils.c similarity index 100% rename from cairo/src/cairo-cogl-utils.c rename to io2d/src/3rd-party/cairo/src/cairo-cogl-utils.c diff --git a/cairo/src/cairo-cogl.h b/io2d/src/3rd-party/cairo/src/cairo-cogl.h similarity index 100% rename from cairo/src/cairo-cogl.h rename to io2d/src/3rd-party/cairo/src/cairo-cogl.h diff --git a/cairo/src/cairo-color.c b/io2d/src/3rd-party/cairo/src/cairo-color.c similarity index 100% rename from cairo/src/cairo-color.c rename to io2d/src/3rd-party/cairo/src/cairo-color.c diff --git a/cairo/src/cairo-combsort-inline.h b/io2d/src/3rd-party/cairo/src/cairo-combsort-inline.h similarity index 100% rename from cairo/src/cairo-combsort-inline.h rename to io2d/src/3rd-party/cairo/src/cairo-combsort-inline.h diff --git a/cairo/src/cairo-compiler-private.h b/io2d/src/3rd-party/cairo/src/cairo-compiler-private.h similarity index 100% rename from cairo/src/cairo-compiler-private.h rename to io2d/src/3rd-party/cairo/src/cairo-compiler-private.h diff --git a/cairo/src/cairo-composite-rectangles-private.h b/io2d/src/3rd-party/cairo/src/cairo-composite-rectangles-private.h similarity index 100% rename from cairo/src/cairo-composite-rectangles-private.h rename to io2d/src/3rd-party/cairo/src/cairo-composite-rectangles-private.h diff --git a/cairo/src/cairo-composite-rectangles.c b/io2d/src/3rd-party/cairo/src/cairo-composite-rectangles.c similarity index 100% rename from cairo/src/cairo-composite-rectangles.c rename to io2d/src/3rd-party/cairo/src/cairo-composite-rectangles.c diff --git a/cairo/src/cairo-compositor-private.h b/io2d/src/3rd-party/cairo/src/cairo-compositor-private.h similarity index 100% rename from cairo/src/cairo-compositor-private.h rename to io2d/src/3rd-party/cairo/src/cairo-compositor-private.h diff --git a/cairo/src/cairo-compositor.c b/io2d/src/3rd-party/cairo/src/cairo-compositor.c similarity index 100% rename from cairo/src/cairo-compositor.c rename to io2d/src/3rd-party/cairo/src/cairo-compositor.c diff --git a/cairo/src/cairo-contour-inline.h b/io2d/src/3rd-party/cairo/src/cairo-contour-inline.h similarity index 100% rename from cairo/src/cairo-contour-inline.h rename to io2d/src/3rd-party/cairo/src/cairo-contour-inline.h diff --git a/cairo/src/cairo-contour-private.h b/io2d/src/3rd-party/cairo/src/cairo-contour-private.h similarity index 100% rename from cairo/src/cairo-contour-private.h rename to io2d/src/3rd-party/cairo/src/cairo-contour-private.h diff --git a/cairo/src/cairo-contour.c b/io2d/src/3rd-party/cairo/src/cairo-contour.c similarity index 100% rename from cairo/src/cairo-contour.c rename to io2d/src/3rd-party/cairo/src/cairo-contour.c diff --git a/cairo/src/cairo-damage-private.h b/io2d/src/3rd-party/cairo/src/cairo-damage-private.h similarity index 100% rename from cairo/src/cairo-damage-private.h rename to io2d/src/3rd-party/cairo/src/cairo-damage-private.h diff --git a/cairo/src/cairo-damage.c b/io2d/src/3rd-party/cairo/src/cairo-damage.c similarity index 100% rename from cairo/src/cairo-damage.c rename to io2d/src/3rd-party/cairo/src/cairo-damage.c diff --git a/cairo/src/cairo-debug.c b/io2d/src/3rd-party/cairo/src/cairo-debug.c similarity index 100% rename from cairo/src/cairo-debug.c rename to io2d/src/3rd-party/cairo/src/cairo-debug.c diff --git a/cairo/src/cairo-default-context-private.h b/io2d/src/3rd-party/cairo/src/cairo-default-context-private.h similarity index 100% rename from cairo/src/cairo-default-context-private.h rename to io2d/src/3rd-party/cairo/src/cairo-default-context-private.h diff --git a/cairo/src/cairo-default-context.c b/io2d/src/3rd-party/cairo/src/cairo-default-context.c similarity index 100% rename from cairo/src/cairo-default-context.c rename to io2d/src/3rd-party/cairo/src/cairo-default-context.c diff --git a/cairo/src/cairo-deflate-stream.c b/io2d/src/3rd-party/cairo/src/cairo-deflate-stream.c similarity index 100% rename from cairo/src/cairo-deflate-stream.c rename to io2d/src/3rd-party/cairo/src/cairo-deflate-stream.c diff --git a/N3888_RefImpl/src/win32/include/cairo-deprecated.h b/io2d/src/3rd-party/cairo/src/cairo-deprecated.h similarity index 100% rename from N3888_RefImpl/src/win32/include/cairo-deprecated.h rename to io2d/src/3rd-party/cairo/src/cairo-deprecated.h diff --git a/cairo/src/cairo-device-private.h b/io2d/src/3rd-party/cairo/src/cairo-device-private.h similarity index 100% rename from cairo/src/cairo-device-private.h rename to io2d/src/3rd-party/cairo/src/cairo-device-private.h diff --git a/cairo/src/cairo-device.c b/io2d/src/3rd-party/cairo/src/cairo-device.c similarity index 100% rename from cairo/src/cairo-device.c rename to io2d/src/3rd-party/cairo/src/cairo-device.c diff --git a/cairo/src/cairo-directfb-surface.c b/io2d/src/3rd-party/cairo/src/cairo-directfb-surface.c similarity index 100% rename from cairo/src/cairo-directfb-surface.c rename to io2d/src/3rd-party/cairo/src/cairo-directfb-surface.c diff --git a/cairo/src/cairo-directfb.h b/io2d/src/3rd-party/cairo/src/cairo-directfb.h similarity index 100% rename from cairo/src/cairo-directfb.h rename to io2d/src/3rd-party/cairo/src/cairo-directfb.h diff --git a/cairo/src/cairo-drm.h b/io2d/src/3rd-party/cairo/src/cairo-drm.h similarity index 100% rename from cairo/src/cairo-drm.h rename to io2d/src/3rd-party/cairo/src/cairo-drm.h diff --git a/cairo/src/cairo-egl-context.c b/io2d/src/3rd-party/cairo/src/cairo-egl-context.c similarity index 100% rename from cairo/src/cairo-egl-context.c rename to io2d/src/3rd-party/cairo/src/cairo-egl-context.c diff --git a/cairo/src/cairo-error-inline.h b/io2d/src/3rd-party/cairo/src/cairo-error-inline.h similarity index 100% rename from cairo/src/cairo-error-inline.h rename to io2d/src/3rd-party/cairo/src/cairo-error-inline.h diff --git a/cairo/src/cairo-error-private.h b/io2d/src/3rd-party/cairo/src/cairo-error-private.h similarity index 100% rename from cairo/src/cairo-error-private.h rename to io2d/src/3rd-party/cairo/src/cairo-error-private.h diff --git a/cairo/src/cairo-error.c b/io2d/src/3rd-party/cairo/src/cairo-error.c similarity index 100% rename from cairo/src/cairo-error.c rename to io2d/src/3rd-party/cairo/src/cairo-error.c diff --git a/cairo/src/cairo-fallback-compositor.c b/io2d/src/3rd-party/cairo/src/cairo-fallback-compositor.c similarity index 100% rename from cairo/src/cairo-fallback-compositor.c rename to io2d/src/3rd-party/cairo/src/cairo-fallback-compositor.c diff --git a/cairo/src/cairo-features-uninstalled.pc.in b/io2d/src/3rd-party/cairo/src/cairo-features-uninstalled.pc.in similarity index 100% rename from cairo/src/cairo-features-uninstalled.pc.in rename to io2d/src/3rd-party/cairo/src/cairo-features-uninstalled.pc.in diff --git a/cairo/src/cairo-features.pc.in b/io2d/src/3rd-party/cairo/src/cairo-features.pc.in similarity index 100% rename from cairo/src/cairo-features.pc.in rename to io2d/src/3rd-party/cairo/src/cairo-features.pc.in diff --git a/cairo/src/cairo-fixed-private.h b/io2d/src/3rd-party/cairo/src/cairo-fixed-private.h similarity index 100% rename from cairo/src/cairo-fixed-private.h rename to io2d/src/3rd-party/cairo/src/cairo-fixed-private.h diff --git a/cairo/src/cairo-fixed-type-private.h b/io2d/src/3rd-party/cairo/src/cairo-fixed-type-private.h similarity index 100% rename from cairo/src/cairo-fixed-type-private.h rename to io2d/src/3rd-party/cairo/src/cairo-fixed-type-private.h diff --git a/cairo/src/cairo-fixed.c b/io2d/src/3rd-party/cairo/src/cairo-fixed.c similarity index 100% rename from cairo/src/cairo-fixed.c rename to io2d/src/3rd-party/cairo/src/cairo-fixed.c diff --git a/cairo/src/cairo-font-face-twin-data.c b/io2d/src/3rd-party/cairo/src/cairo-font-face-twin-data.c similarity index 100% rename from cairo/src/cairo-font-face-twin-data.c rename to io2d/src/3rd-party/cairo/src/cairo-font-face-twin-data.c diff --git a/cairo/src/cairo-font-face-twin.c b/io2d/src/3rd-party/cairo/src/cairo-font-face-twin.c similarity index 100% rename from cairo/src/cairo-font-face-twin.c rename to io2d/src/3rd-party/cairo/src/cairo-font-face-twin.c diff --git a/cairo/src/cairo-font-face.c b/io2d/src/3rd-party/cairo/src/cairo-font-face.c similarity index 100% rename from cairo/src/cairo-font-face.c rename to io2d/src/3rd-party/cairo/src/cairo-font-face.c diff --git a/cairo/src/cairo-font-options.c b/io2d/src/3rd-party/cairo/src/cairo-font-options.c similarity index 100% rename from cairo/src/cairo-font-options.c rename to io2d/src/3rd-party/cairo/src/cairo-font-options.c diff --git a/cairo/src/cairo-fontconfig-private.h b/io2d/src/3rd-party/cairo/src/cairo-fontconfig-private.h similarity index 100% rename from cairo/src/cairo-fontconfig-private.h rename to io2d/src/3rd-party/cairo/src/cairo-fontconfig-private.h diff --git a/cairo/src/cairo-freed-pool-private.h b/io2d/src/3rd-party/cairo/src/cairo-freed-pool-private.h similarity index 100% rename from cairo/src/cairo-freed-pool-private.h rename to io2d/src/3rd-party/cairo/src/cairo-freed-pool-private.h diff --git a/cairo/src/cairo-freed-pool.c b/io2d/src/3rd-party/cairo/src/cairo-freed-pool.c similarity index 100% rename from cairo/src/cairo-freed-pool.c rename to io2d/src/3rd-party/cairo/src/cairo-freed-pool.c diff --git a/cairo/src/cairo-freelist-private.h b/io2d/src/3rd-party/cairo/src/cairo-freelist-private.h similarity index 100% rename from cairo/src/cairo-freelist-private.h rename to io2d/src/3rd-party/cairo/src/cairo-freelist-private.h diff --git a/cairo/src/cairo-freelist-type-private.h b/io2d/src/3rd-party/cairo/src/cairo-freelist-type-private.h similarity index 100% rename from cairo/src/cairo-freelist-type-private.h rename to io2d/src/3rd-party/cairo/src/cairo-freelist-type-private.h diff --git a/cairo/src/cairo-freelist.c b/io2d/src/3rd-party/cairo/src/cairo-freelist.c similarity index 100% rename from cairo/src/cairo-freelist.c rename to io2d/src/3rd-party/cairo/src/cairo-freelist.c diff --git a/cairo/src/cairo-ft-font.c b/io2d/src/3rd-party/cairo/src/cairo-ft-font.c similarity index 100% rename from cairo/src/cairo-ft-font.c rename to io2d/src/3rd-party/cairo/src/cairo-ft-font.c diff --git a/cairo/src/cairo-ft-private.h b/io2d/src/3rd-party/cairo/src/cairo-ft-private.h similarity index 100% rename from cairo/src/cairo-ft-private.h rename to io2d/src/3rd-party/cairo/src/cairo-ft-private.h diff --git a/cairo/src/cairo-ft.h b/io2d/src/3rd-party/cairo/src/cairo-ft.h similarity index 100% rename from cairo/src/cairo-ft.h rename to io2d/src/3rd-party/cairo/src/cairo-ft.h diff --git a/cairo/src/cairo-gl-composite.c b/io2d/src/3rd-party/cairo/src/cairo-gl-composite.c similarity index 100% rename from cairo/src/cairo-gl-composite.c rename to io2d/src/3rd-party/cairo/src/cairo-gl-composite.c diff --git a/cairo/src/cairo-gl-device.c b/io2d/src/3rd-party/cairo/src/cairo-gl-device.c similarity index 100% rename from cairo/src/cairo-gl-device.c rename to io2d/src/3rd-party/cairo/src/cairo-gl-device.c diff --git a/cairo/src/cairo-gl-dispatch-private.h b/io2d/src/3rd-party/cairo/src/cairo-gl-dispatch-private.h similarity index 100% rename from cairo/src/cairo-gl-dispatch-private.h rename to io2d/src/3rd-party/cairo/src/cairo-gl-dispatch-private.h diff --git a/cairo/src/cairo-gl-dispatch.c b/io2d/src/3rd-party/cairo/src/cairo-gl-dispatch.c similarity index 100% rename from cairo/src/cairo-gl-dispatch.c rename to io2d/src/3rd-party/cairo/src/cairo-gl-dispatch.c diff --git a/cairo/src/cairo-gl-ext-def-private.h b/io2d/src/3rd-party/cairo/src/cairo-gl-ext-def-private.h similarity index 100% rename from cairo/src/cairo-gl-ext-def-private.h rename to io2d/src/3rd-party/cairo/src/cairo-gl-ext-def-private.h diff --git a/cairo/src/cairo-gl-glyphs.c b/io2d/src/3rd-party/cairo/src/cairo-gl-glyphs.c similarity index 100% rename from cairo/src/cairo-gl-glyphs.c rename to io2d/src/3rd-party/cairo/src/cairo-gl-glyphs.c diff --git a/cairo/src/cairo-gl-gradient-private.h b/io2d/src/3rd-party/cairo/src/cairo-gl-gradient-private.h similarity index 100% rename from cairo/src/cairo-gl-gradient-private.h rename to io2d/src/3rd-party/cairo/src/cairo-gl-gradient-private.h diff --git a/cairo/src/cairo-gl-gradient.c b/io2d/src/3rd-party/cairo/src/cairo-gl-gradient.c similarity index 100% rename from cairo/src/cairo-gl-gradient.c rename to io2d/src/3rd-party/cairo/src/cairo-gl-gradient.c diff --git a/cairo/src/cairo-gl-info.c b/io2d/src/3rd-party/cairo/src/cairo-gl-info.c similarity index 100% rename from cairo/src/cairo-gl-info.c rename to io2d/src/3rd-party/cairo/src/cairo-gl-info.c diff --git a/cairo/src/cairo-gl-msaa-compositor.c b/io2d/src/3rd-party/cairo/src/cairo-gl-msaa-compositor.c similarity index 100% rename from cairo/src/cairo-gl-msaa-compositor.c rename to io2d/src/3rd-party/cairo/src/cairo-gl-msaa-compositor.c diff --git a/cairo/src/cairo-gl-operand.c b/io2d/src/3rd-party/cairo/src/cairo-gl-operand.c similarity index 100% rename from cairo/src/cairo-gl-operand.c rename to io2d/src/3rd-party/cairo/src/cairo-gl-operand.c diff --git a/cairo/src/cairo-gl-private.h b/io2d/src/3rd-party/cairo/src/cairo-gl-private.h similarity index 100% rename from cairo/src/cairo-gl-private.h rename to io2d/src/3rd-party/cairo/src/cairo-gl-private.h diff --git a/cairo/src/cairo-gl-shaders.c b/io2d/src/3rd-party/cairo/src/cairo-gl-shaders.c similarity index 100% rename from cairo/src/cairo-gl-shaders.c rename to io2d/src/3rd-party/cairo/src/cairo-gl-shaders.c diff --git a/cairo/src/cairo-gl-source.c b/io2d/src/3rd-party/cairo/src/cairo-gl-source.c similarity index 100% rename from cairo/src/cairo-gl-source.c rename to io2d/src/3rd-party/cairo/src/cairo-gl-source.c diff --git a/cairo/src/cairo-gl-spans-compositor.c b/io2d/src/3rd-party/cairo/src/cairo-gl-spans-compositor.c similarity index 100% rename from cairo/src/cairo-gl-spans-compositor.c rename to io2d/src/3rd-party/cairo/src/cairo-gl-spans-compositor.c diff --git a/cairo/src/cairo-gl-surface-legacy.c b/io2d/src/3rd-party/cairo/src/cairo-gl-surface-legacy.c similarity index 100% rename from cairo/src/cairo-gl-surface-legacy.c rename to io2d/src/3rd-party/cairo/src/cairo-gl-surface-legacy.c diff --git a/cairo/src/cairo-gl-surface.c b/io2d/src/3rd-party/cairo/src/cairo-gl-surface.c similarity index 100% rename from cairo/src/cairo-gl-surface.c rename to io2d/src/3rd-party/cairo/src/cairo-gl-surface.c diff --git a/cairo/src/cairo-gl-traps-compositor.c b/io2d/src/3rd-party/cairo/src/cairo-gl-traps-compositor.c similarity index 100% rename from cairo/src/cairo-gl-traps-compositor.c rename to io2d/src/3rd-party/cairo/src/cairo-gl-traps-compositor.c diff --git a/cairo/src/cairo-gl.h b/io2d/src/3rd-party/cairo/src/cairo-gl.h similarity index 100% rename from cairo/src/cairo-gl.h rename to io2d/src/3rd-party/cairo/src/cairo-gl.h diff --git a/cairo/src/cairo-glx-context.c b/io2d/src/3rd-party/cairo/src/cairo-glx-context.c similarity index 100% rename from cairo/src/cairo-glx-context.c rename to io2d/src/3rd-party/cairo/src/cairo-glx-context.c diff --git a/cairo/src/cairo-gstate-private.h b/io2d/src/3rd-party/cairo/src/cairo-gstate-private.h similarity index 100% rename from cairo/src/cairo-gstate-private.h rename to io2d/src/3rd-party/cairo/src/cairo-gstate-private.h diff --git a/cairo/src/cairo-gstate.c b/io2d/src/3rd-party/cairo/src/cairo-gstate.c similarity index 100% rename from cairo/src/cairo-gstate.c rename to io2d/src/3rd-party/cairo/src/cairo-gstate.c diff --git a/cairo/src/cairo-hash-private.h b/io2d/src/3rd-party/cairo/src/cairo-hash-private.h similarity index 100% rename from cairo/src/cairo-hash-private.h rename to io2d/src/3rd-party/cairo/src/cairo-hash-private.h diff --git a/cairo/src/cairo-hash.c b/io2d/src/3rd-party/cairo/src/cairo-hash.c similarity index 100% rename from cairo/src/cairo-hash.c rename to io2d/src/3rd-party/cairo/src/cairo-hash.c diff --git a/cairo/src/cairo-hull.c b/io2d/src/3rd-party/cairo/src/cairo-hull.c similarity index 100% rename from cairo/src/cairo-hull.c rename to io2d/src/3rd-party/cairo/src/cairo-hull.c diff --git a/cairo/src/cairo-image-compositor.c b/io2d/src/3rd-party/cairo/src/cairo-image-compositor.c similarity index 100% rename from cairo/src/cairo-image-compositor.c rename to io2d/src/3rd-party/cairo/src/cairo-image-compositor.c diff --git a/cairo/src/cairo-image-info-private.h b/io2d/src/3rd-party/cairo/src/cairo-image-info-private.h similarity index 100% rename from cairo/src/cairo-image-info-private.h rename to io2d/src/3rd-party/cairo/src/cairo-image-info-private.h diff --git a/cairo/src/cairo-image-info.c b/io2d/src/3rd-party/cairo/src/cairo-image-info.c similarity index 100% rename from cairo/src/cairo-image-info.c rename to io2d/src/3rd-party/cairo/src/cairo-image-info.c diff --git a/cairo/src/cairo-image-mask-compositor.c b/io2d/src/3rd-party/cairo/src/cairo-image-mask-compositor.c similarity index 100% rename from cairo/src/cairo-image-mask-compositor.c rename to io2d/src/3rd-party/cairo/src/cairo-image-mask-compositor.c diff --git a/cairo/src/cairo-image-source.c b/io2d/src/3rd-party/cairo/src/cairo-image-source.c similarity index 100% rename from cairo/src/cairo-image-source.c rename to io2d/src/3rd-party/cairo/src/cairo-image-source.c diff --git a/cairo/src/cairo-image-surface-inline.h b/io2d/src/3rd-party/cairo/src/cairo-image-surface-inline.h similarity index 100% rename from cairo/src/cairo-image-surface-inline.h rename to io2d/src/3rd-party/cairo/src/cairo-image-surface-inline.h diff --git a/cairo/src/cairo-image-surface-private.h b/io2d/src/3rd-party/cairo/src/cairo-image-surface-private.h similarity index 100% rename from cairo/src/cairo-image-surface-private.h rename to io2d/src/3rd-party/cairo/src/cairo-image-surface-private.h diff --git a/cairo/src/cairo-image-surface.c b/io2d/src/3rd-party/cairo/src/cairo-image-surface.c similarity index 100% rename from cairo/src/cairo-image-surface.c rename to io2d/src/3rd-party/cairo/src/cairo-image-surface.c diff --git a/cairo/src/cairo-list-inline.h b/io2d/src/3rd-party/cairo/src/cairo-list-inline.h similarity index 100% rename from cairo/src/cairo-list-inline.h rename to io2d/src/3rd-party/cairo/src/cairo-list-inline.h diff --git a/cairo/src/cairo-list-private.h b/io2d/src/3rd-party/cairo/src/cairo-list-private.h similarity index 100% rename from cairo/src/cairo-list-private.h rename to io2d/src/3rd-party/cairo/src/cairo-list-private.h diff --git a/cairo/src/cairo-lzw.c b/io2d/src/3rd-party/cairo/src/cairo-lzw.c similarity index 100% rename from cairo/src/cairo-lzw.c rename to io2d/src/3rd-party/cairo/src/cairo-lzw.c diff --git a/cairo/src/cairo-malloc-private.h b/io2d/src/3rd-party/cairo/src/cairo-malloc-private.h similarity index 100% rename from cairo/src/cairo-malloc-private.h rename to io2d/src/3rd-party/cairo/src/cairo-malloc-private.h diff --git a/cairo/src/cairo-mask-compositor.c b/io2d/src/3rd-party/cairo/src/cairo-mask-compositor.c similarity index 100% rename from cairo/src/cairo-mask-compositor.c rename to io2d/src/3rd-party/cairo/src/cairo-mask-compositor.c diff --git a/cairo/src/cairo-matrix.c b/io2d/src/3rd-party/cairo/src/cairo-matrix.c similarity index 100% rename from cairo/src/cairo-matrix.c rename to io2d/src/3rd-party/cairo/src/cairo-matrix.c diff --git a/cairo/src/cairo-mempool-private.h b/io2d/src/3rd-party/cairo/src/cairo-mempool-private.h similarity index 100% rename from cairo/src/cairo-mempool-private.h rename to io2d/src/3rd-party/cairo/src/cairo-mempool-private.h diff --git a/cairo/src/cairo-mempool.c b/io2d/src/3rd-party/cairo/src/cairo-mempool.c similarity index 100% rename from cairo/src/cairo-mempool.c rename to io2d/src/3rd-party/cairo/src/cairo-mempool.c diff --git a/cairo/src/cairo-mesh-pattern-rasterizer.c b/io2d/src/3rd-party/cairo/src/cairo-mesh-pattern-rasterizer.c similarity index 100% rename from cairo/src/cairo-mesh-pattern-rasterizer.c rename to io2d/src/3rd-party/cairo/src/cairo-mesh-pattern-rasterizer.c diff --git a/cairo/src/cairo-misc.c b/io2d/src/3rd-party/cairo/src/cairo-misc.c similarity index 100% rename from cairo/src/cairo-misc.c rename to io2d/src/3rd-party/cairo/src/cairo-misc.c diff --git a/cairo/src/cairo-mono-scan-converter.c b/io2d/src/3rd-party/cairo/src/cairo-mono-scan-converter.c similarity index 100% rename from cairo/src/cairo-mono-scan-converter.c rename to io2d/src/3rd-party/cairo/src/cairo-mono-scan-converter.c diff --git a/cairo/src/cairo-mutex-impl-private.h b/io2d/src/3rd-party/cairo/src/cairo-mutex-impl-private.h similarity index 100% rename from cairo/src/cairo-mutex-impl-private.h rename to io2d/src/3rd-party/cairo/src/cairo-mutex-impl-private.h diff --git a/cairo/src/cairo-mutex-list-private.h b/io2d/src/3rd-party/cairo/src/cairo-mutex-list-private.h similarity index 100% rename from cairo/src/cairo-mutex-list-private.h rename to io2d/src/3rd-party/cairo/src/cairo-mutex-list-private.h diff --git a/cairo/src/cairo-mutex-private.h b/io2d/src/3rd-party/cairo/src/cairo-mutex-private.h similarity index 100% rename from cairo/src/cairo-mutex-private.h rename to io2d/src/3rd-party/cairo/src/cairo-mutex-private.h diff --git a/cairo/src/cairo-mutex-type-private.h b/io2d/src/3rd-party/cairo/src/cairo-mutex-type-private.h similarity index 100% rename from cairo/src/cairo-mutex-type-private.h rename to io2d/src/3rd-party/cairo/src/cairo-mutex-type-private.h diff --git a/cairo/src/cairo-mutex.c b/io2d/src/3rd-party/cairo/src/cairo-mutex.c similarity index 100% rename from cairo/src/cairo-mutex.c rename to io2d/src/3rd-party/cairo/src/cairo-mutex.c diff --git a/cairo/src/cairo-no-compositor.c b/io2d/src/3rd-party/cairo/src/cairo-no-compositor.c similarity index 100% rename from cairo/src/cairo-no-compositor.c rename to io2d/src/3rd-party/cairo/src/cairo-no-compositor.c diff --git a/cairo/src/cairo-observer.c b/io2d/src/3rd-party/cairo/src/cairo-observer.c similarity index 100% rename from cairo/src/cairo-observer.c rename to io2d/src/3rd-party/cairo/src/cairo-observer.c diff --git a/cairo/src/cairo-os2-private.h b/io2d/src/3rd-party/cairo/src/cairo-os2-private.h similarity index 100% rename from cairo/src/cairo-os2-private.h rename to io2d/src/3rd-party/cairo/src/cairo-os2-private.h diff --git a/cairo/src/cairo-os2-surface.c b/io2d/src/3rd-party/cairo/src/cairo-os2-surface.c similarity index 100% rename from cairo/src/cairo-os2-surface.c rename to io2d/src/3rd-party/cairo/src/cairo-os2-surface.c diff --git a/cairo/src/cairo-os2.h b/io2d/src/3rd-party/cairo/src/cairo-os2.h similarity index 100% rename from cairo/src/cairo-os2.h rename to io2d/src/3rd-party/cairo/src/cairo-os2.h diff --git a/cairo/src/cairo-output-stream-private.h b/io2d/src/3rd-party/cairo/src/cairo-output-stream-private.h similarity index 100% rename from cairo/src/cairo-output-stream-private.h rename to io2d/src/3rd-party/cairo/src/cairo-output-stream-private.h diff --git a/cairo/src/cairo-output-stream.c b/io2d/src/3rd-party/cairo/src/cairo-output-stream.c similarity index 100% rename from cairo/src/cairo-output-stream.c rename to io2d/src/3rd-party/cairo/src/cairo-output-stream.c diff --git a/cairo/src/cairo-paginated-private.h b/io2d/src/3rd-party/cairo/src/cairo-paginated-private.h similarity index 100% rename from cairo/src/cairo-paginated-private.h rename to io2d/src/3rd-party/cairo/src/cairo-paginated-private.h diff --git a/cairo/src/cairo-paginated-surface-private.h b/io2d/src/3rd-party/cairo/src/cairo-paginated-surface-private.h similarity index 100% rename from cairo/src/cairo-paginated-surface-private.h rename to io2d/src/3rd-party/cairo/src/cairo-paginated-surface-private.h diff --git a/cairo/src/cairo-paginated-surface.c b/io2d/src/3rd-party/cairo/src/cairo-paginated-surface.c similarity index 100% rename from cairo/src/cairo-paginated-surface.c rename to io2d/src/3rd-party/cairo/src/cairo-paginated-surface.c diff --git a/cairo/src/cairo-path-bounds.c b/io2d/src/3rd-party/cairo/src/cairo-path-bounds.c similarity index 100% rename from cairo/src/cairo-path-bounds.c rename to io2d/src/3rd-party/cairo/src/cairo-path-bounds.c diff --git a/cairo/src/cairo-path-fill.c b/io2d/src/3rd-party/cairo/src/cairo-path-fill.c similarity index 100% rename from cairo/src/cairo-path-fill.c rename to io2d/src/3rd-party/cairo/src/cairo-path-fill.c diff --git a/cairo/src/cairo-path-fixed-private.h b/io2d/src/3rd-party/cairo/src/cairo-path-fixed-private.h similarity index 100% rename from cairo/src/cairo-path-fixed-private.h rename to io2d/src/3rd-party/cairo/src/cairo-path-fixed-private.h diff --git a/cairo/src/cairo-path-fixed.c b/io2d/src/3rd-party/cairo/src/cairo-path-fixed.c similarity index 100% rename from cairo/src/cairo-path-fixed.c rename to io2d/src/3rd-party/cairo/src/cairo-path-fixed.c diff --git a/cairo/src/cairo-path-in-fill.c b/io2d/src/3rd-party/cairo/src/cairo-path-in-fill.c similarity index 100% rename from cairo/src/cairo-path-in-fill.c rename to io2d/src/3rd-party/cairo/src/cairo-path-in-fill.c diff --git a/cairo/src/cairo-path-private.h b/io2d/src/3rd-party/cairo/src/cairo-path-private.h similarity index 100% rename from cairo/src/cairo-path-private.h rename to io2d/src/3rd-party/cairo/src/cairo-path-private.h diff --git a/cairo/src/cairo-path-stroke-boxes.c b/io2d/src/3rd-party/cairo/src/cairo-path-stroke-boxes.c similarity index 100% rename from cairo/src/cairo-path-stroke-boxes.c rename to io2d/src/3rd-party/cairo/src/cairo-path-stroke-boxes.c diff --git a/cairo/src/cairo-path-stroke-polygon.c b/io2d/src/3rd-party/cairo/src/cairo-path-stroke-polygon.c similarity index 100% rename from cairo/src/cairo-path-stroke-polygon.c rename to io2d/src/3rd-party/cairo/src/cairo-path-stroke-polygon.c diff --git a/cairo/src/cairo-path-stroke-traps.c b/io2d/src/3rd-party/cairo/src/cairo-path-stroke-traps.c similarity index 100% rename from cairo/src/cairo-path-stroke-traps.c rename to io2d/src/3rd-party/cairo/src/cairo-path-stroke-traps.c diff --git a/cairo/src/cairo-path-stroke-tristrip.c b/io2d/src/3rd-party/cairo/src/cairo-path-stroke-tristrip.c similarity index 100% rename from cairo/src/cairo-path-stroke-tristrip.c rename to io2d/src/3rd-party/cairo/src/cairo-path-stroke-tristrip.c diff --git a/cairo/src/cairo-path-stroke.c b/io2d/src/3rd-party/cairo/src/cairo-path-stroke.c similarity index 100% rename from cairo/src/cairo-path-stroke.c rename to io2d/src/3rd-party/cairo/src/cairo-path-stroke.c diff --git a/cairo/src/cairo-path.c b/io2d/src/3rd-party/cairo/src/cairo-path.c similarity index 100% rename from cairo/src/cairo-path.c rename to io2d/src/3rd-party/cairo/src/cairo-path.c diff --git a/cairo/src/cairo-pattern-inline.h b/io2d/src/3rd-party/cairo/src/cairo-pattern-inline.h similarity index 100% rename from cairo/src/cairo-pattern-inline.h rename to io2d/src/3rd-party/cairo/src/cairo-pattern-inline.h diff --git a/cairo/src/cairo-pattern-private.h b/io2d/src/3rd-party/cairo/src/cairo-pattern-private.h similarity index 100% rename from cairo/src/cairo-pattern-private.h rename to io2d/src/3rd-party/cairo/src/cairo-pattern-private.h diff --git a/cairo/src/cairo-pattern.c b/io2d/src/3rd-party/cairo/src/cairo-pattern.c similarity index 100% rename from cairo/src/cairo-pattern.c rename to io2d/src/3rd-party/cairo/src/cairo-pattern.c diff --git a/cairo/src/cairo-pdf-operators-private.h b/io2d/src/3rd-party/cairo/src/cairo-pdf-operators-private.h similarity index 100% rename from cairo/src/cairo-pdf-operators-private.h rename to io2d/src/3rd-party/cairo/src/cairo-pdf-operators-private.h diff --git a/cairo/src/cairo-pdf-operators.c b/io2d/src/3rd-party/cairo/src/cairo-pdf-operators.c similarity index 100% rename from cairo/src/cairo-pdf-operators.c rename to io2d/src/3rd-party/cairo/src/cairo-pdf-operators.c diff --git a/cairo/src/cairo-pdf-shading-private.h b/io2d/src/3rd-party/cairo/src/cairo-pdf-shading-private.h similarity index 100% rename from cairo/src/cairo-pdf-shading-private.h rename to io2d/src/3rd-party/cairo/src/cairo-pdf-shading-private.h diff --git a/cairo/src/cairo-pdf-shading.c b/io2d/src/3rd-party/cairo/src/cairo-pdf-shading.c similarity index 100% rename from cairo/src/cairo-pdf-shading.c rename to io2d/src/3rd-party/cairo/src/cairo-pdf-shading.c diff --git a/cairo/src/cairo-pdf-surface-private.h b/io2d/src/3rd-party/cairo/src/cairo-pdf-surface-private.h similarity index 100% rename from cairo/src/cairo-pdf-surface-private.h rename to io2d/src/3rd-party/cairo/src/cairo-pdf-surface-private.h diff --git a/cairo/src/cairo-pdf-surface.c b/io2d/src/3rd-party/cairo/src/cairo-pdf-surface.c similarity index 100% rename from cairo/src/cairo-pdf-surface.c rename to io2d/src/3rd-party/cairo/src/cairo-pdf-surface.c diff --git a/N3888_RefImpl/src/win32/include/cairo-pdf.h b/io2d/src/3rd-party/cairo/src/cairo-pdf.h similarity index 100% rename from N3888_RefImpl/src/win32/include/cairo-pdf.h rename to io2d/src/3rd-party/cairo/src/cairo-pdf.h diff --git a/cairo/src/cairo-pen.c b/io2d/src/3rd-party/cairo/src/cairo-pen.c similarity index 100% rename from cairo/src/cairo-pen.c rename to io2d/src/3rd-party/cairo/src/cairo-pen.c diff --git a/cairo/src/cairo-pixman-private.h b/io2d/src/3rd-party/cairo/src/cairo-pixman-private.h similarity index 100% rename from cairo/src/cairo-pixman-private.h rename to io2d/src/3rd-party/cairo/src/cairo-pixman-private.h diff --git a/cairo/src/cairo-png.c b/io2d/src/3rd-party/cairo/src/cairo-png.c similarity index 100% rename from cairo/src/cairo-png.c rename to io2d/src/3rd-party/cairo/src/cairo-png.c diff --git a/cairo/src/cairo-polygon-intersect.c b/io2d/src/3rd-party/cairo/src/cairo-polygon-intersect.c similarity index 100% rename from cairo/src/cairo-polygon-intersect.c rename to io2d/src/3rd-party/cairo/src/cairo-polygon-intersect.c diff --git a/cairo/src/cairo-polygon-reduce.c b/io2d/src/3rd-party/cairo/src/cairo-polygon-reduce.c similarity index 100% rename from cairo/src/cairo-polygon-reduce.c rename to io2d/src/3rd-party/cairo/src/cairo-polygon-reduce.c diff --git a/cairo/src/cairo-polygon.c b/io2d/src/3rd-party/cairo/src/cairo-polygon.c similarity index 100% rename from cairo/src/cairo-polygon.c rename to io2d/src/3rd-party/cairo/src/cairo-polygon.c diff --git a/cairo/src/cairo-private.h b/io2d/src/3rd-party/cairo/src/cairo-private.h similarity index 100% rename from cairo/src/cairo-private.h rename to io2d/src/3rd-party/cairo/src/cairo-private.h diff --git a/cairo/src/cairo-ps-surface-private.h b/io2d/src/3rd-party/cairo/src/cairo-ps-surface-private.h similarity index 100% rename from cairo/src/cairo-ps-surface-private.h rename to io2d/src/3rd-party/cairo/src/cairo-ps-surface-private.h diff --git a/cairo/src/cairo-ps-surface.c b/io2d/src/3rd-party/cairo/src/cairo-ps-surface.c similarity index 100% rename from cairo/src/cairo-ps-surface.c rename to io2d/src/3rd-party/cairo/src/cairo-ps-surface.c diff --git a/N3888_RefImpl/src/win32/include/cairo-ps.h b/io2d/src/3rd-party/cairo/src/cairo-ps.h similarity index 100% rename from N3888_RefImpl/src/win32/include/cairo-ps.h rename to io2d/src/3rd-party/cairo/src/cairo-ps.h diff --git a/cairo/src/cairo-qt-surface.cpp b/io2d/src/3rd-party/cairo/src/cairo-qt-surface.cpp similarity index 100% rename from cairo/src/cairo-qt-surface.cpp rename to io2d/src/3rd-party/cairo/src/cairo-qt-surface.cpp diff --git a/cairo/src/cairo-qt.h b/io2d/src/3rd-party/cairo/src/cairo-qt.h similarity index 100% rename from cairo/src/cairo-qt.h rename to io2d/src/3rd-party/cairo/src/cairo-qt.h diff --git a/cairo/src/cairo-quartz-font.c b/io2d/src/3rd-party/cairo/src/cairo-quartz-font.c similarity index 100% rename from cairo/src/cairo-quartz-font.c rename to io2d/src/3rd-party/cairo/src/cairo-quartz-font.c diff --git a/cairo/src/cairo-quartz-image-surface.c b/io2d/src/3rd-party/cairo/src/cairo-quartz-image-surface.c similarity index 100% rename from cairo/src/cairo-quartz-image-surface.c rename to io2d/src/3rd-party/cairo/src/cairo-quartz-image-surface.c diff --git a/cairo/src/cairo-quartz-image.h b/io2d/src/3rd-party/cairo/src/cairo-quartz-image.h similarity index 100% rename from cairo/src/cairo-quartz-image.h rename to io2d/src/3rd-party/cairo/src/cairo-quartz-image.h diff --git a/cairo/src/cairo-quartz-private.h b/io2d/src/3rd-party/cairo/src/cairo-quartz-private.h similarity index 100% rename from cairo/src/cairo-quartz-private.h rename to io2d/src/3rd-party/cairo/src/cairo-quartz-private.h diff --git a/cairo/src/cairo-quartz-surface.c b/io2d/src/3rd-party/cairo/src/cairo-quartz-surface.c similarity index 100% rename from cairo/src/cairo-quartz-surface.c rename to io2d/src/3rd-party/cairo/src/cairo-quartz-surface.c diff --git a/cairo/src/cairo-quartz.h b/io2d/src/3rd-party/cairo/src/cairo-quartz.h similarity index 100% rename from cairo/src/cairo-quartz.h rename to io2d/src/3rd-party/cairo/src/cairo-quartz.h diff --git a/cairo/src/cairo-raster-source-pattern.c b/io2d/src/3rd-party/cairo/src/cairo-raster-source-pattern.c similarity index 100% rename from cairo/src/cairo-raster-source-pattern.c rename to io2d/src/3rd-party/cairo/src/cairo-raster-source-pattern.c diff --git a/cairo/src/cairo-recording-surface-inline.h b/io2d/src/3rd-party/cairo/src/cairo-recording-surface-inline.h similarity index 100% rename from cairo/src/cairo-recording-surface-inline.h rename to io2d/src/3rd-party/cairo/src/cairo-recording-surface-inline.h diff --git a/cairo/src/cairo-recording-surface-private.h b/io2d/src/3rd-party/cairo/src/cairo-recording-surface-private.h similarity index 100% rename from cairo/src/cairo-recording-surface-private.h rename to io2d/src/3rd-party/cairo/src/cairo-recording-surface-private.h diff --git a/cairo/src/cairo-recording-surface.c b/io2d/src/3rd-party/cairo/src/cairo-recording-surface.c similarity index 100% rename from cairo/src/cairo-recording-surface.c rename to io2d/src/3rd-party/cairo/src/cairo-recording-surface.c diff --git a/cairo/src/cairo-rectangle.c b/io2d/src/3rd-party/cairo/src/cairo-rectangle.c similarity index 100% rename from cairo/src/cairo-rectangle.c rename to io2d/src/3rd-party/cairo/src/cairo-rectangle.c diff --git a/cairo/src/cairo-rectangular-scan-converter.c b/io2d/src/3rd-party/cairo/src/cairo-rectangular-scan-converter.c similarity index 100% rename from cairo/src/cairo-rectangular-scan-converter.c rename to io2d/src/3rd-party/cairo/src/cairo-rectangular-scan-converter.c diff --git a/cairo/src/cairo-reference-count-private.h b/io2d/src/3rd-party/cairo/src/cairo-reference-count-private.h similarity index 100% rename from cairo/src/cairo-reference-count-private.h rename to io2d/src/3rd-party/cairo/src/cairo-reference-count-private.h diff --git a/cairo/src/cairo-region-private.h b/io2d/src/3rd-party/cairo/src/cairo-region-private.h similarity index 100% rename from cairo/src/cairo-region-private.h rename to io2d/src/3rd-party/cairo/src/cairo-region-private.h diff --git a/cairo/src/cairo-region.c b/io2d/src/3rd-party/cairo/src/cairo-region.c similarity index 100% rename from cairo/src/cairo-region.c rename to io2d/src/3rd-party/cairo/src/cairo-region.c diff --git a/cairo/src/cairo-rtree-private.h b/io2d/src/3rd-party/cairo/src/cairo-rtree-private.h similarity index 100% rename from cairo/src/cairo-rtree-private.h rename to io2d/src/3rd-party/cairo/src/cairo-rtree-private.h diff --git a/cairo/src/cairo-rtree.c b/io2d/src/3rd-party/cairo/src/cairo-rtree.c similarity index 100% rename from cairo/src/cairo-rtree.c rename to io2d/src/3rd-party/cairo/src/cairo-rtree.c diff --git a/cairo/src/cairo-scaled-font-private.h b/io2d/src/3rd-party/cairo/src/cairo-scaled-font-private.h similarity index 100% rename from cairo/src/cairo-scaled-font-private.h rename to io2d/src/3rd-party/cairo/src/cairo-scaled-font-private.h diff --git a/cairo/src/cairo-scaled-font-subsets-private.h b/io2d/src/3rd-party/cairo/src/cairo-scaled-font-subsets-private.h similarity index 100% rename from cairo/src/cairo-scaled-font-subsets-private.h rename to io2d/src/3rd-party/cairo/src/cairo-scaled-font-subsets-private.h diff --git a/cairo/src/cairo-scaled-font-subsets.c b/io2d/src/3rd-party/cairo/src/cairo-scaled-font-subsets.c similarity index 100% rename from cairo/src/cairo-scaled-font-subsets.c rename to io2d/src/3rd-party/cairo/src/cairo-scaled-font-subsets.c diff --git a/cairo/src/cairo-scaled-font.c b/io2d/src/3rd-party/cairo/src/cairo-scaled-font.c similarity index 100% rename from cairo/src/cairo-scaled-font.c rename to io2d/src/3rd-party/cairo/src/cairo-scaled-font.c diff --git a/cairo/src/cairo-script-private.h b/io2d/src/3rd-party/cairo/src/cairo-script-private.h similarity index 100% rename from cairo/src/cairo-script-private.h rename to io2d/src/3rd-party/cairo/src/cairo-script-private.h diff --git a/cairo/src/cairo-script-surface.c b/io2d/src/3rd-party/cairo/src/cairo-script-surface.c similarity index 100% rename from cairo/src/cairo-script-surface.c rename to io2d/src/3rd-party/cairo/src/cairo-script-surface.c diff --git a/N3888_RefImpl/src/win32/include/cairo-script.h b/io2d/src/3rd-party/cairo/src/cairo-script.h similarity index 100% rename from N3888_RefImpl/src/win32/include/cairo-script.h rename to io2d/src/3rd-party/cairo/src/cairo-script.h diff --git a/cairo/src/cairo-shape-mask-compositor.c b/io2d/src/3rd-party/cairo/src/cairo-shape-mask-compositor.c similarity index 100% rename from cairo/src/cairo-shape-mask-compositor.c rename to io2d/src/3rd-party/cairo/src/cairo-shape-mask-compositor.c diff --git a/cairo/src/cairo-skia-surface.cpp b/io2d/src/3rd-party/cairo/src/cairo-skia-surface.cpp similarity index 100% rename from cairo/src/cairo-skia-surface.cpp rename to io2d/src/3rd-party/cairo/src/cairo-skia-surface.cpp diff --git a/cairo/src/cairo-skia.h b/io2d/src/3rd-party/cairo/src/cairo-skia.h similarity index 100% rename from cairo/src/cairo-skia.h rename to io2d/src/3rd-party/cairo/src/cairo-skia.h diff --git a/cairo/src/cairo-slope-private.h b/io2d/src/3rd-party/cairo/src/cairo-slope-private.h similarity index 100% rename from cairo/src/cairo-slope-private.h rename to io2d/src/3rd-party/cairo/src/cairo-slope-private.h diff --git a/cairo/src/cairo-slope.c b/io2d/src/3rd-party/cairo/src/cairo-slope.c similarity index 100% rename from cairo/src/cairo-slope.c rename to io2d/src/3rd-party/cairo/src/cairo-slope.c diff --git a/cairo/src/cairo-spans-compositor-private.h b/io2d/src/3rd-party/cairo/src/cairo-spans-compositor-private.h similarity index 100% rename from cairo/src/cairo-spans-compositor-private.h rename to io2d/src/3rd-party/cairo/src/cairo-spans-compositor-private.h diff --git a/cairo/src/cairo-spans-compositor.c b/io2d/src/3rd-party/cairo/src/cairo-spans-compositor.c similarity index 100% rename from cairo/src/cairo-spans-compositor.c rename to io2d/src/3rd-party/cairo/src/cairo-spans-compositor.c diff --git a/cairo/src/cairo-spans-private.h b/io2d/src/3rd-party/cairo/src/cairo-spans-private.h similarity index 100% rename from cairo/src/cairo-spans-private.h rename to io2d/src/3rd-party/cairo/src/cairo-spans-private.h diff --git a/cairo/src/cairo-spans.c b/io2d/src/3rd-party/cairo/src/cairo-spans.c similarity index 100% rename from cairo/src/cairo-spans.c rename to io2d/src/3rd-party/cairo/src/cairo-spans.c diff --git a/cairo/src/cairo-spline.c b/io2d/src/3rd-party/cairo/src/cairo-spline.c similarity index 100% rename from cairo/src/cairo-spline.c rename to io2d/src/3rd-party/cairo/src/cairo-spline.c diff --git a/cairo/src/cairo-stroke-dash-private.h b/io2d/src/3rd-party/cairo/src/cairo-stroke-dash-private.h similarity index 100% rename from cairo/src/cairo-stroke-dash-private.h rename to io2d/src/3rd-party/cairo/src/cairo-stroke-dash-private.h diff --git a/cairo/src/cairo-stroke-dash.c b/io2d/src/3rd-party/cairo/src/cairo-stroke-dash.c similarity index 100% rename from cairo/src/cairo-stroke-dash.c rename to io2d/src/3rd-party/cairo/src/cairo-stroke-dash.c diff --git a/cairo/src/cairo-stroke-style.c b/io2d/src/3rd-party/cairo/src/cairo-stroke-style.c similarity index 100% rename from cairo/src/cairo-stroke-style.c rename to io2d/src/3rd-party/cairo/src/cairo-stroke-style.c diff --git a/cairo/src/cairo-surface-backend-private.h b/io2d/src/3rd-party/cairo/src/cairo-surface-backend-private.h similarity index 100% rename from cairo/src/cairo-surface-backend-private.h rename to io2d/src/3rd-party/cairo/src/cairo-surface-backend-private.h diff --git a/cairo/src/cairo-surface-clipper-private.h b/io2d/src/3rd-party/cairo/src/cairo-surface-clipper-private.h similarity index 100% rename from cairo/src/cairo-surface-clipper-private.h rename to io2d/src/3rd-party/cairo/src/cairo-surface-clipper-private.h diff --git a/cairo/src/cairo-surface-clipper.c b/io2d/src/3rd-party/cairo/src/cairo-surface-clipper.c similarity index 100% rename from cairo/src/cairo-surface-clipper.c rename to io2d/src/3rd-party/cairo/src/cairo-surface-clipper.c diff --git a/cairo/src/cairo-surface-fallback-private.h b/io2d/src/3rd-party/cairo/src/cairo-surface-fallback-private.h similarity index 100% rename from cairo/src/cairo-surface-fallback-private.h rename to io2d/src/3rd-party/cairo/src/cairo-surface-fallback-private.h diff --git a/cairo/src/cairo-surface-fallback.c b/io2d/src/3rd-party/cairo/src/cairo-surface-fallback.c similarity index 100% rename from cairo/src/cairo-surface-fallback.c rename to io2d/src/3rd-party/cairo/src/cairo-surface-fallback.c diff --git a/cairo/src/cairo-surface-inline.h b/io2d/src/3rd-party/cairo/src/cairo-surface-inline.h similarity index 100% rename from cairo/src/cairo-surface-inline.h rename to io2d/src/3rd-party/cairo/src/cairo-surface-inline.h diff --git a/cairo/src/cairo-surface-observer-inline.h b/io2d/src/3rd-party/cairo/src/cairo-surface-observer-inline.h similarity index 100% rename from cairo/src/cairo-surface-observer-inline.h rename to io2d/src/3rd-party/cairo/src/cairo-surface-observer-inline.h diff --git a/cairo/src/cairo-surface-observer-private.h b/io2d/src/3rd-party/cairo/src/cairo-surface-observer-private.h similarity index 100% rename from cairo/src/cairo-surface-observer-private.h rename to io2d/src/3rd-party/cairo/src/cairo-surface-observer-private.h diff --git a/cairo/src/cairo-surface-observer.c b/io2d/src/3rd-party/cairo/src/cairo-surface-observer.c similarity index 100% rename from cairo/src/cairo-surface-observer.c rename to io2d/src/3rd-party/cairo/src/cairo-surface-observer.c diff --git a/cairo/src/cairo-surface-offset-private.h b/io2d/src/3rd-party/cairo/src/cairo-surface-offset-private.h similarity index 100% rename from cairo/src/cairo-surface-offset-private.h rename to io2d/src/3rd-party/cairo/src/cairo-surface-offset-private.h diff --git a/cairo/src/cairo-surface-offset.c b/io2d/src/3rd-party/cairo/src/cairo-surface-offset.c similarity index 100% rename from cairo/src/cairo-surface-offset.c rename to io2d/src/3rd-party/cairo/src/cairo-surface-offset.c diff --git a/cairo/src/cairo-surface-private.h b/io2d/src/3rd-party/cairo/src/cairo-surface-private.h similarity index 100% rename from cairo/src/cairo-surface-private.h rename to io2d/src/3rd-party/cairo/src/cairo-surface-private.h diff --git a/cairo/src/cairo-surface-snapshot-inline.h b/io2d/src/3rd-party/cairo/src/cairo-surface-snapshot-inline.h similarity index 100% rename from cairo/src/cairo-surface-snapshot-inline.h rename to io2d/src/3rd-party/cairo/src/cairo-surface-snapshot-inline.h diff --git a/cairo/src/cairo-surface-snapshot-private.h b/io2d/src/3rd-party/cairo/src/cairo-surface-snapshot-private.h similarity index 100% rename from cairo/src/cairo-surface-snapshot-private.h rename to io2d/src/3rd-party/cairo/src/cairo-surface-snapshot-private.h diff --git a/cairo/src/cairo-surface-snapshot.c b/io2d/src/3rd-party/cairo/src/cairo-surface-snapshot.c similarity index 100% rename from cairo/src/cairo-surface-snapshot.c rename to io2d/src/3rd-party/cairo/src/cairo-surface-snapshot.c diff --git a/cairo/src/cairo-surface-subsurface-inline.h b/io2d/src/3rd-party/cairo/src/cairo-surface-subsurface-inline.h similarity index 100% rename from cairo/src/cairo-surface-subsurface-inline.h rename to io2d/src/3rd-party/cairo/src/cairo-surface-subsurface-inline.h diff --git a/cairo/src/cairo-surface-subsurface-private.h b/io2d/src/3rd-party/cairo/src/cairo-surface-subsurface-private.h similarity index 100% rename from cairo/src/cairo-surface-subsurface-private.h rename to io2d/src/3rd-party/cairo/src/cairo-surface-subsurface-private.h diff --git a/cairo/src/cairo-surface-subsurface.c b/io2d/src/3rd-party/cairo/src/cairo-surface-subsurface.c similarity index 100% rename from cairo/src/cairo-surface-subsurface.c rename to io2d/src/3rd-party/cairo/src/cairo-surface-subsurface.c diff --git a/cairo/src/cairo-surface-wrapper-private.h b/io2d/src/3rd-party/cairo/src/cairo-surface-wrapper-private.h similarity index 100% rename from cairo/src/cairo-surface-wrapper-private.h rename to io2d/src/3rd-party/cairo/src/cairo-surface-wrapper-private.h diff --git a/cairo/src/cairo-surface-wrapper.c b/io2d/src/3rd-party/cairo/src/cairo-surface-wrapper.c similarity index 100% rename from cairo/src/cairo-surface-wrapper.c rename to io2d/src/3rd-party/cairo/src/cairo-surface-wrapper.c diff --git a/cairo/src/cairo-surface.c b/io2d/src/3rd-party/cairo/src/cairo-surface.c similarity index 100% rename from cairo/src/cairo-surface.c rename to io2d/src/3rd-party/cairo/src/cairo-surface.c diff --git a/cairo/src/cairo-svg-surface-private.h b/io2d/src/3rd-party/cairo/src/cairo-svg-surface-private.h similarity index 100% rename from cairo/src/cairo-svg-surface-private.h rename to io2d/src/3rd-party/cairo/src/cairo-svg-surface-private.h diff --git a/cairo/src/cairo-svg-surface.c b/io2d/src/3rd-party/cairo/src/cairo-svg-surface.c similarity index 100% rename from cairo/src/cairo-svg-surface.c rename to io2d/src/3rd-party/cairo/src/cairo-svg-surface.c diff --git a/N3888_RefImpl/src/win32/include/cairo-svg.h b/io2d/src/3rd-party/cairo/src/cairo-svg.h similarity index 100% rename from N3888_RefImpl/src/win32/include/cairo-svg.h rename to io2d/src/3rd-party/cairo/src/cairo-svg.h diff --git a/cairo/src/cairo-tee-surface-private.h b/io2d/src/3rd-party/cairo/src/cairo-tee-surface-private.h similarity index 100% rename from cairo/src/cairo-tee-surface-private.h rename to io2d/src/3rd-party/cairo/src/cairo-tee-surface-private.h diff --git a/cairo/src/cairo-tee-surface.c b/io2d/src/3rd-party/cairo/src/cairo-tee-surface.c similarity index 100% rename from cairo/src/cairo-tee-surface.c rename to io2d/src/3rd-party/cairo/src/cairo-tee-surface.c diff --git a/cairo/src/cairo-tee.h b/io2d/src/3rd-party/cairo/src/cairo-tee.h similarity index 100% rename from cairo/src/cairo-tee.h rename to io2d/src/3rd-party/cairo/src/cairo-tee.h diff --git a/cairo/src/cairo-time-private.h b/io2d/src/3rd-party/cairo/src/cairo-time-private.h similarity index 100% rename from cairo/src/cairo-time-private.h rename to io2d/src/3rd-party/cairo/src/cairo-time-private.h diff --git a/cairo/src/cairo-time.c b/io2d/src/3rd-party/cairo/src/cairo-time.c similarity index 100% rename from cairo/src/cairo-time.c rename to io2d/src/3rd-party/cairo/src/cairo-time.c diff --git a/cairo/src/cairo-tor-scan-converter.c b/io2d/src/3rd-party/cairo/src/cairo-tor-scan-converter.c similarity index 100% rename from cairo/src/cairo-tor-scan-converter.c rename to io2d/src/3rd-party/cairo/src/cairo-tor-scan-converter.c diff --git a/cairo/src/cairo-tor22-scan-converter.c b/io2d/src/3rd-party/cairo/src/cairo-tor22-scan-converter.c similarity index 100% rename from cairo/src/cairo-tor22-scan-converter.c rename to io2d/src/3rd-party/cairo/src/cairo-tor22-scan-converter.c diff --git a/cairo/src/cairo-toy-font-face.c b/io2d/src/3rd-party/cairo/src/cairo-toy-font-face.c similarity index 100% rename from cairo/src/cairo-toy-font-face.c rename to io2d/src/3rd-party/cairo/src/cairo-toy-font-face.c diff --git a/cairo/src/cairo-traps-compositor.c b/io2d/src/3rd-party/cairo/src/cairo-traps-compositor.c similarity index 100% rename from cairo/src/cairo-traps-compositor.c rename to io2d/src/3rd-party/cairo/src/cairo-traps-compositor.c diff --git a/cairo/src/cairo-traps-private.h b/io2d/src/3rd-party/cairo/src/cairo-traps-private.h similarity index 100% rename from cairo/src/cairo-traps-private.h rename to io2d/src/3rd-party/cairo/src/cairo-traps-private.h diff --git a/cairo/src/cairo-traps.c b/io2d/src/3rd-party/cairo/src/cairo-traps.c similarity index 100% rename from cairo/src/cairo-traps.c rename to io2d/src/3rd-party/cairo/src/cairo-traps.c diff --git a/cairo/src/cairo-tristrip-private.h b/io2d/src/3rd-party/cairo/src/cairo-tristrip-private.h similarity index 100% rename from cairo/src/cairo-tristrip-private.h rename to io2d/src/3rd-party/cairo/src/cairo-tristrip-private.h diff --git a/cairo/src/cairo-tristrip.c b/io2d/src/3rd-party/cairo/src/cairo-tristrip.c similarity index 100% rename from cairo/src/cairo-tristrip.c rename to io2d/src/3rd-party/cairo/src/cairo-tristrip.c diff --git a/cairo/src/cairo-truetype-subset-private.h b/io2d/src/3rd-party/cairo/src/cairo-truetype-subset-private.h similarity index 100% rename from cairo/src/cairo-truetype-subset-private.h rename to io2d/src/3rd-party/cairo/src/cairo-truetype-subset-private.h diff --git a/cairo/src/cairo-truetype-subset.c b/io2d/src/3rd-party/cairo/src/cairo-truetype-subset.c similarity index 100% rename from cairo/src/cairo-truetype-subset.c rename to io2d/src/3rd-party/cairo/src/cairo-truetype-subset.c diff --git a/cairo/src/cairo-type1-fallback.c b/io2d/src/3rd-party/cairo/src/cairo-type1-fallback.c similarity index 100% rename from cairo/src/cairo-type1-fallback.c rename to io2d/src/3rd-party/cairo/src/cairo-type1-fallback.c diff --git a/cairo/src/cairo-type1-glyph-names.c b/io2d/src/3rd-party/cairo/src/cairo-type1-glyph-names.c similarity index 100% rename from cairo/src/cairo-type1-glyph-names.c rename to io2d/src/3rd-party/cairo/src/cairo-type1-glyph-names.c diff --git a/cairo/src/cairo-type1-private.h b/io2d/src/3rd-party/cairo/src/cairo-type1-private.h similarity index 100% rename from cairo/src/cairo-type1-private.h rename to io2d/src/3rd-party/cairo/src/cairo-type1-private.h diff --git a/cairo/src/cairo-type1-subset.c b/io2d/src/3rd-party/cairo/src/cairo-type1-subset.c similarity index 100% rename from cairo/src/cairo-type1-subset.c rename to io2d/src/3rd-party/cairo/src/cairo-type1-subset.c diff --git a/cairo/src/cairo-type3-glyph-surface-private.h b/io2d/src/3rd-party/cairo/src/cairo-type3-glyph-surface-private.h similarity index 100% rename from cairo/src/cairo-type3-glyph-surface-private.h rename to io2d/src/3rd-party/cairo/src/cairo-type3-glyph-surface-private.h diff --git a/cairo/src/cairo-type3-glyph-surface.c b/io2d/src/3rd-party/cairo/src/cairo-type3-glyph-surface.c similarity index 100% rename from cairo/src/cairo-type3-glyph-surface.c rename to io2d/src/3rd-party/cairo/src/cairo-type3-glyph-surface.c diff --git a/cairo/src/cairo-types-private.h b/io2d/src/3rd-party/cairo/src/cairo-types-private.h similarity index 100% rename from cairo/src/cairo-types-private.h rename to io2d/src/3rd-party/cairo/src/cairo-types-private.h diff --git a/cairo/src/cairo-unicode.c b/io2d/src/3rd-party/cairo/src/cairo-unicode.c similarity index 100% rename from cairo/src/cairo-unicode.c rename to io2d/src/3rd-party/cairo/src/cairo-unicode.c diff --git a/cairo/src/cairo-uninstalled.pc.in b/io2d/src/3rd-party/cairo/src/cairo-uninstalled.pc.in similarity index 100% rename from cairo/src/cairo-uninstalled.pc.in rename to io2d/src/3rd-party/cairo/src/cairo-uninstalled.pc.in diff --git a/cairo/src/cairo-user-font-private.h b/io2d/src/3rd-party/cairo/src/cairo-user-font-private.h similarity index 100% rename from cairo/src/cairo-user-font-private.h rename to io2d/src/3rd-party/cairo/src/cairo-user-font-private.h diff --git a/cairo/src/cairo-user-font.c b/io2d/src/3rd-party/cairo/src/cairo-user-font.c similarity index 100% rename from cairo/src/cairo-user-font.c rename to io2d/src/3rd-party/cairo/src/cairo-user-font.c diff --git a/cairo/src/cairo-version.c b/io2d/src/3rd-party/cairo/src/cairo-version.c similarity index 100% rename from cairo/src/cairo-version.c rename to io2d/src/3rd-party/cairo/src/cairo-version.c diff --git a/cairo/src/cairo-version.h b/io2d/src/3rd-party/cairo/src/cairo-version.h similarity index 100% rename from cairo/src/cairo-version.h rename to io2d/src/3rd-party/cairo/src/cairo-version.h diff --git a/cairo/src/cairo-vg-surface.c b/io2d/src/3rd-party/cairo/src/cairo-vg-surface.c similarity index 100% rename from cairo/src/cairo-vg-surface.c rename to io2d/src/3rd-party/cairo/src/cairo-vg-surface.c diff --git a/cairo/src/cairo-vg.h b/io2d/src/3rd-party/cairo/src/cairo-vg.h similarity index 100% rename from cairo/src/cairo-vg.h rename to io2d/src/3rd-party/cairo/src/cairo-vg.h diff --git a/cairo/src/cairo-wgl-context.c b/io2d/src/3rd-party/cairo/src/cairo-wgl-context.c similarity index 100% rename from cairo/src/cairo-wgl-context.c rename to io2d/src/3rd-party/cairo/src/cairo-wgl-context.c diff --git a/cairo/src/cairo-wideint-private.h b/io2d/src/3rd-party/cairo/src/cairo-wideint-private.h similarity index 100% rename from cairo/src/cairo-wideint-private.h rename to io2d/src/3rd-party/cairo/src/cairo-wideint-private.h diff --git a/cairo/src/cairo-wideint-type-private.h b/io2d/src/3rd-party/cairo/src/cairo-wideint-type-private.h similarity index 100% rename from cairo/src/cairo-wideint-type-private.h rename to io2d/src/3rd-party/cairo/src/cairo-wideint-type-private.h diff --git a/cairo/src/cairo-wideint.c b/io2d/src/3rd-party/cairo/src/cairo-wideint.c similarity index 100% rename from cairo/src/cairo-wideint.c rename to io2d/src/3rd-party/cairo/src/cairo-wideint.c diff --git a/N3888_RefImpl/src/win32/include/cairo-win32.h b/io2d/src/3rd-party/cairo/src/cairo-win32.h similarity index 100% rename from N3888_RefImpl/src/win32/include/cairo-win32.h rename to io2d/src/3rd-party/cairo/src/cairo-win32.h diff --git a/cairo/src/cairo-xcb-connection-core.c b/io2d/src/3rd-party/cairo/src/cairo-xcb-connection-core.c similarity index 100% rename from cairo/src/cairo-xcb-connection-core.c rename to io2d/src/3rd-party/cairo/src/cairo-xcb-connection-core.c diff --git a/cairo/src/cairo-xcb-connection-render.c b/io2d/src/3rd-party/cairo/src/cairo-xcb-connection-render.c similarity index 100% rename from cairo/src/cairo-xcb-connection-render.c rename to io2d/src/3rd-party/cairo/src/cairo-xcb-connection-render.c diff --git a/cairo/src/cairo-xcb-connection-shm.c b/io2d/src/3rd-party/cairo/src/cairo-xcb-connection-shm.c similarity index 100% rename from cairo/src/cairo-xcb-connection-shm.c rename to io2d/src/3rd-party/cairo/src/cairo-xcb-connection-shm.c diff --git a/cairo/src/cairo-xcb-connection.c b/io2d/src/3rd-party/cairo/src/cairo-xcb-connection.c similarity index 100% rename from cairo/src/cairo-xcb-connection.c rename to io2d/src/3rd-party/cairo/src/cairo-xcb-connection.c diff --git a/cairo/src/cairo-xcb-private.h b/io2d/src/3rd-party/cairo/src/cairo-xcb-private.h similarity index 100% rename from cairo/src/cairo-xcb-private.h rename to io2d/src/3rd-party/cairo/src/cairo-xcb-private.h diff --git a/cairo/src/cairo-xcb-screen.c b/io2d/src/3rd-party/cairo/src/cairo-xcb-screen.c similarity index 100% rename from cairo/src/cairo-xcb-screen.c rename to io2d/src/3rd-party/cairo/src/cairo-xcb-screen.c diff --git a/cairo/src/cairo-xcb-shm.c b/io2d/src/3rd-party/cairo/src/cairo-xcb-shm.c similarity index 100% rename from cairo/src/cairo-xcb-shm.c rename to io2d/src/3rd-party/cairo/src/cairo-xcb-shm.c diff --git a/cairo/src/cairo-xcb-surface-core.c b/io2d/src/3rd-party/cairo/src/cairo-xcb-surface-core.c similarity index 100% rename from cairo/src/cairo-xcb-surface-core.c rename to io2d/src/3rd-party/cairo/src/cairo-xcb-surface-core.c diff --git a/cairo/src/cairo-xcb-surface-render.c b/io2d/src/3rd-party/cairo/src/cairo-xcb-surface-render.c similarity index 100% rename from cairo/src/cairo-xcb-surface-render.c rename to io2d/src/3rd-party/cairo/src/cairo-xcb-surface-render.c diff --git a/cairo/src/cairo-xcb-surface.c b/io2d/src/3rd-party/cairo/src/cairo-xcb-surface.c similarity index 100% rename from cairo/src/cairo-xcb-surface.c rename to io2d/src/3rd-party/cairo/src/cairo-xcb-surface.c diff --git a/cairo/src/cairo-xcb.h b/io2d/src/3rd-party/cairo/src/cairo-xcb.h similarity index 100% rename from cairo/src/cairo-xcb.h rename to io2d/src/3rd-party/cairo/src/cairo-xcb.h diff --git a/cairo/src/cairo-xlib-core-compositor.c b/io2d/src/3rd-party/cairo/src/cairo-xlib-core-compositor.c similarity index 100% rename from cairo/src/cairo-xlib-core-compositor.c rename to io2d/src/3rd-party/cairo/src/cairo-xlib-core-compositor.c diff --git a/cairo/src/cairo-xlib-display.c b/io2d/src/3rd-party/cairo/src/cairo-xlib-display.c similarity index 100% rename from cairo/src/cairo-xlib-display.c rename to io2d/src/3rd-party/cairo/src/cairo-xlib-display.c diff --git a/cairo/src/cairo-xlib-fallback-compositor.c b/io2d/src/3rd-party/cairo/src/cairo-xlib-fallback-compositor.c similarity index 100% rename from cairo/src/cairo-xlib-fallback-compositor.c rename to io2d/src/3rd-party/cairo/src/cairo-xlib-fallback-compositor.c diff --git a/cairo/src/cairo-xlib-private.h b/io2d/src/3rd-party/cairo/src/cairo-xlib-private.h similarity index 100% rename from cairo/src/cairo-xlib-private.h rename to io2d/src/3rd-party/cairo/src/cairo-xlib-private.h diff --git a/cairo/src/cairo-xlib-render-compositor.c b/io2d/src/3rd-party/cairo/src/cairo-xlib-render-compositor.c similarity index 100% rename from cairo/src/cairo-xlib-render-compositor.c rename to io2d/src/3rd-party/cairo/src/cairo-xlib-render-compositor.c diff --git a/cairo/src/cairo-xlib-screen.c b/io2d/src/3rd-party/cairo/src/cairo-xlib-screen.c similarity index 100% rename from cairo/src/cairo-xlib-screen.c rename to io2d/src/3rd-party/cairo/src/cairo-xlib-screen.c diff --git a/cairo/src/cairo-xlib-source.c b/io2d/src/3rd-party/cairo/src/cairo-xlib-source.c similarity index 100% rename from cairo/src/cairo-xlib-source.c rename to io2d/src/3rd-party/cairo/src/cairo-xlib-source.c diff --git a/cairo/src/cairo-xlib-surface-private.h b/io2d/src/3rd-party/cairo/src/cairo-xlib-surface-private.h similarity index 100% rename from cairo/src/cairo-xlib-surface-private.h rename to io2d/src/3rd-party/cairo/src/cairo-xlib-surface-private.h diff --git a/cairo/src/cairo-xlib-surface-shm.c b/io2d/src/3rd-party/cairo/src/cairo-xlib-surface-shm.c similarity index 100% rename from cairo/src/cairo-xlib-surface-shm.c rename to io2d/src/3rd-party/cairo/src/cairo-xlib-surface-shm.c diff --git a/cairo/src/cairo-xlib-surface.c b/io2d/src/3rd-party/cairo/src/cairo-xlib-surface.c similarity index 100% rename from cairo/src/cairo-xlib-surface.c rename to io2d/src/3rd-party/cairo/src/cairo-xlib-surface.c diff --git a/cairo/src/cairo-xlib-visual.c b/io2d/src/3rd-party/cairo/src/cairo-xlib-visual.c similarity index 100% rename from cairo/src/cairo-xlib-visual.c rename to io2d/src/3rd-party/cairo/src/cairo-xlib-visual.c diff --git a/cairo/src/cairo-xlib-xcb-surface.c b/io2d/src/3rd-party/cairo/src/cairo-xlib-xcb-surface.c similarity index 100% rename from cairo/src/cairo-xlib-xcb-surface.c rename to io2d/src/3rd-party/cairo/src/cairo-xlib-xcb-surface.c diff --git a/cairo/src/cairo-xlib-xrender-private.h b/io2d/src/3rd-party/cairo/src/cairo-xlib-xrender-private.h similarity index 100% rename from cairo/src/cairo-xlib-xrender-private.h rename to io2d/src/3rd-party/cairo/src/cairo-xlib-xrender-private.h diff --git a/cairo/src/cairo-xlib-xrender.h b/io2d/src/3rd-party/cairo/src/cairo-xlib-xrender.h similarity index 100% rename from cairo/src/cairo-xlib-xrender.h rename to io2d/src/3rd-party/cairo/src/cairo-xlib-xrender.h diff --git a/cairo/src/cairo-xlib.h b/io2d/src/3rd-party/cairo/src/cairo-xlib.h similarity index 100% rename from cairo/src/cairo-xlib.h rename to io2d/src/3rd-party/cairo/src/cairo-xlib.h diff --git a/cairo/src/cairo-xml-surface.c b/io2d/src/3rd-party/cairo/src/cairo-xml-surface.c similarity index 100% rename from cairo/src/cairo-xml-surface.c rename to io2d/src/3rd-party/cairo/src/cairo-xml-surface.c diff --git a/cairo/src/cairo-xml.h b/io2d/src/3rd-party/cairo/src/cairo-xml.h similarity index 100% rename from cairo/src/cairo-xml.h rename to io2d/src/3rd-party/cairo/src/cairo-xml.h diff --git a/cairo/src/cairo.c b/io2d/src/3rd-party/cairo/src/cairo.c similarity index 100% rename from cairo/src/cairo.c rename to io2d/src/3rd-party/cairo/src/cairo.c diff --git a/N3888_RefImpl/src/win32/include/cairo.h b/io2d/src/3rd-party/cairo/src/cairo.h similarity index 100% rename from N3888_RefImpl/src/win32/include/cairo.h rename to io2d/src/3rd-party/cairo/src/cairo.h diff --git a/cairo/src/cairo.pc.in b/io2d/src/3rd-party/cairo/src/cairo.pc.in similarity index 100% rename from cairo/src/cairo.pc.in rename to io2d/src/3rd-party/cairo/src/cairo.pc.in diff --git a/cairo/src/cairoint.h b/io2d/src/3rd-party/cairo/src/cairoint.h similarity index 100% rename from cairo/src/cairoint.h rename to io2d/src/3rd-party/cairo/src/cairoint.h diff --git a/cairo/src/check-def.sh b/io2d/src/3rd-party/cairo/src/check-def.sh similarity index 100% rename from cairo/src/check-def.sh rename to io2d/src/3rd-party/cairo/src/check-def.sh diff --git a/cairo/src/check-doc-syntax.awk b/io2d/src/3rd-party/cairo/src/check-doc-syntax.awk similarity index 100% rename from cairo/src/check-doc-syntax.awk rename to io2d/src/3rd-party/cairo/src/check-doc-syntax.awk diff --git a/cairo/src/check-doc-syntax.sh b/io2d/src/3rd-party/cairo/src/check-doc-syntax.sh similarity index 100% rename from cairo/src/check-doc-syntax.sh rename to io2d/src/3rd-party/cairo/src/check-doc-syntax.sh diff --git a/cairo/src/check-has-hidden-symbols.c b/io2d/src/3rd-party/cairo/src/check-has-hidden-symbols.c similarity index 100% rename from cairo/src/check-has-hidden-symbols.c rename to io2d/src/3rd-party/cairo/src/check-has-hidden-symbols.c diff --git a/cairo/src/check-headers.sh b/io2d/src/3rd-party/cairo/src/check-headers.sh similarity index 100% rename from cairo/src/check-headers.sh rename to io2d/src/3rd-party/cairo/src/check-headers.sh diff --git a/cairo/src/check-link.c b/io2d/src/3rd-party/cairo/src/check-link.c similarity index 100% rename from cairo/src/check-link.c rename to io2d/src/3rd-party/cairo/src/check-link.c diff --git a/cairo/src/check-plt.sh b/io2d/src/3rd-party/cairo/src/check-plt.sh similarity index 100% rename from cairo/src/check-plt.sh rename to io2d/src/3rd-party/cairo/src/check-plt.sh diff --git a/cairo/src/check-preprocessor-syntax.sh b/io2d/src/3rd-party/cairo/src/check-preprocessor-syntax.sh similarity index 100% rename from cairo/src/check-preprocessor-syntax.sh rename to io2d/src/3rd-party/cairo/src/check-preprocessor-syntax.sh diff --git a/cairo/src/drm/cairo-drm-bo.c b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-bo.c similarity index 100% rename from cairo/src/drm/cairo-drm-bo.c rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-bo.c diff --git a/cairo/src/drm/cairo-drm-gallium-surface.c b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-gallium-surface.c similarity index 100% rename from cairo/src/drm/cairo-drm-gallium-surface.c rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-gallium-surface.c diff --git a/cairo/src/drm/cairo-drm-i915-glyphs.c b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-i915-glyphs.c similarity index 100% rename from cairo/src/drm/cairo-drm-i915-glyphs.c rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-i915-glyphs.c diff --git a/cairo/src/drm/cairo-drm-i915-private.h b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-i915-private.h similarity index 100% rename from cairo/src/drm/cairo-drm-i915-private.h rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-i915-private.h diff --git a/cairo/src/drm/cairo-drm-i915-shader.c b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-i915-shader.c similarity index 100% rename from cairo/src/drm/cairo-drm-i915-shader.c rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-i915-shader.c diff --git a/cairo/src/drm/cairo-drm-i915-spans.c b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-i915-spans.c similarity index 100% rename from cairo/src/drm/cairo-drm-i915-spans.c rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-i915-spans.c diff --git a/cairo/src/drm/cairo-drm-i915-surface.c b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-i915-surface.c similarity index 100% rename from cairo/src/drm/cairo-drm-i915-surface.c rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-i915-surface.c diff --git a/cairo/src/drm/cairo-drm-i965-glyphs.c b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-i965-glyphs.c similarity index 100% rename from cairo/src/drm/cairo-drm-i965-glyphs.c rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-i965-glyphs.c diff --git a/cairo/src/drm/cairo-drm-i965-private.h b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-i965-private.h similarity index 100% rename from cairo/src/drm/cairo-drm-i965-private.h rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-i965-private.h diff --git a/cairo/src/drm/cairo-drm-i965-shader.c b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-i965-shader.c similarity index 100% rename from cairo/src/drm/cairo-drm-i965-shader.c rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-i965-shader.c diff --git a/cairo/src/drm/cairo-drm-i965-spans.c b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-i965-spans.c similarity index 100% rename from cairo/src/drm/cairo-drm-i965-spans.c rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-i965-spans.c diff --git a/cairo/src/drm/cairo-drm-i965-surface.c b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-i965-surface.c similarity index 100% rename from cairo/src/drm/cairo-drm-i965-surface.c rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-i965-surface.c diff --git a/cairo/src/drm/cairo-drm-intel-brw-defines.h b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-intel-brw-defines.h similarity index 100% rename from cairo/src/drm/cairo-drm-intel-brw-defines.h rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-intel-brw-defines.h diff --git a/cairo/src/drm/cairo-drm-intel-brw-eu-emit.c b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-intel-brw-eu-emit.c similarity index 100% rename from cairo/src/drm/cairo-drm-intel-brw-eu-emit.c rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-intel-brw-eu-emit.c diff --git a/cairo/src/drm/cairo-drm-intel-brw-eu-util.c b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-intel-brw-eu-util.c similarity index 100% rename from cairo/src/drm/cairo-drm-intel-brw-eu-util.c rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-intel-brw-eu-util.c diff --git a/cairo/src/drm/cairo-drm-intel-brw-eu.c b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-intel-brw-eu.c similarity index 100% rename from cairo/src/drm/cairo-drm-intel-brw-eu.c rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-intel-brw-eu.c diff --git a/cairo/src/drm/cairo-drm-intel-brw-eu.h b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-intel-brw-eu.h similarity index 100% rename from cairo/src/drm/cairo-drm-intel-brw-eu.h rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-intel-brw-eu.h diff --git a/cairo/src/drm/cairo-drm-intel-brw-structs.h b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-intel-brw-structs.h similarity index 100% rename from cairo/src/drm/cairo-drm-intel-brw-structs.h rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-intel-brw-structs.h diff --git a/cairo/src/drm/cairo-drm-intel-command-private.h b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-intel-command-private.h similarity index 100% rename from cairo/src/drm/cairo-drm-intel-command-private.h rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-intel-command-private.h diff --git a/cairo/src/drm/cairo-drm-intel-debug.c b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-intel-debug.c similarity index 100% rename from cairo/src/drm/cairo-drm-intel-debug.c rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-intel-debug.c diff --git a/cairo/src/drm/cairo-drm-intel-ioctl-private.h b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-intel-ioctl-private.h similarity index 100% rename from cairo/src/drm/cairo-drm-intel-ioctl-private.h rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-intel-ioctl-private.h diff --git a/cairo/src/drm/cairo-drm-intel-private.h b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-intel-private.h similarity index 100% rename from cairo/src/drm/cairo-drm-intel-private.h rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-intel-private.h diff --git a/cairo/src/drm/cairo-drm-intel-surface.c b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-intel-surface.c similarity index 100% rename from cairo/src/drm/cairo-drm-intel-surface.c rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-intel-surface.c diff --git a/cairo/src/drm/cairo-drm-intel.c b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-intel.c similarity index 100% rename from cairo/src/drm/cairo-drm-intel.c rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-intel.c diff --git a/cairo/src/drm/cairo-drm-ioctl-private.h b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-ioctl-private.h similarity index 100% rename from cairo/src/drm/cairo-drm-ioctl-private.h rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-ioctl-private.h diff --git a/cairo/src/drm/cairo-drm-private.h b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-private.h similarity index 100% rename from cairo/src/drm/cairo-drm-private.h rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-private.h diff --git a/cairo/src/drm/cairo-drm-radeon-private.h b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-radeon-private.h similarity index 100% rename from cairo/src/drm/cairo-drm-radeon-private.h rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-radeon-private.h diff --git a/cairo/src/drm/cairo-drm-radeon-surface.c b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-radeon-surface.c similarity index 100% rename from cairo/src/drm/cairo-drm-radeon-surface.c rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-radeon-surface.c diff --git a/cairo/src/drm/cairo-drm-radeon.c b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-radeon.c similarity index 100% rename from cairo/src/drm/cairo-drm-radeon.c rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-radeon.c diff --git a/cairo/src/drm/cairo-drm-surface.c b/io2d/src/3rd-party/cairo/src/drm/cairo-drm-surface.c similarity index 100% rename from cairo/src/drm/cairo-drm-surface.c rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm-surface.c diff --git a/cairo/src/drm/cairo-drm.c b/io2d/src/3rd-party/cairo/src/drm/cairo-drm.c similarity index 100% rename from cairo/src/drm/cairo-drm.c rename to io2d/src/3rd-party/cairo/src/drm/cairo-drm.c diff --git a/cairo/src/skia/cairo-skia-context.cpp b/io2d/src/3rd-party/cairo/src/skia/cairo-skia-context.cpp similarity index 100% rename from cairo/src/skia/cairo-skia-context.cpp rename to io2d/src/3rd-party/cairo/src/skia/cairo-skia-context.cpp diff --git a/cairo/src/skia/cairo-skia-private.h b/io2d/src/3rd-party/cairo/src/skia/cairo-skia-private.h similarity index 100% rename from cairo/src/skia/cairo-skia-private.h rename to io2d/src/3rd-party/cairo/src/skia/cairo-skia-private.h diff --git a/cairo/src/skia/cairo-skia-surface.cpp b/io2d/src/3rd-party/cairo/src/skia/cairo-skia-surface.cpp similarity index 100% rename from cairo/src/skia/cairo-skia-surface.cpp rename to io2d/src/3rd-party/cairo/src/skia/cairo-skia-surface.cpp diff --git a/cairo/src/test-base-compositor-surface.c b/io2d/src/3rd-party/cairo/src/test-base-compositor-surface.c similarity index 100% rename from cairo/src/test-base-compositor-surface.c rename to io2d/src/3rd-party/cairo/src/test-base-compositor-surface.c diff --git a/cairo/src/test-compositor-surface-private.h b/io2d/src/3rd-party/cairo/src/test-compositor-surface-private.h similarity index 100% rename from cairo/src/test-compositor-surface-private.h rename to io2d/src/3rd-party/cairo/src/test-compositor-surface-private.h diff --git a/cairo/src/test-compositor-surface.c b/io2d/src/3rd-party/cairo/src/test-compositor-surface.c similarity index 100% rename from cairo/src/test-compositor-surface.c rename to io2d/src/3rd-party/cairo/src/test-compositor-surface.c diff --git a/cairo/src/test-compositor-surface.h b/io2d/src/3rd-party/cairo/src/test-compositor-surface.h similarity index 100% rename from cairo/src/test-compositor-surface.h rename to io2d/src/3rd-party/cairo/src/test-compositor-surface.h diff --git a/cairo/src/test-null-compositor-surface.c b/io2d/src/3rd-party/cairo/src/test-null-compositor-surface.c similarity index 100% rename from cairo/src/test-null-compositor-surface.c rename to io2d/src/3rd-party/cairo/src/test-null-compositor-surface.c diff --git a/cairo/src/test-null-compositor-surface.h b/io2d/src/3rd-party/cairo/src/test-null-compositor-surface.h similarity index 100% rename from cairo/src/test-null-compositor-surface.h rename to io2d/src/3rd-party/cairo/src/test-null-compositor-surface.h diff --git a/cairo/src/test-paginated-surface.c b/io2d/src/3rd-party/cairo/src/test-paginated-surface.c similarity index 100% rename from cairo/src/test-paginated-surface.c rename to io2d/src/3rd-party/cairo/src/test-paginated-surface.c diff --git a/cairo/src/test-paginated-surface.h b/io2d/src/3rd-party/cairo/src/test-paginated-surface.h similarity index 100% rename from cairo/src/test-paginated-surface.h rename to io2d/src/3rd-party/cairo/src/test-paginated-surface.h diff --git a/cairo/src/win32/cairo-win32-debug.c b/io2d/src/3rd-party/cairo/src/win32/cairo-win32-debug.c similarity index 100% rename from cairo/src/win32/cairo-win32-debug.c rename to io2d/src/3rd-party/cairo/src/win32/cairo-win32-debug.c diff --git a/cairo/src/win32/cairo-win32-device.c b/io2d/src/3rd-party/cairo/src/win32/cairo-win32-device.c similarity index 100% rename from cairo/src/win32/cairo-win32-device.c rename to io2d/src/3rd-party/cairo/src/win32/cairo-win32-device.c diff --git a/cairo/src/win32/cairo-win32-display-surface.c b/io2d/src/3rd-party/cairo/src/win32/cairo-win32-display-surface.c similarity index 100% rename from cairo/src/win32/cairo-win32-display-surface.c rename to io2d/src/3rd-party/cairo/src/win32/cairo-win32-display-surface.c diff --git a/cairo/src/win32/cairo-win32-font.c b/io2d/src/3rd-party/cairo/src/win32/cairo-win32-font.c similarity index 100% rename from cairo/src/win32/cairo-win32-font.c rename to io2d/src/3rd-party/cairo/src/win32/cairo-win32-font.c diff --git a/cairo/src/win32/cairo-win32-gdi-compositor.c b/io2d/src/3rd-party/cairo/src/win32/cairo-win32-gdi-compositor.c similarity index 100% rename from cairo/src/win32/cairo-win32-gdi-compositor.c rename to io2d/src/3rd-party/cairo/src/win32/cairo-win32-gdi-compositor.c diff --git a/cairo/src/win32/cairo-win32-printing-surface.c b/io2d/src/3rd-party/cairo/src/win32/cairo-win32-printing-surface.c similarity index 100% rename from cairo/src/win32/cairo-win32-printing-surface.c rename to io2d/src/3rd-party/cairo/src/win32/cairo-win32-printing-surface.c diff --git a/cairo/src/win32/cairo-win32-private.h b/io2d/src/3rd-party/cairo/src/win32/cairo-win32-private.h similarity index 100% rename from cairo/src/win32/cairo-win32-private.h rename to io2d/src/3rd-party/cairo/src/win32/cairo-win32-private.h diff --git a/cairo/src/win32/cairo-win32-surface.c b/io2d/src/3rd-party/cairo/src/win32/cairo-win32-surface.c similarity index 100% rename from cairo/src/win32/cairo-win32-surface.c rename to io2d/src/3rd-party/cairo/src/win32/cairo-win32-surface.c diff --git a/cairo/src/win32/cairo-win32-system.c b/io2d/src/3rd-party/cairo/src/win32/cairo-win32-system.c similarity index 100% rename from cairo/src/win32/cairo-win32-system.c rename to io2d/src/3rd-party/cairo/src/win32/cairo-win32-system.c diff --git a/cairo/test/.gitignore b/io2d/src/3rd-party/cairo/test/.gitignore similarity index 100% rename from cairo/test/.gitignore rename to io2d/src/3rd-party/cairo/test/.gitignore diff --git a/cairo/test/.valgrind-suppressions b/io2d/src/3rd-party/cairo/test/.valgrind-suppressions similarity index 100% rename from cairo/test/.valgrind-suppressions rename to io2d/src/3rd-party/cairo/test/.valgrind-suppressions diff --git a/cairo/test/6x13.pcf b/io2d/src/3rd-party/cairo/test/6x13.pcf similarity index 100% rename from cairo/test/6x13.pcf rename to io2d/src/3rd-party/cairo/test/6x13.pcf diff --git a/cairo/test/COPYING b/io2d/src/3rd-party/cairo/test/COPYING similarity index 100% rename from cairo/test/COPYING rename to io2d/src/3rd-party/cairo/test/COPYING diff --git a/cairo/test/Makefile.am b/io2d/src/3rd-party/cairo/test/Makefile.am similarity index 100% rename from cairo/test/Makefile.am rename to io2d/src/3rd-party/cairo/test/Makefile.am diff --git a/cairo/test/Makefile.sources b/io2d/src/3rd-party/cairo/test/Makefile.sources similarity index 100% rename from cairo/test/Makefile.sources rename to io2d/src/3rd-party/cairo/test/Makefile.sources diff --git a/cairo/test/Makefile.win32 b/io2d/src/3rd-party/cairo/test/Makefile.win32 similarity index 100% rename from cairo/test/Makefile.win32 rename to io2d/src/3rd-party/cairo/test/Makefile.win32 diff --git a/cairo/test/README b/io2d/src/3rd-party/cairo/test/README similarity index 100% rename from cairo/test/README rename to io2d/src/3rd-party/cairo/test/README diff --git a/cairo/test/a1-bug.c b/io2d/src/3rd-party/cairo/test/a1-bug.c similarity index 100% rename from cairo/test/a1-bug.c rename to io2d/src/3rd-party/cairo/test/a1-bug.c diff --git a/cairo/test/a1-clip.c b/io2d/src/3rd-party/cairo/test/a1-clip.c similarity index 100% rename from cairo/test/a1-clip.c rename to io2d/src/3rd-party/cairo/test/a1-clip.c diff --git a/cairo/test/a1-fill.c b/io2d/src/3rd-party/cairo/test/a1-fill.c similarity index 100% rename from cairo/test/a1-fill.c rename to io2d/src/3rd-party/cairo/test/a1-fill.c diff --git a/cairo/test/a1-image-sample.c b/io2d/src/3rd-party/cairo/test/a1-image-sample.c similarity index 100% rename from cairo/test/a1-image-sample.c rename to io2d/src/3rd-party/cairo/test/a1-image-sample.c diff --git a/cairo/test/a1-mask-sample.c b/io2d/src/3rd-party/cairo/test/a1-mask-sample.c similarity index 100% rename from cairo/test/a1-mask-sample.c rename to io2d/src/3rd-party/cairo/test/a1-mask-sample.c diff --git a/cairo/test/a1-mask.c b/io2d/src/3rd-party/cairo/test/a1-mask.c similarity index 100% rename from cairo/test/a1-mask.c rename to io2d/src/3rd-party/cairo/test/a1-mask.c diff --git a/cairo/test/a1-rasterisation.c b/io2d/src/3rd-party/cairo/test/a1-rasterisation.c similarity index 100% rename from cairo/test/a1-rasterisation.c rename to io2d/src/3rd-party/cairo/test/a1-rasterisation.c diff --git a/cairo/test/a1-sample.c b/io2d/src/3rd-party/cairo/test/a1-sample.c similarity index 100% rename from cairo/test/a1-sample.c rename to io2d/src/3rd-party/cairo/test/a1-sample.c diff --git a/cairo/test/a1-traps-sample.c b/io2d/src/3rd-party/cairo/test/a1-traps-sample.c similarity index 100% rename from cairo/test/a1-traps-sample.c rename to io2d/src/3rd-party/cairo/test/a1-traps-sample.c diff --git a/cairo/test/a8-clear.c b/io2d/src/3rd-party/cairo/test/a8-clear.c similarity index 100% rename from cairo/test/a8-clear.c rename to io2d/src/3rd-party/cairo/test/a8-clear.c diff --git a/cairo/test/a8-mask.c b/io2d/src/3rd-party/cairo/test/a8-mask.c similarity index 100% rename from cairo/test/a8-mask.c rename to io2d/src/3rd-party/cairo/test/a8-mask.c diff --git a/cairo/test/aliasing.c b/io2d/src/3rd-party/cairo/test/aliasing.c similarity index 100% rename from cairo/test/aliasing.c rename to io2d/src/3rd-party/cairo/test/aliasing.c diff --git a/cairo/test/alpha-similar.c b/io2d/src/3rd-party/cairo/test/alpha-similar.c similarity index 100% rename from cairo/test/alpha-similar.c rename to io2d/src/3rd-party/cairo/test/alpha-similar.c diff --git a/cairo/test/any2ppm.c b/io2d/src/3rd-party/cairo/test/any2ppm.c similarity index 100% rename from cairo/test/any2ppm.c rename to io2d/src/3rd-party/cairo/test/any2ppm.c diff --git a/cairo/test/api-special-cases.c b/io2d/src/3rd-party/cairo/test/api-special-cases.c similarity index 100% rename from cairo/test/api-special-cases.c rename to io2d/src/3rd-party/cairo/test/api-special-cases.c diff --git a/cairo/test/arc-direction.c b/io2d/src/3rd-party/cairo/test/arc-direction.c similarity index 100% rename from cairo/test/arc-direction.c rename to io2d/src/3rd-party/cairo/test/arc-direction.c diff --git a/cairo/test/arc-infinite-loop.c b/io2d/src/3rd-party/cairo/test/arc-infinite-loop.c similarity index 100% rename from cairo/test/arc-infinite-loop.c rename to io2d/src/3rd-party/cairo/test/arc-infinite-loop.c diff --git a/cairo/test/arc-looping-dash.c b/io2d/src/3rd-party/cairo/test/arc-looping-dash.c similarity index 100% rename from cairo/test/arc-looping-dash.c rename to io2d/src/3rd-party/cairo/test/arc-looping-dash.c diff --git a/cairo/test/big-empty-box.c b/io2d/src/3rd-party/cairo/test/big-empty-box.c similarity index 100% rename from cairo/test/big-empty-box.c rename to io2d/src/3rd-party/cairo/test/big-empty-box.c diff --git a/cairo/test/big-empty-triangle.c b/io2d/src/3rd-party/cairo/test/big-empty-triangle.c similarity index 100% rename from cairo/test/big-empty-triangle.c rename to io2d/src/3rd-party/cairo/test/big-empty-triangle.c diff --git a/cairo/test/big-line.c b/io2d/src/3rd-party/cairo/test/big-line.c similarity index 100% rename from cairo/test/big-line.c rename to io2d/src/3rd-party/cairo/test/big-line.c diff --git a/cairo/test/big-little-box.c b/io2d/src/3rd-party/cairo/test/big-little-box.c similarity index 100% rename from cairo/test/big-little-box.c rename to io2d/src/3rd-party/cairo/test/big-little-box.c diff --git a/cairo/test/big-little-triangle.c b/io2d/src/3rd-party/cairo/test/big-little-triangle.c similarity index 100% rename from cairo/test/big-little-triangle.c rename to io2d/src/3rd-party/cairo/test/big-little-triangle.c diff --git a/cairo/test/big-trap.c b/io2d/src/3rd-party/cairo/test/big-trap.c similarity index 100% rename from cairo/test/big-trap.c rename to io2d/src/3rd-party/cairo/test/big-trap.c diff --git a/cairo/test/bilevel-image.c b/io2d/src/3rd-party/cairo/test/bilevel-image.c similarity index 100% rename from cairo/test/bilevel-image.c rename to io2d/src/3rd-party/cairo/test/bilevel-image.c diff --git a/cairo/test/bitmap-font.c b/io2d/src/3rd-party/cairo/test/bitmap-font.c similarity index 100% rename from cairo/test/bitmap-font.c rename to io2d/src/3rd-party/cairo/test/bitmap-font.c diff --git a/cairo/test/buffer-diff.c b/io2d/src/3rd-party/cairo/test/buffer-diff.c similarity index 100% rename from cairo/test/buffer-diff.c rename to io2d/src/3rd-party/cairo/test/buffer-diff.c diff --git a/cairo/test/buffer-diff.h b/io2d/src/3rd-party/cairo/test/buffer-diff.h similarity index 100% rename from cairo/test/buffer-diff.h rename to io2d/src/3rd-party/cairo/test/buffer-diff.h diff --git a/cairo/test/bug-40410.c b/io2d/src/3rd-party/cairo/test/bug-40410.c similarity index 100% rename from cairo/test/bug-40410.c rename to io2d/src/3rd-party/cairo/test/bug-40410.c diff --git a/cairo/test/bug-51910.c b/io2d/src/3rd-party/cairo/test/bug-51910.c similarity index 100% rename from cairo/test/bug-51910.c rename to io2d/src/3rd-party/cairo/test/bug-51910.c diff --git a/cairo/test/bug-bo-collins.c b/io2d/src/3rd-party/cairo/test/bug-bo-collins.c similarity index 100% rename from cairo/test/bug-bo-collins.c rename to io2d/src/3rd-party/cairo/test/bug-bo-collins.c diff --git a/cairo/test/bug-bo-rectangular.c b/io2d/src/3rd-party/cairo/test/bug-bo-rectangular.c similarity index 100% rename from cairo/test/bug-bo-rectangular.c rename to io2d/src/3rd-party/cairo/test/bug-bo-rectangular.c diff --git a/cairo/test/bug-bo-ricotz.c b/io2d/src/3rd-party/cairo/test/bug-bo-ricotz.c similarity index 100% rename from cairo/test/bug-bo-ricotz.c rename to io2d/src/3rd-party/cairo/test/bug-bo-ricotz.c diff --git a/cairo/test/bug-extents.c b/io2d/src/3rd-party/cairo/test/bug-extents.c similarity index 100% rename from cairo/test/bug-extents.c rename to io2d/src/3rd-party/cairo/test/bug-extents.c diff --git a/cairo/test/bug-seams.c b/io2d/src/3rd-party/cairo/test/bug-seams.c similarity index 100% rename from cairo/test/bug-seams.c rename to io2d/src/3rd-party/cairo/test/bug-seams.c diff --git a/cairo/test/bug-source-cu.c b/io2d/src/3rd-party/cairo/test/bug-source-cu.c similarity index 100% rename from cairo/test/bug-source-cu.c rename to io2d/src/3rd-party/cairo/test/bug-source-cu.c diff --git a/cairo/test/bug-spline.c b/io2d/src/3rd-party/cairo/test/bug-spline.c similarity index 100% rename from cairo/test/bug-spline.c rename to io2d/src/3rd-party/cairo/test/bug-spline.c diff --git a/cairo/test/cairo-test-private.h b/io2d/src/3rd-party/cairo/test/cairo-test-private.h similarity index 100% rename from cairo/test/cairo-test-private.h rename to io2d/src/3rd-party/cairo/test/cairo-test-private.h diff --git a/cairo/test/cairo-test-runner.c b/io2d/src/3rd-party/cairo/test/cairo-test-runner.c similarity index 100% rename from cairo/test/cairo-test-runner.c rename to io2d/src/3rd-party/cairo/test/cairo-test-runner.c diff --git a/cairo/test/cairo-test-trace.c b/io2d/src/3rd-party/cairo/test/cairo-test-trace.c similarity index 100% rename from cairo/test/cairo-test-trace.c rename to io2d/src/3rd-party/cairo/test/cairo-test-trace.c diff --git a/cairo/test/cairo-test.c b/io2d/src/3rd-party/cairo/test/cairo-test.c similarity index 100% rename from cairo/test/cairo-test.c rename to io2d/src/3rd-party/cairo/test/cairo-test.c diff --git a/cairo/test/cairo-test.h b/io2d/src/3rd-party/cairo/test/cairo-test.h similarity index 100% rename from cairo/test/cairo-test.h rename to io2d/src/3rd-party/cairo/test/cairo-test.h diff --git a/cairo/test/caps-joins-alpha.c b/io2d/src/3rd-party/cairo/test/caps-joins-alpha.c similarity index 100% rename from cairo/test/caps-joins-alpha.c rename to io2d/src/3rd-party/cairo/test/caps-joins-alpha.c diff --git a/cairo/test/caps-joins-curve.c b/io2d/src/3rd-party/cairo/test/caps-joins-curve.c similarity index 100% rename from cairo/test/caps-joins-curve.c rename to io2d/src/3rd-party/cairo/test/caps-joins-curve.c diff --git a/cairo/test/caps-joins.c b/io2d/src/3rd-party/cairo/test/caps-joins.c similarity index 100% rename from cairo/test/caps-joins.c rename to io2d/src/3rd-party/cairo/test/caps-joins.c diff --git a/cairo/test/caps-sub-paths.c b/io2d/src/3rd-party/cairo/test/caps-sub-paths.c similarity index 100% rename from cairo/test/caps-sub-paths.c rename to io2d/src/3rd-party/cairo/test/caps-sub-paths.c diff --git a/cairo/test/caps-tails-curve.c b/io2d/src/3rd-party/cairo/test/caps-tails-curve.c similarity index 100% rename from cairo/test/caps-tails-curve.c rename to io2d/src/3rd-party/cairo/test/caps-tails-curve.c diff --git a/cairo/test/caps.c b/io2d/src/3rd-party/cairo/test/caps.c similarity index 100% rename from cairo/test/caps.c rename to io2d/src/3rd-party/cairo/test/caps.c diff --git a/cairo/test/check-refs.sh b/io2d/src/3rd-party/cairo/test/check-refs.sh similarity index 100% rename from cairo/test/check-refs.sh rename to io2d/src/3rd-party/cairo/test/check-refs.sh diff --git a/cairo/test/checkerboard.c b/io2d/src/3rd-party/cairo/test/checkerboard.c similarity index 100% rename from cairo/test/checkerboard.c rename to io2d/src/3rd-party/cairo/test/checkerboard.c diff --git a/cairo/test/clear-source.c b/io2d/src/3rd-party/cairo/test/clear-source.c similarity index 100% rename from cairo/test/clear-source.c rename to io2d/src/3rd-party/cairo/test/clear-source.c diff --git a/cairo/test/clear.c b/io2d/src/3rd-party/cairo/test/clear.c similarity index 100% rename from cairo/test/clear.c rename to io2d/src/3rd-party/cairo/test/clear.c diff --git a/cairo/test/clip-all.c b/io2d/src/3rd-party/cairo/test/clip-all.c similarity index 100% rename from cairo/test/clip-all.c rename to io2d/src/3rd-party/cairo/test/clip-all.c diff --git a/cairo/test/clip-complex-bug61592.c b/io2d/src/3rd-party/cairo/test/clip-complex-bug61592.c similarity index 100% rename from cairo/test/clip-complex-bug61592.c rename to io2d/src/3rd-party/cairo/test/clip-complex-bug61592.c diff --git a/cairo/test/clip-complex-shape.c b/io2d/src/3rd-party/cairo/test/clip-complex-shape.c similarity index 100% rename from cairo/test/clip-complex-shape.c rename to io2d/src/3rd-party/cairo/test/clip-complex-shape.c diff --git a/cairo/test/clip-contexts.c b/io2d/src/3rd-party/cairo/test/clip-contexts.c similarity index 100% rename from cairo/test/clip-contexts.c rename to io2d/src/3rd-party/cairo/test/clip-contexts.c diff --git a/cairo/test/clip-device-offset.c b/io2d/src/3rd-party/cairo/test/clip-device-offset.c similarity index 100% rename from cairo/test/clip-device-offset.c rename to io2d/src/3rd-party/cairo/test/clip-device-offset.c diff --git a/cairo/test/clip-disjoint-hatching.c b/io2d/src/3rd-party/cairo/test/clip-disjoint-hatching.c similarity index 100% rename from cairo/test/clip-disjoint-hatching.c rename to io2d/src/3rd-party/cairo/test/clip-disjoint-hatching.c diff --git a/cairo/test/clip-disjoint-quad.c b/io2d/src/3rd-party/cairo/test/clip-disjoint-quad.c similarity index 100% rename from cairo/test/clip-disjoint-quad.c rename to io2d/src/3rd-party/cairo/test/clip-disjoint-quad.c diff --git a/cairo/test/clip-disjoint.c b/io2d/src/3rd-party/cairo/test/clip-disjoint.c similarity index 100% rename from cairo/test/clip-disjoint.c rename to io2d/src/3rd-party/cairo/test/clip-disjoint.c diff --git a/cairo/test/clip-double-free.c b/io2d/src/3rd-party/cairo/test/clip-double-free.c similarity index 100% rename from cairo/test/clip-double-free.c rename to io2d/src/3rd-party/cairo/test/clip-double-free.c diff --git a/cairo/test/clip-draw-unbounded.c b/io2d/src/3rd-party/cairo/test/clip-draw-unbounded.c similarity index 100% rename from cairo/test/clip-draw-unbounded.c rename to io2d/src/3rd-party/cairo/test/clip-draw-unbounded.c diff --git a/cairo/test/clip-empty-group.c b/io2d/src/3rd-party/cairo/test/clip-empty-group.c similarity index 100% rename from cairo/test/clip-empty-group.c rename to io2d/src/3rd-party/cairo/test/clip-empty-group.c diff --git a/cairo/test/clip-empty-save.c b/io2d/src/3rd-party/cairo/test/clip-empty-save.c similarity index 100% rename from cairo/test/clip-empty-save.c rename to io2d/src/3rd-party/cairo/test/clip-empty-save.c diff --git a/cairo/test/clip-empty.c b/io2d/src/3rd-party/cairo/test/clip-empty.c similarity index 100% rename from cairo/test/clip-empty.c rename to io2d/src/3rd-party/cairo/test/clip-empty.c diff --git a/cairo/test/clip-fill-no-op.c b/io2d/src/3rd-party/cairo/test/clip-fill-no-op.c similarity index 100% rename from cairo/test/clip-fill-no-op.c rename to io2d/src/3rd-party/cairo/test/clip-fill-no-op.c diff --git a/cairo/test/clip-fill-rule-pixel-aligned.c b/io2d/src/3rd-party/cairo/test/clip-fill-rule-pixel-aligned.c similarity index 100% rename from cairo/test/clip-fill-rule-pixel-aligned.c rename to io2d/src/3rd-party/cairo/test/clip-fill-rule-pixel-aligned.c diff --git a/cairo/test/clip-fill-rule.c b/io2d/src/3rd-party/cairo/test/clip-fill-rule.c similarity index 100% rename from cairo/test/clip-fill-rule.c rename to io2d/src/3rd-party/cairo/test/clip-fill-rule.c diff --git a/cairo/test/clip-fill.c b/io2d/src/3rd-party/cairo/test/clip-fill.c similarity index 100% rename from cairo/test/clip-fill.c rename to io2d/src/3rd-party/cairo/test/clip-fill.c diff --git a/cairo/test/clip-group-shapes.c b/io2d/src/3rd-party/cairo/test/clip-group-shapes.c similarity index 100% rename from cairo/test/clip-group-shapes.c rename to io2d/src/3rd-party/cairo/test/clip-group-shapes.c diff --git a/cairo/test/clip-image.c b/io2d/src/3rd-party/cairo/test/clip-image.c similarity index 100% rename from cairo/test/clip-image.c rename to io2d/src/3rd-party/cairo/test/clip-image.c diff --git a/cairo/test/clip-intersect.c b/io2d/src/3rd-party/cairo/test/clip-intersect.c similarity index 100% rename from cairo/test/clip-intersect.c rename to io2d/src/3rd-party/cairo/test/clip-intersect.c diff --git a/cairo/test/clip-mixed-antialias.c b/io2d/src/3rd-party/cairo/test/clip-mixed-antialias.c similarity index 100% rename from cairo/test/clip-mixed-antialias.c rename to io2d/src/3rd-party/cairo/test/clip-mixed-antialias.c diff --git a/cairo/test/clip-nesting.c b/io2d/src/3rd-party/cairo/test/clip-nesting.c similarity index 100% rename from cairo/test/clip-nesting.c rename to io2d/src/3rd-party/cairo/test/clip-nesting.c diff --git a/cairo/test/clip-operator.c b/io2d/src/3rd-party/cairo/test/clip-operator.c similarity index 100% rename from cairo/test/clip-operator.c rename to io2d/src/3rd-party/cairo/test/clip-operator.c diff --git a/cairo/test/clip-polygons.c b/io2d/src/3rd-party/cairo/test/clip-polygons.c similarity index 100% rename from cairo/test/clip-polygons.c rename to io2d/src/3rd-party/cairo/test/clip-polygons.c diff --git a/cairo/test/clip-push-group.c b/io2d/src/3rd-party/cairo/test/clip-push-group.c similarity index 100% rename from cairo/test/clip-push-group.c rename to io2d/src/3rd-party/cairo/test/clip-push-group.c diff --git a/cairo/test/clip-rectilinear.c b/io2d/src/3rd-party/cairo/test/clip-rectilinear.c similarity index 100% rename from cairo/test/clip-rectilinear.c rename to io2d/src/3rd-party/cairo/test/clip-rectilinear.c diff --git a/cairo/test/clip-shape.c b/io2d/src/3rd-party/cairo/test/clip-shape.c similarity index 100% rename from cairo/test/clip-shape.c rename to io2d/src/3rd-party/cairo/test/clip-shape.c diff --git a/cairo/test/clip-stroke-no-op.c b/io2d/src/3rd-party/cairo/test/clip-stroke-no-op.c similarity index 100% rename from cairo/test/clip-stroke-no-op.c rename to io2d/src/3rd-party/cairo/test/clip-stroke-no-op.c diff --git a/cairo/test/clip-stroke.c b/io2d/src/3rd-party/cairo/test/clip-stroke.c similarity index 100% rename from cairo/test/clip-stroke.c rename to io2d/src/3rd-party/cairo/test/clip-stroke.c diff --git a/cairo/test/clip-text.c b/io2d/src/3rd-party/cairo/test/clip-text.c similarity index 100% rename from cairo/test/clip-text.c rename to io2d/src/3rd-party/cairo/test/clip-text.c diff --git a/cairo/test/clip-twice-rectangle.c b/io2d/src/3rd-party/cairo/test/clip-twice-rectangle.c similarity index 100% rename from cairo/test/clip-twice-rectangle.c rename to io2d/src/3rd-party/cairo/test/clip-twice-rectangle.c diff --git a/cairo/test/clip-twice.c b/io2d/src/3rd-party/cairo/test/clip-twice.c similarity index 100% rename from cairo/test/clip-twice.c rename to io2d/src/3rd-party/cairo/test/clip-twice.c diff --git a/cairo/test/clip-unbounded.c b/io2d/src/3rd-party/cairo/test/clip-unbounded.c similarity index 100% rename from cairo/test/clip-unbounded.c rename to io2d/src/3rd-party/cairo/test/clip-unbounded.c diff --git a/cairo/test/clip-zero.c b/io2d/src/3rd-party/cairo/test/clip-zero.c similarity index 100% rename from cairo/test/clip-zero.c rename to io2d/src/3rd-party/cairo/test/clip-zero.c diff --git a/cairo/test/clipped-group.c b/io2d/src/3rd-party/cairo/test/clipped-group.c similarity index 100% rename from cairo/test/clipped-group.c rename to io2d/src/3rd-party/cairo/test/clipped-group.c diff --git a/cairo/test/clipped-surface.c b/io2d/src/3rd-party/cairo/test/clipped-surface.c similarity index 100% rename from cairo/test/clipped-surface.c rename to io2d/src/3rd-party/cairo/test/clipped-surface.c diff --git a/cairo/test/clipped-trapezoids-ref.png b/io2d/src/3rd-party/cairo/test/clipped-trapezoids-ref.png similarity index 100% rename from cairo/test/clipped-trapezoids-ref.png rename to io2d/src/3rd-party/cairo/test/clipped-trapezoids-ref.png diff --git a/cairo/test/clipped-trapezoids.c b/io2d/src/3rd-party/cairo/test/clipped-trapezoids.c similarity index 100% rename from cairo/test/clipped-trapezoids.c rename to io2d/src/3rd-party/cairo/test/clipped-trapezoids.c diff --git a/cairo/test/close-path-current-point.c b/io2d/src/3rd-party/cairo/test/close-path-current-point.c similarity index 100% rename from cairo/test/close-path-current-point.c rename to io2d/src/3rd-party/cairo/test/close-path-current-point.c diff --git a/cairo/test/close-path.c b/io2d/src/3rd-party/cairo/test/close-path.c similarity index 100% rename from cairo/test/close-path.c rename to io2d/src/3rd-party/cairo/test/close-path.c diff --git a/cairo/test/composite-integer-translate-over-repeat.c b/io2d/src/3rd-party/cairo/test/composite-integer-translate-over-repeat.c similarity index 100% rename from cairo/test/composite-integer-translate-over-repeat.c rename to io2d/src/3rd-party/cairo/test/composite-integer-translate-over-repeat.c diff --git a/cairo/test/composite-integer-translate-over.c b/io2d/src/3rd-party/cairo/test/composite-integer-translate-over.c similarity index 100% rename from cairo/test/composite-integer-translate-over.c rename to io2d/src/3rd-party/cairo/test/composite-integer-translate-over.c diff --git a/cairo/test/composite-integer-translate-source.c b/io2d/src/3rd-party/cairo/test/composite-integer-translate-source.c similarity index 100% rename from cairo/test/composite-integer-translate-source.c rename to io2d/src/3rd-party/cairo/test/composite-integer-translate-source.c diff --git a/cairo/test/copy-disjoint.c b/io2d/src/3rd-party/cairo/test/copy-disjoint.c similarity index 100% rename from cairo/test/copy-disjoint.c rename to io2d/src/3rd-party/cairo/test/copy-disjoint.c diff --git a/cairo/test/copy-path.c b/io2d/src/3rd-party/cairo/test/copy-path.c similarity index 100% rename from cairo/test/copy-path.c rename to io2d/src/3rd-party/cairo/test/copy-path.c diff --git a/cairo/test/coverage.c b/io2d/src/3rd-party/cairo/test/coverage.c similarity index 100% rename from cairo/test/coverage.c rename to io2d/src/3rd-party/cairo/test/coverage.c diff --git a/cairo/test/create-for-stream.c b/io2d/src/3rd-party/cairo/test/create-for-stream.c similarity index 100% rename from cairo/test/create-for-stream.c rename to io2d/src/3rd-party/cairo/test/create-for-stream.c diff --git a/cairo/test/create-from-png-stream.c b/io2d/src/3rd-party/cairo/test/create-from-png-stream.c similarity index 100% rename from cairo/test/create-from-png-stream.c rename to io2d/src/3rd-party/cairo/test/create-from-png-stream.c diff --git a/cairo/test/create-from-png.c b/io2d/src/3rd-party/cairo/test/create-from-png.c similarity index 100% rename from cairo/test/create-from-png.c rename to io2d/src/3rd-party/cairo/test/create-from-png.c diff --git a/cairo/test/culled-glyphs.c b/io2d/src/3rd-party/cairo/test/culled-glyphs.c similarity index 100% rename from cairo/test/culled-glyphs.c rename to io2d/src/3rd-party/cairo/test/culled-glyphs.c diff --git a/cairo/test/curve-to-as-line-to.c b/io2d/src/3rd-party/cairo/test/curve-to-as-line-to.c similarity index 100% rename from cairo/test/curve-to-as-line-to.c rename to io2d/src/3rd-party/cairo/test/curve-to-as-line-to.c diff --git a/cairo/test/dash-caps-joins.c b/io2d/src/3rd-party/cairo/test/dash-caps-joins.c similarity index 100% rename from cairo/test/dash-caps-joins.c rename to io2d/src/3rd-party/cairo/test/dash-caps-joins.c diff --git a/cairo/test/dash-curve.c b/io2d/src/3rd-party/cairo/test/dash-curve.c similarity index 100% rename from cairo/test/dash-curve.c rename to io2d/src/3rd-party/cairo/test/dash-curve.c diff --git a/cairo/test/dash-infinite-loop.c b/io2d/src/3rd-party/cairo/test/dash-infinite-loop.c similarity index 100% rename from cairo/test/dash-infinite-loop.c rename to io2d/src/3rd-party/cairo/test/dash-infinite-loop.c diff --git a/cairo/test/dash-no-dash.c b/io2d/src/3rd-party/cairo/test/dash-no-dash.c similarity index 100% rename from cairo/test/dash-no-dash.c rename to io2d/src/3rd-party/cairo/test/dash-no-dash.c diff --git a/cairo/test/dash-offset-negative.c b/io2d/src/3rd-party/cairo/test/dash-offset-negative.c similarity index 100% rename from cairo/test/dash-offset-negative.c rename to io2d/src/3rd-party/cairo/test/dash-offset-negative.c diff --git a/cairo/test/dash-offset.c b/io2d/src/3rd-party/cairo/test/dash-offset.c similarity index 100% rename from cairo/test/dash-offset.c rename to io2d/src/3rd-party/cairo/test/dash-offset.c diff --git a/cairo/test/dash-scale.c b/io2d/src/3rd-party/cairo/test/dash-scale.c similarity index 100% rename from cairo/test/dash-scale.c rename to io2d/src/3rd-party/cairo/test/dash-scale.c diff --git a/cairo/test/dash-state.c b/io2d/src/3rd-party/cairo/test/dash-state.c similarity index 100% rename from cairo/test/dash-state.c rename to io2d/src/3rd-party/cairo/test/dash-state.c diff --git a/cairo/test/dash-zero-length.c b/io2d/src/3rd-party/cairo/test/dash-zero-length.c similarity index 100% rename from cairo/test/dash-zero-length.c rename to io2d/src/3rd-party/cairo/test/dash-zero-length.c diff --git a/cairo/test/degenerate-arc.c b/io2d/src/3rd-party/cairo/test/degenerate-arc.c similarity index 100% rename from cairo/test/degenerate-arc.c rename to io2d/src/3rd-party/cairo/test/degenerate-arc.c diff --git a/cairo/test/degenerate-arcs.c b/io2d/src/3rd-party/cairo/test/degenerate-arcs.c similarity index 100% rename from cairo/test/degenerate-arcs.c rename to io2d/src/3rd-party/cairo/test/degenerate-arcs.c diff --git a/cairo/test/degenerate-curve-to.c b/io2d/src/3rd-party/cairo/test/degenerate-curve-to.c similarity index 100% rename from cairo/test/degenerate-curve-to.c rename to io2d/src/3rd-party/cairo/test/degenerate-curve-to.c diff --git a/cairo/test/degenerate-dash.c b/io2d/src/3rd-party/cairo/test/degenerate-dash.c similarity index 100% rename from cairo/test/degenerate-dash.c rename to io2d/src/3rd-party/cairo/test/degenerate-dash.c diff --git a/cairo/test/degenerate-linear-gradient.c b/io2d/src/3rd-party/cairo/test/degenerate-linear-gradient.c similarity index 100% rename from cairo/test/degenerate-linear-gradient.c rename to io2d/src/3rd-party/cairo/test/degenerate-linear-gradient.c diff --git a/cairo/test/degenerate-path.c b/io2d/src/3rd-party/cairo/test/degenerate-path.c similarity index 100% rename from cairo/test/degenerate-path.c rename to io2d/src/3rd-party/cairo/test/degenerate-path.c diff --git a/cairo/test/degenerate-pen.c b/io2d/src/3rd-party/cairo/test/degenerate-pen.c similarity index 100% rename from cairo/test/degenerate-pen.c rename to io2d/src/3rd-party/cairo/test/degenerate-pen.c diff --git a/cairo/test/degenerate-radial-gradient.c b/io2d/src/3rd-party/cairo/test/degenerate-radial-gradient.c similarity index 100% rename from cairo/test/degenerate-radial-gradient.c rename to io2d/src/3rd-party/cairo/test/degenerate-radial-gradient.c diff --git a/cairo/test/degenerate-rel-curve-to.c b/io2d/src/3rd-party/cairo/test/degenerate-rel-curve-to.c similarity index 100% rename from cairo/test/degenerate-rel-curve-to.c rename to io2d/src/3rd-party/cairo/test/degenerate-rel-curve-to.c diff --git a/cairo/test/degenerate-solid-dash.c b/io2d/src/3rd-party/cairo/test/degenerate-solid-dash.c similarity index 100% rename from cairo/test/degenerate-solid-dash.c rename to io2d/src/3rd-party/cairo/test/degenerate-solid-dash.c diff --git a/cairo/test/device-offset-fractional.c b/io2d/src/3rd-party/cairo/test/device-offset-fractional.c similarity index 100% rename from cairo/test/device-offset-fractional.c rename to io2d/src/3rd-party/cairo/test/device-offset-fractional.c diff --git a/cairo/test/device-offset-positive.c b/io2d/src/3rd-party/cairo/test/device-offset-positive.c similarity index 100% rename from cairo/test/device-offset-positive.c rename to io2d/src/3rd-party/cairo/test/device-offset-positive.c diff --git a/cairo/test/device-offset-scale.c b/io2d/src/3rd-party/cairo/test/device-offset-scale.c similarity index 100% rename from cairo/test/device-offset-scale.c rename to io2d/src/3rd-party/cairo/test/device-offset-scale.c diff --git a/cairo/test/device-offset.c b/io2d/src/3rd-party/cairo/test/device-offset.c similarity index 100% rename from cairo/test/device-offset.c rename to io2d/src/3rd-party/cairo/test/device-offset.c diff --git a/cairo/test/drunkard-tails.c b/io2d/src/3rd-party/cairo/test/drunkard-tails.c similarity index 100% rename from cairo/test/drunkard-tails.c rename to io2d/src/3rd-party/cairo/test/drunkard-tails.c diff --git a/cairo/test/error-setters.c b/io2d/src/3rd-party/cairo/test/error-setters.c similarity index 100% rename from cairo/test/error-setters.c rename to io2d/src/3rd-party/cairo/test/error-setters.c diff --git a/cairo/test/extend-pad-border.c b/io2d/src/3rd-party/cairo/test/extend-pad-border.c similarity index 100% rename from cairo/test/extend-pad-border.c rename to io2d/src/3rd-party/cairo/test/extend-pad-border.c diff --git a/cairo/test/extend-pad-similar.c b/io2d/src/3rd-party/cairo/test/extend-pad-similar.c similarity index 100% rename from cairo/test/extend-pad-similar.c rename to io2d/src/3rd-party/cairo/test/extend-pad-similar.c diff --git a/cairo/test/extend-pad.c b/io2d/src/3rd-party/cairo/test/extend-pad.c similarity index 100% rename from cairo/test/extend-pad.c rename to io2d/src/3rd-party/cairo/test/extend-pad.c diff --git a/cairo/test/extend-reflect-similar.c b/io2d/src/3rd-party/cairo/test/extend-reflect-similar.c similarity index 100% rename from cairo/test/extend-reflect-similar.c rename to io2d/src/3rd-party/cairo/test/extend-reflect-similar.c diff --git a/cairo/test/extend-reflect.c b/io2d/src/3rd-party/cairo/test/extend-reflect.c similarity index 100% rename from cairo/test/extend-reflect.c rename to io2d/src/3rd-party/cairo/test/extend-reflect.c diff --git a/cairo/test/extend-repeat-similar.c b/io2d/src/3rd-party/cairo/test/extend-repeat-similar.c similarity index 100% rename from cairo/test/extend-repeat-similar.c rename to io2d/src/3rd-party/cairo/test/extend-repeat-similar.c diff --git a/cairo/test/extend-repeat.c b/io2d/src/3rd-party/cairo/test/extend-repeat.c similarity index 100% rename from cairo/test/extend-repeat.c rename to io2d/src/3rd-party/cairo/test/extend-repeat.c diff --git a/cairo/test/extended-blend.c b/io2d/src/3rd-party/cairo/test/extended-blend.c similarity index 100% rename from cairo/test/extended-blend.c rename to io2d/src/3rd-party/cairo/test/extended-blend.c diff --git a/cairo/test/fallback-resolution.c b/io2d/src/3rd-party/cairo/test/fallback-resolution.c similarity index 100% rename from cairo/test/fallback-resolution.c rename to io2d/src/3rd-party/cairo/test/fallback-resolution.c diff --git a/cairo/test/fallback.c b/io2d/src/3rd-party/cairo/test/fallback.c similarity index 100% rename from cairo/test/fallback.c rename to io2d/src/3rd-party/cairo/test/fallback.c diff --git a/cairo/test/fill-alpha-pattern.c b/io2d/src/3rd-party/cairo/test/fill-alpha-pattern.c similarity index 100% rename from cairo/test/fill-alpha-pattern.c rename to io2d/src/3rd-party/cairo/test/fill-alpha-pattern.c diff --git a/cairo/test/fill-alpha.c b/io2d/src/3rd-party/cairo/test/fill-alpha.c similarity index 100% rename from cairo/test/fill-alpha.c rename to io2d/src/3rd-party/cairo/test/fill-alpha.c diff --git a/cairo/test/fill-and-stroke-alpha-add.c b/io2d/src/3rd-party/cairo/test/fill-and-stroke-alpha-add.c similarity index 100% rename from cairo/test/fill-and-stroke-alpha-add.c rename to io2d/src/3rd-party/cairo/test/fill-and-stroke-alpha-add.c diff --git a/cairo/test/fill-and-stroke-alpha.c b/io2d/src/3rd-party/cairo/test/fill-and-stroke-alpha.c similarity index 100% rename from cairo/test/fill-and-stroke-alpha.c rename to io2d/src/3rd-party/cairo/test/fill-and-stroke-alpha.c diff --git a/cairo/test/fill-and-stroke.c b/io2d/src/3rd-party/cairo/test/fill-and-stroke.c similarity index 100% rename from cairo/test/fill-and-stroke.c rename to io2d/src/3rd-party/cairo/test/fill-and-stroke.c diff --git a/cairo/test/fill-degenerate-sort-order.c b/io2d/src/3rd-party/cairo/test/fill-degenerate-sort-order.c similarity index 100% rename from cairo/test/fill-degenerate-sort-order.c rename to io2d/src/3rd-party/cairo/test/fill-degenerate-sort-order.c diff --git a/cairo/test/fill-disjoint.c b/io2d/src/3rd-party/cairo/test/fill-disjoint.c similarity index 100% rename from cairo/test/fill-disjoint.c rename to io2d/src/3rd-party/cairo/test/fill-disjoint.c diff --git a/cairo/test/fill-empty.c b/io2d/src/3rd-party/cairo/test/fill-empty.c similarity index 100% rename from cairo/test/fill-empty.c rename to io2d/src/3rd-party/cairo/test/fill-empty.c diff --git a/cairo/test/fill-image.c b/io2d/src/3rd-party/cairo/test/fill-image.c similarity index 100% rename from cairo/test/fill-image.c rename to io2d/src/3rd-party/cairo/test/fill-image.c diff --git a/cairo/test/fill-missed-stop.c b/io2d/src/3rd-party/cairo/test/fill-missed-stop.c similarity index 100% rename from cairo/test/fill-missed-stop.c rename to io2d/src/3rd-party/cairo/test/fill-missed-stop.c diff --git a/cairo/test/fill-rule.c b/io2d/src/3rd-party/cairo/test/fill-rule.c similarity index 100% rename from cairo/test/fill-rule.c rename to io2d/src/3rd-party/cairo/test/fill-rule.c diff --git a/cairo/test/filter-bilinear-extents.c b/io2d/src/3rd-party/cairo/test/filter-bilinear-extents.c similarity index 100% rename from cairo/test/filter-bilinear-extents.c rename to io2d/src/3rd-party/cairo/test/filter-bilinear-extents.c diff --git a/cairo/test/filter-nearest-offset.c b/io2d/src/3rd-party/cairo/test/filter-nearest-offset.c similarity index 100% rename from cairo/test/filter-nearest-offset.c rename to io2d/src/3rd-party/cairo/test/filter-nearest-offset.c diff --git a/cairo/test/filter-nearest-transformed.c b/io2d/src/3rd-party/cairo/test/filter-nearest-transformed.c similarity index 100% rename from cairo/test/filter-nearest-transformed.c rename to io2d/src/3rd-party/cairo/test/filter-nearest-transformed.c diff --git a/cairo/test/finer-grained-fallbacks.c b/io2d/src/3rd-party/cairo/test/finer-grained-fallbacks.c similarity index 100% rename from cairo/test/finer-grained-fallbacks.c rename to io2d/src/3rd-party/cairo/test/finer-grained-fallbacks.c diff --git a/cairo/test/font-face-get-type.c b/io2d/src/3rd-party/cairo/test/font-face-get-type.c similarity index 100% rename from cairo/test/font-face-get-type.c rename to io2d/src/3rd-party/cairo/test/font-face-get-type.c diff --git a/cairo/test/font-matrix-translation.c b/io2d/src/3rd-party/cairo/test/font-matrix-translation.c similarity index 100% rename from cairo/test/font-matrix-translation.c rename to io2d/src/3rd-party/cairo/test/font-matrix-translation.c diff --git a/cairo/test/font-options.c b/io2d/src/3rd-party/cairo/test/font-options.c similarity index 100% rename from cairo/test/font-options.c rename to io2d/src/3rd-party/cairo/test/font-options.c diff --git a/cairo/test/ft-font-create-for-ft-face.c b/io2d/src/3rd-party/cairo/test/ft-font-create-for-ft-face.c similarity index 100% rename from cairo/test/ft-font-create-for-ft-face.c rename to io2d/src/3rd-party/cairo/test/ft-font-create-for-ft-face.c diff --git a/cairo/test/ft-show-glyphs-positioning.c b/io2d/src/3rd-party/cairo/test/ft-show-glyphs-positioning.c similarity index 100% rename from cairo/test/ft-show-glyphs-positioning.c rename to io2d/src/3rd-party/cairo/test/ft-show-glyphs-positioning.c diff --git a/cairo/test/ft-show-glyphs-table.c b/io2d/src/3rd-party/cairo/test/ft-show-glyphs-table.c similarity index 100% rename from cairo/test/ft-show-glyphs-table.c rename to io2d/src/3rd-party/cairo/test/ft-show-glyphs-table.c diff --git a/cairo/test/ft-text-antialias-none.c b/io2d/src/3rd-party/cairo/test/ft-text-antialias-none.c similarity index 100% rename from cairo/test/ft-text-antialias-none.c rename to io2d/src/3rd-party/cairo/test/ft-text-antialias-none.c diff --git a/cairo/test/ft-text-vertical-layout-type1.c b/io2d/src/3rd-party/cairo/test/ft-text-vertical-layout-type1.c similarity index 100% rename from cairo/test/ft-text-vertical-layout-type1.c rename to io2d/src/3rd-party/cairo/test/ft-text-vertical-layout-type1.c diff --git a/cairo/test/ft-text-vertical-layout-type3.c b/io2d/src/3rd-party/cairo/test/ft-text-vertical-layout-type3.c similarity index 100% rename from cairo/test/ft-text-vertical-layout-type3.c rename to io2d/src/3rd-party/cairo/test/ft-text-vertical-layout-type3.c diff --git a/cairo/test/generate_refs.sh b/io2d/src/3rd-party/cairo/test/generate_refs.sh similarity index 100% rename from cairo/test/generate_refs.sh rename to io2d/src/3rd-party/cairo/test/generate_refs.sh diff --git a/cairo/test/get-and-set.c b/io2d/src/3rd-party/cairo/test/get-and-set.c similarity index 100% rename from cairo/test/get-and-set.c rename to io2d/src/3rd-party/cairo/test/get-and-set.c diff --git a/cairo/test/get-clip.c b/io2d/src/3rd-party/cairo/test/get-clip.c similarity index 100% rename from cairo/test/get-clip.c rename to io2d/src/3rd-party/cairo/test/get-clip.c diff --git a/cairo/test/get-group-target.c b/io2d/src/3rd-party/cairo/test/get-group-target.c similarity index 100% rename from cairo/test/get-group-target.c rename to io2d/src/3rd-party/cairo/test/get-group-target.c diff --git a/cairo/test/get-path-extents.c b/io2d/src/3rd-party/cairo/test/get-path-extents.c similarity index 100% rename from cairo/test/get-path-extents.c rename to io2d/src/3rd-party/cairo/test/get-path-extents.c diff --git a/cairo/test/get-xrender-format.c b/io2d/src/3rd-party/cairo/test/get-xrender-format.c similarity index 100% rename from cairo/test/get-xrender-format.c rename to io2d/src/3rd-party/cairo/test/get-xrender-format.c diff --git a/cairo/test/gl-device-release.c b/io2d/src/3rd-party/cairo/test/gl-device-release.c similarity index 100% rename from cairo/test/gl-device-release.c rename to io2d/src/3rd-party/cairo/test/gl-device-release.c diff --git a/cairo/test/gl-oversized-surface.c b/io2d/src/3rd-party/cairo/test/gl-oversized-surface.c similarity index 100% rename from cairo/test/gl-oversized-surface.c rename to io2d/src/3rd-party/cairo/test/gl-oversized-surface.c diff --git a/cairo/test/gl-surface-source.c b/io2d/src/3rd-party/cairo/test/gl-surface-source.c similarity index 100% rename from cairo/test/gl-surface-source.c rename to io2d/src/3rd-party/cairo/test/gl-surface-source.c diff --git a/cairo/test/glyph-cache-pressure.c b/io2d/src/3rd-party/cairo/test/glyph-cache-pressure.c similarity index 100% rename from cairo/test/glyph-cache-pressure.c rename to io2d/src/3rd-party/cairo/test/glyph-cache-pressure.c diff --git a/cairo/test/gradient-alpha.c b/io2d/src/3rd-party/cairo/test/gradient-alpha.c similarity index 100% rename from cairo/test/gradient-alpha.c rename to io2d/src/3rd-party/cairo/test/gradient-alpha.c diff --git a/cairo/test/gradient-constant-alpha.c b/io2d/src/3rd-party/cairo/test/gradient-constant-alpha.c similarity index 100% rename from cairo/test/gradient-constant-alpha.c rename to io2d/src/3rd-party/cairo/test/gradient-constant-alpha.c diff --git a/cairo/test/gradient-zero-stops-mask.c b/io2d/src/3rd-party/cairo/test/gradient-zero-stops-mask.c similarity index 100% rename from cairo/test/gradient-zero-stops-mask.c rename to io2d/src/3rd-party/cairo/test/gradient-zero-stops-mask.c diff --git a/cairo/test/gradient-zero-stops.c b/io2d/src/3rd-party/cairo/test/gradient-zero-stops.c similarity index 100% rename from cairo/test/gradient-zero-stops.c rename to io2d/src/3rd-party/cairo/test/gradient-zero-stops.c diff --git a/cairo/test/group-clip.c b/io2d/src/3rd-party/cairo/test/group-clip.c similarity index 100% rename from cairo/test/group-clip.c rename to io2d/src/3rd-party/cairo/test/group-clip.c diff --git a/cairo/test/group-paint.c b/io2d/src/3rd-party/cairo/test/group-paint.c similarity index 100% rename from cairo/test/group-paint.c rename to io2d/src/3rd-party/cairo/test/group-paint.c diff --git a/cairo/test/group-state.c b/io2d/src/3rd-party/cairo/test/group-state.c similarity index 100% rename from cairo/test/group-state.c rename to io2d/src/3rd-party/cairo/test/group-state.c diff --git a/cairo/test/group-unaligned.c b/io2d/src/3rd-party/cairo/test/group-unaligned.c similarity index 100% rename from cairo/test/group-unaligned.c rename to io2d/src/3rd-party/cairo/test/group-unaligned.c diff --git a/cairo/test/half-coverage.c b/io2d/src/3rd-party/cairo/test/half-coverage.c similarity index 100% rename from cairo/test/half-coverage.c rename to io2d/src/3rd-party/cairo/test/half-coverage.c diff --git a/cairo/test/halo.c b/io2d/src/3rd-party/cairo/test/halo.c similarity index 100% rename from cairo/test/halo.c rename to io2d/src/3rd-party/cairo/test/halo.c diff --git a/cairo/test/hatchings.c b/io2d/src/3rd-party/cairo/test/hatchings.c similarity index 100% rename from cairo/test/hatchings.c rename to io2d/src/3rd-party/cairo/test/hatchings.c diff --git a/cairo/test/horizontal-clip.c b/io2d/src/3rd-party/cairo/test/horizontal-clip.c similarity index 100% rename from cairo/test/horizontal-clip.c rename to io2d/src/3rd-party/cairo/test/horizontal-clip.c diff --git a/cairo/test/huge-linear.c b/io2d/src/3rd-party/cairo/test/huge-linear.c similarity index 100% rename from cairo/test/huge-linear.c rename to io2d/src/3rd-party/cairo/test/huge-linear.c diff --git a/cairo/test/huge-radial.c b/io2d/src/3rd-party/cairo/test/huge-radial.c similarity index 100% rename from cairo/test/huge-radial.c rename to io2d/src/3rd-party/cairo/test/huge-radial.c diff --git a/cairo/test/image-bug-710072.c b/io2d/src/3rd-party/cairo/test/image-bug-710072.c similarity index 100% rename from cairo/test/image-bug-710072.c rename to io2d/src/3rd-party/cairo/test/image-bug-710072.c diff --git a/cairo/test/image-surface-source.c b/io2d/src/3rd-party/cairo/test/image-surface-source.c similarity index 100% rename from cairo/test/image-surface-source.c rename to io2d/src/3rd-party/cairo/test/image-surface-source.c diff --git a/cairo/test/imagediff.c b/io2d/src/3rd-party/cairo/test/imagediff.c similarity index 100% rename from cairo/test/imagediff.c rename to io2d/src/3rd-party/cairo/test/imagediff.c diff --git a/cairo/test/implicit-close.c b/io2d/src/3rd-party/cairo/test/implicit-close.c similarity index 100% rename from cairo/test/implicit-close.c rename to io2d/src/3rd-party/cairo/test/implicit-close.c diff --git a/cairo/test/in-fill-empty-trapezoid.c b/io2d/src/3rd-party/cairo/test/in-fill-empty-trapezoid.c similarity index 100% rename from cairo/test/in-fill-empty-trapezoid.c rename to io2d/src/3rd-party/cairo/test/in-fill-empty-trapezoid.c diff --git a/cairo/test/in-fill-trapezoid.c b/io2d/src/3rd-party/cairo/test/in-fill-trapezoid.c similarity index 100% rename from cairo/test/in-fill-trapezoid.c rename to io2d/src/3rd-party/cairo/test/in-fill-trapezoid.c diff --git a/cairo/test/index.html b/io2d/src/3rd-party/cairo/test/index.html similarity index 100% rename from cairo/test/index.html rename to io2d/src/3rd-party/cairo/test/index.html diff --git a/cairo/test/infinite-join.c b/io2d/src/3rd-party/cairo/test/infinite-join.c similarity index 100% rename from cairo/test/infinite-join.c rename to io2d/src/3rd-party/cairo/test/infinite-join.c diff --git a/cairo/test/invalid-matrix.c b/io2d/src/3rd-party/cairo/test/invalid-matrix.c similarity index 100% rename from cairo/test/invalid-matrix.c rename to io2d/src/3rd-party/cairo/test/invalid-matrix.c diff --git a/cairo/test/inverse-text.c b/io2d/src/3rd-party/cairo/test/inverse-text.c similarity index 100% rename from cairo/test/inverse-text.c rename to io2d/src/3rd-party/cairo/test/inverse-text.c diff --git a/cairo/test/inverted-clip.c b/io2d/src/3rd-party/cairo/test/inverted-clip.c similarity index 100% rename from cairo/test/inverted-clip.c rename to io2d/src/3rd-party/cairo/test/inverted-clip.c diff --git a/cairo/test/joins-loop.c b/io2d/src/3rd-party/cairo/test/joins-loop.c similarity index 100% rename from cairo/test/joins-loop.c rename to io2d/src/3rd-party/cairo/test/joins-loop.c diff --git a/cairo/test/joins-retrace.c b/io2d/src/3rd-party/cairo/test/joins-retrace.c similarity index 100% rename from cairo/test/joins-retrace.c rename to io2d/src/3rd-party/cairo/test/joins-retrace.c diff --git a/cairo/test/joins-star.c b/io2d/src/3rd-party/cairo/test/joins-star.c similarity index 100% rename from cairo/test/joins-star.c rename to io2d/src/3rd-party/cairo/test/joins-star.c diff --git a/cairo/test/joins.c b/io2d/src/3rd-party/cairo/test/joins.c similarity index 100% rename from cairo/test/joins.c rename to io2d/src/3rd-party/cairo/test/joins.c diff --git a/cairo/test/jp2.jp2 b/io2d/src/3rd-party/cairo/test/jp2.jp2 similarity index 100% rename from cairo/test/jp2.jp2 rename to io2d/src/3rd-party/cairo/test/jp2.jp2 diff --git a/cairo/test/jpeg.jpg b/io2d/src/3rd-party/cairo/test/jpeg.jpg similarity index 100% rename from cairo/test/jpeg.jpg rename to io2d/src/3rd-party/cairo/test/jpeg.jpg diff --git a/cairo/test/large-clip.c b/io2d/src/3rd-party/cairo/test/large-clip.c similarity index 100% rename from cairo/test/large-clip.c rename to io2d/src/3rd-party/cairo/test/large-clip.c diff --git a/cairo/test/large-font.c b/io2d/src/3rd-party/cairo/test/large-font.c similarity index 100% rename from cairo/test/large-font.c rename to io2d/src/3rd-party/cairo/test/large-font.c diff --git a/cairo/test/large-source-roi.c b/io2d/src/3rd-party/cairo/test/large-source-roi.c similarity index 100% rename from cairo/test/large-source-roi.c rename to io2d/src/3rd-party/cairo/test/large-source-roi.c diff --git a/cairo/test/large-source.c b/io2d/src/3rd-party/cairo/test/large-source.c similarity index 100% rename from cairo/test/large-source.c rename to io2d/src/3rd-party/cairo/test/large-source.c diff --git a/cairo/test/large-twin-antialias-mixed.c b/io2d/src/3rd-party/cairo/test/large-twin-antialias-mixed.c similarity index 100% rename from cairo/test/large-twin-antialias-mixed.c rename to io2d/src/3rd-party/cairo/test/large-twin-antialias-mixed.c diff --git a/cairo/test/leaky-dash.c b/io2d/src/3rd-party/cairo/test/leaky-dash.c similarity index 100% rename from cairo/test/leaky-dash.c rename to io2d/src/3rd-party/cairo/test/leaky-dash.c diff --git a/cairo/test/leaky-dashed-rectangle.c b/io2d/src/3rd-party/cairo/test/leaky-dashed-rectangle.c similarity index 100% rename from cairo/test/leaky-dashed-rectangle.c rename to io2d/src/3rd-party/cairo/test/leaky-dashed-rectangle.c diff --git a/cairo/test/leaky-dashed-stroke.c b/io2d/src/3rd-party/cairo/test/leaky-dashed-stroke.c similarity index 100% rename from cairo/test/leaky-dashed-stroke.c rename to io2d/src/3rd-party/cairo/test/leaky-dashed-stroke.c diff --git a/cairo/test/leaky-polygon.c b/io2d/src/3rd-party/cairo/test/leaky-polygon.c similarity index 100% rename from cairo/test/leaky-polygon.c rename to io2d/src/3rd-party/cairo/test/leaky-polygon.c diff --git a/cairo/test/line-width-large-overlap.c b/io2d/src/3rd-party/cairo/test/line-width-large-overlap.c similarity index 100% rename from cairo/test/line-width-large-overlap.c rename to io2d/src/3rd-party/cairo/test/line-width-large-overlap.c diff --git a/cairo/test/line-width-overlap.c b/io2d/src/3rd-party/cairo/test/line-width-overlap.c similarity index 100% rename from cairo/test/line-width-overlap.c rename to io2d/src/3rd-party/cairo/test/line-width-overlap.c diff --git a/cairo/test/line-width-scale.c b/io2d/src/3rd-party/cairo/test/line-width-scale.c similarity index 100% rename from cairo/test/line-width-scale.c rename to io2d/src/3rd-party/cairo/test/line-width-scale.c diff --git a/cairo/test/line-width-tolerance.c b/io2d/src/3rd-party/cairo/test/line-width-tolerance.c similarity index 100% rename from cairo/test/line-width-tolerance.c rename to io2d/src/3rd-party/cairo/test/line-width-tolerance.c diff --git a/cairo/test/line-width-zero.c b/io2d/src/3rd-party/cairo/test/line-width-zero.c similarity index 100% rename from cairo/test/line-width-zero.c rename to io2d/src/3rd-party/cairo/test/line-width-zero.c diff --git a/cairo/test/line-width.c b/io2d/src/3rd-party/cairo/test/line-width.c similarity index 100% rename from cairo/test/line-width.c rename to io2d/src/3rd-party/cairo/test/line-width.c diff --git a/cairo/test/linear-gradient-extend.c b/io2d/src/3rd-party/cairo/test/linear-gradient-extend.c similarity index 100% rename from cairo/test/linear-gradient-extend.c rename to io2d/src/3rd-party/cairo/test/linear-gradient-extend.c diff --git a/cairo/test/linear-gradient-large.c b/io2d/src/3rd-party/cairo/test/linear-gradient-large.c similarity index 100% rename from cairo/test/linear-gradient-large.c rename to io2d/src/3rd-party/cairo/test/linear-gradient-large.c diff --git a/cairo/test/linear-gradient-one-stop.c b/io2d/src/3rd-party/cairo/test/linear-gradient-one-stop.c similarity index 100% rename from cairo/test/linear-gradient-one-stop.c rename to io2d/src/3rd-party/cairo/test/linear-gradient-one-stop.c diff --git a/cairo/test/linear-gradient-reflect.c b/io2d/src/3rd-party/cairo/test/linear-gradient-reflect.c similarity index 100% rename from cairo/test/linear-gradient-reflect.c rename to io2d/src/3rd-party/cairo/test/linear-gradient-reflect.c diff --git a/cairo/test/linear-gradient-subset.c b/io2d/src/3rd-party/cairo/test/linear-gradient-subset.c similarity index 100% rename from cairo/test/linear-gradient-subset.c rename to io2d/src/3rd-party/cairo/test/linear-gradient-subset.c diff --git a/cairo/test/linear-gradient.c b/io2d/src/3rd-party/cairo/test/linear-gradient.c similarity index 100% rename from cairo/test/linear-gradient.c rename to io2d/src/3rd-party/cairo/test/linear-gradient.c diff --git a/cairo/test/linear-step-function.c b/io2d/src/3rd-party/cairo/test/linear-step-function.c similarity index 100% rename from cairo/test/linear-step-function.c rename to io2d/src/3rd-party/cairo/test/linear-step-function.c diff --git a/cairo/test/linear-uniform.c b/io2d/src/3rd-party/cairo/test/linear-uniform.c similarity index 100% rename from cairo/test/linear-uniform.c rename to io2d/src/3rd-party/cairo/test/linear-uniform.c diff --git a/cairo/test/long-dashed-lines.c b/io2d/src/3rd-party/cairo/test/long-dashed-lines.c similarity index 100% rename from cairo/test/long-dashed-lines.c rename to io2d/src/3rd-party/cairo/test/long-dashed-lines.c diff --git a/cairo/test/long-lines.c b/io2d/src/3rd-party/cairo/test/long-lines.c similarity index 100% rename from cairo/test/long-lines.c rename to io2d/src/3rd-party/cairo/test/long-lines.c diff --git a/cairo/test/make-cairo-test-constructors.sh b/io2d/src/3rd-party/cairo/test/make-cairo-test-constructors.sh similarity index 100% rename from cairo/test/make-cairo-test-constructors.sh rename to io2d/src/3rd-party/cairo/test/make-cairo-test-constructors.sh diff --git a/cairo/test/map-to-image.c b/io2d/src/3rd-party/cairo/test/map-to-image.c similarity index 100% rename from cairo/test/map-to-image.c rename to io2d/src/3rd-party/cairo/test/map-to-image.c diff --git a/cairo/test/mask-alpha.c b/io2d/src/3rd-party/cairo/test/mask-alpha.c similarity index 100% rename from cairo/test/mask-alpha.c rename to io2d/src/3rd-party/cairo/test/mask-alpha.c diff --git a/cairo/test/mask-ctm.c b/io2d/src/3rd-party/cairo/test/mask-ctm.c similarity index 100% rename from cairo/test/mask-ctm.c rename to io2d/src/3rd-party/cairo/test/mask-ctm.c diff --git a/cairo/test/mask-glyphs.c b/io2d/src/3rd-party/cairo/test/mask-glyphs.c similarity index 100% rename from cairo/test/mask-glyphs.c rename to io2d/src/3rd-party/cairo/test/mask-glyphs.c diff --git a/cairo/test/mask-surface-ctm.c b/io2d/src/3rd-party/cairo/test/mask-surface-ctm.c similarity index 100% rename from cairo/test/mask-surface-ctm.c rename to io2d/src/3rd-party/cairo/test/mask-surface-ctm.c diff --git a/cairo/test/mask-transformed-image.c b/io2d/src/3rd-party/cairo/test/mask-transformed-image.c similarity index 100% rename from cairo/test/mask-transformed-image.c rename to io2d/src/3rd-party/cairo/test/mask-transformed-image.c diff --git a/cairo/test/mask-transformed-similar.c b/io2d/src/3rd-party/cairo/test/mask-transformed-similar.c similarity index 100% rename from cairo/test/mask-transformed-similar.c rename to io2d/src/3rd-party/cairo/test/mask-transformed-similar.c diff --git a/cairo/test/mask.c b/io2d/src/3rd-party/cairo/test/mask.c similarity index 100% rename from cairo/test/mask.c rename to io2d/src/3rd-party/cairo/test/mask.c diff --git a/cairo/test/mesh-pattern-accuracy.c b/io2d/src/3rd-party/cairo/test/mesh-pattern-accuracy.c similarity index 100% rename from cairo/test/mesh-pattern-accuracy.c rename to io2d/src/3rd-party/cairo/test/mesh-pattern-accuracy.c diff --git a/cairo/test/mesh-pattern-conical.c b/io2d/src/3rd-party/cairo/test/mesh-pattern-conical.c similarity index 100% rename from cairo/test/mesh-pattern-conical.c rename to io2d/src/3rd-party/cairo/test/mesh-pattern-conical.c diff --git a/cairo/test/mesh-pattern-control-points.c b/io2d/src/3rd-party/cairo/test/mesh-pattern-control-points.c similarity index 100% rename from cairo/test/mesh-pattern-control-points.c rename to io2d/src/3rd-party/cairo/test/mesh-pattern-control-points.c diff --git a/cairo/test/mesh-pattern-fold.c b/io2d/src/3rd-party/cairo/test/mesh-pattern-fold.c similarity index 100% rename from cairo/test/mesh-pattern-fold.c rename to io2d/src/3rd-party/cairo/test/mesh-pattern-fold.c diff --git a/cairo/test/mesh-pattern-overlap.c b/io2d/src/3rd-party/cairo/test/mesh-pattern-overlap.c similarity index 100% rename from cairo/test/mesh-pattern-overlap.c rename to io2d/src/3rd-party/cairo/test/mesh-pattern-overlap.c diff --git a/cairo/test/mesh-pattern-transformed.c b/io2d/src/3rd-party/cairo/test/mesh-pattern-transformed.c similarity index 100% rename from cairo/test/mesh-pattern-transformed.c rename to io2d/src/3rd-party/cairo/test/mesh-pattern-transformed.c diff --git a/cairo/test/mesh-pattern.c b/io2d/src/3rd-party/cairo/test/mesh-pattern.c similarity index 100% rename from cairo/test/mesh-pattern.c rename to io2d/src/3rd-party/cairo/test/mesh-pattern.c diff --git a/cairo/test/mime-data.c b/io2d/src/3rd-party/cairo/test/mime-data.c similarity index 100% rename from cairo/test/mime-data.c rename to io2d/src/3rd-party/cairo/test/mime-data.c diff --git a/cairo/test/mime-surface-api.c b/io2d/src/3rd-party/cairo/test/mime-surface-api.c similarity index 100% rename from cairo/test/mime-surface-api.c rename to io2d/src/3rd-party/cairo/test/mime-surface-api.c diff --git a/cairo/test/miter-precision.c b/io2d/src/3rd-party/cairo/test/miter-precision.c similarity index 100% rename from cairo/test/miter-precision.c rename to io2d/src/3rd-party/cairo/test/miter-precision.c diff --git a/cairo/test/move-to-show-surface.c b/io2d/src/3rd-party/cairo/test/move-to-show-surface.c similarity index 100% rename from cairo/test/move-to-show-surface.c rename to io2d/src/3rd-party/cairo/test/move-to-show-surface.c diff --git a/cairo/test/multi-page.c b/io2d/src/3rd-party/cairo/test/multi-page.c similarity index 100% rename from cairo/test/multi-page.c rename to io2d/src/3rd-party/cairo/test/multi-page.c diff --git a/cairo/test/negative-stride-image.c b/io2d/src/3rd-party/cairo/test/negative-stride-image.c similarity index 100% rename from cairo/test/negative-stride-image.c rename to io2d/src/3rd-party/cairo/test/negative-stride-image.c diff --git a/cairo/test/new-sub-path.c b/io2d/src/3rd-party/cairo/test/new-sub-path.c similarity index 100% rename from cairo/test/new-sub-path.c rename to io2d/src/3rd-party/cairo/test/new-sub-path.c diff --git a/cairo/test/nil-surface.c b/io2d/src/3rd-party/cairo/test/nil-surface.c similarity index 100% rename from cairo/test/nil-surface.c rename to io2d/src/3rd-party/cairo/test/nil-surface.c diff --git a/cairo/test/operator-alpha-alpha.c b/io2d/src/3rd-party/cairo/test/operator-alpha-alpha.c similarity index 100% rename from cairo/test/operator-alpha-alpha.c rename to io2d/src/3rd-party/cairo/test/operator-alpha-alpha.c diff --git a/cairo/test/operator-alpha.c b/io2d/src/3rd-party/cairo/test/operator-alpha.c similarity index 100% rename from cairo/test/operator-alpha.c rename to io2d/src/3rd-party/cairo/test/operator-alpha.c diff --git a/cairo/test/operator-clear.c b/io2d/src/3rd-party/cairo/test/operator-clear.c similarity index 100% rename from cairo/test/operator-clear.c rename to io2d/src/3rd-party/cairo/test/operator-clear.c diff --git a/cairo/test/operator-source.c b/io2d/src/3rd-party/cairo/test/operator-source.c similarity index 100% rename from cairo/test/operator-source.c rename to io2d/src/3rd-party/cairo/test/operator-source.c diff --git a/cairo/test/operator.c b/io2d/src/3rd-party/cairo/test/operator.c similarity index 100% rename from cairo/test/operator.c rename to io2d/src/3rd-party/cairo/test/operator.c diff --git a/cairo/test/outline-tolerance.c b/io2d/src/3rd-party/cairo/test/outline-tolerance.c similarity index 100% rename from cairo/test/outline-tolerance.c rename to io2d/src/3rd-party/cairo/test/outline-tolerance.c diff --git a/cairo/test/over-above-source.c b/io2d/src/3rd-party/cairo/test/over-above-source.c similarity index 100% rename from cairo/test/over-above-source.c rename to io2d/src/3rd-party/cairo/test/over-above-source.c diff --git a/cairo/test/over-around-source.c b/io2d/src/3rd-party/cairo/test/over-around-source.c similarity index 100% rename from cairo/test/over-around-source.c rename to io2d/src/3rd-party/cairo/test/over-around-source.c diff --git a/cairo/test/over-below-source.c b/io2d/src/3rd-party/cairo/test/over-below-source.c similarity index 100% rename from cairo/test/over-below-source.c rename to io2d/src/3rd-party/cairo/test/over-below-source.c diff --git a/cairo/test/over-between-source.c b/io2d/src/3rd-party/cairo/test/over-between-source.c similarity index 100% rename from cairo/test/over-between-source.c rename to io2d/src/3rd-party/cairo/test/over-between-source.c diff --git a/cairo/test/overlapping-boxes.c b/io2d/src/3rd-party/cairo/test/overlapping-boxes.c similarity index 100% rename from cairo/test/overlapping-boxes.c rename to io2d/src/3rd-party/cairo/test/overlapping-boxes.c diff --git a/cairo/test/overlapping-dash-caps.c b/io2d/src/3rd-party/cairo/test/overlapping-dash-caps.c similarity index 100% rename from cairo/test/overlapping-dash-caps.c rename to io2d/src/3rd-party/cairo/test/overlapping-dash-caps.c diff --git a/cairo/test/overlapping-glyphs.c b/io2d/src/3rd-party/cairo/test/overlapping-glyphs.c similarity index 100% rename from cairo/test/overlapping-glyphs.c rename to io2d/src/3rd-party/cairo/test/overlapping-glyphs.c diff --git a/cairo/test/paint-clip-fill.c b/io2d/src/3rd-party/cairo/test/paint-clip-fill.c similarity index 100% rename from cairo/test/paint-clip-fill.c rename to io2d/src/3rd-party/cairo/test/paint-clip-fill.c diff --git a/cairo/test/paint-repeat.c b/io2d/src/3rd-party/cairo/test/paint-repeat.c similarity index 100% rename from cairo/test/paint-repeat.c rename to io2d/src/3rd-party/cairo/test/paint-repeat.c diff --git a/cairo/test/paint-source-alpha.c b/io2d/src/3rd-party/cairo/test/paint-source-alpha.c similarity index 100% rename from cairo/test/paint-source-alpha.c rename to io2d/src/3rd-party/cairo/test/paint-source-alpha.c diff --git a/cairo/test/paint-with-alpha.c b/io2d/src/3rd-party/cairo/test/paint-with-alpha.c similarity index 100% rename from cairo/test/paint-with-alpha.c rename to io2d/src/3rd-party/cairo/test/paint-with-alpha.c diff --git a/cairo/test/paint.c b/io2d/src/3rd-party/cairo/test/paint.c similarity index 100% rename from cairo/test/paint.c rename to io2d/src/3rd-party/cairo/test/paint.c diff --git a/cairo/test/partial-clip-text.c b/io2d/src/3rd-party/cairo/test/partial-clip-text.c similarity index 100% rename from cairo/test/partial-clip-text.c rename to io2d/src/3rd-party/cairo/test/partial-clip-text.c diff --git a/cairo/test/partial-coverage.c b/io2d/src/3rd-party/cairo/test/partial-coverage.c similarity index 100% rename from cairo/test/partial-coverage.c rename to io2d/src/3rd-party/cairo/test/partial-coverage.c diff --git a/cairo/test/pass-through.c b/io2d/src/3rd-party/cairo/test/pass-through.c similarity index 100% rename from cairo/test/pass-through.c rename to io2d/src/3rd-party/cairo/test/pass-through.c diff --git a/cairo/test/path-append.c b/io2d/src/3rd-party/cairo/test/path-append.c similarity index 100% rename from cairo/test/path-append.c rename to io2d/src/3rd-party/cairo/test/path-append.c diff --git a/cairo/test/path-precision.c b/io2d/src/3rd-party/cairo/test/path-precision.c similarity index 100% rename from cairo/test/path-precision.c rename to io2d/src/3rd-party/cairo/test/path-precision.c diff --git a/cairo/test/path-stroke-twice.c b/io2d/src/3rd-party/cairo/test/path-stroke-twice.c similarity index 100% rename from cairo/test/path-stroke-twice.c rename to io2d/src/3rd-party/cairo/test/path-stroke-twice.c diff --git a/cairo/test/pattern-get-type.c b/io2d/src/3rd-party/cairo/test/pattern-get-type.c similarity index 100% rename from cairo/test/pattern-get-type.c rename to io2d/src/3rd-party/cairo/test/pattern-get-type.c diff --git a/cairo/test/pattern-getters.c b/io2d/src/3rd-party/cairo/test/pattern-getters.c similarity index 100% rename from cairo/test/pattern-getters.c rename to io2d/src/3rd-party/cairo/test/pattern-getters.c diff --git a/cairo/test/pdf-features.c b/io2d/src/3rd-party/cairo/test/pdf-features.c similarity index 100% rename from cairo/test/pdf-features.c rename to io2d/src/3rd-party/cairo/test/pdf-features.c diff --git a/cairo/test/pdf-isolated-group.c b/io2d/src/3rd-party/cairo/test/pdf-isolated-group.c similarity index 100% rename from cairo/test/pdf-isolated-group.c rename to io2d/src/3rd-party/cairo/test/pdf-isolated-group.c diff --git a/cairo/test/pdf-mime-data.c b/io2d/src/3rd-party/cairo/test/pdf-mime-data.c similarity index 100% rename from cairo/test/pdf-mime-data.c rename to io2d/src/3rd-party/cairo/test/pdf-mime-data.c diff --git a/cairo/test/pdf-surface-source.c b/io2d/src/3rd-party/cairo/test/pdf-surface-source.c similarity index 100% rename from cairo/test/pdf-surface-source.c rename to io2d/src/3rd-party/cairo/test/pdf-surface-source.c diff --git a/cairo/test/pdf2png.c b/io2d/src/3rd-party/cairo/test/pdf2png.c similarity index 100% rename from cairo/test/pdf2png.c rename to io2d/src/3rd-party/cairo/test/pdf2png.c diff --git a/cairo/test/pdiff/.gitignore b/io2d/src/3rd-party/cairo/test/pdiff/.gitignore similarity index 100% rename from cairo/test/pdiff/.gitignore rename to io2d/src/3rd-party/cairo/test/pdiff/.gitignore diff --git a/cairo/test/pdiff/CMakeLists.txt b/io2d/src/3rd-party/cairo/test/pdiff/CMakeLists.txt similarity index 100% rename from cairo/test/pdiff/CMakeLists.txt rename to io2d/src/3rd-party/cairo/test/pdiff/CMakeLists.txt diff --git a/cairo/test/pdiff/Makefile.am b/io2d/src/3rd-party/cairo/test/pdiff/Makefile.am similarity index 100% rename from cairo/test/pdiff/Makefile.am rename to io2d/src/3rd-party/cairo/test/pdiff/Makefile.am diff --git a/cairo/test/pdiff/Makefile.win32 b/io2d/src/3rd-party/cairo/test/pdiff/Makefile.win32 similarity index 100% rename from cairo/test/pdiff/Makefile.win32 rename to io2d/src/3rd-party/cairo/test/pdiff/Makefile.win32 diff --git a/cairo/test/pdiff/README.txt b/io2d/src/3rd-party/cairo/test/pdiff/README.txt similarity index 100% rename from cairo/test/pdiff/README.txt rename to io2d/src/3rd-party/cairo/test/pdiff/README.txt diff --git a/cairo/test/pdiff/args.c b/io2d/src/3rd-party/cairo/test/pdiff/args.c similarity index 100% rename from cairo/test/pdiff/args.c rename to io2d/src/3rd-party/cairo/test/pdiff/args.c diff --git a/cairo/test/pdiff/args.h b/io2d/src/3rd-party/cairo/test/pdiff/args.h similarity index 100% rename from cairo/test/pdiff/args.h rename to io2d/src/3rd-party/cairo/test/pdiff/args.h diff --git a/cairo/test/pdiff/gpl.txt b/io2d/src/3rd-party/cairo/test/pdiff/gpl.txt similarity index 100% rename from cairo/test/pdiff/gpl.txt rename to io2d/src/3rd-party/cairo/test/pdiff/gpl.txt diff --git a/cairo/test/pdiff/lpyramid.c b/io2d/src/3rd-party/cairo/test/pdiff/lpyramid.c similarity index 100% rename from cairo/test/pdiff/lpyramid.c rename to io2d/src/3rd-party/cairo/test/pdiff/lpyramid.c diff --git a/cairo/test/pdiff/lpyramid.h b/io2d/src/3rd-party/cairo/test/pdiff/lpyramid.h similarity index 100% rename from cairo/test/pdiff/lpyramid.h rename to io2d/src/3rd-party/cairo/test/pdiff/lpyramid.h diff --git a/cairo/test/pdiff/pdiff.c b/io2d/src/3rd-party/cairo/test/pdiff/pdiff.c similarity index 100% rename from cairo/test/pdiff/pdiff.c rename to io2d/src/3rd-party/cairo/test/pdiff/pdiff.c diff --git a/cairo/test/pdiff/pdiff.h b/io2d/src/3rd-party/cairo/test/pdiff/pdiff.h similarity index 100% rename from cairo/test/pdiff/pdiff.h rename to io2d/src/3rd-party/cairo/test/pdiff/pdiff.h diff --git a/cairo/test/pdiff/perceptualdiff.c b/io2d/src/3rd-party/cairo/test/pdiff/perceptualdiff.c similarity index 100% rename from cairo/test/pdiff/perceptualdiff.c rename to io2d/src/3rd-party/cairo/test/pdiff/perceptualdiff.c diff --git a/cairo/test/pixman-rotate.c b/io2d/src/3rd-party/cairo/test/pixman-rotate.c similarity index 100% rename from cairo/test/pixman-rotate.c rename to io2d/src/3rd-party/cairo/test/pixman-rotate.c diff --git a/cairo/test/png-flatten.c b/io2d/src/3rd-party/cairo/test/png-flatten.c similarity index 100% rename from cairo/test/png-flatten.c rename to io2d/src/3rd-party/cairo/test/png-flatten.c diff --git a/cairo/test/png.c b/io2d/src/3rd-party/cairo/test/png.c similarity index 100% rename from cairo/test/png.c rename to io2d/src/3rd-party/cairo/test/png.c diff --git a/cairo/test/png.png b/io2d/src/3rd-party/cairo/test/png.png similarity index 100% rename from cairo/test/png.png rename to io2d/src/3rd-party/cairo/test/png.png diff --git a/cairo/test/ps-eps.c b/io2d/src/3rd-party/cairo/test/ps-eps.c similarity index 100% rename from cairo/test/ps-eps.c rename to io2d/src/3rd-party/cairo/test/ps-eps.c diff --git a/cairo/test/ps-features.c b/io2d/src/3rd-party/cairo/test/ps-features.c similarity index 100% rename from cairo/test/ps-features.c rename to io2d/src/3rd-party/cairo/test/ps-features.c diff --git a/cairo/test/ps-surface-source.c b/io2d/src/3rd-party/cairo/test/ps-surface-source.c similarity index 100% rename from cairo/test/ps-surface-source.c rename to io2d/src/3rd-party/cairo/test/ps-surface-source.c diff --git a/cairo/test/ps2png.c b/io2d/src/3rd-party/cairo/test/ps2png.c similarity index 100% rename from cairo/test/ps2png.c rename to io2d/src/3rd-party/cairo/test/ps2png.c diff --git a/cairo/test/pthread-same-source.c b/io2d/src/3rd-party/cairo/test/pthread-same-source.c similarity index 100% rename from cairo/test/pthread-same-source.c rename to io2d/src/3rd-party/cairo/test/pthread-same-source.c diff --git a/cairo/test/pthread-show-text.c b/io2d/src/3rd-party/cairo/test/pthread-show-text.c similarity index 100% rename from cairo/test/pthread-show-text.c rename to io2d/src/3rd-party/cairo/test/pthread-show-text.c diff --git a/cairo/test/pthread-similar.c b/io2d/src/3rd-party/cairo/test/pthread-similar.c similarity index 100% rename from cairo/test/pthread-similar.c rename to io2d/src/3rd-party/cairo/test/pthread-similar.c diff --git a/cairo/test/push-group-color.c b/io2d/src/3rd-party/cairo/test/push-group-color.c similarity index 100% rename from cairo/test/push-group-color.c rename to io2d/src/3rd-party/cairo/test/push-group-color.c diff --git a/cairo/test/push-group-path-offset.c b/io2d/src/3rd-party/cairo/test/push-group-path-offset.c similarity index 100% rename from cairo/test/push-group-path-offset.c rename to io2d/src/3rd-party/cairo/test/push-group-path-offset.c diff --git a/cairo/test/push-group.c b/io2d/src/3rd-party/cairo/test/push-group.c similarity index 100% rename from cairo/test/push-group.c rename to io2d/src/3rd-party/cairo/test/push-group.c diff --git a/cairo/test/quartz-surface-source.c b/io2d/src/3rd-party/cairo/test/quartz-surface-source.c similarity index 100% rename from cairo/test/quartz-surface-source.c rename to io2d/src/3rd-party/cairo/test/quartz-surface-source.c diff --git a/cairo/test/radial-gradient-extend.c b/io2d/src/3rd-party/cairo/test/radial-gradient-extend.c similarity index 100% rename from cairo/test/radial-gradient-extend.c rename to io2d/src/3rd-party/cairo/test/radial-gradient-extend.c diff --git a/cairo/test/radial-gradient.c b/io2d/src/3rd-party/cairo/test/radial-gradient.c similarity index 100% rename from cairo/test/radial-gradient.c rename to io2d/src/3rd-party/cairo/test/radial-gradient.c diff --git a/cairo/test/radial-outer-focus.c b/io2d/src/3rd-party/cairo/test/radial-outer-focus.c similarity index 100% rename from cairo/test/radial-outer-focus.c rename to io2d/src/3rd-party/cairo/test/radial-outer-focus.c diff --git a/cairo/test/random-clips.c b/io2d/src/3rd-party/cairo/test/random-clips.c similarity index 100% rename from cairo/test/random-clips.c rename to io2d/src/3rd-party/cairo/test/random-clips.c diff --git a/cairo/test/random-intersections-curves-eo.c b/io2d/src/3rd-party/cairo/test/random-intersections-curves-eo.c similarity index 100% rename from cairo/test/random-intersections-curves-eo.c rename to io2d/src/3rd-party/cairo/test/random-intersections-curves-eo.c diff --git a/cairo/test/random-intersections-curves-nz.c b/io2d/src/3rd-party/cairo/test/random-intersections-curves-nz.c similarity index 100% rename from cairo/test/random-intersections-curves-nz.c rename to io2d/src/3rd-party/cairo/test/random-intersections-curves-nz.c diff --git a/cairo/test/random-intersections-eo.c b/io2d/src/3rd-party/cairo/test/random-intersections-eo.c similarity index 100% rename from cairo/test/random-intersections-eo.c rename to io2d/src/3rd-party/cairo/test/random-intersections-eo.c diff --git a/cairo/test/random-intersections-nonzero.c b/io2d/src/3rd-party/cairo/test/random-intersections-nonzero.c similarity index 100% rename from cairo/test/random-intersections-nonzero.c rename to io2d/src/3rd-party/cairo/test/random-intersections-nonzero.c diff --git a/cairo/test/raster-source.c b/io2d/src/3rd-party/cairo/test/raster-source.c similarity index 100% rename from cairo/test/raster-source.c rename to io2d/src/3rd-party/cairo/test/raster-source.c diff --git a/cairo/test/record-extend.c b/io2d/src/3rd-party/cairo/test/record-extend.c similarity index 100% rename from cairo/test/record-extend.c rename to io2d/src/3rd-party/cairo/test/record-extend.c diff --git a/cairo/test/record-mesh.c b/io2d/src/3rd-party/cairo/test/record-mesh.c similarity index 100% rename from cairo/test/record-mesh.c rename to io2d/src/3rd-party/cairo/test/record-mesh.c diff --git a/cairo/test/record.c b/io2d/src/3rd-party/cairo/test/record.c similarity index 100% rename from cairo/test/record.c rename to io2d/src/3rd-party/cairo/test/record.c diff --git a/cairo/test/record1414x.c b/io2d/src/3rd-party/cairo/test/record1414x.c similarity index 100% rename from cairo/test/record1414x.c rename to io2d/src/3rd-party/cairo/test/record1414x.c diff --git a/cairo/test/record2x.c b/io2d/src/3rd-party/cairo/test/record2x.c similarity index 100% rename from cairo/test/record2x.c rename to io2d/src/3rd-party/cairo/test/record2x.c diff --git a/cairo/test/record90.c b/io2d/src/3rd-party/cairo/test/record90.c similarity index 100% rename from cairo/test/record90.c rename to io2d/src/3rd-party/cairo/test/record90.c diff --git a/cairo/test/recordflip.c b/io2d/src/3rd-party/cairo/test/recordflip.c similarity index 100% rename from cairo/test/recordflip.c rename to io2d/src/3rd-party/cairo/test/recordflip.c diff --git a/cairo/test/recording-surface-extend.c b/io2d/src/3rd-party/cairo/test/recording-surface-extend.c similarity index 100% rename from cairo/test/recording-surface-extend.c rename to io2d/src/3rd-party/cairo/test/recording-surface-extend.c diff --git a/cairo/test/recording-surface-pattern.c b/io2d/src/3rd-party/cairo/test/recording-surface-pattern.c similarity index 100% rename from cairo/test/recording-surface-pattern.c rename to io2d/src/3rd-party/cairo/test/recording-surface-pattern.c diff --git a/cairo/test/rectangle-rounding-error.c b/io2d/src/3rd-party/cairo/test/rectangle-rounding-error.c similarity index 100% rename from cairo/test/rectangle-rounding-error.c rename to io2d/src/3rd-party/cairo/test/rectangle-rounding-error.c diff --git a/cairo/test/rectilinear-dash-scale.c b/io2d/src/3rd-party/cairo/test/rectilinear-dash-scale.c similarity index 100% rename from cairo/test/rectilinear-dash-scale.c rename to io2d/src/3rd-party/cairo/test/rectilinear-dash-scale.c diff --git a/cairo/test/rectilinear-dash.c b/io2d/src/3rd-party/cairo/test/rectilinear-dash.c similarity index 100% rename from cairo/test/rectilinear-dash.c rename to io2d/src/3rd-party/cairo/test/rectilinear-dash.c diff --git a/cairo/test/rectilinear-fill.c b/io2d/src/3rd-party/cairo/test/rectilinear-fill.c similarity index 100% rename from cairo/test/rectilinear-fill.c rename to io2d/src/3rd-party/cairo/test/rectilinear-fill.c diff --git a/cairo/test/rectilinear-grid.c b/io2d/src/3rd-party/cairo/test/rectilinear-grid.c similarity index 100% rename from cairo/test/rectilinear-grid.c rename to io2d/src/3rd-party/cairo/test/rectilinear-grid.c diff --git a/cairo/test/rectilinear-miter-limit.c b/io2d/src/3rd-party/cairo/test/rectilinear-miter-limit.c similarity index 100% rename from cairo/test/rectilinear-miter-limit.c rename to io2d/src/3rd-party/cairo/test/rectilinear-miter-limit.c diff --git a/cairo/test/rectilinear-stroke.c b/io2d/src/3rd-party/cairo/test/rectilinear-stroke.c similarity index 100% rename from cairo/test/rectilinear-stroke.c rename to io2d/src/3rd-party/cairo/test/rectilinear-stroke.c diff --git a/cairo/test/reference/a1-bug.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-bug.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/a1-bug.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-bug.base.argb32.ref.png diff --git a/cairo/test/reference/a1-bug.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-bug.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a1-bug.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-bug.base.rgb24.ref.png diff --git a/cairo/test/reference/a1-bug.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-bug.image16.ref.png similarity index 100% rename from cairo/test/reference/a1-bug.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-bug.image16.ref.png diff --git a/cairo/test/reference/a1-bug.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-bug.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/a1-bug.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-bug.mask.argb32.ref.png diff --git a/cairo/test/reference/a1-bug.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-bug.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a1-bug.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-bug.mask.rgb24.ref.png diff --git a/cairo/test/reference/a1-bug.quartz.xfail.png b/io2d/src/3rd-party/cairo/test/reference/a1-bug.quartz.xfail.png similarity index 100% rename from cairo/test/reference/a1-bug.quartz.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/a1-bug.quartz.xfail.png diff --git a/cairo/test/reference/a1-bug.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-bug.ref.png similarity index 100% rename from cairo/test/reference/a1-bug.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-bug.ref.png diff --git a/cairo/test/reference/a1-bug.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-bug.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/a1-bug.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-bug.traps.argb32.ref.png diff --git a/cairo/test/reference/a1-bug.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-bug.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a1-bug.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-bug.traps.rgb24.ref.png diff --git a/cairo/test/reference/a1-clip-fill-equal.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-clip-fill-equal.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/a1-clip-fill-equal.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-clip-fill-equal.base.argb32.ref.png diff --git a/cairo/test/reference/a1-clip-fill-equal.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-clip-fill-equal.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a1-clip-fill-equal.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-clip-fill-equal.base.rgb24.ref.png diff --git a/cairo/test/reference/a1-clip-fill-equal.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-clip-fill-equal.ref.png similarity index 100% rename from cairo/test/reference/a1-clip-fill-equal.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-clip-fill-equal.ref.png diff --git a/cairo/test/reference/a1-clip-fill-rule.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-clip-fill-rule.argb32.ref.png similarity index 100% rename from cairo/test/reference/a1-clip-fill-rule.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-clip-fill-rule.argb32.ref.png diff --git a/cairo/test/reference/a1-clip-fill-rule.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-clip-fill-rule.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/a1-clip-fill-rule.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-clip-fill-rule.base.argb32.ref.png diff --git a/cairo/test/reference/a1-clip-fill-rule.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-clip-fill-rule.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a1-clip-fill-rule.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-clip-fill-rule.base.rgb24.ref.png diff --git a/cairo/test/reference/a1-clip-fill-rule.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-clip-fill-rule.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a1-clip-fill-rule.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-clip-fill-rule.rgb24.ref.png diff --git a/cairo/test/reference/a1-clip-fill.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-clip-fill.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/a1-clip-fill.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-clip-fill.base.argb32.ref.png diff --git a/cairo/test/reference/a1-clip-fill.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-clip-fill.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a1-clip-fill.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-clip-fill.base.rgb24.ref.png diff --git a/cairo/test/reference/a1-clip-fill.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-clip-fill.ref.png similarity index 100% rename from cairo/test/reference/a1-clip-fill.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-clip-fill.ref.png diff --git a/cairo/test/reference/a1-clip-paint.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-clip-paint.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/a1-clip-paint.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-clip-paint.base.argb32.ref.png diff --git a/cairo/test/reference/a1-clip-paint.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-clip-paint.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a1-clip-paint.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-clip-paint.base.rgb24.ref.png diff --git a/cairo/test/reference/a1-clip-paint.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-clip-paint.ref.png similarity index 100% rename from cairo/test/reference/a1-clip-paint.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-clip-paint.ref.png diff --git a/cairo/test/reference/a1-clip-stroke.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-clip-stroke.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/a1-clip-stroke.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-clip-stroke.base.argb32.ref.png diff --git a/cairo/test/reference/a1-clip-stroke.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-clip-stroke.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a1-clip-stroke.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-clip-stroke.base.rgb24.ref.png diff --git a/cairo/test/reference/a1-clip-stroke.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-clip-stroke.ref.png similarity index 100% rename from cairo/test/reference/a1-clip-stroke.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-clip-stroke.ref.png diff --git a/cairo/test/reference/a1-fill.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-fill.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/a1-fill.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-fill.base.argb32.ref.png diff --git a/cairo/test/reference/a1-fill.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-fill.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a1-fill.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-fill.base.rgb24.ref.png diff --git a/cairo/test/reference/a1-fill.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-fill.ref.png similarity index 100% rename from cairo/test/reference/a1-fill.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-fill.ref.png diff --git a/cairo/test/reference/a1-image-sample.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-image-sample.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/a1-image-sample.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-image-sample.base.argb32.ref.png diff --git a/cairo/test/reference/a1-image-sample.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-image-sample.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a1-image-sample.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-image-sample.base.rgb24.ref.png diff --git a/cairo/test/reference/a1-image-sample.gl.xfail.png b/io2d/src/3rd-party/cairo/test/reference/a1-image-sample.gl.xfail.png similarity index 100% rename from cairo/test/reference/a1-image-sample.gl.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/a1-image-sample.gl.xfail.png diff --git a/cairo/test/reference/a1-image-sample.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-image-sample.ref.png similarity index 100% rename from cairo/test/reference/a1-image-sample.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-image-sample.ref.png diff --git a/cairo/test/reference/a1-line-width.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-line-width.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/a1-line-width.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-line-width.base.argb32.ref.png diff --git a/cairo/test/reference/a1-line-width.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-line-width.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a1-line-width.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-line-width.base.rgb24.ref.png diff --git a/cairo/test/reference/a1-line-width.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-line-width.pdf.ref.png similarity index 100% rename from cairo/test/reference/a1-line-width.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-line-width.pdf.ref.png diff --git a/cairo/test/reference/a1-line-width.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-line-width.ps.ref.png similarity index 100% rename from cairo/test/reference/a1-line-width.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-line-width.ps.ref.png diff --git a/cairo/test/reference/a1-line-width.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-line-width.ref.png similarity index 100% rename from cairo/test/reference/a1-line-width.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-line-width.ref.png diff --git a/cairo/test/reference/a1-mask-sample.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-mask-sample.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/a1-mask-sample.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-mask-sample.base.argb32.ref.png diff --git a/cairo/test/reference/a1-mask-sample.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-mask-sample.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a1-mask-sample.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-mask-sample.base.rgb24.ref.png diff --git a/cairo/test/reference/a1-mask-sample.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-mask-sample.ref.png similarity index 100% rename from cairo/test/reference/a1-mask-sample.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-mask-sample.ref.png diff --git a/cairo/test/reference/a1-mask.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-mask.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/a1-mask.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-mask.base.argb32.ref.png diff --git a/cairo/test/reference/a1-mask.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-mask.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a1-mask.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-mask.base.rgb24.ref.png diff --git a/cairo/test/reference/a1-mask.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-mask.ref.png similarity index 100% rename from cairo/test/reference/a1-mask.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-mask.ref.png diff --git a/cairo/test/reference/a1-rasterisation-rectangles.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-rasterisation-rectangles.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/a1-rasterisation-rectangles.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-rasterisation-rectangles.base.argb32.ref.png diff --git a/cairo/test/reference/a1-rasterisation-rectangles.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-rasterisation-rectangles.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a1-rasterisation-rectangles.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-rasterisation-rectangles.base.rgb24.ref.png diff --git a/cairo/test/reference/a1-rasterisation-rectangles.quartz.xfail.png b/io2d/src/3rd-party/cairo/test/reference/a1-rasterisation-rectangles.quartz.xfail.png similarity index 100% rename from cairo/test/reference/a1-rasterisation-rectangles.quartz.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/a1-rasterisation-rectangles.quartz.xfail.png diff --git a/cairo/test/reference/a1-rasterisation-rectangles.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-rasterisation-rectangles.ref.png similarity index 100% rename from cairo/test/reference/a1-rasterisation-rectangles.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-rasterisation-rectangles.ref.png diff --git a/cairo/test/reference/a1-rasterisation-triangles.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-rasterisation-triangles.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/a1-rasterisation-triangles.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-rasterisation-triangles.base.argb32.ref.png diff --git a/cairo/test/reference/a1-rasterisation-triangles.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-rasterisation-triangles.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a1-rasterisation-triangles.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-rasterisation-triangles.base.rgb24.ref.png diff --git a/cairo/test/reference/a1-rasterisation-triangles.quartz.xfail.png b/io2d/src/3rd-party/cairo/test/reference/a1-rasterisation-triangles.quartz.xfail.png similarity index 100% rename from cairo/test/reference/a1-rasterisation-triangles.quartz.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/a1-rasterisation-triangles.quartz.xfail.png diff --git a/cairo/test/reference/a1-rasterisation-triangles.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-rasterisation-triangles.ref.png similarity index 100% rename from cairo/test/reference/a1-rasterisation-triangles.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-rasterisation-triangles.ref.png diff --git a/cairo/test/reference/a1-rectilinear-grid.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-rectilinear-grid.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/a1-rectilinear-grid.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-rectilinear-grid.base.argb32.ref.png diff --git a/cairo/test/reference/a1-rectilinear-grid.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-rectilinear-grid.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a1-rectilinear-grid.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-rectilinear-grid.base.rgb24.ref.png diff --git a/cairo/test/reference/a1-rectilinear-grid.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-rectilinear-grid.ref.png similarity index 100% rename from cairo/test/reference/a1-rectilinear-grid.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-rectilinear-grid.ref.png diff --git a/cairo/test/reference/a1-sample.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-sample.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/a1-sample.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-sample.base.argb32.ref.png diff --git a/cairo/test/reference/a1-sample.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-sample.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a1-sample.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-sample.base.rgb24.ref.png diff --git a/cairo/test/reference/a1-sample.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-sample.ref.png similarity index 100% rename from cairo/test/reference/a1-sample.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-sample.ref.png diff --git a/cairo/test/reference/a1-tiger.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-tiger.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/a1-tiger.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-tiger.base.argb32.ref.png diff --git a/cairo/test/reference/a1-tiger.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-tiger.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a1-tiger.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-tiger.base.rgb24.ref.png diff --git a/cairo/test/reference/a1-tiger.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-tiger.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/a1-tiger.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-tiger.mask.argb32.ref.png diff --git a/cairo/test/reference/a1-tiger.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-tiger.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a1-tiger.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-tiger.mask.rgb24.ref.png diff --git a/cairo/test/reference/a1-tiger.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-tiger.ref.png similarity index 100% rename from cairo/test/reference/a1-tiger.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-tiger.ref.png diff --git a/cairo/test/reference/a1-tiger.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-tiger.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/a1-tiger.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-tiger.traps.argb32.ref.png diff --git a/cairo/test/reference/a1-tiger.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-tiger.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a1-tiger.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-tiger.traps.rgb24.ref.png diff --git a/cairo/test/reference/a1-traps-sample.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-traps-sample.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/a1-traps-sample.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-traps-sample.base.argb32.ref.png diff --git a/cairo/test/reference/a1-traps-sample.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-traps-sample.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a1-traps-sample.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-traps-sample.base.rgb24.ref.png diff --git a/cairo/test/reference/a1-traps-sample.quartz.xfail.png b/io2d/src/3rd-party/cairo/test/reference/a1-traps-sample.quartz.xfail.png similarity index 100% rename from cairo/test/reference/a1-traps-sample.quartz.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/a1-traps-sample.quartz.xfail.png diff --git a/cairo/test/reference/a1-traps-sample.ref.png b/io2d/src/3rd-party/cairo/test/reference/a1-traps-sample.ref.png similarity index 100% rename from cairo/test/reference/a1-traps-sample.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a1-traps-sample.ref.png diff --git a/cairo/test/reference/a8-clear.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a8-clear.argb32.ref.png similarity index 100% rename from cairo/test/reference/a8-clear.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a8-clear.argb32.ref.png diff --git a/cairo/test/reference/a8-clear.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a8-clear.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/a8-clear.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a8-clear.base.argb32.ref.png diff --git a/cairo/test/reference/a8-clear.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a8-clear.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a8-clear.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a8-clear.base.rgb24.ref.png diff --git a/cairo/test/reference/a8-clear.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/a8-clear.quartz.ref.png similarity index 100% rename from cairo/test/reference/a8-clear.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a8-clear.quartz.ref.png diff --git a/cairo/test/reference/a8-clear.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a8-clear.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a8-clear.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a8-clear.rgb24.ref.png diff --git a/cairo/test/reference/a8-clear.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a8-clear.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/a8-clear.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a8-clear.traps.argb32.ref.png diff --git a/cairo/test/reference/a8-clear.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a8-clear.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a8-clear.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a8-clear.traps.rgb24.ref.png diff --git a/cairo/test/reference/a8-mask.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/a8-mask.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/a8-mask.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a8-mask.base.argb32.ref.png diff --git a/cairo/test/reference/a8-mask.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/a8-mask.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/a8-mask.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a8-mask.base.rgb24.ref.png diff --git a/cairo/test/reference/a8-mask.ref.png b/io2d/src/3rd-party/cairo/test/reference/a8-mask.ref.png similarity index 100% rename from cairo/test/reference/a8-mask.ref.png rename to io2d/src/3rd-party/cairo/test/reference/a8-mask.ref.png diff --git a/cairo/test/reference/aliasing.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/aliasing.argb32.ref.png similarity index 100% rename from cairo/test/reference/aliasing.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/aliasing.argb32.ref.png diff --git a/cairo/test/reference/aliasing.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/aliasing.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/aliasing.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/aliasing.base.argb32.ref.png diff --git a/cairo/test/reference/aliasing.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/aliasing.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/aliasing.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/aliasing.base.rgb24.ref.png diff --git a/cairo/test/reference/aliasing.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/aliasing.image16.ref.png similarity index 100% rename from cairo/test/reference/aliasing.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/aliasing.image16.ref.png diff --git a/cairo/test/reference/aliasing.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/aliasing.quartz.ref.png similarity index 100% rename from cairo/test/reference/aliasing.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/aliasing.quartz.ref.png diff --git a/cairo/test/reference/aliasing.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/aliasing.rgb24.ref.png similarity index 100% rename from cairo/test/reference/aliasing.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/aliasing.rgb24.ref.png diff --git a/cairo/test/reference/aliasing.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/aliasing.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/aliasing.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/aliasing.traps.argb32.ref.png diff --git a/cairo/test/reference/aliasing.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/aliasing.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/aliasing.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/aliasing.traps.rgb24.ref.png diff --git a/cairo/test/reference/alpha-similar.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/alpha-similar.argb32.ref.png similarity index 100% rename from cairo/test/reference/alpha-similar.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/alpha-similar.argb32.ref.png diff --git a/cairo/test/reference/alpha-similar.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/alpha-similar.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/alpha-similar.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/alpha-similar.base.argb32.ref.png diff --git a/cairo/test/reference/alpha-similar.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/alpha-similar.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/alpha-similar.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/alpha-similar.base.rgb24.ref.png diff --git a/cairo/test/reference/alpha-similar.gl.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/alpha-similar.gl.argb32.xfail.png similarity index 100% rename from cairo/test/reference/alpha-similar.gl.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/alpha-similar.gl.argb32.xfail.png diff --git a/cairo/test/reference/alpha-similar.gl.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/alpha-similar.gl.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/alpha-similar.gl.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/alpha-similar.gl.rgb24.xfail.png diff --git a/cairo/test/reference/alpha-similar.pdf.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/alpha-similar.pdf.argb32.xfail.png similarity index 100% rename from cairo/test/reference/alpha-similar.pdf.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/alpha-similar.pdf.argb32.xfail.png diff --git a/cairo/test/reference/alpha-similar.pdf.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/alpha-similar.pdf.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/alpha-similar.pdf.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/alpha-similar.pdf.rgb24.xfail.png diff --git a/cairo/test/reference/alpha-similar.ps.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/alpha-similar.ps.argb32.xfail.png similarity index 100% rename from cairo/test/reference/alpha-similar.ps.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/alpha-similar.ps.argb32.xfail.png diff --git a/cairo/test/reference/alpha-similar.ps.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/alpha-similar.ps.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/alpha-similar.ps.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/alpha-similar.ps.rgb24.xfail.png diff --git a/cairo/test/reference/alpha-similar.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/alpha-similar.rgb24.ref.png similarity index 100% rename from cairo/test/reference/alpha-similar.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/alpha-similar.rgb24.ref.png diff --git a/cairo/test/reference/alpha-similar.svg.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/alpha-similar.svg.argb32.xfail.png similarity index 100% rename from cairo/test/reference/alpha-similar.svg.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/alpha-similar.svg.argb32.xfail.png diff --git a/cairo/test/reference/alpha-similar.svg.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/alpha-similar.svg.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/alpha-similar.svg.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/alpha-similar.svg.rgb24.xfail.png diff --git a/cairo/test/reference/api-special-cases.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/api-special-cases.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/api-special-cases.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/api-special-cases.base.argb32.ref.png diff --git a/cairo/test/reference/api-special-cases.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/api-special-cases.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/api-special-cases.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/api-special-cases.base.rgb24.ref.png diff --git a/cairo/test/reference/api-special-cases.ref.png b/io2d/src/3rd-party/cairo/test/reference/api-special-cases.ref.png similarity index 100% rename from cairo/test/reference/api-special-cases.ref.png rename to io2d/src/3rd-party/cairo/test/reference/api-special-cases.ref.png diff --git a/cairo/test/reference/arc-direction.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/arc-direction.argb32.ref.png similarity index 100% rename from cairo/test/reference/arc-direction.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/arc-direction.argb32.ref.png diff --git a/cairo/test/reference/arc-direction.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/arc-direction.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/arc-direction.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/arc-direction.base.argb32.ref.png diff --git a/cairo/test/reference/arc-direction.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/arc-direction.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/arc-direction.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/arc-direction.base.rgb24.ref.png diff --git a/cairo/test/reference/arc-direction.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/arc-direction.ps.ref.png similarity index 100% rename from cairo/test/reference/arc-direction.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/arc-direction.ps.ref.png diff --git a/cairo/test/reference/arc-direction.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/arc-direction.rgb24.ref.png similarity index 100% rename from cairo/test/reference/arc-direction.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/arc-direction.rgb24.ref.png diff --git a/cairo/test/reference/arc-direction.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/arc-direction.traps.ref.png similarity index 100% rename from cairo/test/reference/arc-direction.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/arc-direction.traps.ref.png diff --git a/cairo/test/reference/arc-infinite-loop.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/arc-infinite-loop.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/arc-infinite-loop.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/arc-infinite-loop.base.argb32.ref.png diff --git a/cairo/test/reference/arc-infinite-loop.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/arc-infinite-loop.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/arc-infinite-loop.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/arc-infinite-loop.base.rgb24.ref.png diff --git a/cairo/test/reference/arc-infinite-loop.ref.png b/io2d/src/3rd-party/cairo/test/reference/arc-infinite-loop.ref.png similarity index 100% rename from cairo/test/reference/arc-infinite-loop.ref.png rename to io2d/src/3rd-party/cairo/test/reference/arc-infinite-loop.ref.png diff --git a/cairo/test/reference/arc-looping-dash.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/arc-looping-dash.image16.ref.png similarity index 100% rename from cairo/test/reference/arc-looping-dash.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/arc-looping-dash.image16.ref.png diff --git a/cairo/test/reference/arc-looping-dash.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/arc-looping-dash.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/arc-looping-dash.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/arc-looping-dash.mask.argb32.ref.png diff --git a/cairo/test/reference/arc-looping-dash.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/arc-looping-dash.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/arc-looping-dash.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/arc-looping-dash.mask.rgb24.ref.png diff --git a/cairo/test/reference/arc-looping-dash.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/arc-looping-dash.ps.ref.png similarity index 100% rename from cairo/test/reference/arc-looping-dash.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/arc-looping-dash.ps.ref.png diff --git a/cairo/test/reference/arc-looping-dash.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/arc-looping-dash.quartz.ref.png similarity index 100% rename from cairo/test/reference/arc-looping-dash.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/arc-looping-dash.quartz.ref.png diff --git a/cairo/test/reference/arc-looping-dash.ref.png b/io2d/src/3rd-party/cairo/test/reference/arc-looping-dash.ref.png similarity index 100% rename from cairo/test/reference/arc-looping-dash.ref.png rename to io2d/src/3rd-party/cairo/test/reference/arc-looping-dash.ref.png diff --git a/cairo/test/reference/arc-looping-dash.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/arc-looping-dash.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/arc-looping-dash.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/arc-looping-dash.traps.argb32.ref.png diff --git a/cairo/test/reference/arc-looping-dash.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/arc-looping-dash.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/arc-looping-dash.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/arc-looping-dash.traps.rgb24.ref.png diff --git a/cairo/test/reference/big-empty-box.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-empty-box.argb32.ref.png similarity index 100% rename from cairo/test/reference/big-empty-box.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-empty-box.argb32.ref.png diff --git a/cairo/test/reference/big-empty-box.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-empty-box.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/big-empty-box.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-empty-box.base.argb32.ref.png diff --git a/cairo/test/reference/big-empty-box.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-empty-box.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/big-empty-box.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-empty-box.base.rgb24.ref.png diff --git a/cairo/test/reference/big-empty-box.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-empty-box.rgb24.ref.png similarity index 100% rename from cairo/test/reference/big-empty-box.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-empty-box.rgb24.ref.png diff --git a/cairo/test/reference/big-empty-triangle.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-empty-triangle.argb32.ref.png similarity index 100% rename from cairo/test/reference/big-empty-triangle.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-empty-triangle.argb32.ref.png diff --git a/cairo/test/reference/big-empty-triangle.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-empty-triangle.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/big-empty-triangle.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-empty-triangle.base.argb32.ref.png diff --git a/cairo/test/reference/big-empty-triangle.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-empty-triangle.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/big-empty-triangle.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-empty-triangle.base.rgb24.ref.png diff --git a/cairo/test/reference/big-empty-triangle.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-empty-triangle.rgb24.ref.png similarity index 100% rename from cairo/test/reference/big-empty-triangle.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-empty-triangle.rgb24.ref.png diff --git a/cairo/test/reference/big-line.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-line.argb32.ref.png similarity index 100% rename from cairo/test/reference/big-line.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-line.argb32.ref.png diff --git a/cairo/test/reference/big-line.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-line.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/big-line.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-line.base.argb32.ref.png diff --git a/cairo/test/reference/big-line.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-line.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/big-line.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-line.base.rgb24.ref.png diff --git a/cairo/test/reference/big-line.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-line.image16.ref.png similarity index 100% rename from cairo/test/reference/big-line.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-line.image16.ref.png diff --git a/cairo/test/reference/big-line.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-line.ps.ref.png similarity index 100% rename from cairo/test/reference/big-line.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-line.ps.ref.png diff --git a/cairo/test/reference/big-line.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-line.quartz.ref.png similarity index 100% rename from cairo/test/reference/big-line.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-line.quartz.ref.png diff --git a/cairo/test/reference/big-line.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-line.rgb24.ref.png similarity index 100% rename from cairo/test/reference/big-line.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-line.rgb24.ref.png diff --git a/cairo/test/reference/big-line.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-line.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/big-line.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-line.traps.argb32.ref.png diff --git a/cairo/test/reference/big-line.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-line.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/big-line.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-line.traps.rgb24.ref.png diff --git a/cairo/test/reference/big-little-box.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-little-box.argb32.ref.png similarity index 100% rename from cairo/test/reference/big-little-box.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-little-box.argb32.ref.png diff --git a/cairo/test/reference/big-little-box.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-little-box.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/big-little-box.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-little-box.base.argb32.ref.png diff --git a/cairo/test/reference/big-little-box.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-little-box.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/big-little-box.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-little-box.base.rgb24.ref.png diff --git a/cairo/test/reference/big-little-box.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-little-box.rgb24.ref.png similarity index 100% rename from cairo/test/reference/big-little-box.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-little-box.rgb24.ref.png diff --git a/cairo/test/reference/big-little-triangle.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-little-triangle.argb32.ref.png similarity index 100% rename from cairo/test/reference/big-little-triangle.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-little-triangle.argb32.ref.png diff --git a/cairo/test/reference/big-little-triangle.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-little-triangle.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/big-little-triangle.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-little-triangle.base.argb32.ref.png diff --git a/cairo/test/reference/big-little-triangle.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-little-triangle.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/big-little-triangle.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-little-triangle.base.rgb24.ref.png diff --git a/cairo/test/reference/big-little-triangle.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-little-triangle.rgb24.ref.png similarity index 100% rename from cairo/test/reference/big-little-triangle.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-little-triangle.rgb24.ref.png diff --git a/cairo/test/reference/big-little-triangle.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-little-triangle.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/big-little-triangle.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-little-triangle.traps.argb32.ref.png diff --git a/cairo/test/reference/big-little-triangle.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-little-triangle.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/big-little-triangle.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-little-triangle.traps.rgb24.ref.png diff --git a/cairo/test/reference/big-trap.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-trap.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/big-trap.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-trap.base.argb32.ref.png diff --git a/cairo/test/reference/big-trap.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-trap.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/big-trap.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-trap.base.rgb24.ref.png diff --git a/cairo/test/reference/big-trap.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-trap.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/big-trap.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-trap.mask.argb32.ref.png diff --git a/cairo/test/reference/big-trap.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-trap.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/big-trap.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-trap.mask.rgb24.ref.png diff --git a/cairo/test/reference/big-trap.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-trap.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/big-trap.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-trap.traps.argb32.ref.png diff --git a/cairo/test/reference/big-trap.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/big-trap.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/big-trap.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/big-trap.traps.rgb24.ref.png diff --git a/cairo/test/reference/bilevel-image.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/bilevel-image.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/bilevel-image.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bilevel-image.base.argb32.ref.png diff --git a/cairo/test/reference/bilevel-image.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/bilevel-image.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/bilevel-image.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bilevel-image.base.rgb24.ref.png diff --git a/cairo/test/reference/bilevel-image.ref.png b/io2d/src/3rd-party/cairo/test/reference/bilevel-image.ref.png similarity index 100% rename from cairo/test/reference/bilevel-image.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bilevel-image.ref.png diff --git a/cairo/test/reference/bilevel-xlib-fallback.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/bilevel-xlib-fallback.rgb24.ref.png similarity index 100% rename from cairo/test/reference/bilevel-xlib-fallback.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bilevel-xlib-fallback.rgb24.ref.png diff --git a/cairo/test/reference/bilevel-xlib-window.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/bilevel-xlib-window.rgb24.ref.png similarity index 100% rename from cairo/test/reference/bilevel-xlib-window.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bilevel-xlib-window.rgb24.ref.png diff --git a/cairo/test/reference/bilevel-xlib.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/bilevel-xlib.argb32.ref.png similarity index 100% rename from cairo/test/reference/bilevel-xlib.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bilevel-xlib.argb32.ref.png diff --git a/cairo/test/reference/bilevel-xlib.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/bilevel-xlib.rgb24.ref.png similarity index 100% rename from cairo/test/reference/bilevel-xlib.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bilevel-xlib.rgb24.ref.png diff --git a/cairo/test/reference/bitmap-font.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/bitmap-font.argb32.ref.png similarity index 100% rename from cairo/test/reference/bitmap-font.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bitmap-font.argb32.ref.png diff --git a/cairo/test/reference/bitmap-font.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/bitmap-font.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/bitmap-font.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bitmap-font.base.argb32.ref.png diff --git a/cairo/test/reference/bitmap-font.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/bitmap-font.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/bitmap-font.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bitmap-font.base.rgb24.ref.png diff --git a/cairo/test/reference/bitmap-font.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/bitmap-font.rgb24.ref.png similarity index 100% rename from cairo/test/reference/bitmap-font.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bitmap-font.rgb24.ref.png diff --git a/cairo/test/reference/bug-40410.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-40410.argb32.ref.png similarity index 100% rename from cairo/test/reference/bug-40410.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-40410.argb32.ref.png diff --git a/cairo/test/reference/bug-40410.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-40410.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/bug-40410.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-40410.base.argb32.ref.png diff --git a/cairo/test/reference/bug-40410.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-40410.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/bug-40410.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-40410.base.rgb24.ref.png diff --git a/cairo/test/reference/bug-40410.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-40410.rgb24.ref.png similarity index 100% rename from cairo/test/reference/bug-40410.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-40410.rgb24.ref.png diff --git a/cairo/test/reference/bug-40410.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-40410.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/bug-40410.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-40410.traps.argb32.ref.png diff --git a/cairo/test/reference/bug-40410.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-40410.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/bug-40410.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-40410.traps.rgb24.ref.png diff --git a/cairo/test/reference/bug-51910.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-51910.ref.png similarity index 100% rename from cairo/test/reference/bug-51910.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-51910.ref.png diff --git a/cairo/test/reference/bug-bo-collins.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-bo-collins.ref.png similarity index 100% rename from cairo/test/reference/bug-bo-collins.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-bo-collins.ref.png diff --git a/cairo/test/reference/bug-bo-rectangular.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-bo-rectangular.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/bug-bo-rectangular.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-bo-rectangular.base.argb32.ref.png diff --git a/cairo/test/reference/bug-bo-rectangular.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-bo-rectangular.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/bug-bo-rectangular.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-bo-rectangular.base.rgb24.ref.png diff --git a/cairo/test/reference/bug-bo-rectangular.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-bo-rectangular.image16.ref.png similarity index 100% rename from cairo/test/reference/bug-bo-rectangular.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-bo-rectangular.image16.ref.png diff --git a/cairo/test/reference/bug-bo-rectangular.ps.xfail.png b/io2d/src/3rd-party/cairo/test/reference/bug-bo-rectangular.ps.xfail.png similarity index 100% rename from cairo/test/reference/bug-bo-rectangular.ps.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/bug-bo-rectangular.ps.xfail.png diff --git a/cairo/test/reference/bug-bo-rectangular.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-bo-rectangular.ref.png similarity index 100% rename from cairo/test/reference/bug-bo-rectangular.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-bo-rectangular.ref.png diff --git a/cairo/test/reference/bug-bo-ricotz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-bo-ricotz.argb32.ref.png similarity index 100% rename from cairo/test/reference/bug-bo-ricotz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-bo-ricotz.argb32.ref.png diff --git a/cairo/test/reference/bug-bo-ricotz.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-bo-ricotz.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/bug-bo-ricotz.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-bo-ricotz.base.argb32.ref.png diff --git a/cairo/test/reference/bug-bo-ricotz.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-bo-ricotz.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/bug-bo-ricotz.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-bo-ricotz.base.rgb24.ref.png diff --git a/cairo/test/reference/bug-bo-ricotz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-bo-ricotz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/bug-bo-ricotz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-bo-ricotz.rgb24.ref.png diff --git a/cairo/test/reference/bug-bo-ricotz.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-bo-ricotz.traps.ref.png similarity index 100% rename from cairo/test/reference/bug-bo-ricotz.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-bo-ricotz.traps.ref.png diff --git a/cairo/test/reference/bug-extents.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-extents.argb32.ref.png similarity index 100% rename from cairo/test/reference/bug-extents.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-extents.argb32.ref.png diff --git a/cairo/test/reference/bug-extents.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-extents.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/bug-extents.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-extents.base.argb32.ref.png diff --git a/cairo/test/reference/bug-extents.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-extents.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/bug-extents.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-extents.base.rgb24.ref.png diff --git a/cairo/test/reference/bug-extents.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-extents.image16.ref.png similarity index 100% rename from cairo/test/reference/bug-extents.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-extents.image16.ref.png diff --git a/cairo/test/reference/bug-extents.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-extents.ps.ref.png similarity index 100% rename from cairo/test/reference/bug-extents.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-extents.ps.ref.png diff --git a/cairo/test/reference/bug-extents.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-extents.quartz.ref.png similarity index 100% rename from cairo/test/reference/bug-extents.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-extents.quartz.ref.png diff --git a/cairo/test/reference/bug-extents.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-extents.rgb24.ref.png similarity index 100% rename from cairo/test/reference/bug-extents.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-extents.rgb24.ref.png diff --git a/cairo/test/reference/bug-extents.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-extents.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/bug-extents.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-extents.traps.argb32.ref.png diff --git a/cairo/test/reference/bug-extents.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-extents.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/bug-extents.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-extents.traps.rgb24.ref.png diff --git a/cairo/test/reference/bug-seams.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-seams.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/bug-seams.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-seams.base.argb32.ref.png diff --git a/cairo/test/reference/bug-seams.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-seams.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/bug-seams.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-seams.base.rgb24.ref.png diff --git a/cairo/test/reference/bug-seams.image.xfail.png b/io2d/src/3rd-party/cairo/test/reference/bug-seams.image.xfail.png similarity index 100% rename from cairo/test/reference/bug-seams.image.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/bug-seams.image.xfail.png diff --git a/cairo/test/reference/bug-seams.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-seams.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/bug-seams.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-seams.mask.argb32.ref.png diff --git a/cairo/test/reference/bug-seams.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-seams.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/bug-seams.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-seams.mask.rgb24.ref.png diff --git a/cairo/test/reference/bug-seams.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-seams.ref.png similarity index 100% rename from cairo/test/reference/bug-seams.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-seams.ref.png diff --git a/cairo/test/reference/bug-seams.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-seams.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/bug-seams.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-seams.traps.argb32.ref.png diff --git a/cairo/test/reference/bug-seams.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-seams.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/bug-seams.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-seams.traps.rgb24.ref.png diff --git a/cairo/test/reference/bug-seams.xlib-fallback.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-seams.xlib-fallback.ref.png similarity index 100% rename from cairo/test/reference/bug-seams.xlib-fallback.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-seams.xlib-fallback.ref.png diff --git a/cairo/test/reference/bug-source-cu.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-source-cu.argb32.ref.png similarity index 100% rename from cairo/test/reference/bug-source-cu.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-source-cu.argb32.ref.png diff --git a/cairo/test/reference/bug-source-cu.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-source-cu.rgb24.ref.png similarity index 100% rename from cairo/test/reference/bug-source-cu.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-source-cu.rgb24.ref.png diff --git a/cairo/test/reference/bug-source-cu.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-source-cu.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/bug-source-cu.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-source-cu.traps.argb32.ref.png diff --git a/cairo/test/reference/bug-source-cu.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-source-cu.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/bug-source-cu.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-source-cu.traps.rgb24.ref.png diff --git a/cairo/test/reference/bug-spline.ref.png b/io2d/src/3rd-party/cairo/test/reference/bug-spline.ref.png similarity index 100% rename from cairo/test/reference/bug-spline.ref.png rename to io2d/src/3rd-party/cairo/test/reference/bug-spline.ref.png diff --git a/cairo/test/reference/caps-05.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-05.ref.png similarity index 100% rename from cairo/test/reference/caps-05.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-05.ref.png diff --git a/cairo/test/reference/caps-05.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-05.traps.ref.png similarity index 100% rename from cairo/test/reference/caps-05.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-05.traps.ref.png diff --git a/cairo/test/reference/caps-1.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-1.ref.png similarity index 100% rename from cairo/test/reference/caps-1.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-1.ref.png diff --git a/cairo/test/reference/caps-1.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-1.traps.ref.png similarity index 100% rename from cairo/test/reference/caps-1.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-1.traps.ref.png diff --git a/cairo/test/reference/caps-2.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-2.ref.png similarity index 100% rename from cairo/test/reference/caps-2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-2.ref.png diff --git a/cairo/test/reference/caps-2.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-2.traps.ref.png similarity index 100% rename from cairo/test/reference/caps-2.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-2.traps.ref.png diff --git a/cairo/test/reference/caps-joins-05.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins-05.ref.png similarity index 100% rename from cairo/test/reference/caps-joins-05.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins-05.ref.png diff --git a/cairo/test/reference/caps-joins-05.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins-05.traps.ref.png similarity index 100% rename from cairo/test/reference/caps-joins-05.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins-05.traps.ref.png diff --git a/cairo/test/reference/caps-joins-1.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins-1.ref.png similarity index 100% rename from cairo/test/reference/caps-joins-1.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins-1.ref.png diff --git a/cairo/test/reference/caps-joins-1.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins-1.traps.ref.png similarity index 100% rename from cairo/test/reference/caps-joins-1.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins-1.traps.ref.png diff --git a/cairo/test/reference/caps-joins-2.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins-2.ref.png similarity index 100% rename from cairo/test/reference/caps-joins-2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins-2.ref.png diff --git a/cairo/test/reference/caps-joins-2.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins-2.traps.ref.png similarity index 100% rename from cairo/test/reference/caps-joins-2.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins-2.traps.ref.png diff --git a/cairo/test/reference/caps-joins-alpha.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins-alpha.image16.ref.png similarity index 100% rename from cairo/test/reference/caps-joins-alpha.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins-alpha.image16.ref.png diff --git a/cairo/test/reference/caps-joins-alpha.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins-alpha.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/caps-joins-alpha.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins-alpha.mask.argb32.ref.png diff --git a/cairo/test/reference/caps-joins-alpha.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins-alpha.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/caps-joins-alpha.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins-alpha.mask.rgb24.ref.png diff --git a/cairo/test/reference/caps-joins-alpha.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins-alpha.quartz.ref.png similarity index 100% rename from cairo/test/reference/caps-joins-alpha.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins-alpha.quartz.ref.png diff --git a/cairo/test/reference/caps-joins-alpha.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins-alpha.ref.png similarity index 100% rename from cairo/test/reference/caps-joins-alpha.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins-alpha.ref.png diff --git a/cairo/test/reference/caps-joins-alpha.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins-alpha.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/caps-joins-alpha.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins-alpha.traps.argb32.ref.png diff --git a/cairo/test/reference/caps-joins-alpha.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins-alpha.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/caps-joins-alpha.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins-alpha.traps.rgb24.ref.png diff --git a/cairo/test/reference/caps-joins-curve.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins-curve.image16.ref.png similarity index 100% rename from cairo/test/reference/caps-joins-curve.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins-curve.image16.ref.png diff --git a/cairo/test/reference/caps-joins-curve.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins-curve.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/caps-joins-curve.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins-curve.mask.argb32.ref.png diff --git a/cairo/test/reference/caps-joins-curve.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins-curve.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/caps-joins-curve.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins-curve.mask.rgb24.ref.png diff --git a/cairo/test/reference/caps-joins-curve.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins-curve.ps.ref.png similarity index 100% rename from cairo/test/reference/caps-joins-curve.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins-curve.ps.ref.png diff --git a/cairo/test/reference/caps-joins-curve.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins-curve.quartz.ref.png similarity index 100% rename from cairo/test/reference/caps-joins-curve.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins-curve.quartz.ref.png diff --git a/cairo/test/reference/caps-joins-curve.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins-curve.ref.png similarity index 100% rename from cairo/test/reference/caps-joins-curve.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins-curve.ref.png diff --git a/cairo/test/reference/caps-joins-curve.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins-curve.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/caps-joins-curve.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins-curve.traps.argb32.ref.png diff --git a/cairo/test/reference/caps-joins-curve.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins-curve.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/caps-joins-curve.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins-curve.traps.rgb24.ref.png diff --git a/cairo/test/reference/caps-joins.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins.argb32.ref.png similarity index 100% rename from cairo/test/reference/caps-joins.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins.argb32.ref.png diff --git a/cairo/test/reference/caps-joins.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/caps-joins.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins.base.argb32.ref.png diff --git a/cairo/test/reference/caps-joins.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/caps-joins.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins.base.rgb24.ref.png diff --git a/cairo/test/reference/caps-joins.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins.image16.ref.png similarity index 100% rename from cairo/test/reference/caps-joins.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins.image16.ref.png diff --git a/cairo/test/reference/caps-joins.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins.ps.ref.png similarity index 100% rename from cairo/test/reference/caps-joins.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins.ps.ref.png diff --git a/cairo/test/reference/caps-joins.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins.rgb24.ref.png similarity index 100% rename from cairo/test/reference/caps-joins.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins.rgb24.ref.png diff --git a/cairo/test/reference/caps-joins.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/caps-joins.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins.traps.argb32.ref.png diff --git a/cairo/test/reference/caps-joins.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-joins.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/caps-joins.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-joins.traps.rgb24.ref.png diff --git a/cairo/test/reference/caps-sub-paths.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-sub-paths.argb32.ref.png similarity index 100% rename from cairo/test/reference/caps-sub-paths.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-sub-paths.argb32.ref.png diff --git a/cairo/test/reference/caps-sub-paths.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-sub-paths.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/caps-sub-paths.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-sub-paths.base.argb32.ref.png diff --git a/cairo/test/reference/caps-sub-paths.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-sub-paths.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/caps-sub-paths.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-sub-paths.base.rgb24.ref.png diff --git a/cairo/test/reference/caps-sub-paths.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-sub-paths.image16.ref.png similarity index 100% rename from cairo/test/reference/caps-sub-paths.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-sub-paths.image16.ref.png diff --git a/cairo/test/reference/caps-sub-paths.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-sub-paths.ps.ref.png similarity index 100% rename from cairo/test/reference/caps-sub-paths.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-sub-paths.ps.ref.png diff --git a/cairo/test/reference/caps-sub-paths.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-sub-paths.rgb24.ref.png similarity index 100% rename from cairo/test/reference/caps-sub-paths.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-sub-paths.rgb24.ref.png diff --git a/cairo/test/reference/caps-sub-paths.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-sub-paths.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/caps-sub-paths.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-sub-paths.traps.argb32.ref.png diff --git a/cairo/test/reference/caps-sub-paths.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-sub-paths.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/caps-sub-paths.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-sub-paths.traps.rgb24.ref.png diff --git a/cairo/test/reference/caps-tails-curve.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-tails-curve.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/caps-tails-curve.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-tails-curve.mask.argb32.ref.png diff --git a/cairo/test/reference/caps-tails-curve.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-tails-curve.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/caps-tails-curve.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-tails-curve.mask.rgb24.ref.png diff --git a/cairo/test/reference/caps-tails-curve.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-tails-curve.ps.ref.png similarity index 100% rename from cairo/test/reference/caps-tails-curve.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-tails-curve.ps.ref.png diff --git a/cairo/test/reference/caps-tails-curve.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-tails-curve.ref.png similarity index 100% rename from cairo/test/reference/caps-tails-curve.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-tails-curve.ref.png diff --git a/cairo/test/reference/caps-tails-curve.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-tails-curve.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/caps-tails-curve.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-tails-curve.traps.argb32.ref.png diff --git a/cairo/test/reference/caps-tails-curve.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-tails-curve.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/caps-tails-curve.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-tails-curve.traps.rgb24.ref.png diff --git a/cairo/test/reference/caps-tails-curve.xcb.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps-tails-curve.xcb.ref.png similarity index 100% rename from cairo/test/reference/caps-tails-curve.xcb.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps-tails-curve.xcb.ref.png diff --git a/cairo/test/reference/caps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps.argb32.ref.png similarity index 100% rename from cairo/test/reference/caps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps.argb32.ref.png diff --git a/cairo/test/reference/caps.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/caps.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps.base.argb32.ref.png diff --git a/cairo/test/reference/caps.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/caps.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps.base.rgb24.ref.png diff --git a/cairo/test/reference/caps.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps.image16.ref.png similarity index 100% rename from cairo/test/reference/caps.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps.image16.ref.png diff --git a/cairo/test/reference/caps.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps.ps.ref.png similarity index 100% rename from cairo/test/reference/caps.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps.ps.ref.png diff --git a/cairo/test/reference/caps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/caps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps.rgb24.ref.png diff --git a/cairo/test/reference/caps.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/caps.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps.traps.argb32.ref.png diff --git a/cairo/test/reference/caps.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/caps.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/caps.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/caps.traps.rgb24.ref.png diff --git a/cairo/test/reference/checkerboard.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/checkerboard.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/checkerboard.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/checkerboard.base.argb32.ref.png diff --git a/cairo/test/reference/checkerboard.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/checkerboard.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/checkerboard.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/checkerboard.base.rgb24.ref.png diff --git a/cairo/test/reference/checkerboard.ref.png b/io2d/src/3rd-party/cairo/test/reference/checkerboard.ref.png similarity index 100% rename from cairo/test/reference/checkerboard.ref.png rename to io2d/src/3rd-party/cairo/test/reference/checkerboard.ref.png diff --git a/cairo/test/reference/clear-source.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clear-source.argb32.ref.png similarity index 100% rename from cairo/test/reference/clear-source.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clear-source.argb32.ref.png diff --git a/cairo/test/reference/clear-source.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clear-source.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clear-source.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clear-source.base.argb32.ref.png diff --git a/cairo/test/reference/clear-source.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clear-source.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clear-source.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clear-source.base.rgb24.ref.png diff --git a/cairo/test/reference/clear-source.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/clear-source.image16.ref.png similarity index 100% rename from cairo/test/reference/clear-source.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clear-source.image16.ref.png diff --git a/cairo/test/reference/clear-source.pdf.xfail.png b/io2d/src/3rd-party/cairo/test/reference/clear-source.pdf.xfail.png similarity index 100% rename from cairo/test/reference/clear-source.pdf.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/clear-source.pdf.xfail.png diff --git a/cairo/test/reference/clear-source.ps.xfail.png b/io2d/src/3rd-party/cairo/test/reference/clear-source.ps.xfail.png similarity index 100% rename from cairo/test/reference/clear-source.ps.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/clear-source.ps.xfail.png diff --git a/cairo/test/reference/clear-source.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clear-source.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clear-source.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clear-source.rgb24.ref.png diff --git a/cairo/test/reference/clear-source.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clear-source.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clear-source.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clear-source.traps.argb32.ref.png diff --git a/cairo/test/reference/clear-source.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clear-source.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clear-source.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clear-source.traps.rgb24.ref.png diff --git a/cairo/test/reference/clear.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clear.argb32.ref.png similarity index 100% rename from cairo/test/reference/clear.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clear.argb32.ref.png diff --git a/cairo/test/reference/clear.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clear.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clear.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clear.base.argb32.ref.png diff --git a/cairo/test/reference/clear.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clear.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clear.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clear.base.rgb24.ref.png diff --git a/cairo/test/reference/clear.pdf.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clear.pdf.argb32.ref.png similarity index 100% rename from cairo/test/reference/clear.pdf.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clear.pdf.argb32.ref.png diff --git a/cairo/test/reference/clear.ps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clear.ps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clear.ps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clear.ps.argb32.ref.png diff --git a/cairo/test/reference/clear.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clear.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/clear.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clear.quartz.argb32.ref.png diff --git a/cairo/test/reference/clear.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clear.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clear.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clear.quartz.rgb24.ref.png diff --git a/cairo/test/reference/clear.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clear.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clear.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clear.rgb24.ref.png diff --git a/cairo/test/reference/clear.svg12.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/clear.svg12.argb32.xfail.png similarity index 100% rename from cairo/test/reference/clear.svg12.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/clear.svg12.argb32.xfail.png diff --git a/cairo/test/reference/clear.svg12.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/clear.svg12.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/clear.svg12.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/clear.svg12.rgb24.xfail.png diff --git a/cairo/test/reference/clear.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clear.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clear.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clear.traps.argb32.ref.png diff --git a/cairo/test/reference/clear.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clear.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clear.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clear.traps.rgb24.ref.png diff --git a/cairo/test/reference/clip-all.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-all.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-all.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-all.base.argb32.ref.png diff --git a/cairo/test/reference/clip-all.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-all.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-all.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-all.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-all.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-all.ref.png similarity index 100% rename from cairo/test/reference/clip-all.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-all.ref.png diff --git a/cairo/test/reference/clip-complex-bug61492.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-complex-bug61492.ref.png similarity index 100% rename from cairo/test/reference/clip-complex-bug61492.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-complex-bug61492.ref.png diff --git a/cairo/test/reference/clip-complex-shape-eo-aa.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-complex-shape-eo-aa.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-complex-shape-eo-aa.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-complex-shape-eo-aa.base.argb32.ref.png diff --git a/cairo/test/reference/clip-complex-shape-eo-aa.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-complex-shape-eo-aa.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-complex-shape-eo-aa.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-complex-shape-eo-aa.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-complex-shape-eo-aa.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-complex-shape-eo-aa.ref.png similarity index 100% rename from cairo/test/reference/clip-complex-shape-eo-aa.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-complex-shape-eo-aa.ref.png diff --git a/cairo/test/reference/clip-complex-shape-eo-mono.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-complex-shape-eo-mono.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-complex-shape-eo-mono.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-complex-shape-eo-mono.base.argb32.ref.png diff --git a/cairo/test/reference/clip-complex-shape-eo-mono.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-complex-shape-eo-mono.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-complex-shape-eo-mono.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-complex-shape-eo-mono.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-complex-shape-eo-mono.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-complex-shape-eo-mono.ref.png similarity index 100% rename from cairo/test/reference/clip-complex-shape-eo-mono.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-complex-shape-eo-mono.ref.png diff --git a/cairo/test/reference/clip-contexts.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-contexts.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-contexts.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-contexts.base.argb32.ref.png diff --git a/cairo/test/reference/clip-contexts.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-contexts.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-contexts.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-contexts.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-contexts.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-contexts.ref.png similarity index 100% rename from cairo/test/reference/clip-contexts.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-contexts.ref.png diff --git a/cairo/test/reference/clip-device-offset.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-device-offset.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-device-offset.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-device-offset.argb32.ref.png diff --git a/cairo/test/reference/clip-device-offset.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-device-offset.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-device-offset.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-device-offset.base.argb32.ref.png diff --git a/cairo/test/reference/clip-device-offset.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-device-offset.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-device-offset.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-device-offset.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-device-offset.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-device-offset.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-device-offset.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-device-offset.rgb24.ref.png diff --git a/cairo/test/reference/clip-disjoint-hatching.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-disjoint-hatching.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-disjoint-hatching.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-disjoint-hatching.argb32.ref.png diff --git a/cairo/test/reference/clip-disjoint-hatching.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-disjoint-hatching.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-disjoint-hatching.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-disjoint-hatching.base.argb32.ref.png diff --git a/cairo/test/reference/clip-disjoint-hatching.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-disjoint-hatching.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-disjoint-hatching.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-disjoint-hatching.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-disjoint-hatching.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-disjoint-hatching.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-disjoint-hatching.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-disjoint-hatching.mask.argb32.ref.png diff --git a/cairo/test/reference/clip-disjoint-hatching.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-disjoint-hatching.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-disjoint-hatching.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-disjoint-hatching.mask.rgb24.ref.png diff --git a/cairo/test/reference/clip-disjoint-hatching.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-disjoint-hatching.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-disjoint-hatching.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-disjoint-hatching.rgb24.ref.png diff --git a/cairo/test/reference/clip-disjoint-hatching.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-disjoint-hatching.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-disjoint-hatching.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-disjoint-hatching.traps.argb32.ref.png diff --git a/cairo/test/reference/clip-disjoint-hatching.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-disjoint-hatching.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-disjoint-hatching.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-disjoint-hatching.traps.rgb24.ref.png diff --git a/cairo/test/reference/clip-disjoint-quad.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-disjoint-quad.ref.png similarity index 100% rename from cairo/test/reference/clip-disjoint-quad.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-disjoint-quad.ref.png diff --git a/cairo/test/reference/clip-disjoint-quad.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-disjoint-quad.traps.ref.png similarity index 100% rename from cairo/test/reference/clip-disjoint-quad.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-disjoint-quad.traps.ref.png diff --git a/cairo/test/reference/clip-disjoint.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-disjoint.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-disjoint.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-disjoint.base.argb32.ref.png diff --git a/cairo/test/reference/clip-disjoint.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-disjoint.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-disjoint.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-disjoint.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-disjoint.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-disjoint.image16.ref.png similarity index 100% rename from cairo/test/reference/clip-disjoint.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-disjoint.image16.ref.png diff --git a/cairo/test/reference/clip-disjoint.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-disjoint.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-disjoint.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-disjoint.mask.argb32.ref.png diff --git a/cairo/test/reference/clip-disjoint.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-disjoint.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-disjoint.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-disjoint.mask.rgb24.ref.png diff --git a/cairo/test/reference/clip-disjoint.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-disjoint.ps.ref.png similarity index 100% rename from cairo/test/reference/clip-disjoint.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-disjoint.ps.ref.png diff --git a/cairo/test/reference/clip-disjoint.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-disjoint.quartz.ref.png similarity index 100% rename from cairo/test/reference/clip-disjoint.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-disjoint.quartz.ref.png diff --git a/cairo/test/reference/clip-disjoint.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-disjoint.ref.png similarity index 100% rename from cairo/test/reference/clip-disjoint.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-disjoint.ref.png diff --git a/cairo/test/reference/clip-disjoint.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-disjoint.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-disjoint.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-disjoint.traps.argb32.ref.png diff --git a/cairo/test/reference/clip-disjoint.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-disjoint.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-disjoint.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-disjoint.traps.rgb24.ref.png diff --git a/cairo/test/reference/clip-empty-group.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-empty-group.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-empty-group.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-empty-group.base.argb32.ref.png diff --git a/cairo/test/reference/clip-empty-group.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-empty-group.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-empty-group.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-empty-group.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-empty-group.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-empty-group.ref.png similarity index 100% rename from cairo/test/reference/clip-empty-group.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-empty-group.ref.png diff --git a/cairo/test/reference/clip-empty-save.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-empty-save.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-empty-save.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-empty-save.base.argb32.ref.png diff --git a/cairo/test/reference/clip-empty-save.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-empty-save.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-empty-save.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-empty-save.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-empty-save.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-empty-save.ref.png similarity index 100% rename from cairo/test/reference/clip-empty-save.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-empty-save.ref.png diff --git a/cairo/test/reference/clip-empty.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-empty.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-empty.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-empty.base.argb32.ref.png diff --git a/cairo/test/reference/clip-empty.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-empty.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-empty.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-empty.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-empty.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-empty.ref.png similarity index 100% rename from cairo/test/reference/clip-empty.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-empty.ref.png diff --git a/cairo/test/reference/clip-fill-eo-unbounded.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-eo-unbounded.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.argb32.ref.png diff --git a/cairo/test/reference/clip-fill-eo-unbounded.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-eo-unbounded.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.base.argb32.ref.png diff --git a/cairo/test/reference/clip-fill-eo-unbounded.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-eo-unbounded.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-fill-eo-unbounded.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.image16.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-eo-unbounded.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.image16.ref.png diff --git a/cairo/test/reference/clip-fill-eo-unbounded.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-eo-unbounded.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.mask.argb32.ref.png diff --git a/cairo/test/reference/clip-fill-eo-unbounded.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-eo-unbounded.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.mask.rgb24.ref.png diff --git a/cairo/test/reference/clip-fill-eo-unbounded.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-eo-unbounded.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.quartz.argb32.ref.png diff --git a/cairo/test/reference/clip-fill-eo-unbounded.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-eo-unbounded.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.quartz.rgb24.ref.png diff --git a/cairo/test/reference/clip-fill-eo-unbounded.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-eo-unbounded.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.rgb24.ref.png diff --git a/cairo/test/reference/clip-fill-eo-unbounded.svg12.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.svg12.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/clip-fill-eo-unbounded.svg12.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.svg12.rgb24.xfail.png diff --git a/cairo/test/reference/clip-fill-eo-unbounded.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-eo-unbounded.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.traps.argb32.ref.png diff --git a/cairo/test/reference/clip-fill-eo-unbounded.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-eo-unbounded.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.traps.rgb24.ref.png diff --git a/cairo/test/reference/clip-fill-eo-unbounded.xlib-fallback.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.xlib-fallback.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-eo-unbounded.xlib-fallback.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-eo-unbounded.xlib-fallback.rgb24.ref.png diff --git a/cairo/test/reference/clip-fill-no-op.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-no-op.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-no-op.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-no-op.base.argb32.ref.png diff --git a/cairo/test/reference/clip-fill-no-op.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-no-op.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-no-op.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-no-op.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-fill-no-op.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-no-op.image16.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-no-op.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-no-op.image16.ref.png diff --git a/cairo/test/reference/clip-fill-no-op.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-no-op.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-no-op.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-no-op.ref.png diff --git a/cairo/test/reference/clip-fill-nz-unbounded.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-nz-unbounded.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.argb32.ref.png diff --git a/cairo/test/reference/clip-fill-nz-unbounded.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-nz-unbounded.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.base.argb32.ref.png diff --git a/cairo/test/reference/clip-fill-nz-unbounded.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-nz-unbounded.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-fill-nz-unbounded.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.image16.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-nz-unbounded.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.image16.ref.png diff --git a/cairo/test/reference/clip-fill-nz-unbounded.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-nz-unbounded.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.mask.argb32.ref.png diff --git a/cairo/test/reference/clip-fill-nz-unbounded.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-nz-unbounded.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.mask.rgb24.ref.png diff --git a/cairo/test/reference/clip-fill-nz-unbounded.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-nz-unbounded.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.quartz.argb32.ref.png diff --git a/cairo/test/reference/clip-fill-nz-unbounded.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-nz-unbounded.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.quartz.rgb24.ref.png diff --git a/cairo/test/reference/clip-fill-nz-unbounded.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-nz-unbounded.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.rgb24.ref.png diff --git a/cairo/test/reference/clip-fill-nz-unbounded.svg12.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.svg12.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/clip-fill-nz-unbounded.svg12.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.svg12.rgb24.xfail.png diff --git a/cairo/test/reference/clip-fill-nz-unbounded.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-nz-unbounded.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.traps.argb32.ref.png diff --git a/cairo/test/reference/clip-fill-nz-unbounded.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-nz-unbounded.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.traps.rgb24.ref.png diff --git a/cairo/test/reference/clip-fill-nz-unbounded.xlib-fallback.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.xlib-fallback.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-nz-unbounded.xlib-fallback.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-nz-unbounded.xlib-fallback.rgb24.ref.png diff --git a/cairo/test/reference/clip-fill-rule-pixel-aligned.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-rule-pixel-aligned.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-rule-pixel-aligned.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-rule-pixel-aligned.argb32.ref.png diff --git a/cairo/test/reference/clip-fill-rule-pixel-aligned.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-rule-pixel-aligned.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-rule-pixel-aligned.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-rule-pixel-aligned.base.argb32.ref.png diff --git a/cairo/test/reference/clip-fill-rule-pixel-aligned.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-rule-pixel-aligned.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-rule-pixel-aligned.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-rule-pixel-aligned.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-fill-rule-pixel-aligned.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-rule-pixel-aligned.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-rule-pixel-aligned.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-rule-pixel-aligned.rgb24.ref.png diff --git a/cairo/test/reference/clip-fill-rule.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-rule.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-rule.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-rule.argb32.ref.png diff --git a/cairo/test/reference/clip-fill-rule.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-rule.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-rule.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-rule.base.argb32.ref.png diff --git a/cairo/test/reference/clip-fill-rule.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-rule.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-rule.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-rule.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-fill-rule.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-rule.image16.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-rule.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-rule.image16.ref.png diff --git a/cairo/test/reference/clip-fill-rule.pdf.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-rule.pdf.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-rule.pdf.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-rule.pdf.argb32.ref.png diff --git a/cairo/test/reference/clip-fill-rule.ps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-rule.ps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-rule.ps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-rule.ps.argb32.ref.png diff --git a/cairo/test/reference/clip-fill-rule.ps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-rule.ps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-rule.ps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-rule.ps.rgb24.ref.png diff --git a/cairo/test/reference/clip-fill-rule.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-rule.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-rule.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-rule.quartz.rgb24.ref.png diff --git a/cairo/test/reference/clip-fill-rule.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-rule.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-rule.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-rule.rgb24.ref.png diff --git a/cairo/test/reference/clip-fill-rule.test-paginated.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-rule.test-paginated.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-rule.test-paginated.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-rule.test-paginated.rgb24.ref.png diff --git a/cairo/test/reference/clip-fill-rule.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-rule.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-rule.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-rule.traps.argb32.ref.png diff --git a/cairo/test/reference/clip-fill-rule.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill-rule.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-fill-rule.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill-rule.traps.rgb24.ref.png diff --git a/cairo/test/reference/clip-fill.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-fill.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill.argb32.ref.png diff --git a/cairo/test/reference/clip-fill.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-fill.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill.base.argb32.ref.png diff --git a/cairo/test/reference/clip-fill.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-fill.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-fill.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill.image16.ref.png similarity index 100% rename from cairo/test/reference/clip-fill.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill.image16.ref.png diff --git a/cairo/test/reference/clip-fill.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-fill.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill.mask.argb32.ref.png diff --git a/cairo/test/reference/clip-fill.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-fill.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill.mask.rgb24.ref.png diff --git a/cairo/test/reference/clip-fill.ps.xfail.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill.ps.xfail.png similarity index 100% rename from cairo/test/reference/clip-fill.ps.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill.ps.xfail.png diff --git a/cairo/test/reference/clip-fill.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill.quartz.ref.png similarity index 100% rename from cairo/test/reference/clip-fill.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill.quartz.ref.png diff --git a/cairo/test/reference/clip-fill.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-fill.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill.rgb24.ref.png diff --git a/cairo/test/reference/clip-fill.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-fill.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill.traps.argb32.ref.png diff --git a/cairo/test/reference/clip-fill.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-fill.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill.traps.rgb24.ref.png diff --git a/cairo/test/reference/clip-fill.xlib-fallback.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-fill.xlib-fallback.ref.png similarity index 100% rename from cairo/test/reference/clip-fill.xlib-fallback.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-fill.xlib-fallback.ref.png diff --git a/cairo/test/reference/clip-group-shapes-aligned-rectangles.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-aligned-rectangles.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-group-shapes-aligned-rectangles.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-aligned-rectangles.base.argb32.ref.png diff --git a/cairo/test/reference/clip-group-shapes-aligned-rectangles.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-aligned-rectangles.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-group-shapes-aligned-rectangles.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-aligned-rectangles.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-group-shapes-aligned-rectangles.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-aligned-rectangles.ref.png similarity index 100% rename from cairo/test/reference/clip-group-shapes-aligned-rectangles.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-aligned-rectangles.ref.png diff --git a/cairo/test/reference/clip-group-shapes-circles.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-circles.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-group-shapes-circles.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-circles.argb32.ref.png diff --git a/cairo/test/reference/clip-group-shapes-circles.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-circles.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-group-shapes-circles.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-circles.base.argb32.ref.png diff --git a/cairo/test/reference/clip-group-shapes-circles.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-circles.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-group-shapes-circles.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-circles.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-group-shapes-circles.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-circles.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-group-shapes-circles.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-circles.mask.argb32.ref.png diff --git a/cairo/test/reference/clip-group-shapes-circles.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-circles.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-group-shapes-circles.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-circles.mask.rgb24.ref.png diff --git a/cairo/test/reference/clip-group-shapes-circles.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-circles.ps.ref.png similarity index 100% rename from cairo/test/reference/clip-group-shapes-circles.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-circles.ps.ref.png diff --git a/cairo/test/reference/clip-group-shapes-circles.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-circles.quartz.ref.png similarity index 100% rename from cairo/test/reference/clip-group-shapes-circles.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-circles.quartz.ref.png diff --git a/cairo/test/reference/clip-group-shapes-circles.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-circles.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-group-shapes-circles.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-circles.rgb24.ref.png diff --git a/cairo/test/reference/clip-group-shapes-circles.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-circles.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-group-shapes-circles.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-circles.traps.argb32.ref.png diff --git a/cairo/test/reference/clip-group-shapes-circles.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-circles.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-group-shapes-circles.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-circles.traps.rgb24.ref.png diff --git a/cairo/test/reference/clip-group-shapes-unaligned-rectangles.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-unaligned-rectangles.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-group-shapes-unaligned-rectangles.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-unaligned-rectangles.base.argb32.ref.png diff --git a/cairo/test/reference/clip-group-shapes-unaligned-rectangles.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-unaligned-rectangles.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-group-shapes-unaligned-rectangles.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-unaligned-rectangles.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-group-shapes-unaligned-rectangles.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-unaligned-rectangles.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-group-shapes-unaligned-rectangles.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-unaligned-rectangles.mask.argb32.ref.png diff --git a/cairo/test/reference/clip-group-shapes-unaligned-rectangles.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-unaligned-rectangles.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-group-shapes-unaligned-rectangles.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-unaligned-rectangles.mask.rgb24.ref.png diff --git a/cairo/test/reference/clip-group-shapes-unaligned-rectangles.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-unaligned-rectangles.ref.png similarity index 100% rename from cairo/test/reference/clip-group-shapes-unaligned-rectangles.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-unaligned-rectangles.ref.png diff --git a/cairo/test/reference/clip-group-shapes-unaligned-rectangles.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-unaligned-rectangles.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-group-shapes-unaligned-rectangles.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-unaligned-rectangles.traps.argb32.ref.png diff --git a/cairo/test/reference/clip-group-shapes-unaligned-rectangles.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-unaligned-rectangles.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-group-shapes-unaligned-rectangles.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-group-shapes-unaligned-rectangles.traps.rgb24.ref.png diff --git a/cairo/test/reference/clip-image.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-image.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-image.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-image.argb32.ref.png diff --git a/cairo/test/reference/clip-image.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-image.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-image.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-image.base.argb32.ref.png diff --git a/cairo/test/reference/clip-image.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-image.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-image.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-image.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-image.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-image.image16.ref.png similarity index 100% rename from cairo/test/reference/clip-image.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-image.image16.ref.png diff --git a/cairo/test/reference/clip-image.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-image.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-image.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-image.mask.argb32.ref.png diff --git a/cairo/test/reference/clip-image.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-image.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-image.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-image.mask.rgb24.ref.png diff --git a/cairo/test/reference/clip-image.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-image.ps.ref.png similarity index 100% rename from cairo/test/reference/clip-image.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-image.ps.ref.png diff --git a/cairo/test/reference/clip-image.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-image.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-image.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-image.rgb24.ref.png diff --git a/cairo/test/reference/clip-image.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-image.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-image.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-image.traps.argb32.ref.png diff --git a/cairo/test/reference/clip-image.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-image.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-image.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-image.traps.rgb24.ref.png diff --git a/cairo/test/reference/clip-intersect.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-intersect.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-intersect.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-intersect.argb32.ref.png diff --git a/cairo/test/reference/clip-intersect.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-intersect.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-intersect.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-intersect.base.argb32.ref.png diff --git a/cairo/test/reference/clip-intersect.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-intersect.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-intersect.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-intersect.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-intersect.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-intersect.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-intersect.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-intersect.rgb24.ref.png diff --git a/cairo/test/reference/clip-intersect.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-intersect.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-intersect.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-intersect.traps.argb32.ref.png diff --git a/cairo/test/reference/clip-intersect.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-intersect.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-intersect.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-intersect.traps.rgb24.ref.png diff --git a/cairo/test/reference/clip-mixed-antialias.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-mixed-antialias.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-mixed-antialias.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-mixed-antialias.argb32.ref.png diff --git a/cairo/test/reference/clip-mixed-antialias.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-mixed-antialias.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-mixed-antialias.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-mixed-antialias.base.argb32.ref.png diff --git a/cairo/test/reference/clip-mixed-antialias.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-mixed-antialias.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-mixed-antialias.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-mixed-antialias.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-mixed-antialias.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-mixed-antialias.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-mixed-antialias.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-mixed-antialias.rgb24.ref.png diff --git a/cairo/test/reference/clip-mixed-antialias.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-mixed-antialias.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-mixed-antialias.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-mixed-antialias.traps.argb32.ref.png diff --git a/cairo/test/reference/clip-mixed-antialias.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-mixed-antialias.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-mixed-antialias.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-mixed-antialias.traps.rgb24.ref.png diff --git a/cairo/test/reference/clip-nesting.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-nesting.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-nesting.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-nesting.argb32.ref.png diff --git a/cairo/test/reference/clip-nesting.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-nesting.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-nesting.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-nesting.base.argb32.ref.png diff --git a/cairo/test/reference/clip-nesting.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-nesting.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-nesting.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-nesting.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-nesting.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-nesting.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-nesting.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-nesting.mask.rgb24.ref.png diff --git a/cairo/test/reference/clip-nesting.pdf.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-nesting.pdf.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-nesting.pdf.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-nesting.pdf.argb32.ref.png diff --git a/cairo/test/reference/clip-nesting.ps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-nesting.ps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-nesting.ps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-nesting.ps.argb32.ref.png diff --git a/cairo/test/reference/clip-nesting.ps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-nesting.ps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-nesting.ps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-nesting.ps.rgb24.ref.png diff --git a/cairo/test/reference/clip-nesting.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-nesting.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-nesting.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-nesting.quartz.argb32.ref.png diff --git a/cairo/test/reference/clip-nesting.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-nesting.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-nesting.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-nesting.quartz.rgb24.ref.png diff --git a/cairo/test/reference/clip-nesting.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-nesting.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-nesting.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-nesting.rgb24.ref.png diff --git a/cairo/test/reference/clip-nesting.test-paginated.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-nesting.test-paginated.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-nesting.test-paginated.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-nesting.test-paginated.rgb24.ref.png diff --git a/cairo/test/reference/clip-nesting.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-nesting.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-nesting.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-nesting.traps.argb32.ref.png diff --git a/cairo/test/reference/clip-nesting.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-nesting.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-nesting.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-nesting.traps.rgb24.ref.png diff --git a/cairo/test/reference/clip-operator.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-operator.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-operator.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-operator.argb32.ref.png diff --git a/cairo/test/reference/clip-operator.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-operator.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-operator.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-operator.base.argb32.ref.png diff --git a/cairo/test/reference/clip-operator.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-operator.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-operator.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-operator.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-operator.gl.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-operator.gl.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-operator.gl.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-operator.gl.argb32.ref.png diff --git a/cairo/test/reference/clip-operator.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-operator.image16.ref.png similarity index 100% rename from cairo/test/reference/clip-operator.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-operator.image16.ref.png diff --git a/cairo/test/reference/clip-operator.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-operator.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-operator.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-operator.mask.argb32.ref.png diff --git a/cairo/test/reference/clip-operator.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-operator.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-operator.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-operator.mask.rgb24.ref.png diff --git a/cairo/test/reference/clip-operator.pdf.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-operator.pdf.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-operator.pdf.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-operator.pdf.argb32.ref.png diff --git a/cairo/test/reference/clip-operator.pdf.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-operator.pdf.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-operator.pdf.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-operator.pdf.rgb24.ref.png diff --git a/cairo/test/reference/clip-operator.ps2.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-operator.ps2.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-operator.ps2.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-operator.ps2.rgb24.ref.png diff --git a/cairo/test/reference/clip-operator.ps3.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-operator.ps3.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-operator.ps3.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-operator.ps3.argb32.ref.png diff --git a/cairo/test/reference/clip-operator.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-operator.ps3.ref.png similarity index 100% rename from cairo/test/reference/clip-operator.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-operator.ps3.ref.png diff --git a/cairo/test/reference/clip-operator.ps3.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-operator.ps3.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-operator.ps3.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-operator.ps3.rgb24.ref.png diff --git a/cairo/test/reference/clip-operator.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-operator.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-operator.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-operator.quartz.argb32.ref.png diff --git a/cairo/test/reference/clip-operator.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-operator.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-operator.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-operator.quartz.rgb24.ref.png diff --git a/cairo/test/reference/clip-operator.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-operator.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-operator.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-operator.rgb24.ref.png diff --git a/cairo/test/reference/clip-operator.svg12.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/clip-operator.svg12.argb32.xfail.png similarity index 100% rename from cairo/test/reference/clip-operator.svg12.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/clip-operator.svg12.argb32.xfail.png diff --git a/cairo/test/reference/clip-operator.svg12.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/clip-operator.svg12.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/clip-operator.svg12.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/clip-operator.svg12.rgb24.xfail.png diff --git a/cairo/test/reference/clip-operator.test-paginated.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-operator.test-paginated.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-operator.test-paginated.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-operator.test-paginated.argb32.ref.png diff --git a/cairo/test/reference/clip-operator.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-operator.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-operator.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-operator.traps.argb32.ref.png diff --git a/cairo/test/reference/clip-operator.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-operator.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-operator.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-operator.traps.rgb24.ref.png diff --git a/cairo/test/reference/clip-operator.xlib-fallback.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-operator.xlib-fallback.ref.png similarity index 100% rename from cairo/test/reference/clip-operator.xlib-fallback.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-operator.xlib-fallback.ref.png diff --git a/cairo/test/reference/clip-polygons.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-polygons.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-polygons.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-polygons.argb32.ref.png diff --git a/cairo/test/reference/clip-polygons.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-polygons.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-polygons.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-polygons.base.argb32.ref.png diff --git a/cairo/test/reference/clip-polygons.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-polygons.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-polygons.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-polygons.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-polygons.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-polygons.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-polygons.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-polygons.mask.argb32.ref.png diff --git a/cairo/test/reference/clip-polygons.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-polygons.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-polygons.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-polygons.mask.rgb24.ref.png diff --git a/cairo/test/reference/clip-polygons.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-polygons.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-polygons.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-polygons.rgb24.ref.png diff --git a/cairo/test/reference/clip-polygons.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-polygons.traps.ref.png similarity index 100% rename from cairo/test/reference/clip-polygons.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-polygons.traps.ref.png diff --git a/cairo/test/reference/clip-push-group.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-push-group.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-push-group.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-push-group.argb32.ref.png diff --git a/cairo/test/reference/clip-push-group.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-push-group.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-push-group.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-push-group.base.argb32.ref.png diff --git a/cairo/test/reference/clip-push-group.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-push-group.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-push-group.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-push-group.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-push-group.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-push-group.image16.ref.png similarity index 100% rename from cairo/test/reference/clip-push-group.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-push-group.image16.ref.png diff --git a/cairo/test/reference/clip-push-group.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-push-group.pdf.ref.png similarity index 100% rename from cairo/test/reference/clip-push-group.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-push-group.pdf.ref.png diff --git a/cairo/test/reference/clip-push-group.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-push-group.ps.ref.png similarity index 100% rename from cairo/test/reference/clip-push-group.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-push-group.ps.ref.png diff --git a/cairo/test/reference/clip-push-group.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-push-group.quartz.ref.png similarity index 100% rename from cairo/test/reference/clip-push-group.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-push-group.quartz.ref.png diff --git a/cairo/test/reference/clip-push-group.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-push-group.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-push-group.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-push-group.rgb24.ref.png diff --git a/cairo/test/reference/clip-push-group.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-push-group.svg.ref.png similarity index 100% rename from cairo/test/reference/clip-push-group.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-push-group.svg.ref.png diff --git a/cairo/test/reference/clip-push-group.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-push-group.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-push-group.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-push-group.traps.argb32.ref.png diff --git a/cairo/test/reference/clip-push-group.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-push-group.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-push-group.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-push-group.traps.rgb24.ref.png diff --git a/cairo/test/reference/clip-rectilinear.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-rectilinear.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-rectilinear.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-rectilinear.base.argb32.ref.png diff --git a/cairo/test/reference/clip-rectilinear.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-rectilinear.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-rectilinear.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-rectilinear.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-rectilinear.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-rectilinear.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-rectilinear.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-rectilinear.mask.argb32.ref.png diff --git a/cairo/test/reference/clip-rectilinear.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-rectilinear.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-rectilinear.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-rectilinear.mask.rgb24.ref.png diff --git a/cairo/test/reference/clip-rectilinear.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-rectilinear.ref.png similarity index 100% rename from cairo/test/reference/clip-rectilinear.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-rectilinear.ref.png diff --git a/cairo/test/reference/clip-rectilinear.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-rectilinear.traps.ref.png similarity index 100% rename from cairo/test/reference/clip-rectilinear.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-rectilinear.traps.ref.png diff --git a/cairo/test/reference/clip-rotate-image-surface-paint.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-rotate-image-surface-paint.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-rotate-image-surface-paint.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-rotate-image-surface-paint.base.argb32.ref.png diff --git a/cairo/test/reference/clip-rotate-image-surface-paint.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-rotate-image-surface-paint.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-rotate-image-surface-paint.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-rotate-image-surface-paint.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-rotate-image-surface-paint.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-rotate-image-surface-paint.ref.png similarity index 100% rename from cairo/test/reference/clip-rotate-image-surface-paint.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-rotate-image-surface-paint.ref.png diff --git a/cairo/test/reference/clip-shape.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-shape.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-shape.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-shape.argb32.ref.png diff --git a/cairo/test/reference/clip-shape.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-shape.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-shape.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-shape.base.argb32.ref.png diff --git a/cairo/test/reference/clip-shape.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-shape.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-shape.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-shape.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-shape.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-shape.image16.ref.png similarity index 100% rename from cairo/test/reference/clip-shape.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-shape.image16.ref.png diff --git a/cairo/test/reference/clip-shape.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-shape.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-shape.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-shape.mask.argb32.ref.png diff --git a/cairo/test/reference/clip-shape.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-shape.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-shape.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-shape.mask.rgb24.ref.png diff --git a/cairo/test/reference/clip-shape.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-shape.ps.ref.png similarity index 100% rename from cairo/test/reference/clip-shape.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-shape.ps.ref.png diff --git a/cairo/test/reference/clip-shape.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-shape.quartz.ref.png similarity index 100% rename from cairo/test/reference/clip-shape.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-shape.quartz.ref.png diff --git a/cairo/test/reference/clip-shape.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-shape.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-shape.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-shape.rgb24.ref.png diff --git a/cairo/test/reference/clip-shape.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-shape.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-shape.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-shape.traps.argb32.ref.png diff --git a/cairo/test/reference/clip-shape.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-shape.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-shape.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-shape.traps.rgb24.ref.png diff --git a/cairo/test/reference/clip-shape.xlib-fallback.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-shape.xlib-fallback.ref.png similarity index 100% rename from cairo/test/reference/clip-shape.xlib-fallback.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-shape.xlib-fallback.ref.png diff --git a/cairo/test/reference/clip-stroke-no-op.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke-no-op.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke-no-op.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke-no-op.base.argb32.ref.png diff --git a/cairo/test/reference/clip-stroke-no-op.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke-no-op.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke-no-op.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke-no-op.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-stroke-no-op.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke-no-op.image16.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke-no-op.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke-no-op.image16.ref.png diff --git a/cairo/test/reference/clip-stroke-no-op.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke-no-op.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke-no-op.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke-no-op.ref.png diff --git a/cairo/test/reference/clip-stroke-unbounded.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke-unbounded.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.argb32.ref.png diff --git a/cairo/test/reference/clip-stroke-unbounded.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke-unbounded.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.base.argb32.ref.png diff --git a/cairo/test/reference/clip-stroke-unbounded.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke-unbounded.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-stroke-unbounded.image16.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.image16.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke-unbounded.image16.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.image16.rgb24.ref.png diff --git a/cairo/test/reference/clip-stroke-unbounded.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke-unbounded.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.mask.argb32.ref.png diff --git a/cairo/test/reference/clip-stroke-unbounded.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke-unbounded.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.mask.rgb24.ref.png diff --git a/cairo/test/reference/clip-stroke-unbounded.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke-unbounded.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.quartz.argb32.ref.png diff --git a/cairo/test/reference/clip-stroke-unbounded.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke-unbounded.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.quartz.rgb24.ref.png diff --git a/cairo/test/reference/clip-stroke-unbounded.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke-unbounded.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.rgb24.ref.png diff --git a/cairo/test/reference/clip-stroke-unbounded.svg12.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.svg12.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/clip-stroke-unbounded.svg12.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.svg12.rgb24.xfail.png diff --git a/cairo/test/reference/clip-stroke-unbounded.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke-unbounded.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.traps.argb32.ref.png diff --git a/cairo/test/reference/clip-stroke-unbounded.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke-unbounded.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.traps.rgb24.ref.png diff --git a/cairo/test/reference/clip-stroke-unbounded.xlib-fallback.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.xlib-fallback.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke-unbounded.xlib-fallback.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke-unbounded.xlib-fallback.rgb24.ref.png diff --git a/cairo/test/reference/clip-stroke.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke.base.argb32.ref.png diff --git a/cairo/test/reference/clip-stroke.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-stroke.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke.image16.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke.image16.ref.png diff --git a/cairo/test/reference/clip-stroke.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke.mask.argb32.ref.png diff --git a/cairo/test/reference/clip-stroke.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke.mask.rgb24.ref.png diff --git a/cairo/test/reference/clip-stroke.ps.xfail.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke.ps.xfail.png similarity index 100% rename from cairo/test/reference/clip-stroke.ps.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke.ps.xfail.png diff --git a/cairo/test/reference/clip-stroke.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke.quartz.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke.quartz.ref.png diff --git a/cairo/test/reference/clip-stroke.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke.ref.png diff --git a/cairo/test/reference/clip-stroke.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke.traps.argb32.ref.png diff --git a/cairo/test/reference/clip-stroke.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke.traps.rgb24.ref.png diff --git a/cairo/test/reference/clip-stroke.xlib-fallback.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-stroke.xlib-fallback.ref.png similarity index 100% rename from cairo/test/reference/clip-stroke.xlib-fallback.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-stroke.xlib-fallback.ref.png diff --git a/cairo/test/reference/clip-text.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-text.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-text.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-text.argb32.ref.png diff --git a/cairo/test/reference/clip-text.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-text.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-text.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-text.base.argb32.ref.png diff --git a/cairo/test/reference/clip-text.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-text.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-text.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-text.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-text.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-text.image16.ref.png similarity index 100% rename from cairo/test/reference/clip-text.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-text.image16.ref.png diff --git a/cairo/test/reference/clip-text.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-text.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-text.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-text.mask.argb32.ref.png diff --git a/cairo/test/reference/clip-text.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-text.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-text.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-text.mask.rgb24.ref.png diff --git a/cairo/test/reference/clip-text.ps.xfail.png b/io2d/src/3rd-party/cairo/test/reference/clip-text.ps.xfail.png similarity index 100% rename from cairo/test/reference/clip-text.ps.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/clip-text.ps.xfail.png diff --git a/cairo/test/reference/clip-text.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-text.quartz.ref.png similarity index 100% rename from cairo/test/reference/clip-text.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-text.quartz.ref.png diff --git a/cairo/test/reference/clip-text.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-text.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-text.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-text.rgb24.ref.png diff --git a/cairo/test/reference/clip-text.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-text.svg.ref.png similarity index 100% rename from cairo/test/reference/clip-text.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-text.svg.ref.png diff --git a/cairo/test/reference/clip-text.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-text.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-text.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-text.traps.argb32.ref.png diff --git a/cairo/test/reference/clip-text.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-text.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-text.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-text.traps.rgb24.ref.png diff --git a/cairo/test/reference/clip-twice-rectangle.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-twice-rectangle.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-twice-rectangle.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-twice-rectangle.base.argb32.ref.png diff --git a/cairo/test/reference/clip-twice-rectangle.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-twice-rectangle.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-twice-rectangle.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-twice-rectangle.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-twice-rectangle.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-twice-rectangle.ref.png similarity index 100% rename from cairo/test/reference/clip-twice-rectangle.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-twice-rectangle.ref.png diff --git a/cairo/test/reference/clip-twice.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-twice.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-twice.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-twice.argb32.ref.png diff --git a/cairo/test/reference/clip-twice.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-twice.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-twice.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-twice.base.argb32.ref.png diff --git a/cairo/test/reference/clip-twice.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-twice.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-twice.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-twice.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-twice.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-twice.image16.ref.png similarity index 100% rename from cairo/test/reference/clip-twice.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-twice.image16.ref.png diff --git a/cairo/test/reference/clip-twice.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-twice.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-twice.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-twice.mask.argb32.ref.png diff --git a/cairo/test/reference/clip-twice.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-twice.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-twice.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-twice.mask.rgb24.ref.png diff --git a/cairo/test/reference/clip-twice.pdf.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-twice.pdf.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-twice.pdf.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-twice.pdf.argb32.ref.png diff --git a/cairo/test/reference/clip-twice.ps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-twice.ps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-twice.ps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-twice.ps.argb32.ref.png diff --git a/cairo/test/reference/clip-twice.ps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-twice.ps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-twice.ps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-twice.ps.rgb24.ref.png diff --git a/cairo/test/reference/clip-twice.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-twice.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-twice.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-twice.quartz.argb32.ref.png diff --git a/cairo/test/reference/clip-twice.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-twice.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-twice.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-twice.quartz.rgb24.ref.png diff --git a/cairo/test/reference/clip-twice.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-twice.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-twice.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-twice.rgb24.ref.png diff --git a/cairo/test/reference/clip-twice.test-paginated.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-twice.test-paginated.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-twice.test-paginated.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-twice.test-paginated.argb32.ref.png diff --git a/cairo/test/reference/clip-twice.test-paginated.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-twice.test-paginated.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-twice.test-paginated.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-twice.test-paginated.rgb24.ref.png diff --git a/cairo/test/reference/clip-twice.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-twice.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-twice.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-twice.traps.argb32.ref.png diff --git a/cairo/test/reference/clip-twice.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-twice.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-twice.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-twice.traps.rgb24.ref.png diff --git a/cairo/test/reference/clip-unbounded.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-unbounded.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-unbounded.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-unbounded.argb32.ref.png diff --git a/cairo/test/reference/clip-unbounded.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-unbounded.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-unbounded.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-unbounded.base.argb32.ref.png diff --git a/cairo/test/reference/clip-unbounded.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-unbounded.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-unbounded.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-unbounded.base.rgb24.ref.png diff --git a/cairo/test/reference/clip-unbounded.pdf.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/clip-unbounded.pdf.argb32.xfail.png similarity index 100% rename from cairo/test/reference/clip-unbounded.pdf.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/clip-unbounded.pdf.argb32.xfail.png diff --git a/cairo/test/reference/clip-unbounded.pdf.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/clip-unbounded.pdf.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/clip-unbounded.pdf.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/clip-unbounded.pdf.rgb24.xfail.png diff --git a/cairo/test/reference/clip-unbounded.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-unbounded.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-unbounded.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-unbounded.rgb24.ref.png diff --git a/cairo/test/reference/clip-unbounded.svg12.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/clip-unbounded.svg12.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/clip-unbounded.svg12.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/clip-unbounded.svg12.rgb24.xfail.png diff --git a/cairo/test/reference/clip-xlib-fallback.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-xlib-fallback.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-xlib-fallback.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-xlib-fallback.rgb24.ref.png diff --git a/cairo/test/reference/clip-xlib-window.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-xlib-window.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-xlib-window.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-xlib-window.rgb24.ref.png diff --git a/cairo/test/reference/clip-xlib.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-xlib.argb32.ref.png similarity index 100% rename from cairo/test/reference/clip-xlib.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-xlib.argb32.ref.png diff --git a/cairo/test/reference/clip-xlib.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clip-xlib.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clip-xlib.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clip-xlib.rgb24.ref.png diff --git a/cairo/test/reference/clipped-group.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clipped-group.argb32.ref.png similarity index 100% rename from cairo/test/reference/clipped-group.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clipped-group.argb32.ref.png diff --git a/cairo/test/reference/clipped-group.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clipped-group.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clipped-group.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clipped-group.base.argb32.ref.png diff --git a/cairo/test/reference/clipped-group.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clipped-group.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clipped-group.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clipped-group.base.rgb24.ref.png diff --git a/cairo/test/reference/clipped-group.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/clipped-group.image16.ref.png similarity index 100% rename from cairo/test/reference/clipped-group.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clipped-group.image16.ref.png diff --git a/cairo/test/reference/clipped-group.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clipped-group.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/clipped-group.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clipped-group.mask.argb32.ref.png diff --git a/cairo/test/reference/clipped-group.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clipped-group.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clipped-group.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clipped-group.mask.rgb24.ref.png diff --git a/cairo/test/reference/clipped-group.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/clipped-group.pdf.ref.png similarity index 100% rename from cairo/test/reference/clipped-group.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clipped-group.pdf.ref.png diff --git a/cairo/test/reference/clipped-group.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/clipped-group.ps2.ref.png similarity index 100% rename from cairo/test/reference/clipped-group.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clipped-group.ps2.ref.png diff --git a/cairo/test/reference/clipped-group.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/clipped-group.ps3.ref.png similarity index 100% rename from cairo/test/reference/clipped-group.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clipped-group.ps3.ref.png diff --git a/cairo/test/reference/clipped-group.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/clipped-group.quartz.ref.png similarity index 100% rename from cairo/test/reference/clipped-group.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clipped-group.quartz.ref.png diff --git a/cairo/test/reference/clipped-group.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clipped-group.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clipped-group.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clipped-group.rgb24.ref.png diff --git a/cairo/test/reference/clipped-group.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/clipped-group.svg.ref.png similarity index 100% rename from cairo/test/reference/clipped-group.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clipped-group.svg.ref.png diff --git a/cairo/test/reference/clipped-group.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clipped-group.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/clipped-group.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clipped-group.traps.argb32.ref.png diff --git a/cairo/test/reference/clipped-group.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clipped-group.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clipped-group.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clipped-group.traps.rgb24.ref.png diff --git a/cairo/test/reference/clipped-group.xlib-fallback.ref.png b/io2d/src/3rd-party/cairo/test/reference/clipped-group.xlib-fallback.ref.png similarity index 100% rename from cairo/test/reference/clipped-group.xlib-fallback.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clipped-group.xlib-fallback.ref.png diff --git a/cairo/test/reference/clipped-surface.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/clipped-surface.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/clipped-surface.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clipped-surface.base.argb32.ref.png diff --git a/cairo/test/reference/clipped-surface.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/clipped-surface.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/clipped-surface.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clipped-surface.base.rgb24.ref.png diff --git a/cairo/test/reference/clipped-surface.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/clipped-surface.image16.ref.png similarity index 100% rename from cairo/test/reference/clipped-surface.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clipped-surface.image16.ref.png diff --git a/cairo/test/reference/clipped-surface.ref.png b/io2d/src/3rd-party/cairo/test/reference/clipped-surface.ref.png similarity index 100% rename from cairo/test/reference/clipped-surface.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clipped-surface.ref.png diff --git a/cairo/test/reference/clipped-trapezoids.ref.png b/io2d/src/3rd-party/cairo/test/reference/clipped-trapezoids.ref.png similarity index 100% rename from cairo/test/reference/clipped-trapezoids.ref.png rename to io2d/src/3rd-party/cairo/test/reference/clipped-trapezoids.ref.png diff --git a/cairo/test/reference/close-path-current-point.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/close-path-current-point.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/close-path-current-point.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/close-path-current-point.base.argb32.ref.png diff --git a/cairo/test/reference/close-path-current-point.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/close-path-current-point.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/close-path-current-point.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/close-path-current-point.base.rgb24.ref.png diff --git a/cairo/test/reference/close-path-current-point.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/close-path-current-point.image16.ref.png similarity index 100% rename from cairo/test/reference/close-path-current-point.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/close-path-current-point.image16.ref.png diff --git a/cairo/test/reference/close-path-current-point.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/close-path-current-point.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/close-path-current-point.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/close-path-current-point.mask.argb32.ref.png diff --git a/cairo/test/reference/close-path-current-point.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/close-path-current-point.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/close-path-current-point.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/close-path-current-point.mask.rgb24.ref.png diff --git a/cairo/test/reference/close-path-current-point.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/close-path-current-point.ps.ref.png similarity index 100% rename from cairo/test/reference/close-path-current-point.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/close-path-current-point.ps.ref.png diff --git a/cairo/test/reference/close-path-current-point.ref.png b/io2d/src/3rd-party/cairo/test/reference/close-path-current-point.ref.png similarity index 100% rename from cairo/test/reference/close-path-current-point.ref.png rename to io2d/src/3rd-party/cairo/test/reference/close-path-current-point.ref.png diff --git a/cairo/test/reference/close-path-current-point.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/close-path-current-point.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/close-path-current-point.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/close-path-current-point.traps.argb32.ref.png diff --git a/cairo/test/reference/close-path-current-point.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/close-path-current-point.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/close-path-current-point.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/close-path-current-point.traps.rgb24.ref.png diff --git a/cairo/test/reference/close-path.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/close-path.argb32.ref.png similarity index 100% rename from cairo/test/reference/close-path.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/close-path.argb32.ref.png diff --git a/cairo/test/reference/close-path.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/close-path.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/close-path.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/close-path.base.argb32.ref.png diff --git a/cairo/test/reference/close-path.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/close-path.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/close-path.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/close-path.base.rgb24.ref.png diff --git a/cairo/test/reference/close-path.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/close-path.ps2.ref.png similarity index 100% rename from cairo/test/reference/close-path.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/close-path.ps2.ref.png diff --git a/cairo/test/reference/close-path.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/close-path.ps3.ref.png similarity index 100% rename from cairo/test/reference/close-path.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/close-path.ps3.ref.png diff --git a/cairo/test/reference/close-path.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/close-path.rgb24.ref.png similarity index 100% rename from cairo/test/reference/close-path.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/close-path.rgb24.ref.png diff --git a/cairo/test/reference/close-path.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/close-path.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/close-path.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/close-path.traps.argb32.ref.png diff --git a/cairo/test/reference/close-path.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/close-path.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/close-path.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/close-path.traps.rgb24.ref.png diff --git a/cairo/test/reference/composite-integer-translate-over-repeat.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-over-repeat.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/composite-integer-translate-over-repeat.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-over-repeat.base.argb32.ref.png diff --git a/cairo/test/reference/composite-integer-translate-over-repeat.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-over-repeat.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/composite-integer-translate-over-repeat.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-over-repeat.base.rgb24.ref.png diff --git a/cairo/test/reference/composite-integer-translate-over-repeat.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-over-repeat.ps2.ref.png similarity index 100% rename from cairo/test/reference/composite-integer-translate-over-repeat.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-over-repeat.ps2.ref.png diff --git a/cairo/test/reference/composite-integer-translate-over-repeat.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-over-repeat.ps3.ref.png similarity index 100% rename from cairo/test/reference/composite-integer-translate-over-repeat.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-over-repeat.ps3.ref.png diff --git a/cairo/test/reference/composite-integer-translate-over-repeat.ref.png b/io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-over-repeat.ref.png similarity index 100% rename from cairo/test/reference/composite-integer-translate-over-repeat.ref.png rename to io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-over-repeat.ref.png diff --git a/cairo/test/reference/composite-integer-translate-over.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-over.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/composite-integer-translate-over.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-over.base.argb32.ref.png diff --git a/cairo/test/reference/composite-integer-translate-over.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-over.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/composite-integer-translate-over.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-over.base.rgb24.ref.png diff --git a/cairo/test/reference/composite-integer-translate-over.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-over.image16.ref.png similarity index 100% rename from cairo/test/reference/composite-integer-translate-over.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-over.image16.ref.png diff --git a/cairo/test/reference/composite-integer-translate-over.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-over.ps2.ref.png similarity index 100% rename from cairo/test/reference/composite-integer-translate-over.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-over.ps2.ref.png diff --git a/cairo/test/reference/composite-integer-translate-over.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-over.ps3.ref.png similarity index 100% rename from cairo/test/reference/composite-integer-translate-over.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-over.ps3.ref.png diff --git a/cairo/test/reference/composite-integer-translate-over.ref.png b/io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-over.ref.png similarity index 100% rename from cairo/test/reference/composite-integer-translate-over.ref.png rename to io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-over.ref.png diff --git a/cairo/test/reference/composite-integer-translate-source.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-source.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/composite-integer-translate-source.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-source.base.argb32.ref.png diff --git a/cairo/test/reference/composite-integer-translate-source.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-source.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/composite-integer-translate-source.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-source.base.rgb24.ref.png diff --git a/cairo/test/reference/composite-integer-translate-source.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-source.image16.ref.png similarity index 100% rename from cairo/test/reference/composite-integer-translate-source.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-source.image16.ref.png diff --git a/cairo/test/reference/composite-integer-translate-source.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-source.ps2.ref.png similarity index 100% rename from cairo/test/reference/composite-integer-translate-source.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-source.ps2.ref.png diff --git a/cairo/test/reference/composite-integer-translate-source.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-source.ps3.ref.png similarity index 100% rename from cairo/test/reference/composite-integer-translate-source.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-source.ps3.ref.png diff --git a/cairo/test/reference/composite-integer-translate-source.ref.png b/io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-source.ref.png similarity index 100% rename from cairo/test/reference/composite-integer-translate-source.ref.png rename to io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-source.ref.png diff --git a/cairo/test/reference/composite-integer-translate-source.svg12.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-source.svg12.argb32.xfail.png similarity index 100% rename from cairo/test/reference/composite-integer-translate-source.svg12.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-source.svg12.argb32.xfail.png diff --git a/cairo/test/reference/composite-integer-translate-source.svg12.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-source.svg12.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/composite-integer-translate-source.svg12.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/composite-integer-translate-source.svg12.rgb24.xfail.png diff --git a/cairo/test/reference/copy-disjoint.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/copy-disjoint.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/copy-disjoint.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/copy-disjoint.base.argb32.ref.png diff --git a/cairo/test/reference/copy-disjoint.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/copy-disjoint.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/copy-disjoint.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/copy-disjoint.base.rgb24.ref.png diff --git a/cairo/test/reference/copy-disjoint.ref.png b/io2d/src/3rd-party/cairo/test/reference/copy-disjoint.ref.png similarity index 100% rename from cairo/test/reference/copy-disjoint.ref.png rename to io2d/src/3rd-party/cairo/test/reference/copy-disjoint.ref.png diff --git a/cairo/test/reference/copy-path.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/copy-path.argb32.ref.png similarity index 100% rename from cairo/test/reference/copy-path.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/copy-path.argb32.ref.png diff --git a/cairo/test/reference/copy-path.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/copy-path.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/copy-path.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/copy-path.base.argb32.ref.png diff --git a/cairo/test/reference/copy-path.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/copy-path.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/copy-path.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/copy-path.base.rgb24.ref.png diff --git a/cairo/test/reference/copy-path.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/copy-path.image16.ref.png similarity index 100% rename from cairo/test/reference/copy-path.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/copy-path.image16.ref.png diff --git a/cairo/test/reference/copy-path.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/copy-path.ps.ref.png similarity index 100% rename from cairo/test/reference/copy-path.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/copy-path.ps.ref.png diff --git a/cairo/test/reference/copy-path.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/copy-path.rgb24.ref.png similarity index 100% rename from cairo/test/reference/copy-path.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/copy-path.rgb24.ref.png diff --git a/cairo/test/reference/copy-path.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/copy-path.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/copy-path.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/copy-path.traps.argb32.ref.png diff --git a/cairo/test/reference/copy-path.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/copy-path.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/copy-path.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/copy-path.traps.rgb24.ref.png diff --git a/cairo/test/reference/coverage-column-triangles.ref.png b/io2d/src/3rd-party/cairo/test/reference/coverage-column-triangles.ref.png similarity index 100% rename from cairo/test/reference/coverage-column-triangles.ref.png rename to io2d/src/3rd-party/cairo/test/reference/coverage-column-triangles.ref.png diff --git a/cairo/test/reference/coverage-column-triangles.xlib.xfail.png b/io2d/src/3rd-party/cairo/test/reference/coverage-column-triangles.xlib.xfail.png similarity index 100% rename from cairo/test/reference/coverage-column-triangles.xlib.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/coverage-column-triangles.xlib.xfail.png diff --git a/cairo/test/reference/coverage-intersecting-quads.ref.png b/io2d/src/3rd-party/cairo/test/reference/coverage-intersecting-quads.ref.png similarity index 100% rename from cairo/test/reference/coverage-intersecting-quads.ref.png rename to io2d/src/3rd-party/cairo/test/reference/coverage-intersecting-quads.ref.png diff --git a/cairo/test/reference/coverage-intersecting-quads.xlib.xfail.png b/io2d/src/3rd-party/cairo/test/reference/coverage-intersecting-quads.xlib.xfail.png similarity index 100% rename from cairo/test/reference/coverage-intersecting-quads.xlib.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/coverage-intersecting-quads.xlib.xfail.png diff --git a/cairo/test/reference/coverage-intersecting-triangles.ref.png b/io2d/src/3rd-party/cairo/test/reference/coverage-intersecting-triangles.ref.png similarity index 100% rename from cairo/test/reference/coverage-intersecting-triangles.ref.png rename to io2d/src/3rd-party/cairo/test/reference/coverage-intersecting-triangles.ref.png diff --git a/cairo/test/reference/coverage-intersecting-triangles.xlib.xfail.png b/io2d/src/3rd-party/cairo/test/reference/coverage-intersecting-triangles.xlib.xfail.png similarity index 100% rename from cairo/test/reference/coverage-intersecting-triangles.xlib.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/coverage-intersecting-triangles.xlib.xfail.png diff --git a/cairo/test/reference/coverage-rectangles.ref.png b/io2d/src/3rd-party/cairo/test/reference/coverage-rectangles.ref.png similarity index 100% rename from cairo/test/reference/coverage-rectangles.ref.png rename to io2d/src/3rd-party/cairo/test/reference/coverage-rectangles.ref.png diff --git a/cairo/test/reference/coverage-rectangles.xlib.xfail.png b/io2d/src/3rd-party/cairo/test/reference/coverage-rectangles.xlib.xfail.png similarity index 100% rename from cairo/test/reference/coverage-rectangles.xlib.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/coverage-rectangles.xlib.xfail.png diff --git a/cairo/test/reference/coverage-row-triangles.ref.png b/io2d/src/3rd-party/cairo/test/reference/coverage-row-triangles.ref.png similarity index 100% rename from cairo/test/reference/coverage-row-triangles.ref.png rename to io2d/src/3rd-party/cairo/test/reference/coverage-row-triangles.ref.png diff --git a/cairo/test/reference/coverage-row-triangles.xlib.xfail.png b/io2d/src/3rd-party/cairo/test/reference/coverage-row-triangles.xlib.xfail.png similarity index 100% rename from cairo/test/reference/coverage-row-triangles.xlib.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/coverage-row-triangles.xlib.xfail.png diff --git a/cairo/test/reference/coverage-triangles.ref.png b/io2d/src/3rd-party/cairo/test/reference/coverage-triangles.ref.png similarity index 100% rename from cairo/test/reference/coverage-triangles.ref.png rename to io2d/src/3rd-party/cairo/test/reference/coverage-triangles.ref.png diff --git a/cairo/test/reference/coverage-triangles.xlib.xfail.png b/io2d/src/3rd-party/cairo/test/reference/coverage-triangles.xlib.xfail.png similarity index 100% rename from cairo/test/reference/coverage-triangles.xlib.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/coverage-triangles.xlib.xfail.png diff --git a/cairo/test/reference/create-from-png-stream.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/create-from-png-stream.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/create-from-png-stream.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/create-from-png-stream.base.argb32.ref.png diff --git a/cairo/test/reference/create-from-png-stream.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/create-from-png-stream.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/create-from-png-stream.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/create-from-png-stream.base.rgb24.ref.png diff --git a/cairo/test/reference/create-from-png-stream.ref.png b/io2d/src/3rd-party/cairo/test/reference/create-from-png-stream.ref.png similarity index 100% rename from cairo/test/reference/create-from-png-stream.ref.png rename to io2d/src/3rd-party/cairo/test/reference/create-from-png-stream.ref.png diff --git a/cairo/test/reference/create-from-png.alpha.ref.png b/io2d/src/3rd-party/cairo/test/reference/create-from-png.alpha.ref.png similarity index 100% rename from cairo/test/reference/create-from-png.alpha.ref.png rename to io2d/src/3rd-party/cairo/test/reference/create-from-png.alpha.ref.png diff --git a/cairo/test/reference/create-from-png.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/create-from-png.argb32.ref.png similarity index 100% rename from cairo/test/reference/create-from-png.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/create-from-png.argb32.ref.png diff --git a/cairo/test/reference/create-from-png.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/create-from-png.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/create-from-png.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/create-from-png.base.argb32.ref.png diff --git a/cairo/test/reference/create-from-png.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/create-from-png.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/create-from-png.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/create-from-png.base.rgb24.ref.png diff --git a/cairo/test/reference/create-from-png.gray-alpha.ref.png b/io2d/src/3rd-party/cairo/test/reference/create-from-png.gray-alpha.ref.png similarity index 100% rename from cairo/test/reference/create-from-png.gray-alpha.ref.png rename to io2d/src/3rd-party/cairo/test/reference/create-from-png.gray-alpha.ref.png diff --git a/cairo/test/reference/create-from-png.gray.ref.png b/io2d/src/3rd-party/cairo/test/reference/create-from-png.gray.ref.png similarity index 100% rename from cairo/test/reference/create-from-png.gray.ref.png rename to io2d/src/3rd-party/cairo/test/reference/create-from-png.gray.ref.png diff --git a/cairo/test/reference/create-from-png.indexed-alpha.ref.png b/io2d/src/3rd-party/cairo/test/reference/create-from-png.indexed-alpha.ref.png similarity index 100% rename from cairo/test/reference/create-from-png.indexed-alpha.ref.png rename to io2d/src/3rd-party/cairo/test/reference/create-from-png.indexed-alpha.ref.png diff --git a/cairo/test/reference/create-from-png.indexed.ref.png b/io2d/src/3rd-party/cairo/test/reference/create-from-png.indexed.ref.png similarity index 100% rename from cairo/test/reference/create-from-png.indexed.ref.png rename to io2d/src/3rd-party/cairo/test/reference/create-from-png.indexed.ref.png diff --git a/cairo/test/reference/create-from-png.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/create-from-png.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/create-from-png.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/create-from-png.mask.argb32.ref.png diff --git a/cairo/test/reference/create-from-png.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/create-from-png.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/create-from-png.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/create-from-png.mask.rgb24.ref.png diff --git a/cairo/test/reference/create-from-png.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/create-from-png.rgb24.ref.png similarity index 100% rename from cairo/test/reference/create-from-png.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/create-from-png.rgb24.ref.png diff --git a/cairo/test/reference/create-from-png.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/create-from-png.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/create-from-png.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/create-from-png.traps.argb32.ref.png diff --git a/cairo/test/reference/create-from-png.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/create-from-png.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/create-from-png.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/create-from-png.traps.rgb24.ref.png diff --git a/cairo/test/reference/culled-glyphs.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/culled-glyphs.argb32.ref.png similarity index 100% rename from cairo/test/reference/culled-glyphs.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/culled-glyphs.argb32.ref.png diff --git a/cairo/test/reference/culled-glyphs.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/culled-glyphs.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/culled-glyphs.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/culled-glyphs.base.argb32.ref.png diff --git a/cairo/test/reference/culled-glyphs.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/culled-glyphs.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/culled-glyphs.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/culled-glyphs.base.rgb24.ref.png diff --git a/cairo/test/reference/culled-glyphs.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/culled-glyphs.image16.ref.png similarity index 100% rename from cairo/test/reference/culled-glyphs.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/culled-glyphs.image16.ref.png diff --git a/cairo/test/reference/culled-glyphs.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/culled-glyphs.ps.ref.png similarity index 100% rename from cairo/test/reference/culled-glyphs.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/culled-glyphs.ps.ref.png diff --git a/cairo/test/reference/culled-glyphs.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/culled-glyphs.quartz.ref.png similarity index 100% rename from cairo/test/reference/culled-glyphs.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/culled-glyphs.quartz.ref.png diff --git a/cairo/test/reference/culled-glyphs.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/culled-glyphs.rgb24.ref.png similarity index 100% rename from cairo/test/reference/culled-glyphs.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/culled-glyphs.rgb24.ref.png diff --git a/cairo/test/reference/curve-to-as-line-to.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/curve-to-as-line-to.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/curve-to-as-line-to.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/curve-to-as-line-to.base.argb32.ref.png diff --git a/cairo/test/reference/curve-to-as-line-to.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/curve-to-as-line-to.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/curve-to-as-line-to.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/curve-to-as-line-to.base.rgb24.ref.png diff --git a/cairo/test/reference/curve-to-as-line-to.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/curve-to-as-line-to.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/curve-to-as-line-to.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/curve-to-as-line-to.mask.argb32.ref.png diff --git a/cairo/test/reference/curve-to-as-line-to.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/curve-to-as-line-to.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/curve-to-as-line-to.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/curve-to-as-line-to.mask.rgb24.ref.png diff --git a/cairo/test/reference/curve-to-as-line-to.ps.xfail.png b/io2d/src/3rd-party/cairo/test/reference/curve-to-as-line-to.ps.xfail.png similarity index 100% rename from cairo/test/reference/curve-to-as-line-to.ps.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/curve-to-as-line-to.ps.xfail.png diff --git a/cairo/test/reference/curve-to-as-line-to.ref.png b/io2d/src/3rd-party/cairo/test/reference/curve-to-as-line-to.ref.png similarity index 100% rename from cairo/test/reference/curve-to-as-line-to.ref.png rename to io2d/src/3rd-party/cairo/test/reference/curve-to-as-line-to.ref.png diff --git a/cairo/test/reference/curve-to-as-line-to.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/curve-to-as-line-to.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/curve-to-as-line-to.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/curve-to-as-line-to.traps.argb32.ref.png diff --git a/cairo/test/reference/curve-to-as-line-to.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/curve-to-as-line-to.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/curve-to-as-line-to.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/curve-to-as-line-to.traps.rgb24.ref.png diff --git a/cairo/test/reference/dash-caps-joins.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-caps-joins.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/dash-caps-joins.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-caps-joins.base.argb32.ref.png diff --git a/cairo/test/reference/dash-caps-joins.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-caps-joins.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/dash-caps-joins.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-caps-joins.base.rgb24.ref.png diff --git a/cairo/test/reference/dash-caps-joins.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-caps-joins.image16.ref.png similarity index 100% rename from cairo/test/reference/dash-caps-joins.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-caps-joins.image16.ref.png diff --git a/cairo/test/reference/dash-caps-joins.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-caps-joins.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/dash-caps-joins.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-caps-joins.mask.argb32.ref.png diff --git a/cairo/test/reference/dash-caps-joins.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-caps-joins.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/dash-caps-joins.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-caps-joins.mask.rgb24.ref.png diff --git a/cairo/test/reference/dash-caps-joins.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-caps-joins.ps.ref.png similarity index 100% rename from cairo/test/reference/dash-caps-joins.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-caps-joins.ps.ref.png diff --git a/cairo/test/reference/dash-caps-joins.quartz.xfail.png b/io2d/src/3rd-party/cairo/test/reference/dash-caps-joins.quartz.xfail.png similarity index 100% rename from cairo/test/reference/dash-caps-joins.quartz.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/dash-caps-joins.quartz.xfail.png diff --git a/cairo/test/reference/dash-caps-joins.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-caps-joins.ref.png similarity index 100% rename from cairo/test/reference/dash-caps-joins.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-caps-joins.ref.png diff --git a/cairo/test/reference/dash-caps-joins.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-caps-joins.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/dash-caps-joins.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-caps-joins.traps.argb32.ref.png diff --git a/cairo/test/reference/dash-caps-joins.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-caps-joins.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/dash-caps-joins.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-caps-joins.traps.rgb24.ref.png diff --git a/cairo/test/reference/dash-curve.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-curve.image16.ref.png similarity index 100% rename from cairo/test/reference/dash-curve.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-curve.image16.ref.png diff --git a/cairo/test/reference/dash-curve.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-curve.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/dash-curve.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-curve.mask.argb32.ref.png diff --git a/cairo/test/reference/dash-curve.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-curve.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/dash-curve.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-curve.mask.rgb24.ref.png diff --git a/cairo/test/reference/dash-curve.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-curve.ps2.ref.png similarity index 100% rename from cairo/test/reference/dash-curve.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-curve.ps2.ref.png diff --git a/cairo/test/reference/dash-curve.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-curve.ps3.ref.png similarity index 100% rename from cairo/test/reference/dash-curve.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-curve.ps3.ref.png diff --git a/cairo/test/reference/dash-curve.quartz.xfail.png b/io2d/src/3rd-party/cairo/test/reference/dash-curve.quartz.xfail.png similarity index 100% rename from cairo/test/reference/dash-curve.quartz.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/dash-curve.quartz.xfail.png diff --git a/cairo/test/reference/dash-curve.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-curve.ref.png similarity index 100% rename from cairo/test/reference/dash-curve.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-curve.ref.png diff --git a/cairo/test/reference/dash-curve.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-curve.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/dash-curve.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-curve.traps.argb32.ref.png diff --git a/cairo/test/reference/dash-curve.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-curve.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/dash-curve.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-curve.traps.rgb24.ref.png diff --git a/cairo/test/reference/dash-infinite-loop.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-infinite-loop.argb32.ref.png similarity index 100% rename from cairo/test/reference/dash-infinite-loop.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-infinite-loop.argb32.ref.png diff --git a/cairo/test/reference/dash-infinite-loop.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-infinite-loop.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/dash-infinite-loop.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-infinite-loop.base.argb32.ref.png diff --git a/cairo/test/reference/dash-infinite-loop.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-infinite-loop.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/dash-infinite-loop.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-infinite-loop.base.rgb24.ref.png diff --git a/cairo/test/reference/dash-infinite-loop.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-infinite-loop.ps.ref.png similarity index 100% rename from cairo/test/reference/dash-infinite-loop.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-infinite-loop.ps.ref.png diff --git a/cairo/test/reference/dash-infinite-loop.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-infinite-loop.rgb24.ref.png similarity index 100% rename from cairo/test/reference/dash-infinite-loop.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-infinite-loop.rgb24.ref.png diff --git a/cairo/test/reference/dash-infinite-loop.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-infinite-loop.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/dash-infinite-loop.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-infinite-loop.traps.argb32.ref.png diff --git a/cairo/test/reference/dash-infinite-loop.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-infinite-loop.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/dash-infinite-loop.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-infinite-loop.traps.rgb24.ref.png diff --git a/cairo/test/reference/dash-no-dash.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-no-dash.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/dash-no-dash.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-no-dash.base.argb32.ref.png diff --git a/cairo/test/reference/dash-no-dash.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-no-dash.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/dash-no-dash.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-no-dash.base.rgb24.ref.png diff --git a/cairo/test/reference/dash-no-dash.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-no-dash.ref.png similarity index 100% rename from cairo/test/reference/dash-no-dash.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-no-dash.ref.png diff --git a/cairo/test/reference/dash-offset-negative.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-offset-negative.argb32.ref.png similarity index 100% rename from cairo/test/reference/dash-offset-negative.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-offset-negative.argb32.ref.png diff --git a/cairo/test/reference/dash-offset-negative.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-offset-negative.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/dash-offset-negative.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-offset-negative.base.argb32.ref.png diff --git a/cairo/test/reference/dash-offset-negative.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-offset-negative.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/dash-offset-negative.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-offset-negative.base.rgb24.ref.png diff --git a/cairo/test/reference/dash-offset-negative.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-offset-negative.pdf.ref.png similarity index 100% rename from cairo/test/reference/dash-offset-negative.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-offset-negative.pdf.ref.png diff --git a/cairo/test/reference/dash-offset-negative.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-offset-negative.rgb24.ref.png similarity index 100% rename from cairo/test/reference/dash-offset-negative.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-offset-negative.rgb24.ref.png diff --git a/cairo/test/reference/dash-offset-negative.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-offset-negative.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/dash-offset-negative.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-offset-negative.traps.argb32.ref.png diff --git a/cairo/test/reference/dash-offset-negative.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-offset-negative.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/dash-offset-negative.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-offset-negative.traps.rgb24.ref.png diff --git a/cairo/test/reference/dash-offset.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-offset.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/dash-offset.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-offset.base.argb32.ref.png diff --git a/cairo/test/reference/dash-offset.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-offset.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/dash-offset.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-offset.base.rgb24.ref.png diff --git a/cairo/test/reference/dash-offset.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-offset.ref.png similarity index 100% rename from cairo/test/reference/dash-offset.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-offset.ref.png diff --git a/cairo/test/reference/dash-scale.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-scale.image16.ref.png similarity index 100% rename from cairo/test/reference/dash-scale.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-scale.image16.ref.png diff --git a/cairo/test/reference/dash-scale.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-scale.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/dash-scale.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-scale.mask.argb32.ref.png diff --git a/cairo/test/reference/dash-scale.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-scale.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/dash-scale.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-scale.mask.rgb24.ref.png diff --git a/cairo/test/reference/dash-scale.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-scale.ps.ref.png similarity index 100% rename from cairo/test/reference/dash-scale.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-scale.ps.ref.png diff --git a/cairo/test/reference/dash-scale.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-scale.quartz.ref.png similarity index 100% rename from cairo/test/reference/dash-scale.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-scale.quartz.ref.png diff --git a/cairo/test/reference/dash-scale.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-scale.ref.png similarity index 100% rename from cairo/test/reference/dash-scale.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-scale.ref.png diff --git a/cairo/test/reference/dash-scale.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-scale.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/dash-scale.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-scale.traps.argb32.ref.png diff --git a/cairo/test/reference/dash-scale.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-scale.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/dash-scale.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-scale.traps.rgb24.ref.png diff --git a/cairo/test/reference/dash-state.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-state.argb32.ref.png similarity index 100% rename from cairo/test/reference/dash-state.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-state.argb32.ref.png diff --git a/cairo/test/reference/dash-state.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-state.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/dash-state.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-state.base.argb32.ref.png diff --git a/cairo/test/reference/dash-state.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-state.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/dash-state.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-state.base.rgb24.ref.png diff --git a/cairo/test/reference/dash-state.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-state.image16.ref.png similarity index 100% rename from cairo/test/reference/dash-state.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-state.image16.ref.png diff --git a/cairo/test/reference/dash-state.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-state.ps2.ref.png similarity index 100% rename from cairo/test/reference/dash-state.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-state.ps2.ref.png diff --git a/cairo/test/reference/dash-state.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-state.ps3.ref.png similarity index 100% rename from cairo/test/reference/dash-state.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-state.ps3.ref.png diff --git a/cairo/test/reference/dash-state.quartz.xfail.png b/io2d/src/3rd-party/cairo/test/reference/dash-state.quartz.xfail.png similarity index 100% rename from cairo/test/reference/dash-state.quartz.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/dash-state.quartz.xfail.png diff --git a/cairo/test/reference/dash-state.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-state.rgb24.ref.png similarity index 100% rename from cairo/test/reference/dash-state.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-state.rgb24.ref.png diff --git a/cairo/test/reference/dash-state.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-state.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/dash-state.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-state.traps.argb32.ref.png diff --git a/cairo/test/reference/dash-state.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-state.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/dash-state.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-state.traps.rgb24.ref.png diff --git a/cairo/test/reference/dash-zero-length.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-zero-length.argb32.ref.png similarity index 100% rename from cairo/test/reference/dash-zero-length.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-zero-length.argb32.ref.png diff --git a/cairo/test/reference/dash-zero-length.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-zero-length.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/dash-zero-length.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-zero-length.base.argb32.ref.png diff --git a/cairo/test/reference/dash-zero-length.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-zero-length.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/dash-zero-length.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-zero-length.base.rgb24.ref.png diff --git a/cairo/test/reference/dash-zero-length.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-zero-length.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/dash-zero-length.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-zero-length.mask.rgb24.ref.png diff --git a/cairo/test/reference/dash-zero-length.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-zero-length.ps2.ref.png similarity index 100% rename from cairo/test/reference/dash-zero-length.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-zero-length.ps2.ref.png diff --git a/cairo/test/reference/dash-zero-length.ps2.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-zero-length.ps2.rgb24.ref.png similarity index 100% rename from cairo/test/reference/dash-zero-length.ps2.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-zero-length.ps2.rgb24.ref.png diff --git a/cairo/test/reference/dash-zero-length.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-zero-length.ps3.ref.png similarity index 100% rename from cairo/test/reference/dash-zero-length.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-zero-length.ps3.ref.png diff --git a/cairo/test/reference/dash-zero-length.ps3.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-zero-length.ps3.rgb24.ref.png similarity index 100% rename from cairo/test/reference/dash-zero-length.ps3.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-zero-length.ps3.rgb24.ref.png diff --git a/cairo/test/reference/dash-zero-length.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-zero-length.rgb24.ref.png similarity index 100% rename from cairo/test/reference/dash-zero-length.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-zero-length.rgb24.ref.png diff --git a/cairo/test/reference/dash-zero-length.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-zero-length.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/dash-zero-length.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-zero-length.traps.argb32.ref.png diff --git a/cairo/test/reference/dash-zero-length.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/dash-zero-length.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/dash-zero-length.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/dash-zero-length.traps.rgb24.ref.png diff --git a/cairo/test/reference/degenerate-arc.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-arc.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/degenerate-arc.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-arc.base.argb32.ref.png diff --git a/cairo/test/reference/degenerate-arc.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-arc.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/degenerate-arc.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-arc.base.rgb24.ref.png diff --git a/cairo/test/reference/degenerate-arc.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-arc.image16.ref.png similarity index 100% rename from cairo/test/reference/degenerate-arc.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-arc.image16.ref.png diff --git a/cairo/test/reference/degenerate-arc.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-arc.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/degenerate-arc.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-arc.mask.argb32.ref.png diff --git a/cairo/test/reference/degenerate-arc.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-arc.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/degenerate-arc.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-arc.mask.rgb24.ref.png diff --git a/cairo/test/reference/degenerate-arc.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-arc.ps2.ref.png similarity index 100% rename from cairo/test/reference/degenerate-arc.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-arc.ps2.ref.png diff --git a/cairo/test/reference/degenerate-arc.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-arc.ps3.ref.png similarity index 100% rename from cairo/test/reference/degenerate-arc.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-arc.ps3.ref.png diff --git a/cairo/test/reference/degenerate-arc.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-arc.quartz.ref.png similarity index 100% rename from cairo/test/reference/degenerate-arc.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-arc.quartz.ref.png diff --git a/cairo/test/reference/degenerate-arc.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-arc.ref.png similarity index 100% rename from cairo/test/reference/degenerate-arc.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-arc.ref.png diff --git a/cairo/test/reference/degenerate-arc.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-arc.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/degenerate-arc.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-arc.traps.argb32.ref.png diff --git a/cairo/test/reference/degenerate-arc.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-arc.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/degenerate-arc.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-arc.traps.rgb24.ref.png diff --git a/cairo/test/reference/degenerate-arcs.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-arcs.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/degenerate-arcs.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-arcs.base.argb32.ref.png diff --git a/cairo/test/reference/degenerate-arcs.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-arcs.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/degenerate-arcs.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-arcs.base.rgb24.ref.png diff --git a/cairo/test/reference/degenerate-arcs.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-arcs.image16.ref.png similarity index 100% rename from cairo/test/reference/degenerate-arcs.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-arcs.image16.ref.png diff --git a/cairo/test/reference/degenerate-arcs.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-arcs.ref.png similarity index 100% rename from cairo/test/reference/degenerate-arcs.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-arcs.ref.png diff --git a/cairo/test/reference/degenerate-curve-to.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-curve-to.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/degenerate-curve-to.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-curve-to.base.argb32.ref.png diff --git a/cairo/test/reference/degenerate-curve-to.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-curve-to.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/degenerate-curve-to.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-curve-to.base.rgb24.ref.png diff --git a/cairo/test/reference/degenerate-curve-to.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-curve-to.image16.ref.png similarity index 100% rename from cairo/test/reference/degenerate-curve-to.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-curve-to.image16.ref.png diff --git a/cairo/test/reference/degenerate-curve-to.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-curve-to.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/degenerate-curve-to.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-curve-to.mask.argb32.ref.png diff --git a/cairo/test/reference/degenerate-curve-to.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-curve-to.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/degenerate-curve-to.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-curve-to.mask.rgb24.ref.png diff --git a/cairo/test/reference/degenerate-curve-to.ps.xfail.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-curve-to.ps.xfail.png similarity index 100% rename from cairo/test/reference/degenerate-curve-to.ps.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-curve-to.ps.xfail.png diff --git a/cairo/test/reference/degenerate-curve-to.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-curve-to.quartz.ref.png similarity index 100% rename from cairo/test/reference/degenerate-curve-to.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-curve-to.quartz.ref.png diff --git a/cairo/test/reference/degenerate-curve-to.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-curve-to.ref.png similarity index 100% rename from cairo/test/reference/degenerate-curve-to.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-curve-to.ref.png diff --git a/cairo/test/reference/degenerate-curve-to.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-curve-to.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/degenerate-curve-to.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-curve-to.traps.argb32.ref.png diff --git a/cairo/test/reference/degenerate-curve-to.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-curve-to.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/degenerate-curve-to.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-curve-to.traps.rgb24.ref.png diff --git a/cairo/test/reference/degenerate-dash.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-dash.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/degenerate-dash.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-dash.base.argb32.ref.png diff --git a/cairo/test/reference/degenerate-dash.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-dash.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/degenerate-dash.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-dash.base.rgb24.ref.png diff --git a/cairo/test/reference/degenerate-dash.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-dash.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/degenerate-dash.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-dash.mask.argb32.ref.png diff --git a/cairo/test/reference/degenerate-dash.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-dash.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/degenerate-dash.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-dash.mask.rgb24.ref.png diff --git a/cairo/test/reference/degenerate-dash.ps.xfail.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-dash.ps.xfail.png similarity index 100% rename from cairo/test/reference/degenerate-dash.ps.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-dash.ps.xfail.png diff --git a/cairo/test/reference/degenerate-dash.quartz.xfail.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-dash.quartz.xfail.png similarity index 100% rename from cairo/test/reference/degenerate-dash.quartz.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-dash.quartz.xfail.png diff --git a/cairo/test/reference/degenerate-dash.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-dash.ref.png similarity index 100% rename from cairo/test/reference/degenerate-dash.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-dash.ref.png diff --git a/cairo/test/reference/degenerate-dash.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-dash.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/degenerate-dash.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-dash.traps.argb32.ref.png diff --git a/cairo/test/reference/degenerate-dash.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-dash.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/degenerate-dash.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-dash.traps.rgb24.ref.png diff --git a/cairo/test/reference/degenerate-linear-gradient.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-linear-gradient.argb32.ref.png similarity index 100% rename from cairo/test/reference/degenerate-linear-gradient.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-linear-gradient.argb32.ref.png diff --git a/cairo/test/reference/degenerate-linear-gradient.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-linear-gradient.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/degenerate-linear-gradient.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-linear-gradient.base.argb32.ref.png diff --git a/cairo/test/reference/degenerate-linear-gradient.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-linear-gradient.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/degenerate-linear-gradient.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-linear-gradient.base.rgb24.ref.png diff --git a/cairo/test/reference/degenerate-linear-gradient.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-linear-gradient.rgb24.ref.png similarity index 100% rename from cairo/test/reference/degenerate-linear-gradient.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-linear-gradient.rgb24.ref.png diff --git a/cairo/test/reference/degenerate-path.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-path.argb32.ref.png similarity index 100% rename from cairo/test/reference/degenerate-path.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-path.argb32.ref.png diff --git a/cairo/test/reference/degenerate-path.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-path.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/degenerate-path.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-path.base.argb32.ref.png diff --git a/cairo/test/reference/degenerate-path.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-path.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/degenerate-path.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-path.base.rgb24.ref.png diff --git a/cairo/test/reference/degenerate-path.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-path.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/degenerate-path.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-path.mask.argb32.ref.png diff --git a/cairo/test/reference/degenerate-path.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-path.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/degenerate-path.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-path.mask.rgb24.ref.png diff --git a/cairo/test/reference/degenerate-path.ps.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-path.ps.argb32.xfail.png similarity index 100% rename from cairo/test/reference/degenerate-path.ps.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-path.ps.argb32.xfail.png diff --git a/cairo/test/reference/degenerate-path.ps.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-path.ps.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/degenerate-path.ps.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-path.ps.rgb24.xfail.png diff --git a/cairo/test/reference/degenerate-path.quartz.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-path.quartz.argb32.xfail.png similarity index 100% rename from cairo/test/reference/degenerate-path.quartz.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-path.quartz.argb32.xfail.png diff --git a/cairo/test/reference/degenerate-path.quartz.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-path.quartz.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/degenerate-path.quartz.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-path.quartz.rgb24.xfail.png diff --git a/cairo/test/reference/degenerate-path.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-path.rgb24.ref.png similarity index 100% rename from cairo/test/reference/degenerate-path.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-path.rgb24.ref.png diff --git a/cairo/test/reference/degenerate-path.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-path.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/degenerate-path.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-path.traps.argb32.ref.png diff --git a/cairo/test/reference/degenerate-path.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-path.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/degenerate-path.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-path.traps.rgb24.ref.png diff --git a/cairo/test/reference/degenerate-pen.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-pen.argb32.ref.png similarity index 100% rename from cairo/test/reference/degenerate-pen.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-pen.argb32.ref.png diff --git a/cairo/test/reference/degenerate-pen.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-pen.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/degenerate-pen.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-pen.base.argb32.ref.png diff --git a/cairo/test/reference/degenerate-pen.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-pen.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/degenerate-pen.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-pen.base.rgb24.ref.png diff --git a/cairo/test/reference/degenerate-pen.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-pen.image16.ref.png similarity index 100% rename from cairo/test/reference/degenerate-pen.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-pen.image16.ref.png diff --git a/cairo/test/reference/degenerate-pen.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-pen.ps.ref.png similarity index 100% rename from cairo/test/reference/degenerate-pen.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-pen.ps.ref.png diff --git a/cairo/test/reference/degenerate-pen.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-pen.rgb24.ref.png similarity index 100% rename from cairo/test/reference/degenerate-pen.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-pen.rgb24.ref.png diff --git a/cairo/test/reference/degenerate-pen.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-pen.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/degenerate-pen.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-pen.traps.argb32.ref.png diff --git a/cairo/test/reference/degenerate-pen.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-pen.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/degenerate-pen.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-pen.traps.rgb24.ref.png diff --git a/cairo/test/reference/degenerate-radial-gradient.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-radial-gradient.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/degenerate-radial-gradient.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-radial-gradient.base.argb32.ref.png diff --git a/cairo/test/reference/degenerate-radial-gradient.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-radial-gradient.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/degenerate-radial-gradient.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-radial-gradient.base.rgb24.ref.png diff --git a/cairo/test/reference/degenerate-radial-gradient.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-radial-gradient.ref.png similarity index 100% rename from cairo/test/reference/degenerate-radial-gradient.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-radial-gradient.ref.png diff --git a/cairo/test/reference/degenerate-rel-curve-to.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-rel-curve-to.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/degenerate-rel-curve-to.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-rel-curve-to.base.argb32.ref.png diff --git a/cairo/test/reference/degenerate-rel-curve-to.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-rel-curve-to.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/degenerate-rel-curve-to.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-rel-curve-to.base.rgb24.ref.png diff --git a/cairo/test/reference/degenerate-rel-curve-to.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-rel-curve-to.image16.ref.png similarity index 100% rename from cairo/test/reference/degenerate-rel-curve-to.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-rel-curve-to.image16.ref.png diff --git a/cairo/test/reference/degenerate-rel-curve-to.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-rel-curve-to.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/degenerate-rel-curve-to.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-rel-curve-to.mask.argb32.ref.png diff --git a/cairo/test/reference/degenerate-rel-curve-to.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-rel-curve-to.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/degenerate-rel-curve-to.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-rel-curve-to.mask.rgb24.ref.png diff --git a/cairo/test/reference/degenerate-rel-curve-to.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-rel-curve-to.ps.ref.png similarity index 100% rename from cairo/test/reference/degenerate-rel-curve-to.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-rel-curve-to.ps.ref.png diff --git a/cairo/test/reference/degenerate-rel-curve-to.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-rel-curve-to.quartz.ref.png similarity index 100% rename from cairo/test/reference/degenerate-rel-curve-to.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-rel-curve-to.quartz.ref.png diff --git a/cairo/test/reference/degenerate-rel-curve-to.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-rel-curve-to.ref.png similarity index 100% rename from cairo/test/reference/degenerate-rel-curve-to.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-rel-curve-to.ref.png diff --git a/cairo/test/reference/degenerate-rel-curve-to.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-rel-curve-to.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/degenerate-rel-curve-to.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-rel-curve-to.traps.argb32.ref.png diff --git a/cairo/test/reference/degenerate-rel-curve-to.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-rel-curve-to.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/degenerate-rel-curve-to.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-rel-curve-to.traps.rgb24.ref.png diff --git a/cairo/test/reference/degenerate-solid-dash.ref.png b/io2d/src/3rd-party/cairo/test/reference/degenerate-solid-dash.ref.png similarity index 100% rename from cairo/test/reference/degenerate-solid-dash.ref.png rename to io2d/src/3rd-party/cairo/test/reference/degenerate-solid-dash.ref.png diff --git a/cairo/test/reference/device-offset-fractional.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/device-offset-fractional.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/device-offset-fractional.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/device-offset-fractional.base.argb32.ref.png diff --git a/cairo/test/reference/device-offset-fractional.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/device-offset-fractional.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/device-offset-fractional.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/device-offset-fractional.base.rgb24.ref.png diff --git a/cairo/test/reference/device-offset-fractional.gl.xfail.png b/io2d/src/3rd-party/cairo/test/reference/device-offset-fractional.gl.xfail.png similarity index 100% rename from cairo/test/reference/device-offset-fractional.gl.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/device-offset-fractional.gl.xfail.png diff --git a/cairo/test/reference/device-offset-fractional.pdf.xfail.png b/io2d/src/3rd-party/cairo/test/reference/device-offset-fractional.pdf.xfail.png similarity index 100% rename from cairo/test/reference/device-offset-fractional.pdf.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/device-offset-fractional.pdf.xfail.png diff --git a/cairo/test/reference/device-offset-fractional.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/device-offset-fractional.ps2.ref.png similarity index 100% rename from cairo/test/reference/device-offset-fractional.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/device-offset-fractional.ps2.ref.png diff --git a/cairo/test/reference/device-offset-fractional.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/device-offset-fractional.ps3.ref.png similarity index 100% rename from cairo/test/reference/device-offset-fractional.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/device-offset-fractional.ps3.ref.png diff --git a/cairo/test/reference/device-offset-fractional.ref.png b/io2d/src/3rd-party/cairo/test/reference/device-offset-fractional.ref.png similarity index 100% rename from cairo/test/reference/device-offset-fractional.ref.png rename to io2d/src/3rd-party/cairo/test/reference/device-offset-fractional.ref.png diff --git a/cairo/test/reference/device-offset-positive.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/device-offset-positive.argb32.ref.png similarity index 100% rename from cairo/test/reference/device-offset-positive.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/device-offset-positive.argb32.ref.png diff --git a/cairo/test/reference/device-offset-positive.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/device-offset-positive.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/device-offset-positive.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/device-offset-positive.base.argb32.ref.png diff --git a/cairo/test/reference/device-offset-positive.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/device-offset-positive.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/device-offset-positive.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/device-offset-positive.base.rgb24.ref.png diff --git a/cairo/test/reference/device-offset-positive.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/device-offset-positive.rgb24.ref.png similarity index 100% rename from cairo/test/reference/device-offset-positive.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/device-offset-positive.rgb24.ref.png diff --git a/cairo/test/reference/device-offset-scale.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/device-offset-scale.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/device-offset-scale.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/device-offset-scale.base.argb32.ref.png diff --git a/cairo/test/reference/device-offset-scale.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/device-offset-scale.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/device-offset-scale.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/device-offset-scale.base.rgb24.ref.png diff --git a/cairo/test/reference/device-offset-scale.ref.png b/io2d/src/3rd-party/cairo/test/reference/device-offset-scale.ref.png similarity index 100% rename from cairo/test/reference/device-offset-scale.ref.png rename to io2d/src/3rd-party/cairo/test/reference/device-offset-scale.ref.png diff --git a/cairo/test/reference/device-offset-scale.svg.xfail.png b/io2d/src/3rd-party/cairo/test/reference/device-offset-scale.svg.xfail.png similarity index 100% rename from cairo/test/reference/device-offset-scale.svg.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/device-offset-scale.svg.xfail.png diff --git a/cairo/test/reference/device-offset.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/device-offset.argb32.ref.png similarity index 100% rename from cairo/test/reference/device-offset.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/device-offset.argb32.ref.png diff --git a/cairo/test/reference/device-offset.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/device-offset.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/device-offset.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/device-offset.base.argb32.ref.png diff --git a/cairo/test/reference/device-offset.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/device-offset.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/device-offset.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/device-offset.base.rgb24.ref.png diff --git a/cairo/test/reference/device-offset.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/device-offset.rgb24.ref.png similarity index 100% rename from cairo/test/reference/device-offset.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/device-offset.rgb24.ref.png diff --git a/cairo/test/reference/drunkard-tails.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/drunkard-tails.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/drunkard-tails.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/drunkard-tails.base.argb32.ref.png diff --git a/cairo/test/reference/drunkard-tails.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/drunkard-tails.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/drunkard-tails.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/drunkard-tails.base.rgb24.ref.png diff --git a/cairo/test/reference/drunkard-tails.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/drunkard-tails.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/drunkard-tails.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/drunkard-tails.mask.argb32.ref.png diff --git a/cairo/test/reference/drunkard-tails.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/drunkard-tails.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/drunkard-tails.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/drunkard-tails.mask.rgb24.ref.png diff --git a/cairo/test/reference/drunkard-tails.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/drunkard-tails.ps.ref.png similarity index 100% rename from cairo/test/reference/drunkard-tails.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/drunkard-tails.ps.ref.png diff --git a/cairo/test/reference/drunkard-tails.ref.png b/io2d/src/3rd-party/cairo/test/reference/drunkard-tails.ref.png similarity index 100% rename from cairo/test/reference/drunkard-tails.ref.png rename to io2d/src/3rd-party/cairo/test/reference/drunkard-tails.ref.png diff --git a/cairo/test/reference/drunkard-tails.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/drunkard-tails.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/drunkard-tails.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/drunkard-tails.traps.argb32.ref.png diff --git a/cairo/test/reference/drunkard-tails.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/drunkard-tails.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/drunkard-tails.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/drunkard-tails.traps.rgb24.ref.png diff --git a/cairo/test/reference/extend-pad-border.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-pad-border.argb32.ref.png similarity index 100% rename from cairo/test/reference/extend-pad-border.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-pad-border.argb32.ref.png diff --git a/cairo/test/reference/extend-pad-border.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-pad-border.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/extend-pad-border.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-pad-border.base.argb32.ref.png diff --git a/cairo/test/reference/extend-pad-border.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-pad-border.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/extend-pad-border.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-pad-border.base.rgb24.ref.png diff --git a/cairo/test/reference/extend-pad-border.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-pad-border.image16.ref.png similarity index 100% rename from cairo/test/reference/extend-pad-border.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-pad-border.image16.ref.png diff --git a/cairo/test/reference/extend-pad-border.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-pad-border.pdf.ref.png similarity index 100% rename from cairo/test/reference/extend-pad-border.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-pad-border.pdf.ref.png diff --git a/cairo/test/reference/extend-pad-border.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-pad-border.ps.ref.png similarity index 100% rename from cairo/test/reference/extend-pad-border.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-pad-border.ps.ref.png diff --git a/cairo/test/reference/extend-pad-border.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-pad-border.quartz.ref.png similarity index 100% rename from cairo/test/reference/extend-pad-border.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-pad-border.quartz.ref.png diff --git a/cairo/test/reference/extend-pad-border.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-pad-border.rgb24.ref.png similarity index 100% rename from cairo/test/reference/extend-pad-border.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-pad-border.rgb24.ref.png diff --git a/cairo/test/reference/extend-pad-border.svg.xfail.png b/io2d/src/3rd-party/cairo/test/reference/extend-pad-border.svg.xfail.png similarity index 100% rename from cairo/test/reference/extend-pad-border.svg.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/extend-pad-border.svg.xfail.png diff --git a/cairo/test/reference/extend-pad-similar.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-pad-similar.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/extend-pad-similar.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-pad-similar.base.argb32.ref.png diff --git a/cairo/test/reference/extend-pad-similar.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-pad-similar.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/extend-pad-similar.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-pad-similar.base.rgb24.ref.png diff --git a/cairo/test/reference/extend-pad-similar.quartz.xfail.png b/io2d/src/3rd-party/cairo/test/reference/extend-pad-similar.quartz.xfail.png similarity index 100% rename from cairo/test/reference/extend-pad-similar.quartz.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/extend-pad-similar.quartz.xfail.png diff --git a/cairo/test/reference/extend-pad-similar.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-pad-similar.ref.png similarity index 100% rename from cairo/test/reference/extend-pad-similar.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-pad-similar.ref.png diff --git a/cairo/test/reference/extend-pad-similar.svg.xfail.png b/io2d/src/3rd-party/cairo/test/reference/extend-pad-similar.svg.xfail.png similarity index 100% rename from cairo/test/reference/extend-pad-similar.svg.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/extend-pad-similar.svg.xfail.png diff --git a/cairo/test/reference/extend-pad.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-pad.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/extend-pad.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-pad.base.argb32.ref.png diff --git a/cairo/test/reference/extend-pad.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-pad.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/extend-pad.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-pad.base.rgb24.ref.png diff --git a/cairo/test/reference/extend-pad.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-pad.ps.ref.png similarity index 100% rename from cairo/test/reference/extend-pad.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-pad.ps.ref.png diff --git a/cairo/test/reference/extend-pad.quartz.xfail.png b/io2d/src/3rd-party/cairo/test/reference/extend-pad.quartz.xfail.png similarity index 100% rename from cairo/test/reference/extend-pad.quartz.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/extend-pad.quartz.xfail.png diff --git a/cairo/test/reference/extend-pad.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-pad.ref.png similarity index 100% rename from cairo/test/reference/extend-pad.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-pad.ref.png diff --git a/cairo/test/reference/extend-pad.svg.xfail.png b/io2d/src/3rd-party/cairo/test/reference/extend-pad.svg.xfail.png similarity index 100% rename from cairo/test/reference/extend-pad.svg.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/extend-pad.svg.xfail.png diff --git a/cairo/test/reference/extend-reflect-similar.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-reflect-similar.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/extend-reflect-similar.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-reflect-similar.base.argb32.ref.png diff --git a/cairo/test/reference/extend-reflect-similar.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-reflect-similar.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/extend-reflect-similar.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-reflect-similar.base.rgb24.ref.png diff --git a/cairo/test/reference/extend-reflect-similar.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-reflect-similar.image16.ref.png similarity index 100% rename from cairo/test/reference/extend-reflect-similar.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-reflect-similar.image16.ref.png diff --git a/cairo/test/reference/extend-reflect-similar.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-reflect-similar.ps2.ref.png similarity index 100% rename from cairo/test/reference/extend-reflect-similar.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-reflect-similar.ps2.ref.png diff --git a/cairo/test/reference/extend-reflect-similar.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-reflect-similar.ps3.ref.png similarity index 100% rename from cairo/test/reference/extend-reflect-similar.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-reflect-similar.ps3.ref.png diff --git a/cairo/test/reference/extend-reflect-similar.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-reflect-similar.ref.png similarity index 100% rename from cairo/test/reference/extend-reflect-similar.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-reflect-similar.ref.png diff --git a/cairo/test/reference/extend-reflect.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-reflect.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/extend-reflect.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-reflect.base.argb32.ref.png diff --git a/cairo/test/reference/extend-reflect.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-reflect.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/extend-reflect.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-reflect.base.rgb24.ref.png diff --git a/cairo/test/reference/extend-reflect.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-reflect.image16.ref.png similarity index 100% rename from cairo/test/reference/extend-reflect.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-reflect.image16.ref.png diff --git a/cairo/test/reference/extend-reflect.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-reflect.ps2.ref.png similarity index 100% rename from cairo/test/reference/extend-reflect.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-reflect.ps2.ref.png diff --git a/cairo/test/reference/extend-reflect.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-reflect.ps3.ref.png similarity index 100% rename from cairo/test/reference/extend-reflect.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-reflect.ps3.ref.png diff --git a/cairo/test/reference/extend-reflect.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-reflect.ref.png similarity index 100% rename from cairo/test/reference/extend-reflect.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-reflect.ref.png diff --git a/cairo/test/reference/extend-repeat-similar.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-repeat-similar.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/extend-repeat-similar.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-repeat-similar.base.argb32.ref.png diff --git a/cairo/test/reference/extend-repeat-similar.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-repeat-similar.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/extend-repeat-similar.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-repeat-similar.base.rgb24.ref.png diff --git a/cairo/test/reference/extend-repeat-similar.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-repeat-similar.image16.ref.png similarity index 100% rename from cairo/test/reference/extend-repeat-similar.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-repeat-similar.image16.ref.png diff --git a/cairo/test/reference/extend-repeat-similar.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-repeat-similar.ps2.ref.png similarity index 100% rename from cairo/test/reference/extend-repeat-similar.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-repeat-similar.ps2.ref.png diff --git a/cairo/test/reference/extend-repeat-similar.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-repeat-similar.ps3.ref.png similarity index 100% rename from cairo/test/reference/extend-repeat-similar.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-repeat-similar.ps3.ref.png diff --git a/cairo/test/reference/extend-repeat-similar.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-repeat-similar.ref.png similarity index 100% rename from cairo/test/reference/extend-repeat-similar.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-repeat-similar.ref.png diff --git a/cairo/test/reference/extend-repeat.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-repeat.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/extend-repeat.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-repeat.base.argb32.ref.png diff --git a/cairo/test/reference/extend-repeat.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-repeat.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/extend-repeat.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-repeat.base.rgb24.ref.png diff --git a/cairo/test/reference/extend-repeat.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-repeat.image16.ref.png similarity index 100% rename from cairo/test/reference/extend-repeat.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-repeat.image16.ref.png diff --git a/cairo/test/reference/extend-repeat.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-repeat.ps2.ref.png similarity index 100% rename from cairo/test/reference/extend-repeat.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-repeat.ps2.ref.png diff --git a/cairo/test/reference/extend-repeat.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-repeat.ps3.ref.png similarity index 100% rename from cairo/test/reference/extend-repeat.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-repeat.ps3.ref.png diff --git a/cairo/test/reference/extend-repeat.ref.png b/io2d/src/3rd-party/cairo/test/reference/extend-repeat.ref.png similarity index 100% rename from cairo/test/reference/extend-repeat.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extend-repeat.ref.png diff --git a/cairo/test/reference/extended-blend-alpha-mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha-mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/extended-blend-alpha-mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha-mask.argb32.ref.png diff --git a/cairo/test/reference/extended-blend-alpha-mask.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha-mask.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/extended-blend-alpha-mask.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha-mask.base.argb32.ref.png diff --git a/cairo/test/reference/extended-blend-alpha-mask.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha-mask.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/extended-blend-alpha-mask.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha-mask.base.rgb24.ref.png diff --git a/cairo/test/reference/extended-blend-alpha-mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha-mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/extended-blend-alpha-mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha-mask.rgb24.ref.png diff --git a/cairo/test/reference/extended-blend-alpha.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha.argb32.ref.png similarity index 100% rename from cairo/test/reference/extended-blend-alpha.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha.argb32.ref.png diff --git a/cairo/test/reference/extended-blend-alpha.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/extended-blend-alpha.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha.base.argb32.ref.png diff --git a/cairo/test/reference/extended-blend-alpha.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/extended-blend-alpha.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha.base.rgb24.ref.png diff --git a/cairo/test/reference/extended-blend-alpha.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha.image16.ref.png similarity index 100% rename from cairo/test/reference/extended-blend-alpha.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha.image16.ref.png diff --git a/cairo/test/reference/extended-blend-alpha.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/extended-blend-alpha.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha.quartz.argb32.ref.png diff --git a/cairo/test/reference/extended-blend-alpha.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/extended-blend-alpha.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha.quartz.rgb24.ref.png diff --git a/cairo/test/reference/extended-blend-alpha.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha.rgb24.ref.png similarity index 100% rename from cairo/test/reference/extended-blend-alpha.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha.rgb24.ref.png diff --git a/cairo/test/reference/extended-blend-alpha.svg12.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha.svg12.argb32.xfail.png similarity index 100% rename from cairo/test/reference/extended-blend-alpha.svg12.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha.svg12.argb32.xfail.png diff --git a/cairo/test/reference/extended-blend-alpha.svg12.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha.svg12.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/extended-blend-alpha.svg12.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-alpha.svg12.rgb24.xfail.png diff --git a/cairo/test/reference/extended-blend-mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/extended-blend-mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-mask.argb32.ref.png diff --git a/cairo/test/reference/extended-blend-mask.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-mask.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/extended-blend-mask.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-mask.base.argb32.ref.png diff --git a/cairo/test/reference/extended-blend-mask.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-mask.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/extended-blend-mask.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-mask.base.rgb24.ref.png diff --git a/cairo/test/reference/extended-blend-mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/extended-blend-mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-mask.rgb24.ref.png diff --git a/cairo/test/reference/extended-blend-solid-alpha.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-solid-alpha.argb32.ref.png similarity index 100% rename from cairo/test/reference/extended-blend-solid-alpha.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-solid-alpha.argb32.ref.png diff --git a/cairo/test/reference/extended-blend-solid-alpha.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-solid-alpha.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/extended-blend-solid-alpha.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-solid-alpha.base.argb32.ref.png diff --git a/cairo/test/reference/extended-blend-solid-alpha.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-solid-alpha.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/extended-blend-solid-alpha.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-solid-alpha.base.rgb24.ref.png diff --git a/cairo/test/reference/extended-blend-solid-alpha.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-solid-alpha.image16.ref.png similarity index 100% rename from cairo/test/reference/extended-blend-solid-alpha.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-solid-alpha.image16.ref.png diff --git a/cairo/test/reference/extended-blend-solid-alpha.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-solid-alpha.rgb24.ref.png similarity index 100% rename from cairo/test/reference/extended-blend-solid-alpha.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-solid-alpha.rgb24.ref.png diff --git a/cairo/test/reference/extended-blend-solid.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-solid.argb32.ref.png similarity index 100% rename from cairo/test/reference/extended-blend-solid.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-solid.argb32.ref.png diff --git a/cairo/test/reference/extended-blend-solid.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-solid.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/extended-blend-solid.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-solid.base.argb32.ref.png diff --git a/cairo/test/reference/extended-blend-solid.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-solid.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/extended-blend-solid.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-solid.base.rgb24.ref.png diff --git a/cairo/test/reference/extended-blend-solid.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-solid.image16.ref.png similarity index 100% rename from cairo/test/reference/extended-blend-solid.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-solid.image16.ref.png diff --git a/cairo/test/reference/extended-blend-solid.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend-solid.rgb24.ref.png similarity index 100% rename from cairo/test/reference/extended-blend-solid.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend-solid.rgb24.ref.png diff --git a/cairo/test/reference/extended-blend.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend.argb32.ref.png similarity index 100% rename from cairo/test/reference/extended-blend.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend.argb32.ref.png diff --git a/cairo/test/reference/extended-blend.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/extended-blend.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend.base.argb32.ref.png diff --git a/cairo/test/reference/extended-blend.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/extended-blend.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend.base.rgb24.ref.png diff --git a/cairo/test/reference/extended-blend.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend.image16.ref.png similarity index 100% rename from cairo/test/reference/extended-blend.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend.image16.ref.png diff --git a/cairo/test/reference/extended-blend.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/extended-blend.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend.quartz.argb32.ref.png diff --git a/cairo/test/reference/extended-blend.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/extended-blend.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend.quartz.rgb24.ref.png diff --git a/cairo/test/reference/extended-blend.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend.rgb24.ref.png similarity index 100% rename from cairo/test/reference/extended-blend.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend.rgb24.ref.png diff --git a/cairo/test/reference/extended-blend.svg12.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend.svg12.argb32.xfail.png similarity index 100% rename from cairo/test/reference/extended-blend.svg12.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend.svg12.argb32.xfail.png diff --git a/cairo/test/reference/extended-blend.svg12.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/extended-blend.svg12.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/extended-blend.svg12.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/extended-blend.svg12.rgb24.xfail.png diff --git a/cairo/test/reference/fallback-resolution.ppi144x144.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi144x144.ps.ref.png similarity index 100% rename from cairo/test/reference/fallback-resolution.ppi144x144.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi144x144.ps.ref.png diff --git a/cairo/test/reference/fallback-resolution.ppi144x144.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi144x144.ref.png similarity index 100% rename from cairo/test/reference/fallback-resolution.ppi144x144.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi144x144.ref.png diff --git a/cairo/test/reference/fallback-resolution.ppi144x72.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi144x72.ps.ref.png similarity index 100% rename from cairo/test/reference/fallback-resolution.ppi144x72.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi144x72.ps.ref.png diff --git a/cairo/test/reference/fallback-resolution.ppi144x72.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi144x72.ref.png similarity index 100% rename from cairo/test/reference/fallback-resolution.ppi144x72.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi144x72.ref.png diff --git a/cairo/test/reference/fallback-resolution.ppi288x288.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi288x288.pdf.ref.png similarity index 100% rename from cairo/test/reference/fallback-resolution.ppi288x288.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi288x288.pdf.ref.png diff --git a/cairo/test/reference/fallback-resolution.ppi288x288.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi288x288.ps.ref.png similarity index 100% rename from cairo/test/reference/fallback-resolution.ppi288x288.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi288x288.ps.ref.png diff --git a/cairo/test/reference/fallback-resolution.ppi288x288.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi288x288.svg.ref.png similarity index 100% rename from cairo/test/reference/fallback-resolution.ppi288x288.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi288x288.svg.ref.png diff --git a/cairo/test/reference/fallback-resolution.ppi288x72.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi288x72.ps.ref.png similarity index 100% rename from cairo/test/reference/fallback-resolution.ppi288x72.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi288x72.ps.ref.png diff --git a/cairo/test/reference/fallback-resolution.ppi288x72.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi288x72.ref.png similarity index 100% rename from cairo/test/reference/fallback-resolution.ppi288x72.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi288x72.ref.png diff --git a/cairo/test/reference/fallback-resolution.ppi576x576.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi576x576.pdf.ref.png similarity index 100% rename from cairo/test/reference/fallback-resolution.ppi576x576.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi576x576.pdf.ref.png diff --git a/cairo/test/reference/fallback-resolution.ppi576x576.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi576x576.ps.ref.png similarity index 100% rename from cairo/test/reference/fallback-resolution.ppi576x576.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi576x576.ps.ref.png diff --git a/cairo/test/reference/fallback-resolution.ppi576x576.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi576x576.svg.ref.png similarity index 100% rename from cairo/test/reference/fallback-resolution.ppi576x576.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi576x576.svg.ref.png diff --git a/cairo/test/reference/fallback-resolution.ppi576x72.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi576x72.ps.ref.png similarity index 100% rename from cairo/test/reference/fallback-resolution.ppi576x72.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi576x72.ps.ref.png diff --git a/cairo/test/reference/fallback-resolution.ppi576x72.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi576x72.ref.png similarity index 100% rename from cairo/test/reference/fallback-resolution.ppi576x72.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi576x72.ref.png diff --git a/cairo/test/reference/fallback-resolution.ppi72x144.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi72x144.ps.ref.png similarity index 100% rename from cairo/test/reference/fallback-resolution.ppi72x144.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi72x144.ps.ref.png diff --git a/cairo/test/reference/fallback-resolution.ppi72x144.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi72x144.ref.png similarity index 100% rename from cairo/test/reference/fallback-resolution.ppi72x144.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi72x144.ref.png diff --git a/cairo/test/reference/fallback-resolution.ppi72x288.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi72x288.ps.ref.png similarity index 100% rename from cairo/test/reference/fallback-resolution.ppi72x288.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi72x288.ps.ref.png diff --git a/cairo/test/reference/fallback-resolution.ppi72x288.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi72x288.ref.png similarity index 100% rename from cairo/test/reference/fallback-resolution.ppi72x288.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi72x288.ref.png diff --git a/cairo/test/reference/fallback-resolution.ppi72x576.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi72x576.ps.ref.png similarity index 100% rename from cairo/test/reference/fallback-resolution.ppi72x576.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi72x576.ps.ref.png diff --git a/cairo/test/reference/fallback-resolution.ppi72x576.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi72x576.ref.png similarity index 100% rename from cairo/test/reference/fallback-resolution.ppi72x576.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi72x576.ref.png diff --git a/cairo/test/reference/fallback-resolution.ppi72x72.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi72x72.ref.png similarity index 100% rename from cairo/test/reference/fallback-resolution.ppi72x72.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback-resolution.ppi72x72.ref.png diff --git a/cairo/test/reference/fallback.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback.argb32.ref.png similarity index 100% rename from cairo/test/reference/fallback.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback.argb32.ref.png diff --git a/cairo/test/reference/fallback.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/fallback.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback.base.argb32.ref.png diff --git a/cairo/test/reference/fallback.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fallback.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback.base.rgb24.ref.png diff --git a/cairo/test/reference/fallback.image16.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback.image16.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fallback.image16.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback.image16.rgb24.ref.png diff --git a/cairo/test/reference/fallback.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/fallback.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback.mask.argb32.ref.png diff --git a/cairo/test/reference/fallback.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fallback.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback.mask.rgb24.ref.png diff --git a/cairo/test/reference/fallback.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fallback.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback.rgb24.ref.png diff --git a/cairo/test/reference/fallback.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/fallback.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback.traps.argb32.ref.png diff --git a/cairo/test/reference/fallback.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fallback.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fallback.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fallback.traps.rgb24.ref.png diff --git a/cairo/test/reference/fill-alpha-pattern.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-alpha-pattern.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-alpha-pattern.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-alpha-pattern.argb32.ref.png diff --git a/cairo/test/reference/fill-alpha-pattern.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-alpha-pattern.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-alpha-pattern.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-alpha-pattern.base.argb32.ref.png diff --git a/cairo/test/reference/fill-alpha-pattern.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-alpha-pattern.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-alpha-pattern.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-alpha-pattern.base.rgb24.ref.png diff --git a/cairo/test/reference/fill-alpha-pattern.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-alpha-pattern.image16.ref.png similarity index 100% rename from cairo/test/reference/fill-alpha-pattern.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-alpha-pattern.image16.ref.png diff --git a/cairo/test/reference/fill-alpha-pattern.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-alpha-pattern.pdf.ref.png similarity index 100% rename from cairo/test/reference/fill-alpha-pattern.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-alpha-pattern.pdf.ref.png diff --git a/cairo/test/reference/fill-alpha-pattern.ps3.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-alpha-pattern.ps3.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-alpha-pattern.ps3.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-alpha-pattern.ps3.argb32.ref.png diff --git a/cairo/test/reference/fill-alpha-pattern.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-alpha-pattern.quartz.ref.png similarity index 100% rename from cairo/test/reference/fill-alpha-pattern.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-alpha-pattern.quartz.ref.png diff --git a/cairo/test/reference/fill-alpha-pattern.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-alpha-pattern.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-alpha-pattern.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-alpha-pattern.rgb24.ref.png diff --git a/cairo/test/reference/fill-alpha-pattern.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-alpha-pattern.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-alpha-pattern.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-alpha-pattern.traps.argb32.ref.png diff --git a/cairo/test/reference/fill-alpha-pattern.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-alpha-pattern.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-alpha-pattern.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-alpha-pattern.traps.rgb24.ref.png diff --git a/cairo/test/reference/fill-alpha.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-alpha.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-alpha.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-alpha.argb32.ref.png diff --git a/cairo/test/reference/fill-alpha.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-alpha.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-alpha.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-alpha.base.argb32.ref.png diff --git a/cairo/test/reference/fill-alpha.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-alpha.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-alpha.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-alpha.base.rgb24.ref.png diff --git a/cairo/test/reference/fill-alpha.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-alpha.image16.ref.png similarity index 100% rename from cairo/test/reference/fill-alpha.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-alpha.image16.ref.png diff --git a/cairo/test/reference/fill-alpha.ps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-alpha.ps.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-alpha.ps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-alpha.ps.argb32.ref.png diff --git a/cairo/test/reference/fill-alpha.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-alpha.quartz.ref.png similarity index 100% rename from cairo/test/reference/fill-alpha.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-alpha.quartz.ref.png diff --git a/cairo/test/reference/fill-alpha.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-alpha.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-alpha.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-alpha.rgb24.ref.png diff --git a/cairo/test/reference/fill-alpha.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-alpha.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-alpha.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-alpha.traps.argb32.ref.png diff --git a/cairo/test/reference/fill-alpha.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-alpha.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-alpha.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-alpha.traps.rgb24.ref.png diff --git a/cairo/test/reference/fill-and-stroke-alpha-add.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha-add.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke-alpha-add.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha-add.argb32.ref.png diff --git a/cairo/test/reference/fill-and-stroke-alpha-add.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha-add.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke-alpha-add.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha-add.base.argb32.ref.png diff --git a/cairo/test/reference/fill-and-stroke-alpha-add.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha-add.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke-alpha-add.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha-add.base.rgb24.ref.png diff --git a/cairo/test/reference/fill-and-stroke-alpha-add.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha-add.image16.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke-alpha-add.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha-add.image16.ref.png diff --git a/cairo/test/reference/fill-and-stroke-alpha-add.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha-add.quartz.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke-alpha-add.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha-add.quartz.ref.png diff --git a/cairo/test/reference/fill-and-stroke-alpha-add.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha-add.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke-alpha-add.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha-add.rgb24.ref.png diff --git a/cairo/test/reference/fill-and-stroke-alpha-add.svg12.xfail.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha-add.svg12.xfail.png similarity index 100% rename from cairo/test/reference/fill-and-stroke-alpha-add.svg12.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha-add.svg12.xfail.png diff --git a/cairo/test/reference/fill-and-stroke-alpha-add.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha-add.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke-alpha-add.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha-add.traps.argb32.ref.png diff --git a/cairo/test/reference/fill-and-stroke-alpha-add.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha-add.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke-alpha-add.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha-add.traps.rgb24.ref.png diff --git a/cairo/test/reference/fill-and-stroke-alpha.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke-alpha.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha.argb32.ref.png diff --git a/cairo/test/reference/fill-and-stroke-alpha.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke-alpha.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha.base.argb32.ref.png diff --git a/cairo/test/reference/fill-and-stroke-alpha.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke-alpha.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha.base.rgb24.ref.png diff --git a/cairo/test/reference/fill-and-stroke-alpha.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha.image16.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke-alpha.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha.image16.ref.png diff --git a/cairo/test/reference/fill-and-stroke-alpha.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke-alpha.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha.rgb24.ref.png diff --git a/cairo/test/reference/fill-and-stroke-alpha.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke-alpha.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha.traps.argb32.ref.png diff --git a/cairo/test/reference/fill-and-stroke-alpha.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke-alpha.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke-alpha.traps.rgb24.ref.png diff --git a/cairo/test/reference/fill-and-stroke.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke.argb32.ref.png diff --git a/cairo/test/reference/fill-and-stroke.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke.base.argb32.ref.png diff --git a/cairo/test/reference/fill-and-stroke.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke.base.rgb24.ref.png diff --git a/cairo/test/reference/fill-and-stroke.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke.image16.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke.image16.ref.png diff --git a/cairo/test/reference/fill-and-stroke.ps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke.ps.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke.ps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke.ps.argb32.ref.png diff --git a/cairo/test/reference/fill-and-stroke.ps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke.ps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke.ps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke.ps.rgb24.ref.png diff --git a/cairo/test/reference/fill-and-stroke.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke.quartz.argb32.ref.png diff --git a/cairo/test/reference/fill-and-stroke.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke.quartz.rgb24.ref.png diff --git a/cairo/test/reference/fill-and-stroke.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke.rgb24.ref.png diff --git a/cairo/test/reference/fill-and-stroke.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke.traps.argb32.ref.png diff --git a/cairo/test/reference/fill-and-stroke.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-and-stroke.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-and-stroke.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-and-stroke.traps.rgb24.ref.png diff --git a/cairo/test/reference/fill-degenerate-sort-order.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-degenerate-sort-order.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-degenerate-sort-order.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-degenerate-sort-order.argb32.ref.png diff --git a/cairo/test/reference/fill-degenerate-sort-order.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-degenerate-sort-order.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-degenerate-sort-order.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-degenerate-sort-order.base.argb32.ref.png diff --git a/cairo/test/reference/fill-degenerate-sort-order.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-degenerate-sort-order.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-degenerate-sort-order.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-degenerate-sort-order.base.rgb24.ref.png diff --git a/cairo/test/reference/fill-degenerate-sort-order.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-degenerate-sort-order.image16.ref.png similarity index 100% rename from cairo/test/reference/fill-degenerate-sort-order.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-degenerate-sort-order.image16.ref.png diff --git a/cairo/test/reference/fill-degenerate-sort-order.ps.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/fill-degenerate-sort-order.ps.argb32.xfail.png similarity index 100% rename from cairo/test/reference/fill-degenerate-sort-order.ps.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/fill-degenerate-sort-order.ps.argb32.xfail.png diff --git a/cairo/test/reference/fill-degenerate-sort-order.ps.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/fill-degenerate-sort-order.ps.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/fill-degenerate-sort-order.ps.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/fill-degenerate-sort-order.ps.rgb24.xfail.png diff --git a/cairo/test/reference/fill-degenerate-sort-order.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-degenerate-sort-order.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-degenerate-sort-order.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-degenerate-sort-order.quartz.argb32.ref.png diff --git a/cairo/test/reference/fill-degenerate-sort-order.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-degenerate-sort-order.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-degenerate-sort-order.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-degenerate-sort-order.quartz.rgb24.ref.png diff --git a/cairo/test/reference/fill-degenerate-sort-order.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-degenerate-sort-order.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-degenerate-sort-order.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-degenerate-sort-order.rgb24.ref.png diff --git a/cairo/test/reference/fill-degenerate-sort-order.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-degenerate-sort-order.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-degenerate-sort-order.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-degenerate-sort-order.traps.argb32.ref.png diff --git a/cairo/test/reference/fill-degenerate-sort-order.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-degenerate-sort-order.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-degenerate-sort-order.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-degenerate-sort-order.traps.rgb24.ref.png diff --git a/cairo/test/reference/fill-disjoint.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-disjoint.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-disjoint.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-disjoint.base.argb32.ref.png diff --git a/cairo/test/reference/fill-disjoint.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-disjoint.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-disjoint.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-disjoint.base.rgb24.ref.png diff --git a/cairo/test/reference/fill-disjoint.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-disjoint.ref.png similarity index 100% rename from cairo/test/reference/fill-disjoint.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-disjoint.ref.png diff --git a/cairo/test/reference/fill-empty.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-empty.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-empty.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-empty.argb32.ref.png diff --git a/cairo/test/reference/fill-empty.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-empty.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-empty.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-empty.base.argb32.ref.png diff --git a/cairo/test/reference/fill-empty.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-empty.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-empty.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-empty.base.rgb24.ref.png diff --git a/cairo/test/reference/fill-empty.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-empty.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-empty.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-empty.rgb24.ref.png diff --git a/cairo/test/reference/fill-empty.svg12.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/fill-empty.svg12.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/fill-empty.svg12.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/fill-empty.svg12.rgb24.xfail.png diff --git a/cairo/test/reference/fill-image.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-image.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-image.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-image.argb32.ref.png diff --git a/cairo/test/reference/fill-image.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-image.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-image.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-image.base.argb32.ref.png diff --git a/cairo/test/reference/fill-image.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-image.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-image.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-image.base.rgb24.ref.png diff --git a/cairo/test/reference/fill-image.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-image.image16.ref.png similarity index 100% rename from cairo/test/reference/fill-image.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-image.image16.ref.png diff --git a/cairo/test/reference/fill-image.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-image.ps.ref.png similarity index 100% rename from cairo/test/reference/fill-image.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-image.ps.ref.png diff --git a/cairo/test/reference/fill-image.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-image.quartz.ref.png similarity index 100% rename from cairo/test/reference/fill-image.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-image.quartz.ref.png diff --git a/cairo/test/reference/fill-image.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-image.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-image.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-image.rgb24.ref.png diff --git a/cairo/test/reference/fill-image.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-image.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-image.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-image.traps.argb32.ref.png diff --git a/cairo/test/reference/fill-image.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-image.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-image.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-image.traps.rgb24.ref.png diff --git a/cairo/test/reference/fill-missed-stop.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-missed-stop.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-missed-stop.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-missed-stop.argb32.ref.png diff --git a/cairo/test/reference/fill-missed-stop.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-missed-stop.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-missed-stop.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-missed-stop.base.argb32.ref.png diff --git a/cairo/test/reference/fill-missed-stop.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-missed-stop.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-missed-stop.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-missed-stop.base.rgb24.ref.png diff --git a/cairo/test/reference/fill-missed-stop.pdf.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-missed-stop.pdf.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-missed-stop.pdf.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-missed-stop.pdf.argb32.ref.png diff --git a/cairo/test/reference/fill-missed-stop.ps2.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-missed-stop.ps2.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-missed-stop.ps2.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-missed-stop.ps2.argb32.ref.png diff --git a/cairo/test/reference/fill-missed-stop.ps2.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-missed-stop.ps2.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-missed-stop.ps2.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-missed-stop.ps2.rgb24.ref.png diff --git a/cairo/test/reference/fill-missed-stop.ps3.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-missed-stop.ps3.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-missed-stop.ps3.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-missed-stop.ps3.argb32.ref.png diff --git a/cairo/test/reference/fill-missed-stop.ps3.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-missed-stop.ps3.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-missed-stop.ps3.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-missed-stop.ps3.rgb24.ref.png diff --git a/cairo/test/reference/fill-missed-stop.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-missed-stop.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-missed-stop.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-missed-stop.rgb24.ref.png diff --git a/cairo/test/reference/fill-missed-stop.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-missed-stop.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-missed-stop.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-missed-stop.traps.argb32.ref.png diff --git a/cairo/test/reference/fill-missed-stop.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-missed-stop.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-missed-stop.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-missed-stop.traps.rgb24.ref.png diff --git a/cairo/test/reference/fill-rule.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-rule.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-rule.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-rule.argb32.ref.png diff --git a/cairo/test/reference/fill-rule.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-rule.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-rule.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-rule.base.argb32.ref.png diff --git a/cairo/test/reference/fill-rule.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-rule.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-rule.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-rule.base.rgb24.ref.png diff --git a/cairo/test/reference/fill-rule.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-rule.image16.ref.png similarity index 100% rename from cairo/test/reference/fill-rule.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-rule.image16.ref.png diff --git a/cairo/test/reference/fill-rule.ps2.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-rule.ps2.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-rule.ps2.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-rule.ps2.argb32.ref.png diff --git a/cairo/test/reference/fill-rule.ps2.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-rule.ps2.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-rule.ps2.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-rule.ps2.rgb24.ref.png diff --git a/cairo/test/reference/fill-rule.ps3.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-rule.ps3.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-rule.ps3.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-rule.ps3.argb32.ref.png diff --git a/cairo/test/reference/fill-rule.ps3.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-rule.ps3.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-rule.ps3.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-rule.ps3.rgb24.ref.png diff --git a/cairo/test/reference/fill-rule.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-rule.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-rule.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-rule.quartz.argb32.ref.png diff --git a/cairo/test/reference/fill-rule.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-rule.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-rule.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-rule.quartz.rgb24.ref.png diff --git a/cairo/test/reference/fill-rule.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-rule.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-rule.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-rule.rgb24.ref.png diff --git a/cairo/test/reference/fill-rule.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-rule.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-rule.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-rule.traps.argb32.ref.png diff --git a/cairo/test/reference/fill-rule.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-rule.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-rule.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-rule.traps.rgb24.ref.png diff --git a/cairo/test/reference/fill-xlib-fallback.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-xlib-fallback.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-xlib-fallback.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-xlib-fallback.rgb24.ref.png diff --git a/cairo/test/reference/fill-xlib-window.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-xlib-window.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-xlib-window.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-xlib-window.rgb24.ref.png diff --git a/cairo/test/reference/fill-xlib.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-xlib.argb32.ref.png similarity index 100% rename from cairo/test/reference/fill-xlib.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-xlib.argb32.ref.png diff --git a/cairo/test/reference/fill-xlib.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/fill-xlib.rgb24.ref.png similarity index 100% rename from cairo/test/reference/fill-xlib.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/fill-xlib.rgb24.ref.png diff --git a/cairo/test/reference/filter-bilinear-extents.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/filter-bilinear-extents.argb32.ref.png similarity index 100% rename from cairo/test/reference/filter-bilinear-extents.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/filter-bilinear-extents.argb32.ref.png diff --git a/cairo/test/reference/filter-bilinear-extents.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/filter-bilinear-extents.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/filter-bilinear-extents.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/filter-bilinear-extents.base.argb32.ref.png diff --git a/cairo/test/reference/filter-bilinear-extents.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/filter-bilinear-extents.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/filter-bilinear-extents.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/filter-bilinear-extents.base.rgb24.ref.png diff --git a/cairo/test/reference/filter-bilinear-extents.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/filter-bilinear-extents.image16.ref.png similarity index 100% rename from cairo/test/reference/filter-bilinear-extents.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/filter-bilinear-extents.image16.ref.png diff --git a/cairo/test/reference/filter-bilinear-extents.pdf.xfail.png b/io2d/src/3rd-party/cairo/test/reference/filter-bilinear-extents.pdf.xfail.png similarity index 100% rename from cairo/test/reference/filter-bilinear-extents.pdf.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/filter-bilinear-extents.pdf.xfail.png diff --git a/cairo/test/reference/filter-bilinear-extents.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/filter-bilinear-extents.ps2.ref.png similarity index 100% rename from cairo/test/reference/filter-bilinear-extents.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/filter-bilinear-extents.ps2.ref.png diff --git a/cairo/test/reference/filter-bilinear-extents.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/filter-bilinear-extents.ps3.ref.png similarity index 100% rename from cairo/test/reference/filter-bilinear-extents.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/filter-bilinear-extents.ps3.ref.png diff --git a/cairo/test/reference/filter-bilinear-extents.quartz.xfail.png b/io2d/src/3rd-party/cairo/test/reference/filter-bilinear-extents.quartz.xfail.png similarity index 100% rename from cairo/test/reference/filter-bilinear-extents.quartz.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/filter-bilinear-extents.quartz.xfail.png diff --git a/cairo/test/reference/filter-bilinear-extents.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/filter-bilinear-extents.rgb24.ref.png similarity index 100% rename from cairo/test/reference/filter-bilinear-extents.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/filter-bilinear-extents.rgb24.ref.png diff --git a/cairo/test/reference/filter-nearest-offset.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/filter-nearest-offset.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/filter-nearest-offset.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/filter-nearest-offset.base.argb32.ref.png diff --git a/cairo/test/reference/filter-nearest-offset.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/filter-nearest-offset.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/filter-nearest-offset.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/filter-nearest-offset.base.rgb24.ref.png diff --git a/cairo/test/reference/filter-nearest-offset.gl.xfail.png b/io2d/src/3rd-party/cairo/test/reference/filter-nearest-offset.gl.xfail.png similarity index 100% rename from cairo/test/reference/filter-nearest-offset.gl.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/filter-nearest-offset.gl.xfail.png diff --git a/cairo/test/reference/filter-nearest-offset.pdf.xfail.png b/io2d/src/3rd-party/cairo/test/reference/filter-nearest-offset.pdf.xfail.png similarity index 100% rename from cairo/test/reference/filter-nearest-offset.pdf.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/filter-nearest-offset.pdf.xfail.png diff --git a/cairo/test/reference/filter-nearest-offset.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/filter-nearest-offset.ps2.ref.png similarity index 100% rename from cairo/test/reference/filter-nearest-offset.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/filter-nearest-offset.ps2.ref.png diff --git a/cairo/test/reference/filter-nearest-offset.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/filter-nearest-offset.ps3.ref.png similarity index 100% rename from cairo/test/reference/filter-nearest-offset.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/filter-nearest-offset.ps3.ref.png diff --git a/cairo/test/reference/filter-nearest-offset.ref.png b/io2d/src/3rd-party/cairo/test/reference/filter-nearest-offset.ref.png similarity index 100% rename from cairo/test/reference/filter-nearest-offset.ref.png rename to io2d/src/3rd-party/cairo/test/reference/filter-nearest-offset.ref.png diff --git a/cairo/test/reference/filter-nearest-offset.svg.xfail.png b/io2d/src/3rd-party/cairo/test/reference/filter-nearest-offset.svg.xfail.png similarity index 100% rename from cairo/test/reference/filter-nearest-offset.svg.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/filter-nearest-offset.svg.xfail.png diff --git a/cairo/test/reference/filter-nearest-transformed.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/filter-nearest-transformed.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/filter-nearest-transformed.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/filter-nearest-transformed.base.argb32.ref.png diff --git a/cairo/test/reference/filter-nearest-transformed.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/filter-nearest-transformed.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/filter-nearest-transformed.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/filter-nearest-transformed.base.rgb24.ref.png diff --git a/cairo/test/reference/filter-nearest-transformed.gl.xfail.png b/io2d/src/3rd-party/cairo/test/reference/filter-nearest-transformed.gl.xfail.png similarity index 100% rename from cairo/test/reference/filter-nearest-transformed.gl.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/filter-nearest-transformed.gl.xfail.png diff --git a/cairo/test/reference/filter-nearest-transformed.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/filter-nearest-transformed.image16.ref.png similarity index 100% rename from cairo/test/reference/filter-nearest-transformed.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/filter-nearest-transformed.image16.ref.png diff --git a/cairo/test/reference/filter-nearest-transformed.pdf.xfail.png b/io2d/src/3rd-party/cairo/test/reference/filter-nearest-transformed.pdf.xfail.png similarity index 100% rename from cairo/test/reference/filter-nearest-transformed.pdf.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/filter-nearest-transformed.pdf.xfail.png diff --git a/cairo/test/reference/filter-nearest-transformed.quartz.xfail.png b/io2d/src/3rd-party/cairo/test/reference/filter-nearest-transformed.quartz.xfail.png similarity index 100% rename from cairo/test/reference/filter-nearest-transformed.quartz.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/filter-nearest-transformed.quartz.xfail.png diff --git a/cairo/test/reference/filter-nearest-transformed.ref.png b/io2d/src/3rd-party/cairo/test/reference/filter-nearest-transformed.ref.png similarity index 100% rename from cairo/test/reference/filter-nearest-transformed.ref.png rename to io2d/src/3rd-party/cairo/test/reference/filter-nearest-transformed.ref.png diff --git a/cairo/test/reference/filter-nearest-transformed.svg.xfail.png b/io2d/src/3rd-party/cairo/test/reference/filter-nearest-transformed.svg.xfail.png similarity index 100% rename from cairo/test/reference/filter-nearest-transformed.svg.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/filter-nearest-transformed.svg.xfail.png diff --git a/cairo/test/reference/finer-grained-fallbacks.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.argb32.ref.png similarity index 100% rename from cairo/test/reference/finer-grained-fallbacks.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.argb32.ref.png diff --git a/cairo/test/reference/finer-grained-fallbacks.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/finer-grained-fallbacks.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.base.argb32.ref.png diff --git a/cairo/test/reference/finer-grained-fallbacks.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/finer-grained-fallbacks.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.base.rgb24.ref.png diff --git a/cairo/test/reference/finer-grained-fallbacks.gl.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.gl.argb32.ref.png similarity index 100% rename from cairo/test/reference/finer-grained-fallbacks.gl.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.gl.argb32.ref.png diff --git a/cairo/test/reference/finer-grained-fallbacks.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.image16.ref.png similarity index 100% rename from cairo/test/reference/finer-grained-fallbacks.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.image16.ref.png diff --git a/cairo/test/reference/finer-grained-fallbacks.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/finer-grained-fallbacks.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.mask.argb32.ref.png diff --git a/cairo/test/reference/finer-grained-fallbacks.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/finer-grained-fallbacks.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.mask.rgb24.ref.png diff --git a/cairo/test/reference/finer-grained-fallbacks.ps2.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.ps2.argb32.ref.png similarity index 100% rename from cairo/test/reference/finer-grained-fallbacks.ps2.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.ps2.argb32.ref.png diff --git a/cairo/test/reference/finer-grained-fallbacks.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.ps2.ref.png similarity index 100% rename from cairo/test/reference/finer-grained-fallbacks.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.ps2.ref.png diff --git a/cairo/test/reference/finer-grained-fallbacks.ps2.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.ps2.rgb24.ref.png similarity index 100% rename from cairo/test/reference/finer-grained-fallbacks.ps2.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.ps2.rgb24.ref.png diff --git a/cairo/test/reference/finer-grained-fallbacks.ps3.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.ps3.argb32.ref.png similarity index 100% rename from cairo/test/reference/finer-grained-fallbacks.ps3.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.ps3.argb32.ref.png diff --git a/cairo/test/reference/finer-grained-fallbacks.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.ps3.ref.png similarity index 100% rename from cairo/test/reference/finer-grained-fallbacks.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.ps3.ref.png diff --git a/cairo/test/reference/finer-grained-fallbacks.ps3.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.ps3.rgb24.ref.png similarity index 100% rename from cairo/test/reference/finer-grained-fallbacks.ps3.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.ps3.rgb24.ref.png diff --git a/cairo/test/reference/finer-grained-fallbacks.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/finer-grained-fallbacks.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.quartz.argb32.ref.png diff --git a/cairo/test/reference/finer-grained-fallbacks.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/finer-grained-fallbacks.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.quartz.rgb24.ref.png diff --git a/cairo/test/reference/finer-grained-fallbacks.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.rgb24.ref.png similarity index 100% rename from cairo/test/reference/finer-grained-fallbacks.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.rgb24.ref.png diff --git a/cairo/test/reference/finer-grained-fallbacks.svg12.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.svg12.argb32.ref.png similarity index 100% rename from cairo/test/reference/finer-grained-fallbacks.svg12.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.svg12.argb32.ref.png diff --git a/cairo/test/reference/finer-grained-fallbacks.svg12.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.svg12.rgb24.ref.png similarity index 100% rename from cairo/test/reference/finer-grained-fallbacks.svg12.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.svg12.rgb24.ref.png diff --git a/cairo/test/reference/finer-grained-fallbacks.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/finer-grained-fallbacks.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.traps.argb32.ref.png diff --git a/cairo/test/reference/finer-grained-fallbacks.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/finer-grained-fallbacks.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.traps.rgb24.ref.png diff --git a/cairo/test/reference/finer-grained-fallbacks.xlib-fallback.ref.png b/io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.xlib-fallback.ref.png similarity index 100% rename from cairo/test/reference/finer-grained-fallbacks.xlib-fallback.ref.png rename to io2d/src/3rd-party/cairo/test/reference/finer-grained-fallbacks.xlib-fallback.ref.png diff --git a/cairo/test/reference/font-matrix-translation.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/font-matrix-translation.argb32.ref.png similarity index 100% rename from cairo/test/reference/font-matrix-translation.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/font-matrix-translation.argb32.ref.png diff --git a/cairo/test/reference/font-matrix-translation.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/font-matrix-translation.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/font-matrix-translation.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/font-matrix-translation.base.argb32.ref.png diff --git a/cairo/test/reference/font-matrix-translation.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/font-matrix-translation.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/font-matrix-translation.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/font-matrix-translation.base.rgb24.ref.png diff --git a/cairo/test/reference/font-matrix-translation.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/font-matrix-translation.image16.ref.png similarity index 100% rename from cairo/test/reference/font-matrix-translation.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/font-matrix-translation.image16.ref.png diff --git a/cairo/test/reference/font-matrix-translation.ps2.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/font-matrix-translation.ps2.argb32.ref.png similarity index 100% rename from cairo/test/reference/font-matrix-translation.ps2.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/font-matrix-translation.ps2.argb32.ref.png diff --git a/cairo/test/reference/font-matrix-translation.ps2.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/font-matrix-translation.ps2.rgb24.ref.png similarity index 100% rename from cairo/test/reference/font-matrix-translation.ps2.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/font-matrix-translation.ps2.rgb24.ref.png diff --git a/cairo/test/reference/font-matrix-translation.ps3.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/font-matrix-translation.ps3.argb32.ref.png similarity index 100% rename from cairo/test/reference/font-matrix-translation.ps3.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/font-matrix-translation.ps3.argb32.ref.png diff --git a/cairo/test/reference/font-matrix-translation.ps3.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/font-matrix-translation.ps3.rgb24.ref.png similarity index 100% rename from cairo/test/reference/font-matrix-translation.ps3.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/font-matrix-translation.ps3.rgb24.ref.png diff --git a/cairo/test/reference/font-matrix-translation.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/font-matrix-translation.quartz.ref.png similarity index 100% rename from cairo/test/reference/font-matrix-translation.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/font-matrix-translation.quartz.ref.png diff --git a/cairo/test/reference/font-matrix-translation.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/font-matrix-translation.rgb24.ref.png similarity index 100% rename from cairo/test/reference/font-matrix-translation.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/font-matrix-translation.rgb24.ref.png diff --git a/cairo/test/reference/font-matrix-translation.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/font-matrix-translation.svg.ref.png similarity index 100% rename from cairo/test/reference/font-matrix-translation.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/font-matrix-translation.svg.ref.png diff --git a/cairo/test/reference/font-matrix-translation.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/font-matrix-translation.traps.ref.png similarity index 100% rename from cairo/test/reference/font-matrix-translation.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/font-matrix-translation.traps.ref.png diff --git a/cairo/test/reference/ft-show-glyphs-positioning.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-positioning.argb32.ref.png similarity index 100% rename from cairo/test/reference/ft-show-glyphs-positioning.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-positioning.argb32.ref.png diff --git a/cairo/test/reference/ft-show-glyphs-positioning.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-positioning.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/ft-show-glyphs-positioning.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-positioning.base.argb32.ref.png diff --git a/cairo/test/reference/ft-show-glyphs-positioning.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-positioning.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/ft-show-glyphs-positioning.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-positioning.base.rgb24.ref.png diff --git a/cairo/test/reference/ft-show-glyphs-positioning.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-positioning.image16.ref.png similarity index 100% rename from cairo/test/reference/ft-show-glyphs-positioning.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-positioning.image16.ref.png diff --git a/cairo/test/reference/ft-show-glyphs-positioning.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-positioning.pdf.ref.png similarity index 100% rename from cairo/test/reference/ft-show-glyphs-positioning.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-positioning.pdf.ref.png diff --git a/cairo/test/reference/ft-show-glyphs-positioning.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-positioning.ps2.ref.png similarity index 100% rename from cairo/test/reference/ft-show-glyphs-positioning.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-positioning.ps2.ref.png diff --git a/cairo/test/reference/ft-show-glyphs-positioning.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-positioning.ps3.ref.png similarity index 100% rename from cairo/test/reference/ft-show-glyphs-positioning.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-positioning.ps3.ref.png diff --git a/cairo/test/reference/ft-show-glyphs-positioning.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-positioning.rgb24.ref.png similarity index 100% rename from cairo/test/reference/ft-show-glyphs-positioning.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-positioning.rgb24.ref.png diff --git a/cairo/test/reference/ft-show-glyphs-positioning.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-positioning.svg.ref.png similarity index 100% rename from cairo/test/reference/ft-show-glyphs-positioning.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-positioning.svg.ref.png diff --git a/cairo/test/reference/ft-show-glyphs-positioning.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-positioning.traps.ref.png similarity index 100% rename from cairo/test/reference/ft-show-glyphs-positioning.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-positioning.traps.ref.png diff --git a/cairo/test/reference/ft-show-glyphs-table.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-table.argb32.ref.png similarity index 100% rename from cairo/test/reference/ft-show-glyphs-table.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-table.argb32.ref.png diff --git a/cairo/test/reference/ft-show-glyphs-table.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-table.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/ft-show-glyphs-table.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-table.base.argb32.ref.png diff --git a/cairo/test/reference/ft-show-glyphs-table.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-table.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/ft-show-glyphs-table.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-table.base.rgb24.ref.png diff --git a/cairo/test/reference/ft-show-glyphs-table.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-table.image16.ref.png similarity index 100% rename from cairo/test/reference/ft-show-glyphs-table.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-table.image16.ref.png diff --git a/cairo/test/reference/ft-show-glyphs-table.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-table.ps2.ref.png similarity index 100% rename from cairo/test/reference/ft-show-glyphs-table.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-table.ps2.ref.png diff --git a/cairo/test/reference/ft-show-glyphs-table.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-table.ps3.ref.png similarity index 100% rename from cairo/test/reference/ft-show-glyphs-table.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-table.ps3.ref.png diff --git a/cairo/test/reference/ft-show-glyphs-table.quartz.xfail.png b/io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-table.quartz.xfail.png similarity index 100% rename from cairo/test/reference/ft-show-glyphs-table.quartz.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-table.quartz.xfail.png diff --git a/cairo/test/reference/ft-show-glyphs-table.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-table.rgb24.ref.png similarity index 100% rename from cairo/test/reference/ft-show-glyphs-table.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-table.rgb24.ref.png diff --git a/cairo/test/reference/ft-show-glyphs-table.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-table.svg.ref.png similarity index 100% rename from cairo/test/reference/ft-show-glyphs-table.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-table.svg.ref.png diff --git a/cairo/test/reference/ft-show-glyphs-table.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-table.traps.ref.png similarity index 100% rename from cairo/test/reference/ft-show-glyphs-table.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-show-glyphs-table.traps.ref.png diff --git a/cairo/test/reference/ft-text-antialias-none.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-antialias-none.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/ft-text-antialias-none.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-antialias-none.base.argb32.ref.png diff --git a/cairo/test/reference/ft-text-antialias-none.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-antialias-none.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/ft-text-antialias-none.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-antialias-none.base.rgb24.ref.png diff --git a/cairo/test/reference/ft-text-antialias-none.ps2.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-antialias-none.ps2.argb32.ref.png similarity index 100% rename from cairo/test/reference/ft-text-antialias-none.ps2.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-antialias-none.ps2.argb32.ref.png diff --git a/cairo/test/reference/ft-text-antialias-none.ps3.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-antialias-none.ps3.argb32.ref.png similarity index 100% rename from cairo/test/reference/ft-text-antialias-none.ps3.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-antialias-none.ps3.argb32.ref.png diff --git a/cairo/test/reference/ft-text-antialias-none.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-antialias-none.ref.png similarity index 100% rename from cairo/test/reference/ft-text-antialias-none.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-antialias-none.ref.png diff --git a/cairo/test/reference/ft-text-vertical-layout-type1.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type1.argb32.ref.png similarity index 100% rename from cairo/test/reference/ft-text-vertical-layout-type1.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type1.argb32.ref.png diff --git a/cairo/test/reference/ft-text-vertical-layout-type1.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type1.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/ft-text-vertical-layout-type1.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type1.base.argb32.ref.png diff --git a/cairo/test/reference/ft-text-vertical-layout-type1.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type1.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/ft-text-vertical-layout-type1.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type1.base.rgb24.ref.png diff --git a/cairo/test/reference/ft-text-vertical-layout-type1.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type1.image16.ref.png similarity index 100% rename from cairo/test/reference/ft-text-vertical-layout-type1.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type1.image16.ref.png diff --git a/cairo/test/reference/ft-text-vertical-layout-type1.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type1.pdf.ref.png similarity index 100% rename from cairo/test/reference/ft-text-vertical-layout-type1.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type1.pdf.ref.png diff --git a/cairo/test/reference/ft-text-vertical-layout-type1.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type1.ps.ref.png similarity index 100% rename from cairo/test/reference/ft-text-vertical-layout-type1.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type1.ps.ref.png diff --git a/cairo/test/reference/ft-text-vertical-layout-type1.quartz.xfail.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type1.quartz.xfail.png similarity index 100% rename from cairo/test/reference/ft-text-vertical-layout-type1.quartz.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type1.quartz.xfail.png diff --git a/cairo/test/reference/ft-text-vertical-layout-type1.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type1.rgb24.ref.png similarity index 100% rename from cairo/test/reference/ft-text-vertical-layout-type1.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type1.rgb24.ref.png diff --git a/cairo/test/reference/ft-text-vertical-layout-type1.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type1.svg.ref.png similarity index 100% rename from cairo/test/reference/ft-text-vertical-layout-type1.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type1.svg.ref.png diff --git a/cairo/test/reference/ft-text-vertical-layout-type1.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type1.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/ft-text-vertical-layout-type1.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type1.traps.argb32.ref.png diff --git a/cairo/test/reference/ft-text-vertical-layout-type1.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type1.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/ft-text-vertical-layout-type1.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type1.traps.rgb24.ref.png diff --git a/cairo/test/reference/ft-text-vertical-layout-type1.xfail.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type1.xfail.png similarity index 100% rename from cairo/test/reference/ft-text-vertical-layout-type1.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type1.xfail.png diff --git a/cairo/test/reference/ft-text-vertical-layout-type3.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type3.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/ft-text-vertical-layout-type3.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type3.base.argb32.ref.png diff --git a/cairo/test/reference/ft-text-vertical-layout-type3.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type3.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/ft-text-vertical-layout-type3.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type3.base.rgb24.ref.png diff --git a/cairo/test/reference/ft-text-vertical-layout-type3.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type3.image16.ref.png similarity index 100% rename from cairo/test/reference/ft-text-vertical-layout-type3.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type3.image16.ref.png diff --git a/cairo/test/reference/ft-text-vertical-layout-type3.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type3.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/ft-text-vertical-layout-type3.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type3.mask.argb32.ref.png diff --git a/cairo/test/reference/ft-text-vertical-layout-type3.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type3.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/ft-text-vertical-layout-type3.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type3.mask.rgb24.ref.png diff --git a/cairo/test/reference/ft-text-vertical-layout-type3.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type3.pdf.ref.png similarity index 100% rename from cairo/test/reference/ft-text-vertical-layout-type3.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type3.pdf.ref.png diff --git a/cairo/test/reference/ft-text-vertical-layout-type3.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type3.ps.ref.png similarity index 100% rename from cairo/test/reference/ft-text-vertical-layout-type3.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type3.ps.ref.png diff --git a/cairo/test/reference/ft-text-vertical-layout-type3.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type3.quartz.ref.png similarity index 100% rename from cairo/test/reference/ft-text-vertical-layout-type3.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type3.quartz.ref.png diff --git a/cairo/test/reference/ft-text-vertical-layout-type3.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type3.ref.png similarity index 100% rename from cairo/test/reference/ft-text-vertical-layout-type3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type3.ref.png diff --git a/cairo/test/reference/ft-text-vertical-layout-type3.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type3.svg.ref.png similarity index 100% rename from cairo/test/reference/ft-text-vertical-layout-type3.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type3.svg.ref.png diff --git a/cairo/test/reference/ft-text-vertical-layout-type3.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type3.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/ft-text-vertical-layout-type3.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type3.traps.argb32.ref.png diff --git a/cairo/test/reference/ft-text-vertical-layout-type3.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type3.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/ft-text-vertical-layout-type3.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ft-text-vertical-layout-type3.traps.rgb24.ref.png diff --git a/cairo/test/reference/get-group-target.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/get-group-target.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/get-group-target.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/get-group-target.base.argb32.ref.png diff --git a/cairo/test/reference/get-group-target.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/get-group-target.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/get-group-target.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/get-group-target.base.rgb24.ref.png diff --git a/cairo/test/reference/get-group-target.ref.png b/io2d/src/3rd-party/cairo/test/reference/get-group-target.ref.png similarity index 100% rename from cairo/test/reference/get-group-target.ref.png rename to io2d/src/3rd-party/cairo/test/reference/get-group-target.ref.png diff --git a/cairo/test/reference/gl-surface-source.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/gl-surface-source.argb32.ref.png similarity index 100% rename from cairo/test/reference/gl-surface-source.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gl-surface-source.argb32.ref.png diff --git a/cairo/test/reference/gl-surface-source.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/gl-surface-source.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/gl-surface-source.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gl-surface-source.base.argb32.ref.png diff --git a/cairo/test/reference/gl-surface-source.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/gl-surface-source.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/gl-surface-source.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gl-surface-source.base.rgb24.ref.png diff --git a/cairo/test/reference/gl-surface-source.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/gl-surface-source.image16.ref.png similarity index 100% rename from cairo/test/reference/gl-surface-source.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gl-surface-source.image16.ref.png diff --git a/cairo/test/reference/gl-surface-source.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/gl-surface-source.rgb24.ref.png similarity index 100% rename from cairo/test/reference/gl-surface-source.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gl-surface-source.rgb24.ref.png diff --git a/cairo/test/reference/glyph-cache-pressure.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/glyph-cache-pressure.argb32.ref.png similarity index 100% rename from cairo/test/reference/glyph-cache-pressure.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/glyph-cache-pressure.argb32.ref.png diff --git a/cairo/test/reference/glyph-cache-pressure.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/glyph-cache-pressure.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/glyph-cache-pressure.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/glyph-cache-pressure.base.argb32.ref.png diff --git a/cairo/test/reference/glyph-cache-pressure.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/glyph-cache-pressure.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/glyph-cache-pressure.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/glyph-cache-pressure.base.rgb24.ref.png diff --git a/cairo/test/reference/glyph-cache-pressure.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/glyph-cache-pressure.image16.ref.png similarity index 100% rename from cairo/test/reference/glyph-cache-pressure.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/glyph-cache-pressure.image16.ref.png diff --git a/cairo/test/reference/glyph-cache-pressure.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/glyph-cache-pressure.ps2.ref.png similarity index 100% rename from cairo/test/reference/glyph-cache-pressure.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/glyph-cache-pressure.ps2.ref.png diff --git a/cairo/test/reference/glyph-cache-pressure.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/glyph-cache-pressure.ps3.ref.png similarity index 100% rename from cairo/test/reference/glyph-cache-pressure.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/glyph-cache-pressure.ps3.ref.png diff --git a/cairo/test/reference/glyph-cache-pressure.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/glyph-cache-pressure.quartz.ref.png similarity index 100% rename from cairo/test/reference/glyph-cache-pressure.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/glyph-cache-pressure.quartz.ref.png diff --git a/cairo/test/reference/glyph-cache-pressure.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/glyph-cache-pressure.rgb24.ref.png similarity index 100% rename from cairo/test/reference/glyph-cache-pressure.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/glyph-cache-pressure.rgb24.ref.png diff --git a/cairo/test/reference/glyph-cache-pressure.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/glyph-cache-pressure.traps.ref.png similarity index 100% rename from cairo/test/reference/glyph-cache-pressure.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/glyph-cache-pressure.traps.ref.png diff --git a/cairo/test/reference/gradient-alpha.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/gradient-alpha.argb32.ref.png similarity index 100% rename from cairo/test/reference/gradient-alpha.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gradient-alpha.argb32.ref.png diff --git a/cairo/test/reference/gradient-alpha.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/gradient-alpha.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/gradient-alpha.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gradient-alpha.base.argb32.ref.png diff --git a/cairo/test/reference/gradient-alpha.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/gradient-alpha.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/gradient-alpha.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gradient-alpha.base.rgb24.ref.png diff --git a/cairo/test/reference/gradient-alpha.ps2.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/gradient-alpha.ps2.argb32.ref.png similarity index 100% rename from cairo/test/reference/gradient-alpha.ps2.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gradient-alpha.ps2.argb32.ref.png diff --git a/cairo/test/reference/gradient-alpha.ps2.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/gradient-alpha.ps2.rgb24.ref.png similarity index 100% rename from cairo/test/reference/gradient-alpha.ps2.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gradient-alpha.ps2.rgb24.ref.png diff --git a/cairo/test/reference/gradient-alpha.ps3.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/gradient-alpha.ps3.argb32.ref.png similarity index 100% rename from cairo/test/reference/gradient-alpha.ps3.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gradient-alpha.ps3.argb32.ref.png diff --git a/cairo/test/reference/gradient-alpha.ps3.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/gradient-alpha.ps3.rgb24.ref.png similarity index 100% rename from cairo/test/reference/gradient-alpha.ps3.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gradient-alpha.ps3.rgb24.ref.png diff --git a/cairo/test/reference/gradient-alpha.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/gradient-alpha.rgb24.ref.png similarity index 100% rename from cairo/test/reference/gradient-alpha.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gradient-alpha.rgb24.ref.png diff --git a/cairo/test/reference/gradient-constant-alpha.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/gradient-constant-alpha.argb32.ref.png similarity index 100% rename from cairo/test/reference/gradient-constant-alpha.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gradient-constant-alpha.argb32.ref.png diff --git a/cairo/test/reference/gradient-constant-alpha.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/gradient-constant-alpha.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/gradient-constant-alpha.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gradient-constant-alpha.base.argb32.ref.png diff --git a/cairo/test/reference/gradient-constant-alpha.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/gradient-constant-alpha.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/gradient-constant-alpha.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gradient-constant-alpha.base.rgb24.ref.png diff --git a/cairo/test/reference/gradient-constant-alpha.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/gradient-constant-alpha.ps3.ref.png similarity index 100% rename from cairo/test/reference/gradient-constant-alpha.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gradient-constant-alpha.ps3.ref.png diff --git a/cairo/test/reference/gradient-constant-alpha.ps3.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/gradient-constant-alpha.ps3.rgb24.ref.png similarity index 100% rename from cairo/test/reference/gradient-constant-alpha.ps3.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gradient-constant-alpha.ps3.rgb24.ref.png diff --git a/cairo/test/reference/gradient-constant-alpha.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/gradient-constant-alpha.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/gradient-constant-alpha.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gradient-constant-alpha.quartz.argb32.ref.png diff --git a/cairo/test/reference/gradient-constant-alpha.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/gradient-constant-alpha.rgb24.ref.png similarity index 100% rename from cairo/test/reference/gradient-constant-alpha.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gradient-constant-alpha.rgb24.ref.png diff --git a/cairo/test/reference/gradient-zero-stops-mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/gradient-zero-stops-mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/gradient-zero-stops-mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gradient-zero-stops-mask.argb32.ref.png diff --git a/cairo/test/reference/gradient-zero-stops-mask.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/gradient-zero-stops-mask.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/gradient-zero-stops-mask.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gradient-zero-stops-mask.base.argb32.ref.png diff --git a/cairo/test/reference/gradient-zero-stops-mask.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/gradient-zero-stops-mask.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/gradient-zero-stops-mask.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gradient-zero-stops-mask.base.rgb24.ref.png diff --git a/cairo/test/reference/gradient-zero-stops-mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/gradient-zero-stops-mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/gradient-zero-stops-mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gradient-zero-stops-mask.rgb24.ref.png diff --git a/cairo/test/reference/gradient-zero-stops.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/gradient-zero-stops.argb32.ref.png similarity index 100% rename from cairo/test/reference/gradient-zero-stops.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gradient-zero-stops.argb32.ref.png diff --git a/cairo/test/reference/gradient-zero-stops.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/gradient-zero-stops.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/gradient-zero-stops.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gradient-zero-stops.base.argb32.ref.png diff --git a/cairo/test/reference/gradient-zero-stops.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/gradient-zero-stops.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/gradient-zero-stops.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gradient-zero-stops.base.rgb24.ref.png diff --git a/cairo/test/reference/gradient-zero-stops.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/gradient-zero-stops.rgb24.ref.png similarity index 100% rename from cairo/test/reference/gradient-zero-stops.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/gradient-zero-stops.rgb24.ref.png diff --git a/cairo/test/reference/group-clip.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/group-clip.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/group-clip.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/group-clip.base.argb32.ref.png diff --git a/cairo/test/reference/group-clip.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/group-clip.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/group-clip.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/group-clip.base.rgb24.ref.png diff --git a/cairo/test/reference/group-clip.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/group-clip.image16.ref.png similarity index 100% rename from cairo/test/reference/group-clip.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/group-clip.image16.ref.png diff --git a/cairo/test/reference/group-clip.ref.png b/io2d/src/3rd-party/cairo/test/reference/group-clip.ref.png similarity index 100% rename from cairo/test/reference/group-clip.ref.png rename to io2d/src/3rd-party/cairo/test/reference/group-clip.ref.png diff --git a/cairo/test/reference/group-paint.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/group-paint.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/group-paint.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/group-paint.base.argb32.ref.png diff --git a/cairo/test/reference/group-paint.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/group-paint.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/group-paint.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/group-paint.base.rgb24.ref.png diff --git a/cairo/test/reference/group-paint.ref.png b/io2d/src/3rd-party/cairo/test/reference/group-paint.ref.png similarity index 100% rename from cairo/test/reference/group-paint.ref.png rename to io2d/src/3rd-party/cairo/test/reference/group-paint.ref.png diff --git a/cairo/test/reference/group-unaligned.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/group-unaligned.argb32.ref.png similarity index 100% rename from cairo/test/reference/group-unaligned.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/group-unaligned.argb32.ref.png diff --git a/cairo/test/reference/group-unaligned.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/group-unaligned.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/group-unaligned.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/group-unaligned.base.argb32.ref.png diff --git a/cairo/test/reference/group-unaligned.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/group-unaligned.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/group-unaligned.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/group-unaligned.base.rgb24.ref.png diff --git a/cairo/test/reference/group-unaligned.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/group-unaligned.image16.ref.png similarity index 100% rename from cairo/test/reference/group-unaligned.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/group-unaligned.image16.ref.png diff --git a/cairo/test/reference/group-unaligned.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/group-unaligned.ps.ref.png similarity index 100% rename from cairo/test/reference/group-unaligned.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/group-unaligned.ps.ref.png diff --git a/cairo/test/reference/group-unaligned.ps.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/group-unaligned.ps.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/group-unaligned.ps.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/group-unaligned.ps.rgb24.xfail.png diff --git a/cairo/test/reference/group-unaligned.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/group-unaligned.quartz.ref.png similarity index 100% rename from cairo/test/reference/group-unaligned.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/group-unaligned.quartz.ref.png diff --git a/cairo/test/reference/group-unaligned.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/group-unaligned.rgb24.ref.png similarity index 100% rename from cairo/test/reference/group-unaligned.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/group-unaligned.rgb24.ref.png diff --git a/cairo/test/reference/group-unaligned.svg.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/group-unaligned.svg.argb32.xfail.png similarity index 100% rename from cairo/test/reference/group-unaligned.svg.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/group-unaligned.svg.argb32.xfail.png diff --git a/cairo/test/reference/group-unaligned.svg.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/group-unaligned.svg.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/group-unaligned.svg.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/group-unaligned.svg.rgb24.xfail.png diff --git a/cairo/test/reference/group-unaligned.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/group-unaligned.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/group-unaligned.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/group-unaligned.traps.argb32.ref.png diff --git a/cairo/test/reference/group-unaligned.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/group-unaligned.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/group-unaligned.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/group-unaligned.traps.rgb24.ref.png diff --git a/cairo/test/reference/group-unaligned.xlib-fallback.ref.png b/io2d/src/3rd-party/cairo/test/reference/group-unaligned.xlib-fallback.ref.png similarity index 100% rename from cairo/test/reference/group-unaligned.xlib-fallback.ref.png rename to io2d/src/3rd-party/cairo/test/reference/group-unaligned.xlib-fallback.ref.png diff --git a/cairo/test/reference/halo-transform.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/halo-transform.argb32.ref.png similarity index 100% rename from cairo/test/reference/halo-transform.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/halo-transform.argb32.ref.png diff --git a/cairo/test/reference/halo-transform.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/halo-transform.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/halo-transform.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/halo-transform.base.argb32.ref.png diff --git a/cairo/test/reference/halo-transform.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/halo-transform.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/halo-transform.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/halo-transform.base.rgb24.ref.png diff --git a/cairo/test/reference/halo-transform.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/halo-transform.image16.ref.png similarity index 100% rename from cairo/test/reference/halo-transform.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/halo-transform.image16.ref.png diff --git a/cairo/test/reference/halo-transform.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/halo-transform.ps.ref.png similarity index 100% rename from cairo/test/reference/halo-transform.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/halo-transform.ps.ref.png diff --git a/cairo/test/reference/halo-transform.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/halo-transform.quartz.ref.png similarity index 100% rename from cairo/test/reference/halo-transform.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/halo-transform.quartz.ref.png diff --git a/cairo/test/reference/halo-transform.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/halo-transform.rgb24.ref.png similarity index 100% rename from cairo/test/reference/halo-transform.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/halo-transform.rgb24.ref.png diff --git a/cairo/test/reference/halo-transform.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/halo-transform.traps.ref.png similarity index 100% rename from cairo/test/reference/halo-transform.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/halo-transform.traps.ref.png diff --git a/cairo/test/reference/halo.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/halo.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/halo.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/halo.base.argb32.ref.png diff --git a/cairo/test/reference/halo.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/halo.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/halo.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/halo.base.rgb24.ref.png diff --git a/cairo/test/reference/halo.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/halo.image16.ref.png similarity index 100% rename from cairo/test/reference/halo.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/halo.image16.ref.png diff --git a/cairo/test/reference/halo.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/halo.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/halo.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/halo.mask.argb32.ref.png diff --git a/cairo/test/reference/halo.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/halo.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/halo.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/halo.mask.rgb24.ref.png diff --git a/cairo/test/reference/halo.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/halo.ps.ref.png similarity index 100% rename from cairo/test/reference/halo.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/halo.ps.ref.png diff --git a/cairo/test/reference/halo.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/halo.quartz.ref.png similarity index 100% rename from cairo/test/reference/halo.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/halo.quartz.ref.png diff --git a/cairo/test/reference/halo.ref.png b/io2d/src/3rd-party/cairo/test/reference/halo.ref.png similarity index 100% rename from cairo/test/reference/halo.ref.png rename to io2d/src/3rd-party/cairo/test/reference/halo.ref.png diff --git a/cairo/test/reference/halo.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/halo.traps.ref.png similarity index 100% rename from cairo/test/reference/halo.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/halo.traps.ref.png diff --git a/cairo/test/reference/hatchings.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/hatchings.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/hatchings.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/hatchings.base.argb32.ref.png diff --git a/cairo/test/reference/hatchings.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/hatchings.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/hatchings.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/hatchings.base.rgb24.ref.png diff --git a/cairo/test/reference/hatchings.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/hatchings.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/hatchings.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/hatchings.mask.argb32.ref.png diff --git a/cairo/test/reference/hatchings.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/hatchings.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/hatchings.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/hatchings.mask.rgb24.ref.png diff --git a/cairo/test/reference/hatchings.ref.png b/io2d/src/3rd-party/cairo/test/reference/hatchings.ref.png similarity index 100% rename from cairo/test/reference/hatchings.ref.png rename to io2d/src/3rd-party/cairo/test/reference/hatchings.ref.png diff --git a/cairo/test/reference/hatchings.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/hatchings.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/hatchings.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/hatchings.traps.argb32.ref.png diff --git a/cairo/test/reference/hatchings.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/hatchings.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/hatchings.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/hatchings.traps.rgb24.ref.png diff --git a/cairo/test/reference/horizontal-clip.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/horizontal-clip.argb32.ref.png similarity index 100% rename from cairo/test/reference/horizontal-clip.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/horizontal-clip.argb32.ref.png diff --git a/cairo/test/reference/horizontal-clip.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/horizontal-clip.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/horizontal-clip.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/horizontal-clip.base.argb32.ref.png diff --git a/cairo/test/reference/horizontal-clip.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/horizontal-clip.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/horizontal-clip.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/horizontal-clip.base.rgb24.ref.png diff --git a/cairo/test/reference/horizontal-clip.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/horizontal-clip.rgb24.ref.png similarity index 100% rename from cairo/test/reference/horizontal-clip.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/horizontal-clip.rgb24.ref.png diff --git a/cairo/test/reference/huge-linear.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/huge-linear.argb32.ref.png similarity index 100% rename from cairo/test/reference/huge-linear.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/huge-linear.argb32.ref.png diff --git a/cairo/test/reference/huge-linear.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/huge-linear.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/huge-linear.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/huge-linear.base.argb32.ref.png diff --git a/cairo/test/reference/huge-linear.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/huge-linear.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/huge-linear.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/huge-linear.base.rgb24.ref.png diff --git a/cairo/test/reference/huge-linear.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/huge-linear.image16.ref.png similarity index 100% rename from cairo/test/reference/huge-linear.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/huge-linear.image16.ref.png diff --git a/cairo/test/reference/huge-linear.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/huge-linear.pdf.ref.png similarity index 100% rename from cairo/test/reference/huge-linear.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/huge-linear.pdf.ref.png diff --git a/cairo/test/reference/huge-linear.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/huge-linear.ps3.ref.png similarity index 100% rename from cairo/test/reference/huge-linear.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/huge-linear.ps3.ref.png diff --git a/cairo/test/reference/huge-linear.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/huge-linear.quartz.ref.png similarity index 100% rename from cairo/test/reference/huge-linear.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/huge-linear.quartz.ref.png diff --git a/cairo/test/reference/huge-linear.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/huge-linear.rgb24.ref.png similarity index 100% rename from cairo/test/reference/huge-linear.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/huge-linear.rgb24.ref.png diff --git a/cairo/test/reference/huge-radial.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/huge-radial.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/huge-radial.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/huge-radial.base.argb32.ref.png diff --git a/cairo/test/reference/huge-radial.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/huge-radial.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/huge-radial.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/huge-radial.base.rgb24.ref.png diff --git a/cairo/test/reference/huge-radial.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/huge-radial.image16.ref.png similarity index 100% rename from cairo/test/reference/huge-radial.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/huge-radial.image16.ref.png diff --git a/cairo/test/reference/huge-radial.pdf.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/huge-radial.pdf.argb32.ref.png similarity index 100% rename from cairo/test/reference/huge-radial.pdf.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/huge-radial.pdf.argb32.ref.png diff --git a/cairo/test/reference/huge-radial.pdf.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/huge-radial.pdf.rgb24.ref.png similarity index 100% rename from cairo/test/reference/huge-radial.pdf.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/huge-radial.pdf.rgb24.ref.png diff --git a/cairo/test/reference/huge-radial.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/huge-radial.ps3.ref.png similarity index 100% rename from cairo/test/reference/huge-radial.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/huge-radial.ps3.ref.png diff --git a/cairo/test/reference/huge-radial.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/huge-radial.quartz.ref.png similarity index 100% rename from cairo/test/reference/huge-radial.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/huge-radial.quartz.ref.png diff --git a/cairo/test/reference/huge-radial.ref.png b/io2d/src/3rd-party/cairo/test/reference/huge-radial.ref.png similarity index 100% rename from cairo/test/reference/huge-radial.ref.png rename to io2d/src/3rd-party/cairo/test/reference/huge-radial.ref.png diff --git a/cairo/test/reference/image-bug-710072-aligned.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/image-bug-710072-aligned.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/image-bug-710072-aligned.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/image-bug-710072-aligned.base.argb32.ref.png diff --git a/cairo/test/reference/image-bug-710072-aligned.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/image-bug-710072-aligned.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/image-bug-710072-aligned.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/image-bug-710072-aligned.base.rgb24.ref.png diff --git a/cairo/test/reference/image-bug-710072-aligned.ref.png b/io2d/src/3rd-party/cairo/test/reference/image-bug-710072-aligned.ref.png similarity index 100% rename from cairo/test/reference/image-bug-710072-aligned.ref.png rename to io2d/src/3rd-party/cairo/test/reference/image-bug-710072-aligned.ref.png diff --git a/cairo/test/reference/image-bug-710072-unaligned.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/image-bug-710072-unaligned.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/image-bug-710072-unaligned.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/image-bug-710072-unaligned.base.argb32.ref.png diff --git a/cairo/test/reference/image-bug-710072-unaligned.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/image-bug-710072-unaligned.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/image-bug-710072-unaligned.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/image-bug-710072-unaligned.base.rgb24.ref.png diff --git a/cairo/test/reference/image-bug-710072-unaligned.ref.png b/io2d/src/3rd-party/cairo/test/reference/image-bug-710072-unaligned.ref.png similarity index 100% rename from cairo/test/reference/image-bug-710072-unaligned.ref.png rename to io2d/src/3rd-party/cairo/test/reference/image-bug-710072-unaligned.ref.png diff --git a/cairo/test/reference/image-bug-710072-unaligned.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/image-bug-710072-unaligned.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/image-bug-710072-unaligned.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/image-bug-710072-unaligned.traps.argb32.ref.png diff --git a/cairo/test/reference/image-bug-710072-unaligned.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/image-bug-710072-unaligned.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/image-bug-710072-unaligned.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/image-bug-710072-unaligned.traps.rgb24.ref.png diff --git a/cairo/test/reference/image-bug-710072-unaligned.xlib-fallback.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/image-bug-710072-unaligned.xlib-fallback.rgb24.ref.png similarity index 100% rename from cairo/test/reference/image-bug-710072-unaligned.xlib-fallback.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/image-bug-710072-unaligned.xlib-fallback.rgb24.ref.png diff --git a/cairo/test/reference/image-bug-710072-unaligned.xlib-window.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/image-bug-710072-unaligned.xlib-window.rgb24.ref.png similarity index 100% rename from cairo/test/reference/image-bug-710072-unaligned.xlib-window.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/image-bug-710072-unaligned.xlib-window.rgb24.ref.png diff --git a/cairo/test/reference/image-surface-source.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/image-surface-source.argb32.ref.png similarity index 100% rename from cairo/test/reference/image-surface-source.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/image-surface-source.argb32.ref.png diff --git a/cairo/test/reference/image-surface-source.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/image-surface-source.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/image-surface-source.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/image-surface-source.base.argb32.ref.png diff --git a/cairo/test/reference/image-surface-source.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/image-surface-source.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/image-surface-source.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/image-surface-source.base.rgb24.ref.png diff --git a/cairo/test/reference/image-surface-source.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/image-surface-source.image16.ref.png similarity index 100% rename from cairo/test/reference/image-surface-source.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/image-surface-source.image16.ref.png diff --git a/cairo/test/reference/image-surface-source.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/image-surface-source.ps2.ref.png similarity index 100% rename from cairo/test/reference/image-surface-source.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/image-surface-source.ps2.ref.png diff --git a/cairo/test/reference/image-surface-source.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/image-surface-source.ps3.ref.png similarity index 100% rename from cairo/test/reference/image-surface-source.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/image-surface-source.ps3.ref.png diff --git a/cairo/test/reference/image-surface-source.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/image-surface-source.rgb24.ref.png similarity index 100% rename from cairo/test/reference/image-surface-source.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/image-surface-source.rgb24.ref.png diff --git a/cairo/test/reference/image-surface-source.svg12.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/image-surface-source.svg12.argb32.xfail.png similarity index 100% rename from cairo/test/reference/image-surface-source.svg12.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/image-surface-source.svg12.argb32.xfail.png diff --git a/cairo/test/reference/image-surface-source.svg12.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/image-surface-source.svg12.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/image-surface-source.svg12.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/image-surface-source.svg12.rgb24.xfail.png diff --git a/cairo/test/reference/implicit-close.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/implicit-close.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/implicit-close.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/implicit-close.base.argb32.ref.png diff --git a/cairo/test/reference/implicit-close.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/implicit-close.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/implicit-close.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/implicit-close.base.rgb24.ref.png diff --git a/cairo/test/reference/implicit-close.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/implicit-close.ps.ref.png similarity index 100% rename from cairo/test/reference/implicit-close.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/implicit-close.ps.ref.png diff --git a/cairo/test/reference/implicit-close.ref.png b/io2d/src/3rd-party/cairo/test/reference/implicit-close.ref.png similarity index 100% rename from cairo/test/reference/implicit-close.ref.png rename to io2d/src/3rd-party/cairo/test/reference/implicit-close.ref.png diff --git a/cairo/test/reference/implicit-close.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/implicit-close.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/implicit-close.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/implicit-close.traps.argb32.ref.png diff --git a/cairo/test/reference/implicit-close.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/implicit-close.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/implicit-close.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/implicit-close.traps.rgb24.ref.png diff --git a/cairo/test/reference/infinite-join.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/infinite-join.argb32.ref.png similarity index 100% rename from cairo/test/reference/infinite-join.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/infinite-join.argb32.ref.png diff --git a/cairo/test/reference/infinite-join.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/infinite-join.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/infinite-join.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/infinite-join.base.argb32.ref.png diff --git a/cairo/test/reference/infinite-join.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/infinite-join.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/infinite-join.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/infinite-join.base.rgb24.ref.png diff --git a/cairo/test/reference/infinite-join.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/infinite-join.ps2.ref.png similarity index 100% rename from cairo/test/reference/infinite-join.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/infinite-join.ps2.ref.png diff --git a/cairo/test/reference/infinite-join.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/infinite-join.ps3.ref.png similarity index 100% rename from cairo/test/reference/infinite-join.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/infinite-join.ps3.ref.png diff --git a/cairo/test/reference/infinite-join.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/infinite-join.rgb24.ref.png similarity index 100% rename from cairo/test/reference/infinite-join.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/infinite-join.rgb24.ref.png diff --git a/cairo/test/reference/infinite-join.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/infinite-join.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/infinite-join.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/infinite-join.traps.argb32.ref.png diff --git a/cairo/test/reference/infinite-join.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/infinite-join.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/infinite-join.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/infinite-join.traps.rgb24.ref.png diff --git a/cairo/test/reference/inverse-text.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/inverse-text.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/inverse-text.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/inverse-text.base.argb32.ref.png diff --git a/cairo/test/reference/inverse-text.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/inverse-text.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/inverse-text.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/inverse-text.base.rgb24.ref.png diff --git a/cairo/test/reference/inverse-text.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/inverse-text.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/inverse-text.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/inverse-text.mask.argb32.ref.png diff --git a/cairo/test/reference/inverse-text.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/inverse-text.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/inverse-text.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/inverse-text.mask.rgb24.ref.png diff --git a/cairo/test/reference/inverse-text.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/inverse-text.traps.ref.png similarity index 100% rename from cairo/test/reference/inverse-text.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/inverse-text.traps.ref.png diff --git a/cairo/test/reference/inverted-clip.base.xfail.png b/io2d/src/3rd-party/cairo/test/reference/inverted-clip.base.xfail.png similarity index 100% rename from cairo/test/reference/inverted-clip.base.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/inverted-clip.base.xfail.png diff --git a/cairo/test/reference/inverted-clip.traps.xfail.png b/io2d/src/3rd-party/cairo/test/reference/inverted-clip.traps.xfail.png similarity index 100% rename from cairo/test/reference/inverted-clip.traps.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/inverted-clip.traps.xfail.png diff --git a/cairo/test/reference/inverted-clip.xfail.png b/io2d/src/3rd-party/cairo/test/reference/inverted-clip.xfail.png similarity index 100% rename from cairo/test/reference/inverted-clip.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/inverted-clip.xfail.png diff --git a/cairo/test/reference/joins-loop.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins-loop.argb32.ref.png similarity index 100% rename from cairo/test/reference/joins-loop.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins-loop.argb32.ref.png diff --git a/cairo/test/reference/joins-loop.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins-loop.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/joins-loop.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins-loop.base.argb32.ref.png diff --git a/cairo/test/reference/joins-loop.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins-loop.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/joins-loop.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins-loop.base.rgb24.ref.png diff --git a/cairo/test/reference/joins-loop.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins-loop.rgb24.ref.png similarity index 100% rename from cairo/test/reference/joins-loop.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins-loop.rgb24.ref.png diff --git a/cairo/test/reference/joins-loop.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins-loop.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/joins-loop.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins-loop.traps.argb32.ref.png diff --git a/cairo/test/reference/joins-loop.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins-loop.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/joins-loop.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins-loop.traps.rgb24.ref.png diff --git a/cairo/test/reference/joins-retrace.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins-retrace.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/joins-retrace.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins-retrace.base.argb32.ref.png diff --git a/cairo/test/reference/joins-retrace.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins-retrace.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/joins-retrace.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins-retrace.base.rgb24.ref.png diff --git a/cairo/test/reference/joins-retrace.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins-retrace.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/joins-retrace.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins-retrace.mask.argb32.ref.png diff --git a/cairo/test/reference/joins-retrace.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins-retrace.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/joins-retrace.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins-retrace.mask.rgb24.ref.png diff --git a/cairo/test/reference/joins-retrace.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins-retrace.ref.png similarity index 100% rename from cairo/test/reference/joins-retrace.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins-retrace.ref.png diff --git a/cairo/test/reference/joins-retrace.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins-retrace.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/joins-retrace.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins-retrace.traps.argb32.ref.png diff --git a/cairo/test/reference/joins-retrace.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins-retrace.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/joins-retrace.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins-retrace.traps.rgb24.ref.png diff --git a/cairo/test/reference/joins-star.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins-star.argb32.ref.png similarity index 100% rename from cairo/test/reference/joins-star.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins-star.argb32.ref.png diff --git a/cairo/test/reference/joins-star.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins-star.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/joins-star.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins-star.base.argb32.ref.png diff --git a/cairo/test/reference/joins-star.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins-star.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/joins-star.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins-star.base.rgb24.ref.png diff --git a/cairo/test/reference/joins-star.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins-star.rgb24.ref.png similarity index 100% rename from cairo/test/reference/joins-star.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins-star.rgb24.ref.png diff --git a/cairo/test/reference/joins-star.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins-star.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/joins-star.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins-star.traps.argb32.ref.png diff --git a/cairo/test/reference/joins-star.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins-star.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/joins-star.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins-star.traps.rgb24.ref.png diff --git a/cairo/test/reference/joins.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/joins.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins.base.argb32.ref.png diff --git a/cairo/test/reference/joins.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/joins.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins.base.rgb24.ref.png diff --git a/cairo/test/reference/joins.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins.image16.ref.png similarity index 100% rename from cairo/test/reference/joins.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins.image16.ref.png diff --git a/cairo/test/reference/joins.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/joins.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins.mask.argb32.ref.png diff --git a/cairo/test/reference/joins.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/joins.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins.mask.rgb24.ref.png diff --git a/cairo/test/reference/joins.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins.ps.ref.png similarity index 100% rename from cairo/test/reference/joins.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins.ps.ref.png diff --git a/cairo/test/reference/joins.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins.quartz.ref.png similarity index 100% rename from cairo/test/reference/joins.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins.quartz.ref.png diff --git a/cairo/test/reference/joins.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins.ref.png similarity index 100% rename from cairo/test/reference/joins.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins.ref.png diff --git a/cairo/test/reference/joins.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/joins.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins.traps.argb32.ref.png diff --git a/cairo/test/reference/joins.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/joins.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/joins.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/joins.traps.rgb24.ref.png diff --git a/cairo/test/reference/large-clip.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/large-clip.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/large-clip.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/large-clip.base.argb32.ref.png diff --git a/cairo/test/reference/large-clip.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/large-clip.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/large-clip.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/large-clip.base.rgb24.ref.png diff --git a/cairo/test/reference/large-clip.ref.png b/io2d/src/3rd-party/cairo/test/reference/large-clip.ref.png similarity index 100% rename from cairo/test/reference/large-clip.ref.png rename to io2d/src/3rd-party/cairo/test/reference/large-clip.ref.png diff --git a/cairo/test/reference/large-font.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/large-font.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/large-font.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/large-font.base.argb32.ref.png diff --git a/cairo/test/reference/large-font.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/large-font.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/large-font.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/large-font.base.rgb24.ref.png diff --git a/cairo/test/reference/large-font.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/large-font.image16.ref.png similarity index 100% rename from cairo/test/reference/large-font.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/large-font.image16.ref.png diff --git a/cairo/test/reference/large-font.ref.png b/io2d/src/3rd-party/cairo/test/reference/large-font.ref.png similarity index 100% rename from cairo/test/reference/large-font.ref.png rename to io2d/src/3rd-party/cairo/test/reference/large-font.ref.png diff --git a/cairo/test/reference/large-source-roi.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/large-source-roi.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/large-source-roi.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/large-source-roi.base.argb32.ref.png diff --git a/cairo/test/reference/large-source-roi.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/large-source-roi.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/large-source-roi.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/large-source-roi.base.rgb24.ref.png diff --git a/cairo/test/reference/large-source-roi.ref.png b/io2d/src/3rd-party/cairo/test/reference/large-source-roi.ref.png similarity index 100% rename from cairo/test/reference/large-source-roi.ref.png rename to io2d/src/3rd-party/cairo/test/reference/large-source-roi.ref.png diff --git a/cairo/test/reference/large-source.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/large-source.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/large-source.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/large-source.base.argb32.ref.png diff --git a/cairo/test/reference/large-source.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/large-source.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/large-source.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/large-source.base.rgb24.ref.png diff --git a/cairo/test/reference/large-source.ref.png b/io2d/src/3rd-party/cairo/test/reference/large-source.ref.png similarity index 100% rename from cairo/test/reference/large-source.ref.png rename to io2d/src/3rd-party/cairo/test/reference/large-source.ref.png diff --git a/cairo/test/reference/large-twin-antialias-mixed.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/large-twin-antialias-mixed.argb32.ref.png similarity index 100% rename from cairo/test/reference/large-twin-antialias-mixed.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/large-twin-antialias-mixed.argb32.ref.png diff --git a/cairo/test/reference/large-twin-antialias-mixed.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/large-twin-antialias-mixed.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/large-twin-antialias-mixed.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/large-twin-antialias-mixed.base.argb32.ref.png diff --git a/cairo/test/reference/large-twin-antialias-mixed.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/large-twin-antialias-mixed.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/large-twin-antialias-mixed.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/large-twin-antialias-mixed.base.rgb24.ref.png diff --git a/cairo/test/reference/large-twin-antialias-mixed.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/large-twin-antialias-mixed.image16.ref.png similarity index 100% rename from cairo/test/reference/large-twin-antialias-mixed.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/large-twin-antialias-mixed.image16.ref.png diff --git a/cairo/test/reference/large-twin-antialias-mixed.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/large-twin-antialias-mixed.rgb24.ref.png similarity index 100% rename from cairo/test/reference/large-twin-antialias-mixed.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/large-twin-antialias-mixed.rgb24.ref.png diff --git a/cairo/test/reference/large-twin-antialias-mixed.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/large-twin-antialias-mixed.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/large-twin-antialias-mixed.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/large-twin-antialias-mixed.traps.argb32.ref.png diff --git a/cairo/test/reference/large-twin-antialias-mixed.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/large-twin-antialias-mixed.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/large-twin-antialias-mixed.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/large-twin-antialias-mixed.traps.rgb24.ref.png diff --git a/cairo/test/reference/leaky-dash.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dash.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/leaky-dash.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dash.base.argb32.ref.png diff --git a/cairo/test/reference/leaky-dash.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dash.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/leaky-dash.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dash.base.rgb24.ref.png diff --git a/cairo/test/reference/leaky-dash.ps2.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dash.ps2.argb32.ref.png similarity index 100% rename from cairo/test/reference/leaky-dash.ps2.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dash.ps2.argb32.ref.png diff --git a/cairo/test/reference/leaky-dash.ps2.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dash.ps2.rgb24.ref.png similarity index 100% rename from cairo/test/reference/leaky-dash.ps2.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dash.ps2.rgb24.ref.png diff --git a/cairo/test/reference/leaky-dash.ps3.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dash.ps3.argb32.ref.png similarity index 100% rename from cairo/test/reference/leaky-dash.ps3.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dash.ps3.argb32.ref.png diff --git a/cairo/test/reference/leaky-dash.ps3.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dash.ps3.rgb24.ref.png similarity index 100% rename from cairo/test/reference/leaky-dash.ps3.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dash.ps3.rgb24.ref.png diff --git a/cairo/test/reference/leaky-dash.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dash.quartz.ref.png similarity index 100% rename from cairo/test/reference/leaky-dash.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dash.quartz.ref.png diff --git a/cairo/test/reference/leaky-dash.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dash.ref.png similarity index 100% rename from cairo/test/reference/leaky-dash.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dash.ref.png diff --git a/cairo/test/reference/leaky-dashed-rectangle.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dashed-rectangle.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/leaky-dashed-rectangle.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dashed-rectangle.base.argb32.ref.png diff --git a/cairo/test/reference/leaky-dashed-rectangle.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dashed-rectangle.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/leaky-dashed-rectangle.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dashed-rectangle.base.rgb24.ref.png diff --git a/cairo/test/reference/leaky-dashed-rectangle.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dashed-rectangle.image16.ref.png similarity index 100% rename from cairo/test/reference/leaky-dashed-rectangle.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dashed-rectangle.image16.ref.png diff --git a/cairo/test/reference/leaky-dashed-rectangle.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dashed-rectangle.pdf.ref.png similarity index 100% rename from cairo/test/reference/leaky-dashed-rectangle.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dashed-rectangle.pdf.ref.png diff --git a/cairo/test/reference/leaky-dashed-rectangle.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dashed-rectangle.ps.ref.png similarity index 100% rename from cairo/test/reference/leaky-dashed-rectangle.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dashed-rectangle.ps.ref.png diff --git a/cairo/test/reference/leaky-dashed-rectangle.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dashed-rectangle.quartz.ref.png similarity index 100% rename from cairo/test/reference/leaky-dashed-rectangle.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dashed-rectangle.quartz.ref.png diff --git a/cairo/test/reference/leaky-dashed-rectangle.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dashed-rectangle.ref.png similarity index 100% rename from cairo/test/reference/leaky-dashed-rectangle.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dashed-rectangle.ref.png diff --git a/cairo/test/reference/leaky-dashed-rectangle.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dashed-rectangle.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/leaky-dashed-rectangle.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dashed-rectangle.traps.argb32.ref.png diff --git a/cairo/test/reference/leaky-dashed-rectangle.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dashed-rectangle.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/leaky-dashed-rectangle.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dashed-rectangle.traps.rgb24.ref.png diff --git a/cairo/test/reference/leaky-dashed-stroke.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dashed-stroke.argb32.ref.png similarity index 100% rename from cairo/test/reference/leaky-dashed-stroke.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dashed-stroke.argb32.ref.png diff --git a/cairo/test/reference/leaky-dashed-stroke.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dashed-stroke.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/leaky-dashed-stroke.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dashed-stroke.base.argb32.ref.png diff --git a/cairo/test/reference/leaky-dashed-stroke.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dashed-stroke.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/leaky-dashed-stroke.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dashed-stroke.base.rgb24.ref.png diff --git a/cairo/test/reference/leaky-dashed-stroke.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dashed-stroke.image16.ref.png similarity index 100% rename from cairo/test/reference/leaky-dashed-stroke.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dashed-stroke.image16.ref.png diff --git a/cairo/test/reference/leaky-dashed-stroke.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dashed-stroke.ps.ref.png similarity index 100% rename from cairo/test/reference/leaky-dashed-stroke.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dashed-stroke.ps.ref.png diff --git a/cairo/test/reference/leaky-dashed-stroke.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dashed-stroke.quartz.ref.png similarity index 100% rename from cairo/test/reference/leaky-dashed-stroke.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dashed-stroke.quartz.ref.png diff --git a/cairo/test/reference/leaky-dashed-stroke.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dashed-stroke.rgb24.ref.png similarity index 100% rename from cairo/test/reference/leaky-dashed-stroke.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dashed-stroke.rgb24.ref.png diff --git a/cairo/test/reference/leaky-dashed-stroke.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dashed-stroke.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/leaky-dashed-stroke.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dashed-stroke.traps.argb32.ref.png diff --git a/cairo/test/reference/leaky-dashed-stroke.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-dashed-stroke.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/leaky-dashed-stroke.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-dashed-stroke.traps.rgb24.ref.png diff --git a/cairo/test/reference/leaky-polygon.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-polygon.argb32.ref.png similarity index 100% rename from cairo/test/reference/leaky-polygon.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-polygon.argb32.ref.png diff --git a/cairo/test/reference/leaky-polygon.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-polygon.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/leaky-polygon.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-polygon.base.argb32.ref.png diff --git a/cairo/test/reference/leaky-polygon.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-polygon.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/leaky-polygon.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-polygon.base.rgb24.ref.png diff --git a/cairo/test/reference/leaky-polygon.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-polygon.image16.ref.png similarity index 100% rename from cairo/test/reference/leaky-polygon.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-polygon.image16.ref.png diff --git a/cairo/test/reference/leaky-polygon.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-polygon.ps.ref.png similarity index 100% rename from cairo/test/reference/leaky-polygon.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-polygon.ps.ref.png diff --git a/cairo/test/reference/leaky-polygon.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-polygon.rgb24.ref.png similarity index 100% rename from cairo/test/reference/leaky-polygon.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-polygon.rgb24.ref.png diff --git a/cairo/test/reference/leaky-polygon.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-polygon.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/leaky-polygon.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-polygon.traps.argb32.ref.png diff --git a/cairo/test/reference/leaky-polygon.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/leaky-polygon.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/leaky-polygon.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/leaky-polygon.traps.rgb24.ref.png diff --git a/cairo/test/reference/line-width-large-overlap-dashed.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-dashed.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width-large-overlap-dashed.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-dashed.base.argb32.ref.png diff --git a/cairo/test/reference/line-width-large-overlap-dashed.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-dashed.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width-large-overlap-dashed.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-dashed.base.rgb24.ref.png diff --git a/cairo/test/reference/line-width-large-overlap-dashed.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-dashed.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width-large-overlap-dashed.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-dashed.mask.argb32.ref.png diff --git a/cairo/test/reference/line-width-large-overlap-dashed.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-dashed.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width-large-overlap-dashed.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-dashed.mask.rgb24.ref.png diff --git a/cairo/test/reference/line-width-large-overlap-dashed.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-dashed.ref.png similarity index 100% rename from cairo/test/reference/line-width-large-overlap-dashed.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-dashed.ref.png diff --git a/cairo/test/reference/line-width-large-overlap-dashed.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-dashed.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width-large-overlap-dashed.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-dashed.traps.argb32.ref.png diff --git a/cairo/test/reference/line-width-large-overlap-dashed.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-dashed.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width-large-overlap-dashed.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-dashed.traps.rgb24.ref.png diff --git a/cairo/test/reference/line-width-large-overlap-flipped.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-flipped.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width-large-overlap-flipped.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-flipped.base.argb32.ref.png diff --git a/cairo/test/reference/line-width-large-overlap-flipped.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-flipped.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width-large-overlap-flipped.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-flipped.base.rgb24.ref.png diff --git a/cairo/test/reference/line-width-large-overlap-flipped.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-flipped.ref.png similarity index 100% rename from cairo/test/reference/line-width-large-overlap-flipped.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-flipped.ref.png diff --git a/cairo/test/reference/line-width-large-overlap-flopped.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-flopped.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width-large-overlap-flopped.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-flopped.base.argb32.ref.png diff --git a/cairo/test/reference/line-width-large-overlap-flopped.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-flopped.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width-large-overlap-flopped.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-flopped.base.rgb24.ref.png diff --git a/cairo/test/reference/line-width-large-overlap-flopped.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-flopped.ref.png similarity index 100% rename from cairo/test/reference/line-width-large-overlap-flopped.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-flopped.ref.png diff --git a/cairo/test/reference/line-width-large-overlap-offset.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-offset.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width-large-overlap-offset.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-offset.base.argb32.ref.png diff --git a/cairo/test/reference/line-width-large-overlap-offset.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-offset.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width-large-overlap-offset.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-offset.base.rgb24.ref.png diff --git a/cairo/test/reference/line-width-large-overlap-offset.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-offset.ref.png similarity index 100% rename from cairo/test/reference/line-width-large-overlap-offset.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-offset.ref.png diff --git a/cairo/test/reference/line-width-large-overlap-rotated.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-rotated.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width-large-overlap-rotated.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-rotated.argb32.ref.png diff --git a/cairo/test/reference/line-width-large-overlap-rotated.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-rotated.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width-large-overlap-rotated.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-rotated.base.argb32.ref.png diff --git a/cairo/test/reference/line-width-large-overlap-rotated.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-rotated.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width-large-overlap-rotated.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-rotated.base.rgb24.ref.png diff --git a/cairo/test/reference/line-width-large-overlap-rotated.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-rotated.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width-large-overlap-rotated.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-rotated.rgb24.ref.png diff --git a/cairo/test/reference/line-width-large-overlap-rotated.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-rotated.traps.ref.png similarity index 100% rename from cairo/test/reference/line-width-large-overlap-rotated.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap-rotated.traps.ref.png diff --git a/cairo/test/reference/line-width-large-overlap.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width-large-overlap.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap.base.argb32.ref.png diff --git a/cairo/test/reference/line-width-large-overlap.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width-large-overlap.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap.base.rgb24.ref.png diff --git a/cairo/test/reference/line-width-large-overlap.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap.ref.png similarity index 100% rename from cairo/test/reference/line-width-large-overlap.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-large-overlap.ref.png diff --git a/cairo/test/reference/line-width-overlap-dashed.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap-dashed.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap-dashed.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap-dashed.base.argb32.ref.png diff --git a/cairo/test/reference/line-width-overlap-dashed.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap-dashed.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap-dashed.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap-dashed.base.rgb24.ref.png diff --git a/cairo/test/reference/line-width-overlap-dashed.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap-dashed.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap-dashed.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap-dashed.mask.argb32.ref.png diff --git a/cairo/test/reference/line-width-overlap-dashed.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap-dashed.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap-dashed.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap-dashed.mask.rgb24.ref.png diff --git a/cairo/test/reference/line-width-overlap-dashed.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap-dashed.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap-dashed.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap-dashed.ref.png diff --git a/cairo/test/reference/line-width-overlap-dashed.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap-dashed.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap-dashed.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap-dashed.traps.argb32.ref.png diff --git a/cairo/test/reference/line-width-overlap-dashed.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap-dashed.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap-dashed.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap-dashed.traps.rgb24.ref.png diff --git a/cairo/test/reference/line-width-overlap-flipped.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap-flipped.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap-flipped.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap-flipped.base.argb32.ref.png diff --git a/cairo/test/reference/line-width-overlap-flipped.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap-flipped.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap-flipped.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap-flipped.base.rgb24.ref.png diff --git a/cairo/test/reference/line-width-overlap-flipped.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap-flipped.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap-flipped.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap-flipped.ref.png diff --git a/cairo/test/reference/line-width-overlap-flopped.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap-flopped.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap-flopped.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap-flopped.base.argb32.ref.png diff --git a/cairo/test/reference/line-width-overlap-flopped.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap-flopped.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap-flopped.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap-flopped.base.rgb24.ref.png diff --git a/cairo/test/reference/line-width-overlap-flopped.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap-flopped.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap-flopped.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap-flopped.ref.png diff --git a/cairo/test/reference/line-width-overlap-offset.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap-offset.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap-offset.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap-offset.base.argb32.ref.png diff --git a/cairo/test/reference/line-width-overlap-offset.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap-offset.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap-offset.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap-offset.base.rgb24.ref.png diff --git a/cairo/test/reference/line-width-overlap-offset.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap-offset.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap-offset.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap-offset.ref.png diff --git a/cairo/test/reference/line-width-overlap-offset.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap-offset.traps.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap-offset.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap-offset.traps.ref.png diff --git a/cairo/test/reference/line-width-overlap-rotated.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap-rotated.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap-rotated.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap-rotated.argb32.ref.png diff --git a/cairo/test/reference/line-width-overlap-rotated.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap-rotated.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap-rotated.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap-rotated.base.argb32.ref.png diff --git a/cairo/test/reference/line-width-overlap-rotated.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap-rotated.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap-rotated.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap-rotated.base.rgb24.ref.png diff --git a/cairo/test/reference/line-width-overlap-rotated.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap-rotated.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap-rotated.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap-rotated.rgb24.ref.png diff --git a/cairo/test/reference/line-width-overlap-rotated.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap-rotated.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap-rotated.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap-rotated.traps.argb32.ref.png diff --git a/cairo/test/reference/line-width-overlap-rotated.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap-rotated.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap-rotated.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap-rotated.traps.rgb24.ref.png diff --git a/cairo/test/reference/line-width-overlap.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap.base.argb32.ref.png diff --git a/cairo/test/reference/line-width-overlap.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap.base.rgb24.ref.png diff --git a/cairo/test/reference/line-width-overlap.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-overlap.ref.png similarity index 100% rename from cairo/test/reference/line-width-overlap.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-overlap.ref.png diff --git a/cairo/test/reference/line-width-scale.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-scale.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width-scale.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-scale.argb32.ref.png diff --git a/cairo/test/reference/line-width-scale.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-scale.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width-scale.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-scale.base.argb32.ref.png diff --git a/cairo/test/reference/line-width-scale.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-scale.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width-scale.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-scale.base.rgb24.ref.png diff --git a/cairo/test/reference/line-width-scale.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-scale.image16.ref.png similarity index 100% rename from cairo/test/reference/line-width-scale.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-scale.image16.ref.png diff --git a/cairo/test/reference/line-width-scale.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-scale.ps2.ref.png similarity index 100% rename from cairo/test/reference/line-width-scale.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-scale.ps2.ref.png diff --git a/cairo/test/reference/line-width-scale.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-scale.ps3.ref.png similarity index 100% rename from cairo/test/reference/line-width-scale.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-scale.ps3.ref.png diff --git a/cairo/test/reference/line-width-scale.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-scale.quartz.ref.png similarity index 100% rename from cairo/test/reference/line-width-scale.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-scale.quartz.ref.png diff --git a/cairo/test/reference/line-width-scale.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-scale.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width-scale.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-scale.rgb24.ref.png diff --git a/cairo/test/reference/line-width-scale.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-scale.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width-scale.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-scale.traps.argb32.ref.png diff --git a/cairo/test/reference/line-width-scale.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-scale.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width-scale.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-scale.traps.rgb24.ref.png diff --git a/cairo/test/reference/line-width-tolerance.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-tolerance.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width-tolerance.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-tolerance.argb32.ref.png diff --git a/cairo/test/reference/line-width-tolerance.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-tolerance.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width-tolerance.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-tolerance.base.argb32.ref.png diff --git a/cairo/test/reference/line-width-tolerance.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-tolerance.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width-tolerance.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-tolerance.base.rgb24.ref.png diff --git a/cairo/test/reference/line-width-tolerance.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-tolerance.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width-tolerance.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-tolerance.rgb24.ref.png diff --git a/cairo/test/reference/line-width-tolerance.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-tolerance.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width-tolerance.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-tolerance.traps.argb32.ref.png diff --git a/cairo/test/reference/line-width-tolerance.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width-tolerance.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width-tolerance.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width-tolerance.traps.rgb24.ref.png diff --git a/cairo/test/reference/line-width.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width.argb32.ref.png diff --git a/cairo/test/reference/line-width.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width.base.argb32.ref.png diff --git a/cairo/test/reference/line-width.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width.base.rgb24.ref.png diff --git a/cairo/test/reference/line-width.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width.rgb24.ref.png diff --git a/cairo/test/reference/line-width.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/line-width.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width.traps.argb32.ref.png diff --git a/cairo/test/reference/line-width.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/line-width.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/line-width.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/line-width.traps.rgb24.ref.png diff --git a/cairo/test/reference/linear-gradient-extend.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-extend.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-extend.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-extend.base.argb32.ref.png diff --git a/cairo/test/reference/linear-gradient-extend.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-extend.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-extend.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-extend.base.rgb24.ref.png diff --git a/cairo/test/reference/linear-gradient-extend.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-extend.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-extend.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-extend.ref.png diff --git a/cairo/test/reference/linear-gradient-large.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-large.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-large.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-large.base.argb32.ref.png diff --git a/cairo/test/reference/linear-gradient-large.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-large.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-large.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-large.base.rgb24.ref.png diff --git a/cairo/test/reference/linear-gradient-large.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-large.quartz.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-large.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-large.quartz.ref.png diff --git a/cairo/test/reference/linear-gradient-large.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-large.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-large.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-large.ref.png diff --git a/cairo/test/reference/linear-gradient-one-stop.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-one-stop.argb32.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-one-stop.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-one-stop.argb32.ref.png diff --git a/cairo/test/reference/linear-gradient-one-stop.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-one-stop.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-one-stop.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-one-stop.base.argb32.ref.png diff --git a/cairo/test/reference/linear-gradient-one-stop.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-one-stop.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-one-stop.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-one-stop.base.rgb24.ref.png diff --git a/cairo/test/reference/linear-gradient-one-stop.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-one-stop.rgb24.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-one-stop.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-one-stop.rgb24.ref.png diff --git a/cairo/test/reference/linear-gradient-reflect.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-reflect.argb32.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-reflect.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-reflect.argb32.ref.png diff --git a/cairo/test/reference/linear-gradient-reflect.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-reflect.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-reflect.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-reflect.base.argb32.ref.png diff --git a/cairo/test/reference/linear-gradient-reflect.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-reflect.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-reflect.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-reflect.base.rgb24.ref.png diff --git a/cairo/test/reference/linear-gradient-reflect.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-reflect.image16.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-reflect.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-reflect.image16.ref.png diff --git a/cairo/test/reference/linear-gradient-reflect.pdf.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-reflect.pdf.argb32.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-reflect.pdf.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-reflect.pdf.argb32.ref.png diff --git a/cairo/test/reference/linear-gradient-reflect.pdf.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-reflect.pdf.rgb24.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-reflect.pdf.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-reflect.pdf.rgb24.ref.png diff --git a/cairo/test/reference/linear-gradient-reflect.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-reflect.ps3.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-reflect.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-reflect.ps3.ref.png diff --git a/cairo/test/reference/linear-gradient-reflect.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-reflect.quartz.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-reflect.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-reflect.quartz.ref.png diff --git a/cairo/test/reference/linear-gradient-reflect.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-reflect.rgb24.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-reflect.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-reflect.rgb24.ref.png diff --git a/cairo/test/reference/linear-gradient-subset.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-subset.argb32.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-subset.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-subset.argb32.ref.png diff --git a/cairo/test/reference/linear-gradient-subset.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-subset.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-subset.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-subset.base.argb32.ref.png diff --git a/cairo/test/reference/linear-gradient-subset.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-subset.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-subset.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-subset.base.rgb24.ref.png diff --git a/cairo/test/reference/linear-gradient-subset.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-subset.image16.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-subset.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-subset.image16.ref.png diff --git a/cairo/test/reference/linear-gradient-subset.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-subset.ps3.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-subset.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-subset.ps3.ref.png diff --git a/cairo/test/reference/linear-gradient-subset.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-subset.quartz.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-subset.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-subset.quartz.ref.png diff --git a/cairo/test/reference/linear-gradient-subset.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-subset.rgb24.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-subset.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-subset.rgb24.ref.png diff --git a/cairo/test/reference/linear-gradient-subset.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-subset.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-subset.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-subset.traps.argb32.ref.png diff --git a/cairo/test/reference/linear-gradient-subset.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient-subset.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient-subset.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient-subset.traps.rgb24.ref.png diff --git a/cairo/test/reference/linear-gradient.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient.argb32.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient.argb32.ref.png diff --git a/cairo/test/reference/linear-gradient.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient.base.argb32.ref.png diff --git a/cairo/test/reference/linear-gradient.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient.base.rgb24.ref.png diff --git a/cairo/test/reference/linear-gradient.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient.image16.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient.image16.ref.png diff --git a/cairo/test/reference/linear-gradient.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient.ps3.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient.ps3.ref.png diff --git a/cairo/test/reference/linear-gradient.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient.quartz.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient.quartz.ref.png diff --git a/cairo/test/reference/linear-gradient.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient.rgb24.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient.rgb24.ref.png diff --git a/cairo/test/reference/linear-gradient.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient.traps.argb32.ref.png diff --git a/cairo/test/reference/linear-gradient.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-gradient.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/linear-gradient.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-gradient.traps.rgb24.ref.png diff --git a/cairo/test/reference/linear-step-function.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-step-function.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/linear-step-function.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-step-function.base.argb32.ref.png diff --git a/cairo/test/reference/linear-step-function.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-step-function.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/linear-step-function.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-step-function.base.rgb24.ref.png diff --git a/cairo/test/reference/linear-step-function.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-step-function.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/linear-step-function.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-step-function.mask.argb32.ref.png diff --git a/cairo/test/reference/linear-step-function.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-step-function.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/linear-step-function.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-step-function.mask.rgb24.ref.png diff --git a/cairo/test/reference/linear-step-function.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-step-function.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/linear-step-function.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-step-function.traps.argb32.ref.png diff --git a/cairo/test/reference/linear-step-function.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-step-function.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/linear-step-function.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-step-function.traps.rgb24.ref.png diff --git a/cairo/test/reference/linear-step-function.xfail.png b/io2d/src/3rd-party/cairo/test/reference/linear-step-function.xfail.png similarity index 100% rename from cairo/test/reference/linear-step-function.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/linear-step-function.xfail.png diff --git a/cairo/test/reference/linear-uniform.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-uniform.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/linear-uniform.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-uniform.base.argb32.ref.png diff --git a/cairo/test/reference/linear-uniform.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-uniform.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/linear-uniform.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-uniform.base.rgb24.ref.png diff --git a/cairo/test/reference/linear-uniform.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-uniform.image16.ref.png similarity index 100% rename from cairo/test/reference/linear-uniform.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-uniform.image16.ref.png diff --git a/cairo/test/reference/linear-uniform.ref.png b/io2d/src/3rd-party/cairo/test/reference/linear-uniform.ref.png similarity index 100% rename from cairo/test/reference/linear-uniform.ref.png rename to io2d/src/3rd-party/cairo/test/reference/linear-uniform.ref.png diff --git a/cairo/test/reference/long-dashed-lines.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/long-dashed-lines.argb32.ref.png similarity index 100% rename from cairo/test/reference/long-dashed-lines.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/long-dashed-lines.argb32.ref.png diff --git a/cairo/test/reference/long-dashed-lines.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/long-dashed-lines.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/long-dashed-lines.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/long-dashed-lines.base.argb32.ref.png diff --git a/cairo/test/reference/long-dashed-lines.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/long-dashed-lines.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/long-dashed-lines.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/long-dashed-lines.base.rgb24.ref.png diff --git a/cairo/test/reference/long-dashed-lines.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/long-dashed-lines.image16.ref.png similarity index 100% rename from cairo/test/reference/long-dashed-lines.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/long-dashed-lines.image16.ref.png diff --git a/cairo/test/reference/long-dashed-lines.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/long-dashed-lines.ps2.ref.png similarity index 100% rename from cairo/test/reference/long-dashed-lines.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/long-dashed-lines.ps2.ref.png diff --git a/cairo/test/reference/long-dashed-lines.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/long-dashed-lines.ps3.ref.png similarity index 100% rename from cairo/test/reference/long-dashed-lines.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/long-dashed-lines.ps3.ref.png diff --git a/cairo/test/reference/long-dashed-lines.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/long-dashed-lines.quartz.ref.png similarity index 100% rename from cairo/test/reference/long-dashed-lines.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/long-dashed-lines.quartz.ref.png diff --git a/cairo/test/reference/long-dashed-lines.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/long-dashed-lines.rgb24.ref.png similarity index 100% rename from cairo/test/reference/long-dashed-lines.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/long-dashed-lines.rgb24.ref.png diff --git a/cairo/test/reference/long-dashed-lines.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/long-dashed-lines.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/long-dashed-lines.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/long-dashed-lines.traps.argb32.ref.png diff --git a/cairo/test/reference/long-dashed-lines.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/long-dashed-lines.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/long-dashed-lines.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/long-dashed-lines.traps.rgb24.ref.png diff --git a/cairo/test/reference/long-lines.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/long-lines.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/long-lines.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/long-lines.base.argb32.ref.png diff --git a/cairo/test/reference/long-lines.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/long-lines.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/long-lines.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/long-lines.base.rgb24.ref.png diff --git a/cairo/test/reference/long-lines.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/long-lines.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/long-lines.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/long-lines.mask.argb32.ref.png diff --git a/cairo/test/reference/long-lines.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/long-lines.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/long-lines.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/long-lines.mask.rgb24.ref.png diff --git a/cairo/test/reference/long-lines.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/long-lines.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/long-lines.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/long-lines.traps.argb32.ref.png diff --git a/cairo/test/reference/long-lines.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/long-lines.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/long-lines.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/long-lines.traps.rgb24.ref.png diff --git a/cairo/test/reference/map-all-to-image.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/map-all-to-image.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/map-all-to-image.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/map-all-to-image.base.argb32.ref.png diff --git a/cairo/test/reference/map-all-to-image.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/map-all-to-image.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/map-all-to-image.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/map-all-to-image.base.rgb24.ref.png diff --git a/cairo/test/reference/map-all-to-image.ref.png b/io2d/src/3rd-party/cairo/test/reference/map-all-to-image.ref.png similarity index 100% rename from cairo/test/reference/map-all-to-image.ref.png rename to io2d/src/3rd-party/cairo/test/reference/map-all-to-image.ref.png diff --git a/cairo/test/reference/map-all-to-xlib-fallback.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/map-all-to-xlib-fallback.rgb24.ref.png similarity index 100% rename from cairo/test/reference/map-all-to-xlib-fallback.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/map-all-to-xlib-fallback.rgb24.ref.png diff --git a/cairo/test/reference/map-all-to-xlib-window.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/map-all-to-xlib-window.rgb24.ref.png similarity index 100% rename from cairo/test/reference/map-all-to-xlib-window.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/map-all-to-xlib-window.rgb24.ref.png diff --git a/cairo/test/reference/map-all-to-xlib.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/map-all-to-xlib.argb32.ref.png similarity index 100% rename from cairo/test/reference/map-all-to-xlib.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/map-all-to-xlib.argb32.ref.png diff --git a/cairo/test/reference/map-all-to-xlib.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/map-all-to-xlib.rgb24.ref.png similarity index 100% rename from cairo/test/reference/map-all-to-xlib.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/map-all-to-xlib.rgb24.ref.png diff --git a/cairo/test/reference/map-bit-to-image.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/map-bit-to-image.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/map-bit-to-image.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/map-bit-to-image.base.argb32.ref.png diff --git a/cairo/test/reference/map-bit-to-image.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/map-bit-to-image.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/map-bit-to-image.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/map-bit-to-image.base.rgb24.ref.png diff --git a/cairo/test/reference/map-bit-to-image.ref.png b/io2d/src/3rd-party/cairo/test/reference/map-bit-to-image.ref.png similarity index 100% rename from cairo/test/reference/map-bit-to-image.ref.png rename to io2d/src/3rd-party/cairo/test/reference/map-bit-to-image.ref.png diff --git a/cairo/test/reference/map-bit-to-xlib-fallback.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/map-bit-to-xlib-fallback.rgb24.ref.png similarity index 100% rename from cairo/test/reference/map-bit-to-xlib-fallback.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/map-bit-to-xlib-fallback.rgb24.ref.png diff --git a/cairo/test/reference/map-bit-to-xlib-window.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/map-bit-to-xlib-window.rgb24.ref.png similarity index 100% rename from cairo/test/reference/map-bit-to-xlib-window.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/map-bit-to-xlib-window.rgb24.ref.png diff --git a/cairo/test/reference/map-bit-to-xlib.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/map-bit-to-xlib.argb32.ref.png similarity index 100% rename from cairo/test/reference/map-bit-to-xlib.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/map-bit-to-xlib.argb32.ref.png diff --git a/cairo/test/reference/map-bit-to-xlib.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/map-bit-to-xlib.rgb24.ref.png similarity index 100% rename from cairo/test/reference/map-bit-to-xlib.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/map-bit-to-xlib.rgb24.ref.png diff --git a/cairo/test/reference/map-to-image-fill.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/map-to-image-fill.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/map-to-image-fill.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/map-to-image-fill.base.argb32.ref.png diff --git a/cairo/test/reference/map-to-image-fill.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/map-to-image-fill.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/map-to-image-fill.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/map-to-image-fill.base.rgb24.ref.png diff --git a/cairo/test/reference/map-to-image-fill.ref.png b/io2d/src/3rd-party/cairo/test/reference/map-to-image-fill.ref.png similarity index 100% rename from cairo/test/reference/map-to-image-fill.ref.png rename to io2d/src/3rd-party/cairo/test/reference/map-to-image-fill.ref.png diff --git a/cairo/test/reference/mask-alpha.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-alpha.argb32.ref.png similarity index 100% rename from cairo/test/reference/mask-alpha.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-alpha.argb32.ref.png diff --git a/cairo/test/reference/mask-alpha.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-alpha.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/mask-alpha.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-alpha.base.argb32.ref.png diff --git a/cairo/test/reference/mask-alpha.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-alpha.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mask-alpha.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-alpha.base.rgb24.ref.png diff --git a/cairo/test/reference/mask-alpha.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-alpha.image16.ref.png similarity index 100% rename from cairo/test/reference/mask-alpha.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-alpha.image16.ref.png diff --git a/cairo/test/reference/mask-alpha.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-alpha.ps.ref.png similarity index 100% rename from cairo/test/reference/mask-alpha.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-alpha.ps.ref.png diff --git a/cairo/test/reference/mask-alpha.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-alpha.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/mask-alpha.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-alpha.quartz.argb32.ref.png diff --git a/cairo/test/reference/mask-alpha.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-alpha.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mask-alpha.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-alpha.rgb24.ref.png diff --git a/cairo/test/reference/mask-alpha.svg.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/mask-alpha.svg.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/mask-alpha.svg.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/mask-alpha.svg.rgb24.xfail.png diff --git a/cairo/test/reference/mask-alpha.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-alpha.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/mask-alpha.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-alpha.traps.argb32.ref.png diff --git a/cairo/test/reference/mask-alpha.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-alpha.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mask-alpha.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-alpha.traps.rgb24.ref.png diff --git a/cairo/test/reference/mask-ctm.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-ctm.argb32.ref.png similarity index 100% rename from cairo/test/reference/mask-ctm.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-ctm.argb32.ref.png diff --git a/cairo/test/reference/mask-ctm.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-ctm.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/mask-ctm.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-ctm.base.argb32.ref.png diff --git a/cairo/test/reference/mask-ctm.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-ctm.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mask-ctm.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-ctm.base.rgb24.ref.png diff --git a/cairo/test/reference/mask-ctm.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-ctm.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mask-ctm.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-ctm.rgb24.ref.png diff --git a/cairo/test/reference/mask-glyphs.gl.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-glyphs.gl.ref.png similarity index 100% rename from cairo/test/reference/mask-glyphs.gl.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-glyphs.gl.ref.png diff --git a/cairo/test/reference/mask-glyphs.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-glyphs.image16.ref.png similarity index 100% rename from cairo/test/reference/mask-glyphs.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-glyphs.image16.ref.png diff --git a/cairo/test/reference/mask-glyphs.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-glyphs.pdf.ref.png similarity index 100% rename from cairo/test/reference/mask-glyphs.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-glyphs.pdf.ref.png diff --git a/cairo/test/reference/mask-glyphs.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-glyphs.ref.png similarity index 100% rename from cairo/test/reference/mask-glyphs.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-glyphs.ref.png diff --git a/cairo/test/reference/mask-glyphs.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-glyphs.svg.ref.png similarity index 100% rename from cairo/test/reference/mask-glyphs.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-glyphs.svg.ref.png diff --git a/cairo/test/reference/mask-surface-ctm.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-surface-ctm.argb32.ref.png similarity index 100% rename from cairo/test/reference/mask-surface-ctm.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-surface-ctm.argb32.ref.png diff --git a/cairo/test/reference/mask-surface-ctm.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-surface-ctm.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/mask-surface-ctm.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-surface-ctm.base.argb32.ref.png diff --git a/cairo/test/reference/mask-surface-ctm.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-surface-ctm.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mask-surface-ctm.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-surface-ctm.base.rgb24.ref.png diff --git a/cairo/test/reference/mask-surface-ctm.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-surface-ctm.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mask-surface-ctm.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-surface-ctm.rgb24.ref.png diff --git a/cairo/test/reference/mask-transformed-image.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-transformed-image.argb32.ref.png similarity index 100% rename from cairo/test/reference/mask-transformed-image.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-transformed-image.argb32.ref.png diff --git a/cairo/test/reference/mask-transformed-image.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-transformed-image.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/mask-transformed-image.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-transformed-image.base.argb32.ref.png diff --git a/cairo/test/reference/mask-transformed-image.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-transformed-image.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mask-transformed-image.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-transformed-image.base.rgb24.ref.png diff --git a/cairo/test/reference/mask-transformed-image.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-transformed-image.image16.ref.png similarity index 100% rename from cairo/test/reference/mask-transformed-image.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-transformed-image.image16.ref.png diff --git a/cairo/test/reference/mask-transformed-image.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-transformed-image.pdf.ref.png similarity index 100% rename from cairo/test/reference/mask-transformed-image.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-transformed-image.pdf.ref.png diff --git a/cairo/test/reference/mask-transformed-image.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-transformed-image.quartz.ref.png similarity index 100% rename from cairo/test/reference/mask-transformed-image.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-transformed-image.quartz.ref.png diff --git a/cairo/test/reference/mask-transformed-image.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-transformed-image.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mask-transformed-image.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-transformed-image.rgb24.ref.png diff --git a/cairo/test/reference/mask-transformed-similar.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-transformed-similar.argb32.ref.png similarity index 100% rename from cairo/test/reference/mask-transformed-similar.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-transformed-similar.argb32.ref.png diff --git a/cairo/test/reference/mask-transformed-similar.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-transformed-similar.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/mask-transformed-similar.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-transformed-similar.base.argb32.ref.png diff --git a/cairo/test/reference/mask-transformed-similar.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-transformed-similar.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mask-transformed-similar.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-transformed-similar.base.rgb24.ref.png diff --git a/cairo/test/reference/mask-transformed-similar.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-transformed-similar.image16.ref.png similarity index 100% rename from cairo/test/reference/mask-transformed-similar.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-transformed-similar.image16.ref.png diff --git a/cairo/test/reference/mask-transformed-similar.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-transformed-similar.pdf.ref.png similarity index 100% rename from cairo/test/reference/mask-transformed-similar.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-transformed-similar.pdf.ref.png diff --git a/cairo/test/reference/mask-transformed-similar.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-transformed-similar.quartz.ref.png similarity index 100% rename from cairo/test/reference/mask-transformed-similar.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-transformed-similar.quartz.ref.png diff --git a/cairo/test/reference/mask-transformed-similar.recording.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-transformed-similar.recording.ref.png similarity index 100% rename from cairo/test/reference/mask-transformed-similar.recording.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-transformed-similar.recording.ref.png diff --git a/cairo/test/reference/mask-transformed-similar.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-transformed-similar.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mask-transformed-similar.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-transformed-similar.rgb24.ref.png diff --git a/cairo/test/reference/mask-transformed-similar.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-transformed-similar.svg.ref.png similarity index 100% rename from cairo/test/reference/mask-transformed-similar.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-transformed-similar.svg.ref.png diff --git a/cairo/test/reference/mask-transformed-xlib-fallback.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-transformed-xlib-fallback.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mask-transformed-xlib-fallback.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-transformed-xlib-fallback.rgb24.ref.png diff --git a/cairo/test/reference/mask-transformed-xlib-window.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-transformed-xlib-window.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mask-transformed-xlib-window.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-transformed-xlib-window.rgb24.ref.png diff --git a/cairo/test/reference/mask-transformed-xlib.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-transformed-xlib.argb32.ref.png similarity index 100% rename from cairo/test/reference/mask-transformed-xlib.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-transformed-xlib.argb32.ref.png diff --git a/cairo/test/reference/mask-transformed-xlib.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask-transformed-xlib.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mask-transformed-xlib.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask-transformed-xlib.rgb24.ref.png diff --git a/cairo/test/reference/mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask.argb32.ref.png diff --git a/cairo/test/reference/mask.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/mask.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask.base.argb32.ref.png diff --git a/cairo/test/reference/mask.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mask.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask.base.rgb24.ref.png diff --git a/cairo/test/reference/mask.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask.image16.ref.png similarity index 100% rename from cairo/test/reference/mask.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask.image16.ref.png diff --git a/cairo/test/reference/mask.pdf.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask.pdf.argb32.ref.png similarity index 100% rename from cairo/test/reference/mask.pdf.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask.pdf.argb32.ref.png diff --git a/cairo/test/reference/mask.pdf.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask.pdf.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mask.pdf.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask.pdf.rgb24.ref.png diff --git a/cairo/test/reference/mask.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/mask.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask.quartz.argb32.ref.png diff --git a/cairo/test/reference/mask.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mask.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask.quartz.rgb24.ref.png diff --git a/cairo/test/reference/mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask.rgb24.ref.png diff --git a/cairo/test/reference/mask.svg.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/mask.svg.argb32.xfail.png similarity index 100% rename from cairo/test/reference/mask.svg.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/mask.svg.argb32.xfail.png diff --git a/cairo/test/reference/mask.svg.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/mask.svg.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/mask.svg.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/mask.svg.rgb24.xfail.png diff --git a/cairo/test/reference/mask.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/mask.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask.traps.argb32.ref.png diff --git a/cairo/test/reference/mask.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mask.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mask.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mask.traps.rgb24.ref.png diff --git a/cairo/test/reference/mesh-pattern-accuracy.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern-accuracy.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern-accuracy.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern-accuracy.base.argb32.ref.png diff --git a/cairo/test/reference/mesh-pattern-accuracy.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern-accuracy.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern-accuracy.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern-accuracy.base.rgb24.ref.png diff --git a/cairo/test/reference/mesh-pattern-accuracy.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern-accuracy.image16.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern-accuracy.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern-accuracy.image16.ref.png diff --git a/cairo/test/reference/mesh-pattern-accuracy.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern-accuracy.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern-accuracy.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern-accuracy.ref.png diff --git a/cairo/test/reference/mesh-pattern-conical.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern-conical.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern-conical.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern-conical.base.argb32.ref.png diff --git a/cairo/test/reference/mesh-pattern-conical.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern-conical.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern-conical.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern-conical.base.rgb24.ref.png diff --git a/cairo/test/reference/mesh-pattern-conical.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern-conical.image16.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern-conical.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern-conical.image16.ref.png diff --git a/cairo/test/reference/mesh-pattern-conical.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern-conical.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern-conical.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern-conical.ref.png diff --git a/cairo/test/reference/mesh-pattern-control-points.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern-control-points.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern-control-points.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern-control-points.base.argb32.ref.png diff --git a/cairo/test/reference/mesh-pattern-control-points.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern-control-points.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern-control-points.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern-control-points.base.rgb24.ref.png diff --git a/cairo/test/reference/mesh-pattern-control-points.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern-control-points.image16.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern-control-points.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern-control-points.image16.ref.png diff --git a/cairo/test/reference/mesh-pattern-control-points.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern-control-points.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern-control-points.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern-control-points.ref.png diff --git a/cairo/test/reference/mesh-pattern-fold.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern-fold.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern-fold.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern-fold.base.argb32.ref.png diff --git a/cairo/test/reference/mesh-pattern-fold.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern-fold.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern-fold.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern-fold.base.rgb24.ref.png diff --git a/cairo/test/reference/mesh-pattern-fold.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern-fold.image16.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern-fold.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern-fold.image16.ref.png diff --git a/cairo/test/reference/mesh-pattern-fold.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern-fold.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern-fold.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern-fold.ref.png diff --git a/cairo/test/reference/mesh-pattern-overlap.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern-overlap.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern-overlap.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern-overlap.base.argb32.ref.png diff --git a/cairo/test/reference/mesh-pattern-overlap.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern-overlap.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern-overlap.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern-overlap.base.rgb24.ref.png diff --git a/cairo/test/reference/mesh-pattern-overlap.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern-overlap.image16.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern-overlap.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern-overlap.image16.ref.png diff --git a/cairo/test/reference/mesh-pattern-overlap.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern-overlap.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern-overlap.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern-overlap.ref.png diff --git a/cairo/test/reference/mesh-pattern-transformed.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern-transformed.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern-transformed.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern-transformed.base.argb32.ref.png diff --git a/cairo/test/reference/mesh-pattern-transformed.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern-transformed.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern-transformed.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern-transformed.base.rgb24.ref.png diff --git a/cairo/test/reference/mesh-pattern-transformed.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern-transformed.image16.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern-transformed.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern-transformed.image16.ref.png diff --git a/cairo/test/reference/mesh-pattern-transformed.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern-transformed.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern-transformed.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern-transformed.ref.png diff --git a/cairo/test/reference/mesh-pattern.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern.base.argb32.ref.png diff --git a/cairo/test/reference/mesh-pattern.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern.base.rgb24.ref.png diff --git a/cairo/test/reference/mesh-pattern.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern.image16.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern.image16.ref.png diff --git a/cairo/test/reference/mesh-pattern.ref.png b/io2d/src/3rd-party/cairo/test/reference/mesh-pattern.ref.png similarity index 100% rename from cairo/test/reference/mesh-pattern.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mesh-pattern.ref.png diff --git a/cairo/test/reference/mime-data.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/mime-data.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/mime-data.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mime-data.base.argb32.ref.png diff --git a/cairo/test/reference/mime-data.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/mime-data.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/mime-data.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mime-data.base.rgb24.ref.png diff --git a/cairo/test/reference/mime-data.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/mime-data.pdf.ref.png similarity index 100% rename from cairo/test/reference/mime-data.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mime-data.pdf.ref.png diff --git a/cairo/test/reference/mime-data.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/mime-data.ps.ref.png similarity index 100% rename from cairo/test/reference/mime-data.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mime-data.ps.ref.png diff --git a/cairo/test/reference/mime-data.ref.png b/io2d/src/3rd-party/cairo/test/reference/mime-data.ref.png similarity index 100% rename from cairo/test/reference/mime-data.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mime-data.ref.png diff --git a/cairo/test/reference/mime-data.script.ref.png b/io2d/src/3rd-party/cairo/test/reference/mime-data.script.ref.png similarity index 100% rename from cairo/test/reference/mime-data.script.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mime-data.script.ref.png diff --git a/cairo/test/reference/mime-data.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/mime-data.svg.ref.png similarity index 100% rename from cairo/test/reference/mime-data.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/mime-data.svg.ref.png diff --git a/cairo/test/reference/miter-precision.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/miter-precision.argb32.ref.png similarity index 100% rename from cairo/test/reference/miter-precision.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/miter-precision.argb32.ref.png diff --git a/cairo/test/reference/miter-precision.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/miter-precision.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/miter-precision.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/miter-precision.base.argb32.ref.png diff --git a/cairo/test/reference/miter-precision.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/miter-precision.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/miter-precision.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/miter-precision.base.rgb24.ref.png diff --git a/cairo/test/reference/miter-precision.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/miter-precision.ps2.ref.png similarity index 100% rename from cairo/test/reference/miter-precision.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/miter-precision.ps2.ref.png diff --git a/cairo/test/reference/miter-precision.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/miter-precision.ps3.ref.png similarity index 100% rename from cairo/test/reference/miter-precision.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/miter-precision.ps3.ref.png diff --git a/cairo/test/reference/miter-precision.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/miter-precision.rgb24.ref.png similarity index 100% rename from cairo/test/reference/miter-precision.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/miter-precision.rgb24.ref.png diff --git a/cairo/test/reference/miter-precision.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/miter-precision.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/miter-precision.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/miter-precision.traps.argb32.ref.png diff --git a/cairo/test/reference/miter-precision.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/miter-precision.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/miter-precision.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/miter-precision.traps.rgb24.ref.png diff --git a/cairo/test/reference/move-to-show-surface.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/move-to-show-surface.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/move-to-show-surface.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/move-to-show-surface.base.argb32.ref.png diff --git a/cairo/test/reference/move-to-show-surface.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/move-to-show-surface.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/move-to-show-surface.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/move-to-show-surface.base.rgb24.ref.png diff --git a/cairo/test/reference/move-to-show-surface.ref.png b/io2d/src/3rd-party/cairo/test/reference/move-to-show-surface.ref.png similarity index 100% rename from cairo/test/reference/move-to-show-surface.ref.png rename to io2d/src/3rd-party/cairo/test/reference/move-to-show-surface.ref.png diff --git a/cairo/test/reference/negative-stride-image.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/negative-stride-image.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/negative-stride-image.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/negative-stride-image.base.argb32.ref.png diff --git a/cairo/test/reference/negative-stride-image.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/negative-stride-image.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/negative-stride-image.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/negative-stride-image.base.rgb24.ref.png diff --git a/cairo/test/reference/negative-stride-image.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/negative-stride-image.image16.ref.png similarity index 100% rename from cairo/test/reference/negative-stride-image.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/negative-stride-image.image16.ref.png diff --git a/cairo/test/reference/negative-stride-image.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/negative-stride-image.ps.ref.png similarity index 100% rename from cairo/test/reference/negative-stride-image.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/negative-stride-image.ps.ref.png diff --git a/cairo/test/reference/negative-stride-image.ref.png b/io2d/src/3rd-party/cairo/test/reference/negative-stride-image.ref.png similarity index 100% rename from cairo/test/reference/negative-stride-image.ref.png rename to io2d/src/3rd-party/cairo/test/reference/negative-stride-image.ref.png diff --git a/cairo/test/reference/new-sub-path.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/new-sub-path.argb32.ref.png similarity index 100% rename from cairo/test/reference/new-sub-path.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/new-sub-path.argb32.ref.png diff --git a/cairo/test/reference/new-sub-path.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/new-sub-path.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/new-sub-path.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/new-sub-path.base.argb32.ref.png diff --git a/cairo/test/reference/new-sub-path.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/new-sub-path.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/new-sub-path.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/new-sub-path.base.rgb24.ref.png diff --git a/cairo/test/reference/new-sub-path.pdf.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/new-sub-path.pdf.argb32.ref.png similarity index 100% rename from cairo/test/reference/new-sub-path.pdf.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/new-sub-path.pdf.argb32.ref.png diff --git a/cairo/test/reference/new-sub-path.ps2.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/new-sub-path.ps2.argb32.ref.png similarity index 100% rename from cairo/test/reference/new-sub-path.ps2.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/new-sub-path.ps2.argb32.ref.png diff --git a/cairo/test/reference/new-sub-path.ps2.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/new-sub-path.ps2.rgb24.ref.png similarity index 100% rename from cairo/test/reference/new-sub-path.ps2.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/new-sub-path.ps2.rgb24.ref.png diff --git a/cairo/test/reference/new-sub-path.ps3.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/new-sub-path.ps3.argb32.ref.png similarity index 100% rename from cairo/test/reference/new-sub-path.ps3.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/new-sub-path.ps3.argb32.ref.png diff --git a/cairo/test/reference/new-sub-path.ps3.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/new-sub-path.ps3.rgb24.ref.png similarity index 100% rename from cairo/test/reference/new-sub-path.ps3.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/new-sub-path.ps3.rgb24.ref.png diff --git a/cairo/test/reference/new-sub-path.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/new-sub-path.quartz.ref.png similarity index 100% rename from cairo/test/reference/new-sub-path.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/new-sub-path.quartz.ref.png diff --git a/cairo/test/reference/new-sub-path.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/new-sub-path.rgb24.ref.png similarity index 100% rename from cairo/test/reference/new-sub-path.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/new-sub-path.rgb24.ref.png diff --git a/cairo/test/reference/new-sub-path.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/new-sub-path.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/new-sub-path.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/new-sub-path.traps.argb32.ref.png diff --git a/cairo/test/reference/new-sub-path.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/new-sub-path.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/new-sub-path.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/new-sub-path.traps.rgb24.ref.png diff --git a/cairo/test/reference/nil-surface.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/nil-surface.argb32.ref.png similarity index 100% rename from cairo/test/reference/nil-surface.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/nil-surface.argb32.ref.png diff --git a/cairo/test/reference/nil-surface.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/nil-surface.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/nil-surface.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/nil-surface.base.argb32.ref.png diff --git a/cairo/test/reference/nil-surface.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/nil-surface.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/nil-surface.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/nil-surface.base.rgb24.ref.png diff --git a/cairo/test/reference/nil-surface.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/nil-surface.rgb24.ref.png similarity index 100% rename from cairo/test/reference/nil-surface.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/nil-surface.rgb24.ref.png diff --git a/cairo/test/reference/operator-alpha-alpha.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-alpha-alpha.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/operator-alpha-alpha.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-alpha-alpha.base.argb32.ref.png diff --git a/cairo/test/reference/operator-alpha-alpha.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-alpha-alpha.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/operator-alpha-alpha.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-alpha-alpha.base.rgb24.ref.png diff --git a/cairo/test/reference/operator-alpha-alpha.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-alpha-alpha.image16.ref.png similarity index 100% rename from cairo/test/reference/operator-alpha-alpha.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-alpha-alpha.image16.ref.png diff --git a/cairo/test/reference/operator-alpha-alpha.pdf.xfail.png b/io2d/src/3rd-party/cairo/test/reference/operator-alpha-alpha.pdf.xfail.png similarity index 100% rename from cairo/test/reference/operator-alpha-alpha.pdf.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/operator-alpha-alpha.pdf.xfail.png diff --git a/cairo/test/reference/operator-alpha-alpha.ps.xfail.png b/io2d/src/3rd-party/cairo/test/reference/operator-alpha-alpha.ps.xfail.png similarity index 100% rename from cairo/test/reference/operator-alpha-alpha.ps.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/operator-alpha-alpha.ps.xfail.png diff --git a/cairo/test/reference/operator-alpha-alpha.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-alpha-alpha.ref.png similarity index 100% rename from cairo/test/reference/operator-alpha-alpha.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-alpha-alpha.ref.png diff --git a/cairo/test/reference/operator-alpha-alpha.svg.xfail.png b/io2d/src/3rd-party/cairo/test/reference/operator-alpha-alpha.svg.xfail.png similarity index 100% rename from cairo/test/reference/operator-alpha-alpha.svg.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/operator-alpha-alpha.svg.xfail.png diff --git a/cairo/test/reference/operator-alpha-alpha.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-alpha-alpha.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/operator-alpha-alpha.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-alpha-alpha.traps.argb32.ref.png diff --git a/cairo/test/reference/operator-alpha-alpha.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-alpha-alpha.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/operator-alpha-alpha.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-alpha-alpha.traps.rgb24.ref.png diff --git a/cairo/test/reference/operator-alpha.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-alpha.argb32.ref.png similarity index 100% rename from cairo/test/reference/operator-alpha.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-alpha.argb32.ref.png diff --git a/cairo/test/reference/operator-alpha.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-alpha.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/operator-alpha.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-alpha.base.argb32.ref.png diff --git a/cairo/test/reference/operator-alpha.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-alpha.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/operator-alpha.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-alpha.base.rgb24.ref.png diff --git a/cairo/test/reference/operator-alpha.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-alpha.rgb24.ref.png similarity index 100% rename from cairo/test/reference/operator-alpha.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-alpha.rgb24.ref.png diff --git a/cairo/test/reference/operator-alpha.svg12.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/operator-alpha.svg12.argb32.xfail.png similarity index 100% rename from cairo/test/reference/operator-alpha.svg12.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/operator-alpha.svg12.argb32.xfail.png diff --git a/cairo/test/reference/operator-alpha.svg12.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/operator-alpha.svg12.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/operator-alpha.svg12.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/operator-alpha.svg12.rgb24.xfail.png diff --git a/cairo/test/reference/operator-clear.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-clear.argb32.ref.png similarity index 100% rename from cairo/test/reference/operator-clear.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-clear.argb32.ref.png diff --git a/cairo/test/reference/operator-clear.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-clear.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/operator-clear.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-clear.base.argb32.ref.png diff --git a/cairo/test/reference/operator-clear.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-clear.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/operator-clear.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-clear.base.rgb24.ref.png diff --git a/cairo/test/reference/operator-clear.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-clear.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/operator-clear.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-clear.mask.rgb24.ref.png diff --git a/cairo/test/reference/operator-clear.ps2.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-clear.ps2.argb32.ref.png similarity index 100% rename from cairo/test/reference/operator-clear.ps2.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-clear.ps2.argb32.ref.png diff --git a/cairo/test/reference/operator-clear.ps3.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-clear.ps3.argb32.ref.png similarity index 100% rename from cairo/test/reference/operator-clear.ps3.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-clear.ps3.argb32.ref.png diff --git a/cairo/test/reference/operator-clear.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-clear.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/operator-clear.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-clear.quartz.argb32.ref.png diff --git a/cairo/test/reference/operator-clear.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-clear.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/operator-clear.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-clear.quartz.rgb24.ref.png diff --git a/cairo/test/reference/operator-clear.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-clear.rgb24.ref.png similarity index 100% rename from cairo/test/reference/operator-clear.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-clear.rgb24.ref.png diff --git a/cairo/test/reference/operator-clear.svg12.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/operator-clear.svg12.argb32.xfail.png similarity index 100% rename from cairo/test/reference/operator-clear.svg12.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/operator-clear.svg12.argb32.xfail.png diff --git a/cairo/test/reference/operator-clear.svg12.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/operator-clear.svg12.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/operator-clear.svg12.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/operator-clear.svg12.rgb24.xfail.png diff --git a/cairo/test/reference/operator-clear.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-clear.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/operator-clear.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-clear.traps.argb32.ref.png diff --git a/cairo/test/reference/operator-clear.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-clear.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/operator-clear.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-clear.traps.rgb24.ref.png diff --git a/cairo/test/reference/operator-source.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-source.argb32.ref.png similarity index 100% rename from cairo/test/reference/operator-source.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-source.argb32.ref.png diff --git a/cairo/test/reference/operator-source.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-source.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/operator-source.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-source.base.argb32.ref.png diff --git a/cairo/test/reference/operator-source.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-source.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/operator-source.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-source.base.rgb24.ref.png diff --git a/cairo/test/reference/operator-source.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-source.image16.ref.png similarity index 100% rename from cairo/test/reference/operator-source.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-source.image16.ref.png diff --git a/cairo/test/reference/operator-source.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-source.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/operator-source.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-source.mask.argb32.ref.png diff --git a/cairo/test/reference/operator-source.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-source.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/operator-source.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-source.mask.rgb24.ref.png diff --git a/cairo/test/reference/operator-source.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-source.rgb24.ref.png similarity index 100% rename from cairo/test/reference/operator-source.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-source.rgb24.ref.png diff --git a/cairo/test/reference/operator-source.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-source.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/operator-source.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-source.traps.argb32.ref.png diff --git a/cairo/test/reference/operator-source.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-source.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/operator-source.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-source.traps.rgb24.ref.png diff --git a/cairo/test/reference/operator-source.xlib-fallback.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator-source.xlib-fallback.ref.png similarity index 100% rename from cairo/test/reference/operator-source.xlib-fallback.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator-source.xlib-fallback.ref.png diff --git a/cairo/test/reference/operator.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator.argb32.ref.png similarity index 100% rename from cairo/test/reference/operator.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator.argb32.ref.png diff --git a/cairo/test/reference/operator.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/operator.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator.base.argb32.ref.png diff --git a/cairo/test/reference/operator.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/operator.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator.base.rgb24.ref.png diff --git a/cairo/test/reference/operator.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/operator.rgb24.ref.png similarity index 100% rename from cairo/test/reference/operator.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/operator.rgb24.ref.png diff --git a/cairo/test/reference/operator.svg12.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/operator.svg12.argb32.xfail.png similarity index 100% rename from cairo/test/reference/operator.svg12.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/operator.svg12.argb32.xfail.png diff --git a/cairo/test/reference/operator.svg12.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/operator.svg12.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/operator.svg12.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/operator.svg12.rgb24.xfail.png diff --git a/cairo/test/reference/outline-tolerance.ref.png b/io2d/src/3rd-party/cairo/test/reference/outline-tolerance.ref.png similarity index 100% rename from cairo/test/reference/outline-tolerance.ref.png rename to io2d/src/3rd-party/cairo/test/reference/outline-tolerance.ref.png diff --git a/cairo/test/reference/over-above-source.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-above-source.argb32.ref.png similarity index 100% rename from cairo/test/reference/over-above-source.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-above-source.argb32.ref.png diff --git a/cairo/test/reference/over-above-source.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-above-source.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/over-above-source.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-above-source.base.argb32.ref.png diff --git a/cairo/test/reference/over-above-source.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-above-source.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/over-above-source.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-above-source.base.rgb24.ref.png diff --git a/cairo/test/reference/over-above-source.ps2.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-above-source.ps2.argb32.ref.png similarity index 100% rename from cairo/test/reference/over-above-source.ps2.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-above-source.ps2.argb32.ref.png diff --git a/cairo/test/reference/over-above-source.ps3.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-above-source.ps3.argb32.ref.png similarity index 100% rename from cairo/test/reference/over-above-source.ps3.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-above-source.ps3.argb32.ref.png diff --git a/cairo/test/reference/over-above-source.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-above-source.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/over-above-source.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-above-source.quartz.argb32.ref.png diff --git a/cairo/test/reference/over-above-source.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-above-source.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/over-above-source.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-above-source.quartz.rgb24.ref.png diff --git a/cairo/test/reference/over-above-source.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-above-source.rgb24.ref.png similarity index 100% rename from cairo/test/reference/over-above-source.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-above-source.rgb24.ref.png diff --git a/cairo/test/reference/over-above-source.svg12.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/over-above-source.svg12.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/over-above-source.svg12.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/over-above-source.svg12.rgb24.xfail.png diff --git a/cairo/test/reference/over-above-source.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-above-source.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/over-above-source.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-above-source.traps.argb32.ref.png diff --git a/cairo/test/reference/over-above-source.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-above-source.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/over-above-source.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-above-source.traps.rgb24.ref.png diff --git a/cairo/test/reference/over-around-source.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-around-source.argb32.ref.png similarity index 100% rename from cairo/test/reference/over-around-source.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-around-source.argb32.ref.png diff --git a/cairo/test/reference/over-around-source.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-around-source.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/over-around-source.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-around-source.base.argb32.ref.png diff --git a/cairo/test/reference/over-around-source.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-around-source.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/over-around-source.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-around-source.base.rgb24.ref.png diff --git a/cairo/test/reference/over-around-source.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-around-source.image16.ref.png similarity index 100% rename from cairo/test/reference/over-around-source.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-around-source.image16.ref.png diff --git a/cairo/test/reference/over-around-source.pdf.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-around-source.pdf.argb32.ref.png similarity index 100% rename from cairo/test/reference/over-around-source.pdf.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-around-source.pdf.argb32.ref.png diff --git a/cairo/test/reference/over-around-source.ps2.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-around-source.ps2.argb32.ref.png similarity index 100% rename from cairo/test/reference/over-around-source.ps2.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-around-source.ps2.argb32.ref.png diff --git a/cairo/test/reference/over-around-source.ps2.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-around-source.ps2.rgb24.ref.png similarity index 100% rename from cairo/test/reference/over-around-source.ps2.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-around-source.ps2.rgb24.ref.png diff --git a/cairo/test/reference/over-around-source.ps3.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-around-source.ps3.argb32.ref.png similarity index 100% rename from cairo/test/reference/over-around-source.ps3.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-around-source.ps3.argb32.ref.png diff --git a/cairo/test/reference/over-around-source.ps3.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-around-source.ps3.rgb24.ref.png similarity index 100% rename from cairo/test/reference/over-around-source.ps3.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-around-source.ps3.rgb24.ref.png diff --git a/cairo/test/reference/over-around-source.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-around-source.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/over-around-source.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-around-source.quartz.argb32.ref.png diff --git a/cairo/test/reference/over-around-source.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-around-source.rgb24.ref.png similarity index 100% rename from cairo/test/reference/over-around-source.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-around-source.rgb24.ref.png diff --git a/cairo/test/reference/over-around-source.svg12.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/over-around-source.svg12.argb32.xfail.png similarity index 100% rename from cairo/test/reference/over-around-source.svg12.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/over-around-source.svg12.argb32.xfail.png diff --git a/cairo/test/reference/over-around-source.svg12.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/over-around-source.svg12.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/over-around-source.svg12.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/over-around-source.svg12.rgb24.xfail.png diff --git a/cairo/test/reference/over-around-source.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-around-source.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/over-around-source.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-around-source.traps.argb32.ref.png diff --git a/cairo/test/reference/over-around-source.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-around-source.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/over-around-source.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-around-source.traps.rgb24.ref.png diff --git a/cairo/test/reference/over-below-source.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-below-source.argb32.ref.png similarity index 100% rename from cairo/test/reference/over-below-source.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-below-source.argb32.ref.png diff --git a/cairo/test/reference/over-below-source.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-below-source.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/over-below-source.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-below-source.base.argb32.ref.png diff --git a/cairo/test/reference/over-below-source.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-below-source.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/over-below-source.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-below-source.base.rgb24.ref.png diff --git a/cairo/test/reference/over-below-source.pdf.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-below-source.pdf.argb32.ref.png similarity index 100% rename from cairo/test/reference/over-below-source.pdf.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-below-source.pdf.argb32.ref.png diff --git a/cairo/test/reference/over-below-source.ps2.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-below-source.ps2.argb32.ref.png similarity index 100% rename from cairo/test/reference/over-below-source.ps2.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-below-source.ps2.argb32.ref.png diff --git a/cairo/test/reference/over-below-source.ps2.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-below-source.ps2.rgb24.ref.png similarity index 100% rename from cairo/test/reference/over-below-source.ps2.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-below-source.ps2.rgb24.ref.png diff --git a/cairo/test/reference/over-below-source.ps3.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-below-source.ps3.argb32.ref.png similarity index 100% rename from cairo/test/reference/over-below-source.ps3.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-below-source.ps3.argb32.ref.png diff --git a/cairo/test/reference/over-below-source.ps3.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-below-source.ps3.rgb24.ref.png similarity index 100% rename from cairo/test/reference/over-below-source.ps3.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-below-source.ps3.rgb24.ref.png diff --git a/cairo/test/reference/over-below-source.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-below-source.rgb24.ref.png similarity index 100% rename from cairo/test/reference/over-below-source.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-below-source.rgb24.ref.png diff --git a/cairo/test/reference/over-below-source.svg12.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/over-below-source.svg12.argb32.xfail.png similarity index 100% rename from cairo/test/reference/over-below-source.svg12.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/over-below-source.svg12.argb32.xfail.png diff --git a/cairo/test/reference/over-below-source.svg12.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/over-below-source.svg12.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/over-below-source.svg12.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/over-below-source.svg12.rgb24.xfail.png diff --git a/cairo/test/reference/over-below-source.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-below-source.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/over-below-source.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-below-source.traps.argb32.ref.png diff --git a/cairo/test/reference/over-below-source.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-below-source.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/over-below-source.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-below-source.traps.rgb24.ref.png diff --git a/cairo/test/reference/over-between-source.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-between-source.argb32.ref.png similarity index 100% rename from cairo/test/reference/over-between-source.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-between-source.argb32.ref.png diff --git a/cairo/test/reference/over-between-source.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-between-source.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/over-between-source.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-between-source.base.argb32.ref.png diff --git a/cairo/test/reference/over-between-source.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-between-source.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/over-between-source.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-between-source.base.rgb24.ref.png diff --git a/cairo/test/reference/over-between-source.ps2.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-between-source.ps2.argb32.ref.png similarity index 100% rename from cairo/test/reference/over-between-source.ps2.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-between-source.ps2.argb32.ref.png diff --git a/cairo/test/reference/over-between-source.ps3.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-between-source.ps3.argb32.ref.png similarity index 100% rename from cairo/test/reference/over-between-source.ps3.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-between-source.ps3.argb32.ref.png diff --git a/cairo/test/reference/over-between-source.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-between-source.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/over-between-source.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-between-source.quartz.argb32.ref.png diff --git a/cairo/test/reference/over-between-source.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-between-source.rgb24.ref.png similarity index 100% rename from cairo/test/reference/over-between-source.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-between-source.rgb24.ref.png diff --git a/cairo/test/reference/over-between-source.svg12.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/over-between-source.svg12.argb32.xfail.png similarity index 100% rename from cairo/test/reference/over-between-source.svg12.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/over-between-source.svg12.argb32.xfail.png diff --git a/cairo/test/reference/over-between-source.svg12.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/over-between-source.svg12.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/over-between-source.svg12.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/over-between-source.svg12.rgb24.xfail.png diff --git a/cairo/test/reference/over-between-source.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-between-source.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/over-between-source.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-between-source.traps.argb32.ref.png diff --git a/cairo/test/reference/over-between-source.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/over-between-source.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/over-between-source.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/over-between-source.traps.rgb24.ref.png diff --git a/cairo/test/reference/overlapping-boxes.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/overlapping-boxes.argb32.ref.png similarity index 100% rename from cairo/test/reference/overlapping-boxes.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/overlapping-boxes.argb32.ref.png diff --git a/cairo/test/reference/overlapping-boxes.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/overlapping-boxes.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/overlapping-boxes.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/overlapping-boxes.base.argb32.ref.png diff --git a/cairo/test/reference/overlapping-boxes.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/overlapping-boxes.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/overlapping-boxes.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/overlapping-boxes.base.rgb24.ref.png diff --git a/cairo/test/reference/overlapping-boxes.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/overlapping-boxes.rgb24.ref.png similarity index 100% rename from cairo/test/reference/overlapping-boxes.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/overlapping-boxes.rgb24.ref.png diff --git a/cairo/test/reference/overlapping-boxes.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/overlapping-boxes.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/overlapping-boxes.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/overlapping-boxes.traps.argb32.ref.png diff --git a/cairo/test/reference/overlapping-boxes.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/overlapping-boxes.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/overlapping-boxes.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/overlapping-boxes.traps.rgb24.ref.png diff --git a/cairo/test/reference/overlapping-dash-caps.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/overlapping-dash-caps.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/overlapping-dash-caps.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/overlapping-dash-caps.base.argb32.ref.png diff --git a/cairo/test/reference/overlapping-dash-caps.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/overlapping-dash-caps.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/overlapping-dash-caps.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/overlapping-dash-caps.base.rgb24.ref.png diff --git a/cairo/test/reference/overlapping-dash-caps.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/overlapping-dash-caps.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/overlapping-dash-caps.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/overlapping-dash-caps.mask.argb32.ref.png diff --git a/cairo/test/reference/overlapping-dash-caps.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/overlapping-dash-caps.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/overlapping-dash-caps.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/overlapping-dash-caps.mask.rgb24.ref.png diff --git a/cairo/test/reference/overlapping-dash-caps.ref.png b/io2d/src/3rd-party/cairo/test/reference/overlapping-dash-caps.ref.png similarity index 100% rename from cairo/test/reference/overlapping-dash-caps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/overlapping-dash-caps.ref.png diff --git a/cairo/test/reference/overlapping-dash-caps.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/overlapping-dash-caps.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/overlapping-dash-caps.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/overlapping-dash-caps.traps.argb32.ref.png diff --git a/cairo/test/reference/overlapping-dash-caps.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/overlapping-dash-caps.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/overlapping-dash-caps.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/overlapping-dash-caps.traps.rgb24.ref.png diff --git a/cairo/test/reference/overlapping-glyphs.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/overlapping-glyphs.argb32.ref.png similarity index 100% rename from cairo/test/reference/overlapping-glyphs.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/overlapping-glyphs.argb32.ref.png diff --git a/cairo/test/reference/overlapping-glyphs.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/overlapping-glyphs.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/overlapping-glyphs.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/overlapping-glyphs.base.argb32.ref.png diff --git a/cairo/test/reference/overlapping-glyphs.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/overlapping-glyphs.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/overlapping-glyphs.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/overlapping-glyphs.base.rgb24.ref.png diff --git a/cairo/test/reference/overlapping-glyphs.pdf.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/overlapping-glyphs.pdf.argb32.xfail.png similarity index 100% rename from cairo/test/reference/overlapping-glyphs.pdf.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/overlapping-glyphs.pdf.argb32.xfail.png diff --git a/cairo/test/reference/overlapping-glyphs.pdf.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/overlapping-glyphs.pdf.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/overlapping-glyphs.pdf.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/overlapping-glyphs.pdf.rgb24.xfail.png diff --git a/cairo/test/reference/overlapping-glyphs.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/overlapping-glyphs.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/overlapping-glyphs.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/overlapping-glyphs.quartz.argb32.ref.png diff --git a/cairo/test/reference/overlapping-glyphs.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/overlapping-glyphs.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/overlapping-glyphs.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/overlapping-glyphs.quartz.rgb24.ref.png diff --git a/cairo/test/reference/overlapping-glyphs.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/overlapping-glyphs.rgb24.ref.png similarity index 100% rename from cairo/test/reference/overlapping-glyphs.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/overlapping-glyphs.rgb24.ref.png diff --git a/cairo/test/reference/overlapping-glyphs.svg.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/overlapping-glyphs.svg.argb32.ref.png similarity index 100% rename from cairo/test/reference/overlapping-glyphs.svg.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/overlapping-glyphs.svg.argb32.ref.png diff --git a/cairo/test/reference/overlapping-glyphs.svg.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/overlapping-glyphs.svg.rgb24.ref.png similarity index 100% rename from cairo/test/reference/overlapping-glyphs.svg.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/overlapping-glyphs.svg.rgb24.ref.png diff --git a/cairo/test/reference/overlapping-glyphs.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/overlapping-glyphs.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/overlapping-glyphs.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/overlapping-glyphs.traps.argb32.ref.png diff --git a/cairo/test/reference/overlapping-glyphs.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/overlapping-glyphs.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/overlapping-glyphs.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/overlapping-glyphs.traps.rgb24.ref.png diff --git a/cairo/test/reference/paint-clip-fill-aa.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-clip-fill-aa.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/paint-clip-fill-aa.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-clip-fill-aa.base.argb32.ref.png diff --git a/cairo/test/reference/paint-clip-fill-aa.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-clip-fill-aa.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/paint-clip-fill-aa.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-clip-fill-aa.base.rgb24.ref.png diff --git a/cairo/test/reference/paint-clip-fill-aa.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-clip-fill-aa.ref.png similarity index 100% rename from cairo/test/reference/paint-clip-fill-aa.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-clip-fill-aa.ref.png diff --git a/cairo/test/reference/paint-clip-fill-mono.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-clip-fill-mono.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/paint-clip-fill-mono.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-clip-fill-mono.base.argb32.ref.png diff --git a/cairo/test/reference/paint-clip-fill-mono.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-clip-fill-mono.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/paint-clip-fill-mono.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-clip-fill-mono.base.rgb24.ref.png diff --git a/cairo/test/reference/paint-clip-fill-mono.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-clip-fill-mono.ref.png similarity index 100% rename from cairo/test/reference/paint-clip-fill-mono.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-clip-fill-mono.ref.png diff --git a/cairo/test/reference/paint-repeat.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-repeat.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/paint-repeat.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-repeat.base.argb32.ref.png diff --git a/cairo/test/reference/paint-repeat.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-repeat.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/paint-repeat.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-repeat.base.rgb24.ref.png diff --git a/cairo/test/reference/paint-repeat.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-repeat.ref.png similarity index 100% rename from cairo/test/reference/paint-repeat.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-repeat.ref.png diff --git a/cairo/test/reference/paint-source-alpha.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-source-alpha.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/paint-source-alpha.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-source-alpha.base.argb32.ref.png diff --git a/cairo/test/reference/paint-source-alpha.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-source-alpha.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/paint-source-alpha.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-source-alpha.base.rgb24.ref.png diff --git a/cairo/test/reference/paint-source-alpha.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-source-alpha.image16.ref.png similarity index 100% rename from cairo/test/reference/paint-source-alpha.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-source-alpha.image16.ref.png diff --git a/cairo/test/reference/paint-source-alpha.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-source-alpha.ref.png similarity index 100% rename from cairo/test/reference/paint-source-alpha.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-source-alpha.ref.png diff --git a/cairo/test/reference/paint-source-alpha.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-source-alpha.svg.ref.png similarity index 100% rename from cairo/test/reference/paint-source-alpha.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-source-alpha.svg.ref.png diff --git a/cairo/test/reference/paint-with-alpha-clip-mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip-mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha-clip-mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip-mask.argb32.ref.png diff --git a/cairo/test/reference/paint-with-alpha-clip-mask.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip-mask.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha-clip-mask.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip-mask.base.argb32.ref.png diff --git a/cairo/test/reference/paint-with-alpha-clip-mask.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip-mask.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha-clip-mask.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip-mask.base.rgb24.ref.png diff --git a/cairo/test/reference/paint-with-alpha-clip-mask.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip-mask.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha-clip-mask.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip-mask.mask.argb32.ref.png diff --git a/cairo/test/reference/paint-with-alpha-clip-mask.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip-mask.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha-clip-mask.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip-mask.mask.rgb24.ref.png diff --git a/cairo/test/reference/paint-with-alpha-clip-mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip-mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha-clip-mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip-mask.rgb24.ref.png diff --git a/cairo/test/reference/paint-with-alpha-clip-mask.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip-mask.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha-clip-mask.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip-mask.traps.argb32.ref.png diff --git a/cairo/test/reference/paint-with-alpha-clip-mask.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip-mask.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha-clip-mask.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip-mask.traps.rgb24.ref.png diff --git a/cairo/test/reference/paint-with-alpha-clip.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha-clip.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip.base.argb32.ref.png diff --git a/cairo/test/reference/paint-with-alpha-clip.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha-clip.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip.base.rgb24.ref.png diff --git a/cairo/test/reference/paint-with-alpha-clip.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha-clip.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip.mask.argb32.ref.png diff --git a/cairo/test/reference/paint-with-alpha-clip.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha-clip.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip.mask.rgb24.ref.png diff --git a/cairo/test/reference/paint-with-alpha-clip.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha-clip.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip.ref.png diff --git a/cairo/test/reference/paint-with-alpha-clip.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha-clip.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip.traps.argb32.ref.png diff --git a/cairo/test/reference/paint-with-alpha-clip.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha-clip.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-clip.traps.rgb24.ref.png diff --git a/cairo/test/reference/paint-with-alpha-solid-clip.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-solid-clip.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha-solid-clip.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-solid-clip.base.argb32.ref.png diff --git a/cairo/test/reference/paint-with-alpha-solid-clip.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-solid-clip.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha-solid-clip.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-solid-clip.base.rgb24.ref.png diff --git a/cairo/test/reference/paint-with-alpha-solid-clip.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-solid-clip.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha-solid-clip.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-solid-clip.mask.argb32.ref.png diff --git a/cairo/test/reference/paint-with-alpha-solid-clip.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-solid-clip.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha-solid-clip.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-solid-clip.mask.rgb24.ref.png diff --git a/cairo/test/reference/paint-with-alpha-solid-clip.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-solid-clip.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha-solid-clip.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-solid-clip.ref.png diff --git a/cairo/test/reference/paint-with-alpha-solid-clip.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-solid-clip.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha-solid-clip.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-solid-clip.traps.argb32.ref.png diff --git a/cairo/test/reference/paint-with-alpha-solid-clip.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-solid-clip.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha-solid-clip.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha-solid-clip.traps.rgb24.ref.png diff --git a/cairo/test/reference/paint-with-alpha.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha.base.argb32.ref.png diff --git a/cairo/test/reference/paint-with-alpha.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha.base.rgb24.ref.png diff --git a/cairo/test/reference/paint-with-alpha.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha.image16.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha.image16.ref.png diff --git a/cairo/test/reference/paint-with-alpha.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha.ref.png diff --git a/cairo/test/reference/paint-with-alpha.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint-with-alpha.svg.ref.png similarity index 100% rename from cairo/test/reference/paint-with-alpha.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint-with-alpha.svg.ref.png diff --git a/cairo/test/reference/paint.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/paint.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint.base.argb32.ref.png diff --git a/cairo/test/reference/paint.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/paint.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint.base.rgb24.ref.png diff --git a/cairo/test/reference/paint.ref.png b/io2d/src/3rd-party/cairo/test/reference/paint.ref.png similarity index 100% rename from cairo/test/reference/paint.ref.png rename to io2d/src/3rd-party/cairo/test/reference/paint.ref.png diff --git a/cairo/test/reference/partial-clip-text-bottom.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-clip-text-bottom.argb32.ref.png similarity index 100% rename from cairo/test/reference/partial-clip-text-bottom.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-clip-text-bottom.argb32.ref.png diff --git a/cairo/test/reference/partial-clip-text-bottom.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-clip-text-bottom.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/partial-clip-text-bottom.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-clip-text-bottom.base.argb32.ref.png diff --git a/cairo/test/reference/partial-clip-text-bottom.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-clip-text-bottom.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/partial-clip-text-bottom.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-clip-text-bottom.base.rgb24.ref.png diff --git a/cairo/test/reference/partial-clip-text-bottom.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-clip-text-bottom.rgb24.ref.png similarity index 100% rename from cairo/test/reference/partial-clip-text-bottom.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-clip-text-bottom.rgb24.ref.png diff --git a/cairo/test/reference/partial-clip-text-left.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-clip-text-left.argb32.ref.png similarity index 100% rename from cairo/test/reference/partial-clip-text-left.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-clip-text-left.argb32.ref.png diff --git a/cairo/test/reference/partial-clip-text-left.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-clip-text-left.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/partial-clip-text-left.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-clip-text-left.base.argb32.ref.png diff --git a/cairo/test/reference/partial-clip-text-left.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-clip-text-left.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/partial-clip-text-left.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-clip-text-left.base.rgb24.ref.png diff --git a/cairo/test/reference/partial-clip-text-left.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-clip-text-left.rgb24.ref.png similarity index 100% rename from cairo/test/reference/partial-clip-text-left.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-clip-text-left.rgb24.ref.png diff --git a/cairo/test/reference/partial-clip-text-right.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-clip-text-right.argb32.ref.png similarity index 100% rename from cairo/test/reference/partial-clip-text-right.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-clip-text-right.argb32.ref.png diff --git a/cairo/test/reference/partial-clip-text-right.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-clip-text-right.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/partial-clip-text-right.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-clip-text-right.base.argb32.ref.png diff --git a/cairo/test/reference/partial-clip-text-right.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-clip-text-right.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/partial-clip-text-right.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-clip-text-right.base.rgb24.ref.png diff --git a/cairo/test/reference/partial-clip-text-right.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-clip-text-right.rgb24.ref.png similarity index 100% rename from cairo/test/reference/partial-clip-text-right.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-clip-text-right.rgb24.ref.png diff --git a/cairo/test/reference/partial-clip-text-right.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-clip-text-right.traps.ref.png similarity index 100% rename from cairo/test/reference/partial-clip-text-right.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-clip-text-right.traps.ref.png diff --git a/cairo/test/reference/partial-clip-text-top.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-clip-text-top.argb32.ref.png similarity index 100% rename from cairo/test/reference/partial-clip-text-top.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-clip-text-top.argb32.ref.png diff --git a/cairo/test/reference/partial-clip-text-top.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-clip-text-top.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/partial-clip-text-top.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-clip-text-top.base.argb32.ref.png diff --git a/cairo/test/reference/partial-clip-text-top.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-clip-text-top.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/partial-clip-text-top.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-clip-text-top.base.rgb24.ref.png diff --git a/cairo/test/reference/partial-clip-text-top.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-clip-text-top.ps.ref.png similarity index 100% rename from cairo/test/reference/partial-clip-text-top.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-clip-text-top.ps.ref.png diff --git a/cairo/test/reference/partial-clip-text-top.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-clip-text-top.quartz.ref.png similarity index 100% rename from cairo/test/reference/partial-clip-text-top.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-clip-text-top.quartz.ref.png diff --git a/cairo/test/reference/partial-clip-text-top.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-clip-text-top.rgb24.ref.png similarity index 100% rename from cairo/test/reference/partial-clip-text-top.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-clip-text-top.rgb24.ref.png diff --git a/cairo/test/reference/partial-clip-text-top.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-clip-text-top.svg.ref.png similarity index 100% rename from cairo/test/reference/partial-clip-text-top.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-clip-text-top.svg.ref.png diff --git a/cairo/test/reference/partial-clip-text-top.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-clip-text-top.traps.ref.png similarity index 100% rename from cairo/test/reference/partial-clip-text-top.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-clip-text-top.traps.ref.png diff --git a/cairo/test/reference/partial-coverage-half-reference.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-coverage-half-reference.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/partial-coverage-half-reference.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-coverage-half-reference.base.argb32.ref.png diff --git a/cairo/test/reference/partial-coverage-half-reference.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-coverage-half-reference.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/partial-coverage-half-reference.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-coverage-half-reference.base.rgb24.ref.png diff --git a/cairo/test/reference/partial-coverage-half-reference.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-coverage-half-reference.ref.png similarity index 100% rename from cairo/test/reference/partial-coverage-half-reference.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-coverage-half-reference.ref.png diff --git a/cairo/test/reference/partial-coverage-half-triangles.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-coverage-half-triangles.ref.png similarity index 100% rename from cairo/test/reference/partial-coverage-half-triangles.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-coverage-half-triangles.ref.png diff --git a/cairo/test/reference/partial-coverage-intersecting-quads.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-coverage-intersecting-quads.ref.png similarity index 100% rename from cairo/test/reference/partial-coverage-intersecting-quads.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-coverage-intersecting-quads.ref.png diff --git a/cairo/test/reference/partial-coverage-intersecting-quads.xfail.png b/io2d/src/3rd-party/cairo/test/reference/partial-coverage-intersecting-quads.xfail.png similarity index 100% rename from cairo/test/reference/partial-coverage-intersecting-quads.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/partial-coverage-intersecting-quads.xfail.png diff --git a/cairo/test/reference/partial-coverage-intersecting-triangles.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-coverage-intersecting-triangles.ref.png similarity index 100% rename from cairo/test/reference/partial-coverage-intersecting-triangles.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-coverage-intersecting-triangles.ref.png diff --git a/cairo/test/reference/partial-coverage-overlap-half-triangles-eo.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-coverage-overlap-half-triangles-eo.ref.png similarity index 100% rename from cairo/test/reference/partial-coverage-overlap-half-triangles-eo.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-coverage-overlap-half-triangles-eo.ref.png diff --git a/cairo/test/reference/partial-coverage-overlap-half-triangles.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-coverage-overlap-half-triangles.ref.png similarity index 100% rename from cairo/test/reference/partial-coverage-overlap-half-triangles.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-coverage-overlap-half-triangles.ref.png diff --git a/cairo/test/reference/partial-coverage-overlap-three-quarter-triangles.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-coverage-overlap-three-quarter-triangles.ref.png similarity index 100% rename from cairo/test/reference/partial-coverage-overlap-three-quarter-triangles.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-coverage-overlap-three-quarter-triangles.ref.png diff --git a/cairo/test/reference/partial-coverage-rectangles.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-coverage-rectangles.ref.png similarity index 100% rename from cairo/test/reference/partial-coverage-rectangles.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-coverage-rectangles.ref.png diff --git a/cairo/test/reference/partial-coverage-reference.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-coverage-reference.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/partial-coverage-reference.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-coverage-reference.base.argb32.ref.png diff --git a/cairo/test/reference/partial-coverage-reference.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-coverage-reference.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/partial-coverage-reference.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-coverage-reference.base.rgb24.ref.png diff --git a/cairo/test/reference/partial-coverage-reference.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-coverage-reference.ref.png similarity index 100% rename from cairo/test/reference/partial-coverage-reference.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-coverage-reference.ref.png diff --git a/cairo/test/reference/partial-coverage-three-quarter-reference.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-coverage-three-quarter-reference.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/partial-coverage-three-quarter-reference.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-coverage-three-quarter-reference.base.argb32.ref.png diff --git a/cairo/test/reference/partial-coverage-three-quarter-reference.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-coverage-three-quarter-reference.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/partial-coverage-three-quarter-reference.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-coverage-three-quarter-reference.base.rgb24.ref.png diff --git a/cairo/test/reference/partial-coverage-three-quarter-reference.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-coverage-three-quarter-reference.ref.png similarity index 100% rename from cairo/test/reference/partial-coverage-three-quarter-reference.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-coverage-three-quarter-reference.ref.png diff --git a/cairo/test/reference/partial-coverage-triangles.ref.png b/io2d/src/3rd-party/cairo/test/reference/partial-coverage-triangles.ref.png similarity index 100% rename from cairo/test/reference/partial-coverage-triangles.ref.png rename to io2d/src/3rd-party/cairo/test/reference/partial-coverage-triangles.ref.png diff --git a/cairo/test/reference/pass-through.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/pass-through.argb32.ref.png similarity index 100% rename from cairo/test/reference/pass-through.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pass-through.argb32.ref.png diff --git a/cairo/test/reference/pass-through.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/pass-through.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/pass-through.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pass-through.base.argb32.ref.png diff --git a/cairo/test/reference/pass-through.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/pass-through.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/pass-through.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pass-through.base.rgb24.ref.png diff --git a/cairo/test/reference/pass-through.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/pass-through.rgb24.ref.png similarity index 100% rename from cairo/test/reference/pass-through.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pass-through.rgb24.ref.png diff --git a/cairo/test/reference/path-append.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/path-append.argb32.ref.png similarity index 100% rename from cairo/test/reference/path-append.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/path-append.argb32.ref.png diff --git a/cairo/test/reference/path-append.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/path-append.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/path-append.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/path-append.base.argb32.ref.png diff --git a/cairo/test/reference/path-append.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/path-append.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/path-append.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/path-append.base.rgb24.ref.png diff --git a/cairo/test/reference/path-append.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/path-append.image16.ref.png similarity index 100% rename from cairo/test/reference/path-append.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/path-append.image16.ref.png diff --git a/cairo/test/reference/path-append.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/path-append.ps.ref.png similarity index 100% rename from cairo/test/reference/path-append.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/path-append.ps.ref.png diff --git a/cairo/test/reference/path-append.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/path-append.quartz.ref.png similarity index 100% rename from cairo/test/reference/path-append.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/path-append.quartz.ref.png diff --git a/cairo/test/reference/path-append.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/path-append.rgb24.ref.png similarity index 100% rename from cairo/test/reference/path-append.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/path-append.rgb24.ref.png diff --git a/cairo/test/reference/path-append.test-fallback.ref.png b/io2d/src/3rd-party/cairo/test/reference/path-append.test-fallback.ref.png similarity index 100% rename from cairo/test/reference/path-append.test-fallback.ref.png rename to io2d/src/3rd-party/cairo/test/reference/path-append.test-fallback.ref.png diff --git a/cairo/test/reference/path-append.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/path-append.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/path-append.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/path-append.traps.argb32.ref.png diff --git a/cairo/test/reference/path-append.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/path-append.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/path-append.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/path-append.traps.rgb24.ref.png diff --git a/cairo/test/reference/path-append.xlib-fallback.ref.png b/io2d/src/3rd-party/cairo/test/reference/path-append.xlib-fallback.ref.png similarity index 100% rename from cairo/test/reference/path-append.xlib-fallback.ref.png rename to io2d/src/3rd-party/cairo/test/reference/path-append.xlib-fallback.ref.png diff --git a/cairo/test/reference/path-stroke-twice.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/path-stroke-twice.argb32.ref.png similarity index 100% rename from cairo/test/reference/path-stroke-twice.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/path-stroke-twice.argb32.ref.png diff --git a/cairo/test/reference/path-stroke-twice.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/path-stroke-twice.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/path-stroke-twice.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/path-stroke-twice.base.argb32.ref.png diff --git a/cairo/test/reference/path-stroke-twice.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/path-stroke-twice.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/path-stroke-twice.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/path-stroke-twice.base.rgb24.ref.png diff --git a/cairo/test/reference/path-stroke-twice.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/path-stroke-twice.image16.ref.png similarity index 100% rename from cairo/test/reference/path-stroke-twice.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/path-stroke-twice.image16.ref.png diff --git a/cairo/test/reference/path-stroke-twice.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/path-stroke-twice.ps.ref.png similarity index 100% rename from cairo/test/reference/path-stroke-twice.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/path-stroke-twice.ps.ref.png diff --git a/cairo/test/reference/path-stroke-twice.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/path-stroke-twice.rgb24.ref.png similarity index 100% rename from cairo/test/reference/path-stroke-twice.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/path-stroke-twice.rgb24.ref.png diff --git a/cairo/test/reference/path-stroke-twice.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/path-stroke-twice.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/path-stroke-twice.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/path-stroke-twice.traps.argb32.ref.png diff --git a/cairo/test/reference/path-stroke-twice.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/path-stroke-twice.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/path-stroke-twice.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/path-stroke-twice.traps.rgb24.ref.png diff --git a/cairo/test/reference/pattern-getters.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/pattern-getters.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/pattern-getters.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pattern-getters.base.argb32.ref.png diff --git a/cairo/test/reference/pattern-getters.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/pattern-getters.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/pattern-getters.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pattern-getters.base.rgb24.ref.png diff --git a/cairo/test/reference/pattern-getters.ref.png b/io2d/src/3rd-party/cairo/test/reference/pattern-getters.ref.png similarity index 100% rename from cairo/test/reference/pattern-getters.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pattern-getters.ref.png diff --git a/cairo/test/reference/pdf-isolated-group.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/pdf-isolated-group.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/pdf-isolated-group.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pdf-isolated-group.base.argb32.ref.png diff --git a/cairo/test/reference/pdf-isolated-group.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/pdf-isolated-group.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/pdf-isolated-group.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pdf-isolated-group.base.rgb24.ref.png diff --git a/cairo/test/reference/pdf-isolated-group.ref.png b/io2d/src/3rd-party/cairo/test/reference/pdf-isolated-group.ref.png similarity index 100% rename from cairo/test/reference/pdf-isolated-group.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pdf-isolated-group.ref.png diff --git a/cairo/test/reference/pdf-surface-source.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/pdf-surface-source.argb32.ref.png similarity index 100% rename from cairo/test/reference/pdf-surface-source.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pdf-surface-source.argb32.ref.png diff --git a/cairo/test/reference/pdf-surface-source.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/pdf-surface-source.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/pdf-surface-source.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pdf-surface-source.base.argb32.ref.png diff --git a/cairo/test/reference/pdf-surface-source.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/pdf-surface-source.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/pdf-surface-source.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pdf-surface-source.base.rgb24.ref.png diff --git a/cairo/test/reference/pdf-surface-source.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/pdf-surface-source.image16.ref.png similarity index 100% rename from cairo/test/reference/pdf-surface-source.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pdf-surface-source.image16.ref.png diff --git a/cairo/test/reference/pdf-surface-source.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/pdf-surface-source.rgb24.ref.png similarity index 100% rename from cairo/test/reference/pdf-surface-source.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pdf-surface-source.rgb24.ref.png diff --git a/cairo/test/reference/pdf-surface-source.svg12.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/pdf-surface-source.svg12.argb32.xfail.png similarity index 100% rename from cairo/test/reference/pdf-surface-source.svg12.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/pdf-surface-source.svg12.argb32.xfail.png diff --git a/cairo/test/reference/pdf-surface-source.svg12.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/pdf-surface-source.svg12.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/pdf-surface-source.svg12.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/pdf-surface-source.svg12.rgb24.xfail.png diff --git a/cairo/test/reference/pixman-rotate.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/pixman-rotate.argb32.ref.png similarity index 100% rename from cairo/test/reference/pixman-rotate.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pixman-rotate.argb32.ref.png diff --git a/cairo/test/reference/pixman-rotate.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/pixman-rotate.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/pixman-rotate.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pixman-rotate.base.argb32.ref.png diff --git a/cairo/test/reference/pixman-rotate.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/pixman-rotate.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/pixman-rotate.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pixman-rotate.base.rgb24.ref.png diff --git a/cairo/test/reference/pixman-rotate.ps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/pixman-rotate.ps.argb32.ref.png similarity index 100% rename from cairo/test/reference/pixman-rotate.ps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pixman-rotate.ps.argb32.ref.png diff --git a/cairo/test/reference/pixman-rotate.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/pixman-rotate.rgb24.ref.png similarity index 100% rename from cairo/test/reference/pixman-rotate.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pixman-rotate.rgb24.ref.png diff --git a/cairo/test/reference/ps-eps.ref.png b/io2d/src/3rd-party/cairo/test/reference/ps-eps.ref.png similarity index 100% rename from cairo/test/reference/ps-eps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ps-eps.ref.png diff --git a/cairo/test/reference/ps-surface-source.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/ps-surface-source.argb32.ref.png similarity index 100% rename from cairo/test/reference/ps-surface-source.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ps-surface-source.argb32.ref.png diff --git a/cairo/test/reference/ps-surface-source.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/ps-surface-source.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/ps-surface-source.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ps-surface-source.base.argb32.ref.png diff --git a/cairo/test/reference/ps-surface-source.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/ps-surface-source.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/ps-surface-source.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ps-surface-source.base.rgb24.ref.png diff --git a/cairo/test/reference/ps-surface-source.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/ps-surface-source.image16.ref.png similarity index 100% rename from cairo/test/reference/ps-surface-source.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ps-surface-source.image16.ref.png diff --git a/cairo/test/reference/ps-surface-source.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/ps-surface-source.rgb24.ref.png similarity index 100% rename from cairo/test/reference/ps-surface-source.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/ps-surface-source.rgb24.ref.png diff --git a/cairo/test/reference/ps-surface-source.svg12.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/ps-surface-source.svg12.argb32.xfail.png similarity index 100% rename from cairo/test/reference/ps-surface-source.svg12.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/ps-surface-source.svg12.argb32.xfail.png diff --git a/cairo/test/reference/ps-surface-source.svg12.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/ps-surface-source.svg12.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/ps-surface-source.svg12.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/ps-surface-source.svg12.rgb24.xfail.png diff --git a/cairo/test/reference/pthread-same-source.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/pthread-same-source.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/pthread-same-source.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pthread-same-source.base.argb32.ref.png diff --git a/cairo/test/reference/pthread-same-source.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/pthread-same-source.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/pthread-same-source.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pthread-same-source.base.rgb24.ref.png diff --git a/cairo/test/reference/pthread-same-source.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/pthread-same-source.image16.ref.png similarity index 100% rename from cairo/test/reference/pthread-same-source.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pthread-same-source.image16.ref.png diff --git a/cairo/test/reference/pthread-same-source.quartz.xfail.png b/io2d/src/3rd-party/cairo/test/reference/pthread-same-source.quartz.xfail.png similarity index 100% rename from cairo/test/reference/pthread-same-source.quartz.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/pthread-same-source.quartz.xfail.png diff --git a/cairo/test/reference/pthread-same-source.ref.png b/io2d/src/3rd-party/cairo/test/reference/pthread-same-source.ref.png similarity index 100% rename from cairo/test/reference/pthread-same-source.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pthread-same-source.ref.png diff --git a/cairo/test/reference/pthread-show-text.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/pthread-show-text.argb32.ref.png similarity index 100% rename from cairo/test/reference/pthread-show-text.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pthread-show-text.argb32.ref.png diff --git a/cairo/test/reference/pthread-show-text.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/pthread-show-text.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/pthread-show-text.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pthread-show-text.base.argb32.ref.png diff --git a/cairo/test/reference/pthread-show-text.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/pthread-show-text.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/pthread-show-text.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pthread-show-text.base.rgb24.ref.png diff --git a/cairo/test/reference/pthread-show-text.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/pthread-show-text.image16.ref.png similarity index 100% rename from cairo/test/reference/pthread-show-text.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pthread-show-text.image16.ref.png diff --git a/cairo/test/reference/pthread-show-text.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/pthread-show-text.pdf.ref.png similarity index 100% rename from cairo/test/reference/pthread-show-text.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pthread-show-text.pdf.ref.png diff --git a/cairo/test/reference/pthread-show-text.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/pthread-show-text.ps.ref.png similarity index 100% rename from cairo/test/reference/pthread-show-text.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pthread-show-text.ps.ref.png diff --git a/cairo/test/reference/pthread-show-text.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/pthread-show-text.quartz.ref.png similarity index 100% rename from cairo/test/reference/pthread-show-text.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pthread-show-text.quartz.ref.png diff --git a/cairo/test/reference/pthread-show-text.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/pthread-show-text.rgb24.ref.png similarity index 100% rename from cairo/test/reference/pthread-show-text.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pthread-show-text.rgb24.ref.png diff --git a/cairo/test/reference/pthread-show-text.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/pthread-show-text.traps.ref.png similarity index 100% rename from cairo/test/reference/pthread-show-text.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pthread-show-text.traps.ref.png diff --git a/cairo/test/reference/pthread-show-text.xlib-fallback.ref.png b/io2d/src/3rd-party/cairo/test/reference/pthread-show-text.xlib-fallback.ref.png similarity index 100% rename from cairo/test/reference/pthread-show-text.xlib-fallback.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pthread-show-text.xlib-fallback.ref.png diff --git a/cairo/test/reference/pthread-similar.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/pthread-similar.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/pthread-similar.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pthread-similar.base.argb32.ref.png diff --git a/cairo/test/reference/pthread-similar.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/pthread-similar.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/pthread-similar.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pthread-similar.base.rgb24.ref.png diff --git a/cairo/test/reference/pthread-similar.ref.png b/io2d/src/3rd-party/cairo/test/reference/pthread-similar.ref.png similarity index 100% rename from cairo/test/reference/pthread-similar.ref.png rename to io2d/src/3rd-party/cairo/test/reference/pthread-similar.ref.png diff --git a/cairo/test/reference/push-group-color.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/push-group-color.argb32.ref.png similarity index 100% rename from cairo/test/reference/push-group-color.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/push-group-color.argb32.ref.png diff --git a/cairo/test/reference/push-group-color.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/push-group-color.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/push-group-color.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/push-group-color.base.argb32.ref.png diff --git a/cairo/test/reference/push-group-color.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/push-group-color.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/push-group-color.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/push-group-color.base.rgb24.ref.png diff --git a/cairo/test/reference/push-group-color.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/push-group-color.image16.ref.png similarity index 100% rename from cairo/test/reference/push-group-color.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/push-group-color.image16.ref.png diff --git a/cairo/test/reference/push-group-color.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/push-group-color.ps2.ref.png similarity index 100% rename from cairo/test/reference/push-group-color.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/push-group-color.ps2.ref.png diff --git a/cairo/test/reference/push-group-color.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/push-group-color.ps3.ref.png similarity index 100% rename from cairo/test/reference/push-group-color.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/push-group-color.ps3.ref.png diff --git a/cairo/test/reference/push-group-color.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/push-group-color.quartz.ref.png similarity index 100% rename from cairo/test/reference/push-group-color.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/push-group-color.quartz.ref.png diff --git a/cairo/test/reference/push-group-color.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/push-group-color.rgb24.ref.png similarity index 100% rename from cairo/test/reference/push-group-color.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/push-group-color.rgb24.ref.png diff --git a/cairo/test/reference/push-group-color.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/push-group-color.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/push-group-color.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/push-group-color.traps.argb32.ref.png diff --git a/cairo/test/reference/push-group-color.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/push-group-color.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/push-group-color.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/push-group-color.traps.rgb24.ref.png diff --git a/cairo/test/reference/push-group-path-offset.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/push-group-path-offset.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/push-group-path-offset.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/push-group-path-offset.base.argb32.ref.png diff --git a/cairo/test/reference/push-group-path-offset.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/push-group-path-offset.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/push-group-path-offset.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/push-group-path-offset.base.rgb24.ref.png diff --git a/cairo/test/reference/push-group-path-offset.ref.png b/io2d/src/3rd-party/cairo/test/reference/push-group-path-offset.ref.png similarity index 100% rename from cairo/test/reference/push-group-path-offset.ref.png rename to io2d/src/3rd-party/cairo/test/reference/push-group-path-offset.ref.png diff --git a/cairo/test/reference/push-group.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/push-group.argb32.ref.png similarity index 100% rename from cairo/test/reference/push-group.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/push-group.argb32.ref.png diff --git a/cairo/test/reference/push-group.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/push-group.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/push-group.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/push-group.base.argb32.ref.png diff --git a/cairo/test/reference/push-group.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/push-group.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/push-group.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/push-group.base.rgb24.ref.png diff --git a/cairo/test/reference/push-group.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/push-group.image16.ref.png similarity index 100% rename from cairo/test/reference/push-group.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/push-group.image16.ref.png diff --git a/cairo/test/reference/push-group.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/push-group.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/push-group.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/push-group.quartz.argb32.ref.png diff --git a/cairo/test/reference/push-group.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/push-group.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/push-group.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/push-group.quartz.rgb24.ref.png diff --git a/cairo/test/reference/push-group.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/push-group.rgb24.ref.png similarity index 100% rename from cairo/test/reference/push-group.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/push-group.rgb24.ref.png diff --git a/cairo/test/reference/push-group.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/push-group.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/push-group.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/push-group.traps.argb32.ref.png diff --git a/cairo/test/reference/push-group.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/push-group.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/push-group.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/push-group.traps.rgb24.ref.png diff --git a/cairo/test/reference/quartz-surface-source.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/quartz-surface-source.argb32.ref.png similarity index 100% rename from cairo/test/reference/quartz-surface-source.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/quartz-surface-source.argb32.ref.png diff --git a/cairo/test/reference/quartz-surface-source.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/quartz-surface-source.ps2.ref.png similarity index 100% rename from cairo/test/reference/quartz-surface-source.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/quartz-surface-source.ps2.ref.png diff --git a/cairo/test/reference/quartz-surface-source.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/quartz-surface-source.ps3.ref.png similarity index 100% rename from cairo/test/reference/quartz-surface-source.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/quartz-surface-source.ps3.ref.png diff --git a/cairo/test/reference/quartz-surface-source.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/quartz-surface-source.rgb24.ref.png similarity index 100% rename from cairo/test/reference/quartz-surface-source.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/quartz-surface-source.rgb24.ref.png diff --git a/cairo/test/reference/radial-gradient-extend.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-extend.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-extend.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-extend.base.argb32.ref.png diff --git a/cairo/test/reference/radial-gradient-extend.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-extend.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-extend.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-extend.base.rgb24.ref.png diff --git a/cairo/test/reference/radial-gradient-extend.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-extend.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-extend.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-extend.mask.argb32.ref.png diff --git a/cairo/test/reference/radial-gradient-extend.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-extend.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-extend.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-extend.mask.rgb24.ref.png diff --git a/cairo/test/reference/radial-gradient-extend.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-extend.ps3.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-extend.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-extend.ps3.ref.png diff --git a/cairo/test/reference/radial-gradient-extend.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-extend.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-extend.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-extend.ref.png diff --git a/cairo/test/reference/radial-gradient-extend.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-extend.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-extend.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-extend.traps.argb32.ref.png diff --git a/cairo/test/reference/radial-gradient-extend.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-extend.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-extend.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-extend.traps.rgb24.ref.png diff --git a/cairo/test/reference/radial-gradient-mask-source.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask-source.argb32.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-mask-source.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask-source.argb32.ref.png diff --git a/cairo/test/reference/radial-gradient-mask-source.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask-source.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-mask-source.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask-source.base.argb32.ref.png diff --git a/cairo/test/reference/radial-gradient-mask-source.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask-source.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-mask-source.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask-source.base.rgb24.ref.png diff --git a/cairo/test/reference/radial-gradient-mask-source.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask-source.image16.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-mask-source.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask-source.image16.ref.png diff --git a/cairo/test/reference/radial-gradient-mask-source.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask-source.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-mask-source.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask-source.mask.rgb24.ref.png diff --git a/cairo/test/reference/radial-gradient-mask-source.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask-source.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-mask-source.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask-source.quartz.argb32.ref.png diff --git a/cairo/test/reference/radial-gradient-mask-source.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask-source.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-mask-source.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask-source.quartz.rgb24.ref.png diff --git a/cairo/test/reference/radial-gradient-mask-source.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask-source.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-mask-source.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask-source.traps.rgb24.ref.png diff --git a/cairo/test/reference/radial-gradient-mask.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-mask.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask.base.argb32.ref.png diff --git a/cairo/test/reference/radial-gradient-mask.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-mask.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask.base.rgb24.ref.png diff --git a/cairo/test/reference/radial-gradient-mask.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask.image16.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-mask.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask.image16.ref.png diff --git a/cairo/test/reference/radial-gradient-mask.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask.quartz.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-mask.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask.quartz.ref.png diff --git a/cairo/test/reference/radial-gradient-mask.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-mask.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-mask.ref.png diff --git a/cairo/test/reference/radial-gradient-one-stop.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-one-stop.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-one-stop.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-one-stop.base.argb32.ref.png diff --git a/cairo/test/reference/radial-gradient-one-stop.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-one-stop.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-one-stop.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-one-stop.base.rgb24.ref.png diff --git a/cairo/test/reference/radial-gradient-one-stop.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-one-stop.quartz.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-one-stop.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-one-stop.quartz.ref.png diff --git a/cairo/test/reference/radial-gradient-one-stop.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-one-stop.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-one-stop.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-one-stop.ref.png diff --git a/cairo/test/reference/radial-gradient-source.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-source.argb32.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-source.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-source.argb32.ref.png diff --git a/cairo/test/reference/radial-gradient-source.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-source.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-source.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-source.base.argb32.ref.png diff --git a/cairo/test/reference/radial-gradient-source.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-source.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-source.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-source.base.rgb24.ref.png diff --git a/cairo/test/reference/radial-gradient-source.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-source.image16.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-source.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-source.image16.ref.png diff --git a/cairo/test/reference/radial-gradient-source.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-source.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-source.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-source.quartz.argb32.ref.png diff --git a/cairo/test/reference/radial-gradient-source.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-source.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-source.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-source.quartz.rgb24.ref.png diff --git a/cairo/test/reference/radial-gradient-source.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient-source.rgb24.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient-source.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient-source.rgb24.ref.png diff --git a/cairo/test/reference/radial-gradient.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient.base.argb32.ref.png diff --git a/cairo/test/reference/radial-gradient.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient.base.rgb24.ref.png diff --git a/cairo/test/reference/radial-gradient.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient.image16.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient.image16.ref.png diff --git a/cairo/test/reference/radial-gradient.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient.quartz.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient.quartz.ref.png diff --git a/cairo/test/reference/radial-gradient.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-gradient.ref.png similarity index 100% rename from cairo/test/reference/radial-gradient.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-gradient.ref.png diff --git a/cairo/test/reference/radial-outer-focus.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-outer-focus.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/radial-outer-focus.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-outer-focus.base.argb32.ref.png diff --git a/cairo/test/reference/radial-outer-focus.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-outer-focus.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/radial-outer-focus.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-outer-focus.base.rgb24.ref.png diff --git a/cairo/test/reference/radial-outer-focus.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-outer-focus.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/radial-outer-focus.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-outer-focus.mask.argb32.ref.png diff --git a/cairo/test/reference/radial-outer-focus.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-outer-focus.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/radial-outer-focus.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-outer-focus.mask.rgb24.ref.png diff --git a/cairo/test/reference/radial-outer-focus.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-outer-focus.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/radial-outer-focus.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-outer-focus.traps.argb32.ref.png diff --git a/cairo/test/reference/radial-outer-focus.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/radial-outer-focus.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/radial-outer-focus.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/radial-outer-focus.traps.rgb24.ref.png diff --git a/cairo/test/reference/radial-outer-focus.xfail.png b/io2d/src/3rd-party/cairo/test/reference/radial-outer-focus.xfail.png similarity index 100% rename from cairo/test/reference/radial-outer-focus.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/radial-outer-focus.xfail.png diff --git a/cairo/test/reference/random-clip.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-clip.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/random-clip.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-clip.base.argb32.ref.png diff --git a/cairo/test/reference/random-clip.base.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/random-clip.base.argb32.xfail.png similarity index 100% rename from cairo/test/reference/random-clip.base.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/random-clip.base.argb32.xfail.png diff --git a/cairo/test/reference/random-clip.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-clip.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/random-clip.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-clip.base.rgb24.ref.png diff --git a/cairo/test/reference/random-clip.base.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/random-clip.base.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/random-clip.base.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/random-clip.base.rgb24.xfail.png diff --git a/cairo/test/reference/random-clip.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-clip.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/random-clip.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-clip.mask.argb32.ref.png diff --git a/cairo/test/reference/random-clip.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-clip.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/random-clip.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-clip.mask.rgb24.ref.png diff --git a/cairo/test/reference/random-clip.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-clip.ref.png similarity index 100% rename from cairo/test/reference/random-clip.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-clip.ref.png diff --git a/cairo/test/reference/random-clip.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-clip.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/random-clip.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-clip.traps.argb32.ref.png diff --git a/cairo/test/reference/random-clip.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-clip.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/random-clip.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-clip.traps.rgb24.ref.png diff --git a/cairo/test/reference/random-intersections-curves-eo.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-eo.argb32.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-curves-eo.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-eo.argb32.ref.png diff --git a/cairo/test/reference/random-intersections-curves-eo.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-eo.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-curves-eo.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-eo.base.argb32.ref.png diff --git a/cairo/test/reference/random-intersections-curves-eo.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-eo.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-curves-eo.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-eo.base.rgb24.ref.png diff --git a/cairo/test/reference/random-intersections-curves-eo.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-eo.image16.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-curves-eo.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-eo.image16.ref.png diff --git a/cairo/test/reference/random-intersections-curves-eo.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-eo.pdf.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-curves-eo.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-eo.pdf.ref.png diff --git a/cairo/test/reference/random-intersections-curves-eo.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-eo.ps.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-curves-eo.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-eo.ps.ref.png diff --git a/cairo/test/reference/random-intersections-curves-eo.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-eo.quartz.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-curves-eo.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-eo.quartz.ref.png diff --git a/cairo/test/reference/random-intersections-curves-eo.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-eo.rgb24.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-curves-eo.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-eo.rgb24.ref.png diff --git a/cairo/test/reference/random-intersections-curves-eo.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-eo.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-curves-eo.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-eo.traps.argb32.ref.png diff --git a/cairo/test/reference/random-intersections-curves-eo.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-eo.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-curves-eo.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-eo.traps.rgb24.ref.png diff --git a/cairo/test/reference/random-intersections-curves-eo.xlib-fallback.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-eo.xlib-fallback.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-curves-eo.xlib-fallback.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-eo.xlib-fallback.ref.png diff --git a/cairo/test/reference/random-intersections-curves-nz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-nz.argb32.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-curves-nz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-nz.argb32.ref.png diff --git a/cairo/test/reference/random-intersections-curves-nz.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-nz.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-curves-nz.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-nz.base.argb32.ref.png diff --git a/cairo/test/reference/random-intersections-curves-nz.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-nz.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-curves-nz.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-nz.base.rgb24.ref.png diff --git a/cairo/test/reference/random-intersections-curves-nz.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-nz.image16.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-curves-nz.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-nz.image16.ref.png diff --git a/cairo/test/reference/random-intersections-curves-nz.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-nz.pdf.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-curves-nz.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-nz.pdf.ref.png diff --git a/cairo/test/reference/random-intersections-curves-nz.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-nz.ps.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-curves-nz.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-nz.ps.ref.png diff --git a/cairo/test/reference/random-intersections-curves-nz.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-nz.quartz.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-curves-nz.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-nz.quartz.ref.png diff --git a/cairo/test/reference/random-intersections-curves-nz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-nz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-curves-nz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-nz.rgb24.ref.png diff --git a/cairo/test/reference/random-intersections-curves-nz.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-nz.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-curves-nz.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-nz.traps.argb32.ref.png diff --git a/cairo/test/reference/random-intersections-curves-nz.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-nz.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-curves-nz.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-nz.traps.rgb24.ref.png diff --git a/cairo/test/reference/random-intersections-curves-nz.xlib-fallback.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-nz.xlib-fallback.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-curves-nz.xlib-fallback.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-curves-nz.xlib-fallback.ref.png diff --git a/cairo/test/reference/random-intersections-eo.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-eo.argb32.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-eo.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-eo.argb32.ref.png diff --git a/cairo/test/reference/random-intersections-eo.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-eo.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-eo.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-eo.base.argb32.ref.png diff --git a/cairo/test/reference/random-intersections-eo.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-eo.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-eo.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-eo.base.rgb24.ref.png diff --git a/cairo/test/reference/random-intersections-eo.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-eo.image16.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-eo.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-eo.image16.ref.png diff --git a/cairo/test/reference/random-intersections-eo.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-eo.ps.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-eo.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-eo.ps.ref.png diff --git a/cairo/test/reference/random-intersections-eo.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-eo.quartz.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-eo.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-eo.quartz.ref.png diff --git a/cairo/test/reference/random-intersections-eo.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-eo.rgb24.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-eo.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-eo.rgb24.ref.png diff --git a/cairo/test/reference/random-intersections-eo.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-eo.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-eo.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-eo.traps.argb32.ref.png diff --git a/cairo/test/reference/random-intersections-eo.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-eo.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-eo.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-eo.traps.rgb24.ref.png diff --git a/cairo/test/reference/random-intersections-nonzero.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-nonzero.argb32.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-nonzero.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-nonzero.argb32.ref.png diff --git a/cairo/test/reference/random-intersections-nonzero.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-nonzero.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-nonzero.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-nonzero.base.argb32.ref.png diff --git a/cairo/test/reference/random-intersections-nonzero.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-nonzero.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-nonzero.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-nonzero.base.rgb24.ref.png diff --git a/cairo/test/reference/random-intersections-nonzero.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-nonzero.image16.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-nonzero.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-nonzero.image16.ref.png diff --git a/cairo/test/reference/random-intersections-nonzero.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-nonzero.ps.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-nonzero.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-nonzero.ps.ref.png diff --git a/cairo/test/reference/random-intersections-nonzero.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-nonzero.quartz.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-nonzero.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-nonzero.quartz.ref.png diff --git a/cairo/test/reference/random-intersections-nonzero.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-nonzero.rgb24.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-nonzero.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-nonzero.rgb24.ref.png diff --git a/cairo/test/reference/random-intersections-nonzero.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-nonzero.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-nonzero.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-nonzero.traps.argb32.ref.png diff --git a/cairo/test/reference/random-intersections-nonzero.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/random-intersections-nonzero.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/random-intersections-nonzero.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/random-intersections-nonzero.traps.rgb24.ref.png diff --git a/cairo/test/reference/raster-source.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/raster-source.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/raster-source.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/raster-source.base.argb32.ref.png diff --git a/cairo/test/reference/raster-source.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/raster-source.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/raster-source.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/raster-source.base.rgb24.ref.png diff --git a/cairo/test/reference/raster-source.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/raster-source.ps.ref.png similarity index 100% rename from cairo/test/reference/raster-source.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/raster-source.ps.ref.png diff --git a/cairo/test/reference/raster-source.ref.png b/io2d/src/3rd-party/cairo/test/reference/raster-source.ref.png similarity index 100% rename from cairo/test/reference/raster-source.ref.png rename to io2d/src/3rd-party/cairo/test/reference/raster-source.ref.png diff --git a/cairo/test/reference/record-extend-none-similar.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-none-similar.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-extend-none-similar.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-none-similar.base.argb32.ref.png diff --git a/cairo/test/reference/record-extend-none-similar.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-none-similar.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-extend-none-similar.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-none-similar.base.rgb24.ref.png diff --git a/cairo/test/reference/record-extend-none-similar.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-none-similar.ref.png similarity index 100% rename from cairo/test/reference/record-extend-none-similar.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-none-similar.ref.png diff --git a/cairo/test/reference/record-extend-none-similar.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-none-similar.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-extend-none-similar.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-none-similar.traps.argb32.ref.png diff --git a/cairo/test/reference/record-extend-none-similar.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-none-similar.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-extend-none-similar.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-none-similar.traps.rgb24.ref.png diff --git a/cairo/test/reference/record-extend-none.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-none.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-extend-none.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-none.base.argb32.ref.png diff --git a/cairo/test/reference/record-extend-none.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-none.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-extend-none.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-none.base.rgb24.ref.png diff --git a/cairo/test/reference/record-extend-none.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-none.ref.png similarity index 100% rename from cairo/test/reference/record-extend-none.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-none.ref.png diff --git a/cairo/test/reference/record-extend-pad-similar.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-pad-similar.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-extend-pad-similar.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-pad-similar.base.argb32.ref.png diff --git a/cairo/test/reference/record-extend-pad-similar.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-pad-similar.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-extend-pad-similar.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-pad-similar.base.rgb24.ref.png diff --git a/cairo/test/reference/record-extend-pad-similar.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-pad-similar.ref.png similarity index 100% rename from cairo/test/reference/record-extend-pad-similar.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-pad-similar.ref.png diff --git a/cairo/test/reference/record-extend-pad-similar.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-pad-similar.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-extend-pad-similar.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-pad-similar.traps.argb32.ref.png diff --git a/cairo/test/reference/record-extend-pad-similar.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-pad-similar.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-extend-pad-similar.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-pad-similar.traps.rgb24.ref.png diff --git a/cairo/test/reference/record-extend-pad.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-pad.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-extend-pad.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-pad.base.argb32.ref.png diff --git a/cairo/test/reference/record-extend-pad.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-pad.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-extend-pad.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-pad.base.rgb24.ref.png diff --git a/cairo/test/reference/record-extend-pad.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-pad.ref.png similarity index 100% rename from cairo/test/reference/record-extend-pad.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-pad.ref.png diff --git a/cairo/test/reference/record-extend-reflect-similar.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-reflect-similar.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-extend-reflect-similar.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-reflect-similar.base.argb32.ref.png diff --git a/cairo/test/reference/record-extend-reflect-similar.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-reflect-similar.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-extend-reflect-similar.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-reflect-similar.base.rgb24.ref.png diff --git a/cairo/test/reference/record-extend-reflect-similar.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-reflect-similar.ref.png similarity index 100% rename from cairo/test/reference/record-extend-reflect-similar.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-reflect-similar.ref.png diff --git a/cairo/test/reference/record-extend-reflect-similar.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-reflect-similar.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-extend-reflect-similar.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-reflect-similar.traps.argb32.ref.png diff --git a/cairo/test/reference/record-extend-reflect-similar.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-reflect-similar.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-extend-reflect-similar.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-reflect-similar.traps.rgb24.ref.png diff --git a/cairo/test/reference/record-extend-reflect.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-reflect.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-extend-reflect.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-reflect.base.argb32.ref.png diff --git a/cairo/test/reference/record-extend-reflect.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-reflect.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-extend-reflect.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-reflect.base.rgb24.ref.png diff --git a/cairo/test/reference/record-extend-reflect.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-reflect.ref.png similarity index 100% rename from cairo/test/reference/record-extend-reflect.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-reflect.ref.png diff --git a/cairo/test/reference/record-extend-repeat-similar.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-repeat-similar.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-extend-repeat-similar.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-repeat-similar.base.argb32.ref.png diff --git a/cairo/test/reference/record-extend-repeat-similar.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-repeat-similar.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-extend-repeat-similar.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-repeat-similar.base.rgb24.ref.png diff --git a/cairo/test/reference/record-extend-repeat-similar.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-repeat-similar.ref.png similarity index 100% rename from cairo/test/reference/record-extend-repeat-similar.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-repeat-similar.ref.png diff --git a/cairo/test/reference/record-extend-repeat-similar.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-repeat-similar.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-extend-repeat-similar.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-repeat-similar.traps.argb32.ref.png diff --git a/cairo/test/reference/record-extend-repeat-similar.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-repeat-similar.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-extend-repeat-similar.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-repeat-similar.traps.rgb24.ref.png diff --git a/cairo/test/reference/record-extend-repeat.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-repeat.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-extend-repeat.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-repeat.base.argb32.ref.png diff --git a/cairo/test/reference/record-extend-repeat.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-repeat.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-extend-repeat.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-repeat.base.rgb24.ref.png diff --git a/cairo/test/reference/record-extend-repeat.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-extend-repeat.ref.png similarity index 100% rename from cairo/test/reference/record-extend-repeat.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-extend-repeat.ref.png diff --git a/cairo/test/reference/record-fill-alpha.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-fill-alpha.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-fill-alpha.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-fill-alpha.base.argb32.ref.png diff --git a/cairo/test/reference/record-fill-alpha.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-fill-alpha.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-fill-alpha.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-fill-alpha.base.rgb24.ref.png diff --git a/cairo/test/reference/record-fill-alpha.base.xfail.png b/io2d/src/3rd-party/cairo/test/reference/record-fill-alpha.base.xfail.png similarity index 100% rename from cairo/test/reference/record-fill-alpha.base.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/record-fill-alpha.base.xfail.png diff --git a/cairo/test/reference/record-fill-alpha.image16.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-fill-alpha.image16.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-fill-alpha.image16.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-fill-alpha.image16.rgb24.ref.png diff --git a/cairo/test/reference/record-fill-alpha.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-fill-alpha.ref.png similarity index 100% rename from cairo/test/reference/record-fill-alpha.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-fill-alpha.ref.png diff --git a/cairo/test/reference/record-fill-alpha.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-fill-alpha.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-fill-alpha.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-fill-alpha.traps.argb32.ref.png diff --git a/cairo/test/reference/record-fill-alpha.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-fill-alpha.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-fill-alpha.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-fill-alpha.traps.rgb24.ref.png diff --git a/cairo/test/reference/record-fill-alpha.xfail.png b/io2d/src/3rd-party/cairo/test/reference/record-fill-alpha.xfail.png similarity index 100% rename from cairo/test/reference/record-fill-alpha.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/record-fill-alpha.xfail.png diff --git a/cairo/test/reference/record-mesh.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-mesh.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-mesh.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-mesh.base.argb32.ref.png diff --git a/cairo/test/reference/record-mesh.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-mesh.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-mesh.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-mesh.base.rgb24.ref.png diff --git a/cairo/test/reference/record-mesh.image16.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-mesh.image16.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-mesh.image16.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-mesh.image16.rgb24.ref.png diff --git a/cairo/test/reference/record-mesh.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-mesh.ref.png similarity index 100% rename from cairo/test/reference/record-mesh.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-mesh.ref.png diff --git a/cairo/test/reference/record-paint-alpha-clip-mask.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip-mask.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-paint-alpha-clip-mask.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip-mask.base.argb32.ref.png diff --git a/cairo/test/reference/record-paint-alpha-clip-mask.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip-mask.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-paint-alpha-clip-mask.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip-mask.base.rgb24.ref.png diff --git a/cairo/test/reference/record-paint-alpha-clip-mask.base.xfail.png b/io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip-mask.base.xfail.png similarity index 100% rename from cairo/test/reference/record-paint-alpha-clip-mask.base.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip-mask.base.xfail.png diff --git a/cairo/test/reference/record-paint-alpha-clip-mask.image16.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip-mask.image16.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-paint-alpha-clip-mask.image16.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip-mask.image16.rgb24.ref.png diff --git a/cairo/test/reference/record-paint-alpha-clip-mask.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip-mask.ref.png similarity index 100% rename from cairo/test/reference/record-paint-alpha-clip-mask.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip-mask.ref.png diff --git a/cairo/test/reference/record-paint-alpha-clip-mask.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip-mask.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-paint-alpha-clip-mask.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip-mask.traps.argb32.ref.png diff --git a/cairo/test/reference/record-paint-alpha-clip-mask.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip-mask.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-paint-alpha-clip-mask.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip-mask.traps.rgb24.ref.png diff --git a/cairo/test/reference/record-paint-alpha-clip-mask.xfail.png b/io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip-mask.xfail.png similarity index 100% rename from cairo/test/reference/record-paint-alpha-clip-mask.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip-mask.xfail.png diff --git a/cairo/test/reference/record-paint-alpha-clip.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-paint-alpha-clip.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip.argb32.ref.png diff --git a/cairo/test/reference/record-paint-alpha-clip.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-paint-alpha-clip.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip.base.argb32.ref.png diff --git a/cairo/test/reference/record-paint-alpha-clip.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-paint-alpha-clip.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip.base.rgb24.ref.png diff --git a/cairo/test/reference/record-paint-alpha-clip.image16.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip.image16.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-paint-alpha-clip.image16.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip.image16.rgb24.ref.png diff --git a/cairo/test/reference/record-paint-alpha-clip.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-paint-alpha-clip.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip.rgb24.ref.png diff --git a/cairo/test/reference/record-paint-alpha-clip.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-paint-alpha-clip.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip.traps.argb32.ref.png diff --git a/cairo/test/reference/record-paint-alpha-clip.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-paint-alpha-clip.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-clip.traps.rgb24.ref.png diff --git a/cairo/test/reference/record-paint-alpha-solid-clip.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-solid-clip.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-paint-alpha-solid-clip.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-solid-clip.base.argb32.ref.png diff --git a/cairo/test/reference/record-paint-alpha-solid-clip.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-solid-clip.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-paint-alpha-solid-clip.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-solid-clip.base.rgb24.ref.png diff --git a/cairo/test/reference/record-paint-alpha-solid-clip.image16.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-solid-clip.image16.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-paint-alpha-solid-clip.image16.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-solid-clip.image16.rgb24.ref.png diff --git a/cairo/test/reference/record-paint-alpha-solid-clip.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-solid-clip.ref.png similarity index 100% rename from cairo/test/reference/record-paint-alpha-solid-clip.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-solid-clip.ref.png diff --git a/cairo/test/reference/record-paint-alpha-solid-clip.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-solid-clip.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-paint-alpha-solid-clip.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-solid-clip.traps.argb32.ref.png diff --git a/cairo/test/reference/record-paint-alpha-solid-clip.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-solid-clip.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-paint-alpha-solid-clip.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint-alpha-solid-clip.traps.rgb24.ref.png diff --git a/cairo/test/reference/record-paint-alpha.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint-alpha.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-paint-alpha.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint-alpha.base.argb32.ref.png diff --git a/cairo/test/reference/record-paint-alpha.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint-alpha.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-paint-alpha.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint-alpha.base.rgb24.ref.png diff --git a/cairo/test/reference/record-paint-alpha.image16.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint-alpha.image16.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-paint-alpha.image16.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint-alpha.image16.rgb24.ref.png diff --git a/cairo/test/reference/record-paint-alpha.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint-alpha.ref.png similarity index 100% rename from cairo/test/reference/record-paint-alpha.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint-alpha.ref.png diff --git a/cairo/test/reference/record-paint.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-paint.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint.base.argb32.ref.png diff --git a/cairo/test/reference/record-paint.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-paint.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint.base.rgb24.ref.png diff --git a/cairo/test/reference/record-paint.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-paint.ref.png similarity index 100% rename from cairo/test/reference/record-paint.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-paint.ref.png diff --git a/cairo/test/reference/record-select-font-face.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-select-font-face.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-select-font-face.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-select-font-face.argb32.ref.png diff --git a/cairo/test/reference/record-select-font-face.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-select-font-face.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-select-font-face.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-select-font-face.base.argb32.ref.png diff --git a/cairo/test/reference/record-select-font-face.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-select-font-face.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-select-font-face.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-select-font-face.base.rgb24.ref.png diff --git a/cairo/test/reference/record-select-font-face.image16.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-select-font-face.image16.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-select-font-face.image16.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-select-font-face.image16.rgb24.ref.png diff --git a/cairo/test/reference/record-select-font-face.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-select-font-face.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-select-font-face.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-select-font-face.rgb24.ref.png diff --git a/cairo/test/reference/record-select-font-face.xfail.png b/io2d/src/3rd-party/cairo/test/reference/record-select-font-face.xfail.png similarity index 100% rename from cairo/test/reference/record-select-font-face.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/record-select-font-face.xfail.png diff --git a/cairo/test/reference/record-self-intersecting.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-self-intersecting.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-self-intersecting.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-self-intersecting.base.argb32.ref.png diff --git a/cairo/test/reference/record-self-intersecting.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-self-intersecting.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-self-intersecting.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-self-intersecting.base.rgb24.ref.png diff --git a/cairo/test/reference/record-self-intersecting.image16.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-self-intersecting.image16.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-self-intersecting.image16.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-self-intersecting.image16.rgb24.ref.png diff --git a/cairo/test/reference/record-self-intersecting.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-self-intersecting.ref.png similarity index 100% rename from cairo/test/reference/record-self-intersecting.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-self-intersecting.ref.png diff --git a/cairo/test/reference/record-text-transform.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-text-transform.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record-text-transform.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-text-transform.base.argb32.ref.png diff --git a/cairo/test/reference/record-text-transform.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-text-transform.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-text-transform.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-text-transform.base.rgb24.ref.png diff --git a/cairo/test/reference/record-text-transform.image16.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-text-transform.image16.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record-text-transform.image16.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-text-transform.image16.rgb24.ref.png diff --git a/cairo/test/reference/record-text-transform.ref.png b/io2d/src/3rd-party/cairo/test/reference/record-text-transform.ref.png similarity index 100% rename from cairo/test/reference/record-text-transform.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record-text-transform.ref.png diff --git a/cairo/test/reference/record1414x-fill-alpha.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-fill-alpha.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record1414x-fill-alpha.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-fill-alpha.base.argb32.ref.png diff --git a/cairo/test/reference/record1414x-fill-alpha.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-fill-alpha.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record1414x-fill-alpha.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-fill-alpha.base.rgb24.ref.png diff --git a/cairo/test/reference/record1414x-fill-alpha.base.xfail.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-fill-alpha.base.xfail.png similarity index 100% rename from cairo/test/reference/record1414x-fill-alpha.base.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-fill-alpha.base.xfail.png diff --git a/cairo/test/reference/record1414x-fill-alpha.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-fill-alpha.ref.png similarity index 100% rename from cairo/test/reference/record1414x-fill-alpha.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-fill-alpha.ref.png diff --git a/cairo/test/reference/record1414x-fill-alpha.xfail.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-fill-alpha.xfail.png similarity index 100% rename from cairo/test/reference/record1414x-fill-alpha.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-fill-alpha.xfail.png diff --git a/cairo/test/reference/record1414x-paint-alpha-clip-mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha-clip-mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/record1414x-paint-alpha-clip-mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha-clip-mask.argb32.ref.png diff --git a/cairo/test/reference/record1414x-paint-alpha-clip-mask.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha-clip-mask.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record1414x-paint-alpha-clip-mask.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha-clip-mask.base.argb32.ref.png diff --git a/cairo/test/reference/record1414x-paint-alpha-clip-mask.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha-clip-mask.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record1414x-paint-alpha-clip-mask.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha-clip-mask.base.rgb24.ref.png diff --git a/cairo/test/reference/record1414x-paint-alpha-clip-mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha-clip-mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record1414x-paint-alpha-clip-mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha-clip-mask.rgb24.ref.png diff --git a/cairo/test/reference/record1414x-paint-alpha-clip.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha-clip.argb32.ref.png similarity index 100% rename from cairo/test/reference/record1414x-paint-alpha-clip.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha-clip.argb32.ref.png diff --git a/cairo/test/reference/record1414x-paint-alpha-clip.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha-clip.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record1414x-paint-alpha-clip.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha-clip.base.argb32.ref.png diff --git a/cairo/test/reference/record1414x-paint-alpha-clip.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha-clip.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record1414x-paint-alpha-clip.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha-clip.base.rgb24.ref.png diff --git a/cairo/test/reference/record1414x-paint-alpha-clip.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha-clip.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record1414x-paint-alpha-clip.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha-clip.rgb24.ref.png diff --git a/cairo/test/reference/record1414x-paint-alpha-solid-clip.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha-solid-clip.argb32.ref.png similarity index 100% rename from cairo/test/reference/record1414x-paint-alpha-solid-clip.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha-solid-clip.argb32.ref.png diff --git a/cairo/test/reference/record1414x-paint-alpha-solid-clip.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha-solid-clip.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record1414x-paint-alpha-solid-clip.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha-solid-clip.base.argb32.ref.png diff --git a/cairo/test/reference/record1414x-paint-alpha-solid-clip.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha-solid-clip.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record1414x-paint-alpha-solid-clip.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha-solid-clip.base.rgb24.ref.png diff --git a/cairo/test/reference/record1414x-paint-alpha-solid-clip.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha-solid-clip.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record1414x-paint-alpha-solid-clip.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha-solid-clip.rgb24.ref.png diff --git a/cairo/test/reference/record1414x-paint-alpha.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha.argb32.ref.png similarity index 100% rename from cairo/test/reference/record1414x-paint-alpha.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha.argb32.ref.png diff --git a/cairo/test/reference/record1414x-paint-alpha.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record1414x-paint-alpha.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha.base.argb32.ref.png diff --git a/cairo/test/reference/record1414x-paint-alpha.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record1414x-paint-alpha.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha.base.rgb24.ref.png diff --git a/cairo/test/reference/record1414x-paint-alpha.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record1414x-paint-alpha.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-paint-alpha.rgb24.ref.png diff --git a/cairo/test/reference/record1414x-paint.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-paint.argb32.ref.png similarity index 100% rename from cairo/test/reference/record1414x-paint.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-paint.argb32.ref.png diff --git a/cairo/test/reference/record1414x-paint.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-paint.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record1414x-paint.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-paint.base.argb32.ref.png diff --git a/cairo/test/reference/record1414x-paint.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-paint.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record1414x-paint.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-paint.base.rgb24.ref.png diff --git a/cairo/test/reference/record1414x-paint.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-paint.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record1414x-paint.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-paint.rgb24.ref.png diff --git a/cairo/test/reference/record1414x-select-font-face.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-select-font-face.argb32.ref.png similarity index 100% rename from cairo/test/reference/record1414x-select-font-face.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-select-font-face.argb32.ref.png diff --git a/cairo/test/reference/record1414x-select-font-face.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-select-font-face.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record1414x-select-font-face.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-select-font-face.base.argb32.ref.png diff --git a/cairo/test/reference/record1414x-select-font-face.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-select-font-face.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record1414x-select-font-face.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-select-font-face.base.rgb24.ref.png diff --git a/cairo/test/reference/record1414x-select-font-face.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-select-font-face.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record1414x-select-font-face.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-select-font-face.rgb24.ref.png diff --git a/cairo/test/reference/record1414x-self-intersecting.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-self-intersecting.argb32.ref.png similarity index 100% rename from cairo/test/reference/record1414x-self-intersecting.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-self-intersecting.argb32.ref.png diff --git a/cairo/test/reference/record1414x-self-intersecting.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-self-intersecting.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record1414x-self-intersecting.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-self-intersecting.base.argb32.ref.png diff --git a/cairo/test/reference/record1414x-self-intersecting.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-self-intersecting.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record1414x-self-intersecting.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-self-intersecting.base.rgb24.ref.png diff --git a/cairo/test/reference/record1414x-self-intersecting.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-self-intersecting.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record1414x-self-intersecting.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-self-intersecting.rgb24.ref.png diff --git a/cairo/test/reference/record1414x-text-transform.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-text-transform.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record1414x-text-transform.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-text-transform.base.argb32.ref.png diff --git a/cairo/test/reference/record1414x-text-transform.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-text-transform.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record1414x-text-transform.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-text-transform.base.rgb24.ref.png diff --git a/cairo/test/reference/record1414x-text-transform.ref.png b/io2d/src/3rd-party/cairo/test/reference/record1414x-text-transform.ref.png similarity index 100% rename from cairo/test/reference/record1414x-text-transform.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record1414x-text-transform.ref.png diff --git a/cairo/test/reference/record2x-fill-alpha.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-fill-alpha.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record2x-fill-alpha.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-fill-alpha.base.argb32.ref.png diff --git a/cairo/test/reference/record2x-fill-alpha.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-fill-alpha.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record2x-fill-alpha.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-fill-alpha.base.rgb24.ref.png diff --git a/cairo/test/reference/record2x-fill-alpha.base.xfail.png b/io2d/src/3rd-party/cairo/test/reference/record2x-fill-alpha.base.xfail.png similarity index 100% rename from cairo/test/reference/record2x-fill-alpha.base.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-fill-alpha.base.xfail.png diff --git a/cairo/test/reference/record2x-fill-alpha.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-fill-alpha.ref.png similarity index 100% rename from cairo/test/reference/record2x-fill-alpha.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-fill-alpha.ref.png diff --git a/cairo/test/reference/record2x-fill-alpha.xfail.png b/io2d/src/3rd-party/cairo/test/reference/record2x-fill-alpha.xfail.png similarity index 100% rename from cairo/test/reference/record2x-fill-alpha.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-fill-alpha.xfail.png diff --git a/cairo/test/reference/record2x-paint-alpha-clip-mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha-clip-mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/record2x-paint-alpha-clip-mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha-clip-mask.argb32.ref.png diff --git a/cairo/test/reference/record2x-paint-alpha-clip-mask.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha-clip-mask.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record2x-paint-alpha-clip-mask.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha-clip-mask.base.argb32.ref.png diff --git a/cairo/test/reference/record2x-paint-alpha-clip-mask.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha-clip-mask.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record2x-paint-alpha-clip-mask.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha-clip-mask.base.rgb24.ref.png diff --git a/cairo/test/reference/record2x-paint-alpha-clip-mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha-clip-mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record2x-paint-alpha-clip-mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha-clip-mask.rgb24.ref.png diff --git a/cairo/test/reference/record2x-paint-alpha-clip.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha-clip.argb32.ref.png similarity index 100% rename from cairo/test/reference/record2x-paint-alpha-clip.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha-clip.argb32.ref.png diff --git a/cairo/test/reference/record2x-paint-alpha-clip.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha-clip.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record2x-paint-alpha-clip.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha-clip.base.argb32.ref.png diff --git a/cairo/test/reference/record2x-paint-alpha-clip.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha-clip.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record2x-paint-alpha-clip.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha-clip.base.rgb24.ref.png diff --git a/cairo/test/reference/record2x-paint-alpha-clip.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha-clip.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record2x-paint-alpha-clip.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha-clip.rgb24.ref.png diff --git a/cairo/test/reference/record2x-paint-alpha-solid-clip.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha-solid-clip.argb32.ref.png similarity index 100% rename from cairo/test/reference/record2x-paint-alpha-solid-clip.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha-solid-clip.argb32.ref.png diff --git a/cairo/test/reference/record2x-paint-alpha-solid-clip.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha-solid-clip.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record2x-paint-alpha-solid-clip.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha-solid-clip.base.argb32.ref.png diff --git a/cairo/test/reference/record2x-paint-alpha-solid-clip.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha-solid-clip.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record2x-paint-alpha-solid-clip.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha-solid-clip.base.rgb24.ref.png diff --git a/cairo/test/reference/record2x-paint-alpha-solid-clip.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha-solid-clip.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record2x-paint-alpha-solid-clip.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha-solid-clip.rgb24.ref.png diff --git a/cairo/test/reference/record2x-paint-alpha.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha.argb32.ref.png similarity index 100% rename from cairo/test/reference/record2x-paint-alpha.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha.argb32.ref.png diff --git a/cairo/test/reference/record2x-paint-alpha.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record2x-paint-alpha.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha.base.argb32.ref.png diff --git a/cairo/test/reference/record2x-paint-alpha.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record2x-paint-alpha.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha.base.rgb24.ref.png diff --git a/cairo/test/reference/record2x-paint-alpha.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record2x-paint-alpha.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-paint-alpha.rgb24.ref.png diff --git a/cairo/test/reference/record2x-paint.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-paint.argb32.ref.png similarity index 100% rename from cairo/test/reference/record2x-paint.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-paint.argb32.ref.png diff --git a/cairo/test/reference/record2x-paint.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-paint.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record2x-paint.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-paint.base.argb32.ref.png diff --git a/cairo/test/reference/record2x-paint.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-paint.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record2x-paint.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-paint.base.rgb24.ref.png diff --git a/cairo/test/reference/record2x-paint.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-paint.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record2x-paint.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-paint.rgb24.ref.png diff --git a/cairo/test/reference/record2x-select-font-face.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-select-font-face.argb32.ref.png similarity index 100% rename from cairo/test/reference/record2x-select-font-face.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-select-font-face.argb32.ref.png diff --git a/cairo/test/reference/record2x-select-font-face.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-select-font-face.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record2x-select-font-face.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-select-font-face.base.argb32.ref.png diff --git a/cairo/test/reference/record2x-select-font-face.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-select-font-face.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record2x-select-font-face.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-select-font-face.base.rgb24.ref.png diff --git a/cairo/test/reference/record2x-select-font-face.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-select-font-face.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record2x-select-font-face.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-select-font-face.rgb24.ref.png diff --git a/cairo/test/reference/record2x-self-intersecting.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-self-intersecting.argb32.ref.png similarity index 100% rename from cairo/test/reference/record2x-self-intersecting.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-self-intersecting.argb32.ref.png diff --git a/cairo/test/reference/record2x-self-intersecting.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-self-intersecting.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record2x-self-intersecting.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-self-intersecting.base.argb32.ref.png diff --git a/cairo/test/reference/record2x-self-intersecting.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-self-intersecting.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record2x-self-intersecting.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-self-intersecting.base.rgb24.ref.png diff --git a/cairo/test/reference/record2x-self-intersecting.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-self-intersecting.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record2x-self-intersecting.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-self-intersecting.rgb24.ref.png diff --git a/cairo/test/reference/record2x-text-transform.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-text-transform.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record2x-text-transform.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-text-transform.base.argb32.ref.png diff --git a/cairo/test/reference/record2x-text-transform.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-text-transform.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record2x-text-transform.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-text-transform.base.rgb24.ref.png diff --git a/cairo/test/reference/record2x-text-transform.ref.png b/io2d/src/3rd-party/cairo/test/reference/record2x-text-transform.ref.png similarity index 100% rename from cairo/test/reference/record2x-text-transform.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record2x-text-transform.ref.png diff --git a/cairo/test/reference/record90-fill-alpha.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-fill-alpha.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record90-fill-alpha.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-fill-alpha.base.argb32.ref.png diff --git a/cairo/test/reference/record90-fill-alpha.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-fill-alpha.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record90-fill-alpha.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-fill-alpha.base.rgb24.ref.png diff --git a/cairo/test/reference/record90-fill-alpha.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-fill-alpha.ref.png similarity index 100% rename from cairo/test/reference/record90-fill-alpha.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-fill-alpha.ref.png diff --git a/cairo/test/reference/record90-fill-alpha.xfail.png b/io2d/src/3rd-party/cairo/test/reference/record90-fill-alpha.xfail.png similarity index 100% rename from cairo/test/reference/record90-fill-alpha.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/record90-fill-alpha.xfail.png diff --git a/cairo/test/reference/record90-paint-alpha-clip-mask.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha-clip-mask.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record90-paint-alpha-clip-mask.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha-clip-mask.base.argb32.ref.png diff --git a/cairo/test/reference/record90-paint-alpha-clip-mask.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha-clip-mask.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record90-paint-alpha-clip-mask.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha-clip-mask.base.rgb24.ref.png diff --git a/cairo/test/reference/record90-paint-alpha-clip-mask.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha-clip-mask.ref.png similarity index 100% rename from cairo/test/reference/record90-paint-alpha-clip-mask.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha-clip-mask.ref.png diff --git a/cairo/test/reference/record90-paint-alpha-clip-mask.xfail.png b/io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha-clip-mask.xfail.png similarity index 100% rename from cairo/test/reference/record90-paint-alpha-clip-mask.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha-clip-mask.xfail.png diff --git a/cairo/test/reference/record90-paint-alpha-clip.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha-clip.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record90-paint-alpha-clip.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha-clip.base.argb32.ref.png diff --git a/cairo/test/reference/record90-paint-alpha-clip.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha-clip.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record90-paint-alpha-clip.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha-clip.base.rgb24.ref.png diff --git a/cairo/test/reference/record90-paint-alpha-clip.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha-clip.ref.png similarity index 100% rename from cairo/test/reference/record90-paint-alpha-clip.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha-clip.ref.png diff --git a/cairo/test/reference/record90-paint-alpha-clip.xfail.png b/io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha-clip.xfail.png similarity index 100% rename from cairo/test/reference/record90-paint-alpha-clip.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha-clip.xfail.png diff --git a/cairo/test/reference/record90-paint-alpha-solid-clip.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha-solid-clip.argb32.ref.png similarity index 100% rename from cairo/test/reference/record90-paint-alpha-solid-clip.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha-solid-clip.argb32.ref.png diff --git a/cairo/test/reference/record90-paint-alpha-solid-clip.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha-solid-clip.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record90-paint-alpha-solid-clip.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha-solid-clip.base.argb32.ref.png diff --git a/cairo/test/reference/record90-paint-alpha-solid-clip.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha-solid-clip.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record90-paint-alpha-solid-clip.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha-solid-clip.base.rgb24.ref.png diff --git a/cairo/test/reference/record90-paint-alpha-solid-clip.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha-solid-clip.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record90-paint-alpha-solid-clip.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha-solid-clip.rgb24.ref.png diff --git a/cairo/test/reference/record90-paint-alpha.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha.argb32.ref.png similarity index 100% rename from cairo/test/reference/record90-paint-alpha.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha.argb32.ref.png diff --git a/cairo/test/reference/record90-paint-alpha.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record90-paint-alpha.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha.base.argb32.ref.png diff --git a/cairo/test/reference/record90-paint-alpha.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record90-paint-alpha.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha.base.rgb24.ref.png diff --git a/cairo/test/reference/record90-paint-alpha.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record90-paint-alpha.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-paint-alpha.rgb24.ref.png diff --git a/cairo/test/reference/record90-paint.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-paint.argb32.ref.png similarity index 100% rename from cairo/test/reference/record90-paint.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-paint.argb32.ref.png diff --git a/cairo/test/reference/record90-paint.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-paint.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record90-paint.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-paint.base.argb32.ref.png diff --git a/cairo/test/reference/record90-paint.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-paint.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record90-paint.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-paint.base.rgb24.ref.png diff --git a/cairo/test/reference/record90-paint.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-paint.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record90-paint.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-paint.rgb24.ref.png diff --git a/cairo/test/reference/record90-select-font-face.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-select-font-face.argb32.ref.png similarity index 100% rename from cairo/test/reference/record90-select-font-face.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-select-font-face.argb32.ref.png diff --git a/cairo/test/reference/record90-select-font-face.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-select-font-face.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record90-select-font-face.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-select-font-face.base.argb32.ref.png diff --git a/cairo/test/reference/record90-select-font-face.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-select-font-face.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record90-select-font-face.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-select-font-face.base.rgb24.ref.png diff --git a/cairo/test/reference/record90-select-font-face.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-select-font-face.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record90-select-font-face.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-select-font-face.rgb24.ref.png diff --git a/cairo/test/reference/record90-self-intersecting.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-self-intersecting.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record90-self-intersecting.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-self-intersecting.base.argb32.ref.png diff --git a/cairo/test/reference/record90-self-intersecting.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-self-intersecting.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record90-self-intersecting.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-self-intersecting.base.rgb24.ref.png diff --git a/cairo/test/reference/record90-self-intersecting.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-self-intersecting.ref.png similarity index 100% rename from cairo/test/reference/record90-self-intersecting.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-self-intersecting.ref.png diff --git a/cairo/test/reference/record90-text-transform.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-text-transform.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/record90-text-transform.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-text-transform.base.argb32.ref.png diff --git a/cairo/test/reference/record90-text-transform.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-text-transform.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/record90-text-transform.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-text-transform.base.rgb24.ref.png diff --git a/cairo/test/reference/record90-text-transform.ref.png b/io2d/src/3rd-party/cairo/test/reference/record90-text-transform.ref.png similarity index 100% rename from cairo/test/reference/record90-text-transform.ref.png rename to io2d/src/3rd-party/cairo/test/reference/record90-text-transform.ref.png diff --git a/cairo/test/reference/recordflip-fill-alpha.ref.png b/io2d/src/3rd-party/cairo/test/reference/recordflip-fill-alpha.ref.png similarity index 100% rename from cairo/test/reference/recordflip-fill-alpha.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recordflip-fill-alpha.ref.png diff --git a/cairo/test/reference/recordflip-paint-alpha-clip-mask.ref.png b/io2d/src/3rd-party/cairo/test/reference/recordflip-paint-alpha-clip-mask.ref.png similarity index 100% rename from cairo/test/reference/recordflip-paint-alpha-clip-mask.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recordflip-paint-alpha-clip-mask.ref.png diff --git a/cairo/test/reference/recordflip-paint-alpha-clip.ref.png b/io2d/src/3rd-party/cairo/test/reference/recordflip-paint-alpha-clip.ref.png similarity index 100% rename from cairo/test/reference/recordflip-paint-alpha-clip.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recordflip-paint-alpha-clip.ref.png diff --git a/cairo/test/reference/recordflip-paint-alpha-solid-clip.ref.png b/io2d/src/3rd-party/cairo/test/reference/recordflip-paint-alpha-solid-clip.ref.png similarity index 100% rename from cairo/test/reference/recordflip-paint-alpha-solid-clip.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recordflip-paint-alpha-solid-clip.ref.png diff --git a/cairo/test/reference/recordflip-paint-alpha.ref.png b/io2d/src/3rd-party/cairo/test/reference/recordflip-paint-alpha.ref.png similarity index 100% rename from cairo/test/reference/recordflip-paint-alpha.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recordflip-paint-alpha.ref.png diff --git a/cairo/test/reference/recordflip-paint.ref.png b/io2d/src/3rd-party/cairo/test/reference/recordflip-paint.ref.png similarity index 100% rename from cairo/test/reference/recordflip-paint.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recordflip-paint.ref.png diff --git a/cairo/test/reference/recordflip-select-font-face.ref.png b/io2d/src/3rd-party/cairo/test/reference/recordflip-select-font-face.ref.png similarity index 100% rename from cairo/test/reference/recordflip-select-font-face.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recordflip-select-font-face.ref.png diff --git a/cairo/test/reference/recordflip-self-intersecting.ref.png b/io2d/src/3rd-party/cairo/test/reference/recordflip-self-intersecting.ref.png similarity index 100% rename from cairo/test/reference/recordflip-self-intersecting.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recordflip-self-intersecting.ref.png diff --git a/cairo/test/reference/recordflip-text-transform.ref.png b/io2d/src/3rd-party/cairo/test/reference/recordflip-text-transform.ref.png similarity index 100% rename from cairo/test/reference/recordflip-text-transform.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recordflip-text-transform.ref.png diff --git a/cairo/test/reference/recording-surface-extend-none.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-none.argb32.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-extend-none.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-none.argb32.ref.png diff --git a/cairo/test/reference/recording-surface-extend-none.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-none.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-extend-none.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-none.base.argb32.ref.png diff --git a/cairo/test/reference/recording-surface-extend-none.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-none.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-extend-none.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-none.base.rgb24.ref.png diff --git a/cairo/test/reference/recording-surface-extend-none.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-none.rgb24.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-extend-none.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-none.rgb24.ref.png diff --git a/cairo/test/reference/recording-surface-extend-none.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-none.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-extend-none.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-none.traps.argb32.ref.png diff --git a/cairo/test/reference/recording-surface-extend-none.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-none.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-extend-none.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-none.traps.rgb24.ref.png diff --git a/cairo/test/reference/recording-surface-extend-pad.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-pad.argb32.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-extend-pad.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-pad.argb32.ref.png diff --git a/cairo/test/reference/recording-surface-extend-pad.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-pad.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-extend-pad.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-pad.base.argb32.ref.png diff --git a/cairo/test/reference/recording-surface-extend-pad.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-pad.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-extend-pad.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-pad.base.rgb24.ref.png diff --git a/cairo/test/reference/recording-surface-extend-pad.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-pad.rgb24.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-extend-pad.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-pad.rgb24.ref.png diff --git a/cairo/test/reference/recording-surface-extend-pad.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-pad.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-extend-pad.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-pad.traps.argb32.ref.png diff --git a/cairo/test/reference/recording-surface-extend-pad.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-pad.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-extend-pad.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-pad.traps.rgb24.ref.png diff --git a/cairo/test/reference/recording-surface-extend-reflect.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-reflect.argb32.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-extend-reflect.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-reflect.argb32.ref.png diff --git a/cairo/test/reference/recording-surface-extend-reflect.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-reflect.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-extend-reflect.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-reflect.base.argb32.ref.png diff --git a/cairo/test/reference/recording-surface-extend-reflect.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-reflect.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-extend-reflect.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-reflect.base.rgb24.ref.png diff --git a/cairo/test/reference/recording-surface-extend-reflect.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-reflect.rgb24.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-extend-reflect.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-reflect.rgb24.ref.png diff --git a/cairo/test/reference/recording-surface-extend-reflect.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-reflect.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-extend-reflect.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-reflect.traps.argb32.ref.png diff --git a/cairo/test/reference/recording-surface-extend-reflect.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-reflect.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-extend-reflect.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-reflect.traps.rgb24.ref.png diff --git a/cairo/test/reference/recording-surface-extend-repeat.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-repeat.argb32.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-extend-repeat.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-repeat.argb32.ref.png diff --git a/cairo/test/reference/recording-surface-extend-repeat.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-repeat.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-extend-repeat.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-repeat.base.argb32.ref.png diff --git a/cairo/test/reference/recording-surface-extend-repeat.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-repeat.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-extend-repeat.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-repeat.base.rgb24.ref.png diff --git a/cairo/test/reference/recording-surface-extend-repeat.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-repeat.rgb24.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-extend-repeat.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-repeat.rgb24.ref.png diff --git a/cairo/test/reference/recording-surface-extend-repeat.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-repeat.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-extend-repeat.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-repeat.traps.argb32.ref.png diff --git a/cairo/test/reference/recording-surface-extend-repeat.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-repeat.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-extend-repeat.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-extend-repeat.traps.rgb24.ref.png diff --git a/cairo/test/reference/recording-surface-over.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-over.argb32.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-over.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-over.argb32.ref.png diff --git a/cairo/test/reference/recording-surface-over.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-over.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-over.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-over.base.argb32.ref.png diff --git a/cairo/test/reference/recording-surface-over.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-over.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-over.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-over.base.rgb24.ref.png diff --git a/cairo/test/reference/recording-surface-over.gl.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-over.gl.argb32.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-over.gl.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-over.gl.argb32.ref.png diff --git a/cairo/test/reference/recording-surface-over.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-over.image16.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-over.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-over.image16.ref.png diff --git a/cairo/test/reference/recording-surface-over.pdf.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-over.pdf.argb32.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-over.pdf.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-over.pdf.argb32.ref.png diff --git a/cairo/test/reference/recording-surface-over.pdf.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-over.pdf.rgb24.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-over.pdf.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-over.pdf.rgb24.ref.png diff --git a/cairo/test/reference/recording-surface-over.ps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-over.ps.argb32.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-over.ps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-over.ps.argb32.ref.png diff --git a/cairo/test/reference/recording-surface-over.ps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-over.ps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-over.ps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-over.ps.rgb24.ref.png diff --git a/cairo/test/reference/recording-surface-over.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-over.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-over.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-over.quartz.argb32.ref.png diff --git a/cairo/test/reference/recording-surface-over.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-over.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-over.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-over.quartz.rgb24.ref.png diff --git a/cairo/test/reference/recording-surface-over.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-over.rgb24.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-over.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-over.rgb24.ref.png diff --git a/cairo/test/reference/recording-surface-over.svg.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-over.svg.argb32.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-over.svg.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-over.svg.argb32.ref.png diff --git a/cairo/test/reference/recording-surface-over.svg.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-over.svg.rgb24.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-over.svg.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-over.svg.rgb24.ref.png diff --git a/cairo/test/reference/recording-surface-over.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-over.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-over.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-over.traps.argb32.ref.png diff --git a/cairo/test/reference/recording-surface-over.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-over.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-over.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-over.traps.rgb24.ref.png diff --git a/cairo/test/reference/recording-surface-source.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-source.argb32.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-source.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-source.argb32.ref.png diff --git a/cairo/test/reference/recording-surface-source.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-source.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-source.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-source.base.argb32.ref.png diff --git a/cairo/test/reference/recording-surface-source.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-source.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-source.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-source.base.rgb24.ref.png diff --git a/cairo/test/reference/recording-surface-source.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-source.rgb24.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-source.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-source.rgb24.ref.png diff --git a/cairo/test/reference/recording-surface-source.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-source.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-source.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-source.traps.argb32.ref.png diff --git a/cairo/test/reference/recording-surface-source.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/recording-surface-source.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/recording-surface-source.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/recording-surface-source.traps.rgb24.ref.png diff --git a/cairo/test/reference/rectangle-rounding-error.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectangle-rounding-error.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/rectangle-rounding-error.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectangle-rounding-error.base.argb32.ref.png diff --git a/cairo/test/reference/rectangle-rounding-error.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectangle-rounding-error.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rectangle-rounding-error.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectangle-rounding-error.base.rgb24.ref.png diff --git a/cairo/test/reference/rectangle-rounding-error.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectangle-rounding-error.ref.png similarity index 100% rename from cairo/test/reference/rectangle-rounding-error.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectangle-rounding-error.ref.png diff --git a/cairo/test/reference/rectilinear-dash-scale-unaligned.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-dash-scale-unaligned.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-dash-scale-unaligned.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-dash-scale-unaligned.ref.png diff --git a/cairo/test/reference/rectilinear-dash-scale-unaligned.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-dash-scale-unaligned.traps.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-dash-scale-unaligned.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-dash-scale-unaligned.traps.ref.png diff --git a/cairo/test/reference/rectilinear-dash-scale.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-dash-scale.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-dash-scale.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-dash-scale.ref.png diff --git a/cairo/test/reference/rectilinear-dash.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-dash.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-dash.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-dash.base.argb32.ref.png diff --git a/cairo/test/reference/rectilinear-dash.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-dash.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-dash.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-dash.base.rgb24.ref.png diff --git a/cairo/test/reference/rectilinear-dash.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-dash.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-dash.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-dash.mask.argb32.ref.png diff --git a/cairo/test/reference/rectilinear-dash.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-dash.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-dash.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-dash.mask.rgb24.ref.png diff --git a/cairo/test/reference/rectilinear-dash.quartz.xfail.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-dash.quartz.xfail.png similarity index 100% rename from cairo/test/reference/rectilinear-dash.quartz.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-dash.quartz.xfail.png diff --git a/cairo/test/reference/rectilinear-dash.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-dash.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-dash.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-dash.ref.png diff --git a/cairo/test/reference/rectilinear-dash.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-dash.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-dash.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-dash.traps.argb32.ref.png diff --git a/cairo/test/reference/rectilinear-dash.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-dash.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-dash.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-dash.traps.rgb24.ref.png diff --git a/cairo/test/reference/rectilinear-fill.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-fill.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-fill.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-fill.base.argb32.ref.png diff --git a/cairo/test/reference/rectilinear-fill.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-fill.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-fill.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-fill.base.rgb24.ref.png diff --git a/cairo/test/reference/rectilinear-fill.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-fill.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-fill.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-fill.ref.png diff --git a/cairo/test/reference/rectilinear-grid.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-grid.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-grid.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-grid.base.argb32.ref.png diff --git a/cairo/test/reference/rectilinear-grid.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-grid.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-grid.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-grid.base.rgb24.ref.png diff --git a/cairo/test/reference/rectilinear-grid.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-grid.image16.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-grid.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-grid.image16.ref.png diff --git a/cairo/test/reference/rectilinear-grid.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-grid.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-grid.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-grid.ref.png diff --git a/cairo/test/reference/rectilinear-grid.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-grid.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-grid.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-grid.traps.argb32.ref.png diff --git a/cairo/test/reference/rectilinear-grid.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-grid.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-grid.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-grid.traps.rgb24.ref.png diff --git a/cairo/test/reference/rectilinear-miter-limit.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-miter-limit.argb32.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-miter-limit.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-miter-limit.argb32.ref.png diff --git a/cairo/test/reference/rectilinear-miter-limit.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-miter-limit.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-miter-limit.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-miter-limit.base.argb32.ref.png diff --git a/cairo/test/reference/rectilinear-miter-limit.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-miter-limit.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-miter-limit.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-miter-limit.base.rgb24.ref.png diff --git a/cairo/test/reference/rectilinear-miter-limit.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-miter-limit.ps2.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-miter-limit.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-miter-limit.ps2.ref.png diff --git a/cairo/test/reference/rectilinear-miter-limit.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-miter-limit.ps3.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-miter-limit.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-miter-limit.ps3.ref.png diff --git a/cairo/test/reference/rectilinear-miter-limit.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-miter-limit.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-miter-limit.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-miter-limit.rgb24.ref.png diff --git a/cairo/test/reference/rectilinear-miter-limit.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-miter-limit.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-miter-limit.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-miter-limit.traps.argb32.ref.png diff --git a/cairo/test/reference/rectilinear-miter-limit.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-miter-limit.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-miter-limit.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-miter-limit.traps.rgb24.ref.png diff --git a/cairo/test/reference/rectilinear-stroke.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-stroke.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-stroke.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-stroke.base.argb32.ref.png diff --git a/cairo/test/reference/rectilinear-stroke.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-stroke.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-stroke.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-stroke.base.rgb24.ref.png diff --git a/cairo/test/reference/rectilinear-stroke.quartz.xfail.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-stroke.quartz.xfail.png similarity index 100% rename from cairo/test/reference/rectilinear-stroke.quartz.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-stroke.quartz.xfail.png diff --git a/cairo/test/reference/rectilinear-stroke.ref.png b/io2d/src/3rd-party/cairo/test/reference/rectilinear-stroke.ref.png similarity index 100% rename from cairo/test/reference/rectilinear-stroke.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rectilinear-stroke.ref.png diff --git a/cairo/test/reference/reflected-stroke.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/reflected-stroke.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/reflected-stroke.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/reflected-stroke.base.argb32.ref.png diff --git a/cairo/test/reference/reflected-stroke.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/reflected-stroke.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/reflected-stroke.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/reflected-stroke.base.rgb24.ref.png diff --git a/cairo/test/reference/reflected-stroke.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/reflected-stroke.image16.ref.png similarity index 100% rename from cairo/test/reference/reflected-stroke.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/reflected-stroke.image16.ref.png diff --git a/cairo/test/reference/reflected-stroke.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/reflected-stroke.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/reflected-stroke.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/reflected-stroke.mask.argb32.ref.png diff --git a/cairo/test/reference/reflected-stroke.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/reflected-stroke.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/reflected-stroke.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/reflected-stroke.mask.rgb24.ref.png diff --git a/cairo/test/reference/reflected-stroke.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/reflected-stroke.ps.ref.png similarity index 100% rename from cairo/test/reference/reflected-stroke.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/reflected-stroke.ps.ref.png diff --git a/cairo/test/reference/reflected-stroke.ref.png b/io2d/src/3rd-party/cairo/test/reference/reflected-stroke.ref.png similarity index 100% rename from cairo/test/reference/reflected-stroke.ref.png rename to io2d/src/3rd-party/cairo/test/reference/reflected-stroke.ref.png diff --git a/cairo/test/reference/reflected-stroke.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/reflected-stroke.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/reflected-stroke.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/reflected-stroke.traps.argb32.ref.png diff --git a/cairo/test/reference/reflected-stroke.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/reflected-stroke.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/reflected-stroke.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/reflected-stroke.traps.rgb24.ref.png diff --git a/cairo/test/reference/rel-path.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rel-path.argb32.ref.png similarity index 100% rename from cairo/test/reference/rel-path.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rel-path.argb32.ref.png diff --git a/cairo/test/reference/rel-path.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rel-path.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/rel-path.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rel-path.base.argb32.ref.png diff --git a/cairo/test/reference/rel-path.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rel-path.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rel-path.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rel-path.base.rgb24.ref.png diff --git a/cairo/test/reference/rel-path.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rel-path.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rel-path.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rel-path.mask.rgb24.ref.png diff --git a/cairo/test/reference/rel-path.ps2.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rel-path.ps2.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rel-path.ps2.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rel-path.ps2.rgb24.ref.png diff --git a/cairo/test/reference/rel-path.ps3.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rel-path.ps3.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rel-path.ps3.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rel-path.ps3.rgb24.ref.png diff --git a/cairo/test/reference/rel-path.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rel-path.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rel-path.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rel-path.rgb24.ref.png diff --git a/cairo/test/reference/rel-path.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rel-path.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/rel-path.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rel-path.traps.argb32.ref.png diff --git a/cairo/test/reference/rel-path.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rel-path.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rel-path.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rel-path.traps.rgb24.ref.png diff --git a/cairo/test/reference/rgb24-ignore-alpha.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rgb24-ignore-alpha.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/rgb24-ignore-alpha.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rgb24-ignore-alpha.base.argb32.ref.png diff --git a/cairo/test/reference/rgb24-ignore-alpha.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rgb24-ignore-alpha.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rgb24-ignore-alpha.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rgb24-ignore-alpha.base.rgb24.ref.png diff --git a/cairo/test/reference/rgb24-ignore-alpha.ref.png b/io2d/src/3rd-party/cairo/test/reference/rgb24-ignore-alpha.ref.png similarity index 100% rename from cairo/test/reference/rgb24-ignore-alpha.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rgb24-ignore-alpha.ref.png diff --git a/cairo/test/reference/rotate-clip-image-surface-paint.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rotate-clip-image-surface-paint.argb32.ref.png similarity index 100% rename from cairo/test/reference/rotate-clip-image-surface-paint.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rotate-clip-image-surface-paint.argb32.ref.png diff --git a/cairo/test/reference/rotate-clip-image-surface-paint.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rotate-clip-image-surface-paint.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/rotate-clip-image-surface-paint.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rotate-clip-image-surface-paint.base.argb32.ref.png diff --git a/cairo/test/reference/rotate-clip-image-surface-paint.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rotate-clip-image-surface-paint.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rotate-clip-image-surface-paint.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rotate-clip-image-surface-paint.base.rgb24.ref.png diff --git a/cairo/test/reference/rotate-clip-image-surface-paint.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rotate-clip-image-surface-paint.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rotate-clip-image-surface-paint.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rotate-clip-image-surface-paint.rgb24.ref.png diff --git a/cairo/test/reference/rotate-clip-image-surface-paint.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rotate-clip-image-surface-paint.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/rotate-clip-image-surface-paint.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rotate-clip-image-surface-paint.traps.argb32.ref.png diff --git a/cairo/test/reference/rotate-clip-image-surface-paint.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rotate-clip-image-surface-paint.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rotate-clip-image-surface-paint.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rotate-clip-image-surface-paint.traps.rgb24.ref.png diff --git a/cairo/test/reference/rotate-clip-image-surface-paint.xlib-fallback.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rotate-clip-image-surface-paint.xlib-fallback.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rotate-clip-image-surface-paint.xlib-fallback.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rotate-clip-image-surface-paint.xlib-fallback.rgb24.ref.png diff --git a/cairo/test/reference/rotate-clip-image-surface-paint.xlib-window.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rotate-clip-image-surface-paint.xlib-window.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rotate-clip-image-surface-paint.xlib-window.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rotate-clip-image-surface-paint.xlib-window.rgb24.ref.png diff --git a/cairo/test/reference/rotate-image-surface-paint.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rotate-image-surface-paint.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/rotate-image-surface-paint.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rotate-image-surface-paint.base.argb32.ref.png diff --git a/cairo/test/reference/rotate-image-surface-paint.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rotate-image-surface-paint.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rotate-image-surface-paint.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rotate-image-surface-paint.base.rgb24.ref.png diff --git a/cairo/test/reference/rotate-image-surface-paint.pdf.xfail.png b/io2d/src/3rd-party/cairo/test/reference/rotate-image-surface-paint.pdf.xfail.png similarity index 100% rename from cairo/test/reference/rotate-image-surface-paint.pdf.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/rotate-image-surface-paint.pdf.xfail.png diff --git a/cairo/test/reference/rotate-image-surface-paint.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/rotate-image-surface-paint.ps.ref.png similarity index 100% rename from cairo/test/reference/rotate-image-surface-paint.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rotate-image-surface-paint.ps.ref.png diff --git a/cairo/test/reference/rotate-image-surface-paint.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/rotate-image-surface-paint.quartz.ref.png similarity index 100% rename from cairo/test/reference/rotate-image-surface-paint.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rotate-image-surface-paint.quartz.ref.png diff --git a/cairo/test/reference/rotate-image-surface-paint.ref.png b/io2d/src/3rd-party/cairo/test/reference/rotate-image-surface-paint.ref.png similarity index 100% rename from cairo/test/reference/rotate-image-surface-paint.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rotate-image-surface-paint.ref.png diff --git a/cairo/test/reference/rotate-image-surface-paint.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/rotate-image-surface-paint.svg.ref.png similarity index 100% rename from cairo/test/reference/rotate-image-surface-paint.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rotate-image-surface-paint.svg.ref.png diff --git a/cairo/test/reference/rotate-image-surface-paint.svg.xfail.png b/io2d/src/3rd-party/cairo/test/reference/rotate-image-surface-paint.svg.xfail.png similarity index 100% rename from cairo/test/reference/rotate-image-surface-paint.svg.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/rotate-image-surface-paint.svg.xfail.png diff --git a/cairo/test/reference/rotated-clip.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rotated-clip.argb32.ref.png similarity index 100% rename from cairo/test/reference/rotated-clip.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rotated-clip.argb32.ref.png diff --git a/cairo/test/reference/rotated-clip.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rotated-clip.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/rotated-clip.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rotated-clip.base.argb32.ref.png diff --git a/cairo/test/reference/rotated-clip.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rotated-clip.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rotated-clip.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rotated-clip.base.rgb24.ref.png diff --git a/cairo/test/reference/rotated-clip.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/rotated-clip.image16.ref.png similarity index 100% rename from cairo/test/reference/rotated-clip.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rotated-clip.image16.ref.png diff --git a/cairo/test/reference/rotated-clip.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rotated-clip.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/rotated-clip.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rotated-clip.mask.argb32.ref.png diff --git a/cairo/test/reference/rotated-clip.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rotated-clip.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rotated-clip.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rotated-clip.mask.rgb24.ref.png diff --git a/cairo/test/reference/rotated-clip.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/rotated-clip.ps.ref.png similarity index 100% rename from cairo/test/reference/rotated-clip.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rotated-clip.ps.ref.png diff --git a/cairo/test/reference/rotated-clip.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/rotated-clip.quartz.ref.png similarity index 100% rename from cairo/test/reference/rotated-clip.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rotated-clip.quartz.ref.png diff --git a/cairo/test/reference/rotated-clip.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rotated-clip.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rotated-clip.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rotated-clip.rgb24.ref.png diff --git a/cairo/test/reference/rotated-clip.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rotated-clip.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/rotated-clip.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rotated-clip.traps.argb32.ref.png diff --git a/cairo/test/reference/rotated-clip.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rotated-clip.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rotated-clip.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rotated-clip.traps.rgb24.ref.png diff --git a/cairo/test/reference/rounded-rectangle-fill.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-fill.argb32.ref.png similarity index 100% rename from cairo/test/reference/rounded-rectangle-fill.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-fill.argb32.ref.png diff --git a/cairo/test/reference/rounded-rectangle-fill.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-fill.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/rounded-rectangle-fill.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-fill.base.argb32.ref.png diff --git a/cairo/test/reference/rounded-rectangle-fill.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-fill.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rounded-rectangle-fill.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-fill.base.rgb24.ref.png diff --git a/cairo/test/reference/rounded-rectangle-fill.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-fill.image16.ref.png similarity index 100% rename from cairo/test/reference/rounded-rectangle-fill.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-fill.image16.ref.png diff --git a/cairo/test/reference/rounded-rectangle-fill.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-fill.ps.ref.png similarity index 100% rename from cairo/test/reference/rounded-rectangle-fill.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-fill.ps.ref.png diff --git a/cairo/test/reference/rounded-rectangle-fill.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-fill.quartz.ref.png similarity index 100% rename from cairo/test/reference/rounded-rectangle-fill.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-fill.quartz.ref.png diff --git a/cairo/test/reference/rounded-rectangle-fill.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-fill.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rounded-rectangle-fill.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-fill.rgb24.ref.png diff --git a/cairo/test/reference/rounded-rectangle-fill.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-fill.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/rounded-rectangle-fill.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-fill.traps.argb32.ref.png diff --git a/cairo/test/reference/rounded-rectangle-fill.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-fill.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rounded-rectangle-fill.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-fill.traps.rgb24.ref.png diff --git a/cairo/test/reference/rounded-rectangle-stroke.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-stroke.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/rounded-rectangle-stroke.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-stroke.base.argb32.ref.png diff --git a/cairo/test/reference/rounded-rectangle-stroke.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-stroke.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rounded-rectangle-stroke.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-stroke.base.rgb24.ref.png diff --git a/cairo/test/reference/rounded-rectangle-stroke.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-stroke.image16.ref.png similarity index 100% rename from cairo/test/reference/rounded-rectangle-stroke.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-stroke.image16.ref.png diff --git a/cairo/test/reference/rounded-rectangle-stroke.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-stroke.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/rounded-rectangle-stroke.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-stroke.mask.argb32.ref.png diff --git a/cairo/test/reference/rounded-rectangle-stroke.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-stroke.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rounded-rectangle-stroke.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-stroke.mask.rgb24.ref.png diff --git a/cairo/test/reference/rounded-rectangle-stroke.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-stroke.ps.ref.png similarity index 100% rename from cairo/test/reference/rounded-rectangle-stroke.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-stroke.ps.ref.png diff --git a/cairo/test/reference/rounded-rectangle-stroke.ref.png b/io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-stroke.ref.png similarity index 100% rename from cairo/test/reference/rounded-rectangle-stroke.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-stroke.ref.png diff --git a/cairo/test/reference/rounded-rectangle-stroke.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-stroke.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/rounded-rectangle-stroke.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-stroke.traps.argb32.ref.png diff --git a/cairo/test/reference/rounded-rectangle-stroke.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-stroke.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/rounded-rectangle-stroke.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/rounded-rectangle-stroke.traps.rgb24.ref.png diff --git a/cairo/test/reference/sample-diagonal.ref.png b/io2d/src/3rd-party/cairo/test/reference/sample-diagonal.ref.png similarity index 100% rename from cairo/test/reference/sample-diagonal.ref.png rename to io2d/src/3rd-party/cairo/test/reference/sample-diagonal.ref.png diff --git a/cairo/test/reference/sample-horizontal.ref.png b/io2d/src/3rd-party/cairo/test/reference/sample-horizontal.ref.png similarity index 100% rename from cairo/test/reference/sample-horizontal.ref.png rename to io2d/src/3rd-party/cairo/test/reference/sample-horizontal.ref.png diff --git a/cairo/test/reference/sample-vertical.ref.png b/io2d/src/3rd-party/cairo/test/reference/sample-vertical.ref.png similarity index 100% rename from cairo/test/reference/sample-vertical.ref.png rename to io2d/src/3rd-party/cairo/test/reference/sample-vertical.ref.png diff --git a/cairo/test/reference/scale-down-source-surface-paint.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-down-source-surface-paint.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/scale-down-source-surface-paint.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-down-source-surface-paint.base.argb32.ref.png diff --git a/cairo/test/reference/scale-down-source-surface-paint.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-down-source-surface-paint.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/scale-down-source-surface-paint.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-down-source-surface-paint.base.rgb24.ref.png diff --git a/cairo/test/reference/scale-down-source-surface-paint.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-down-source-surface-paint.ref.png similarity index 100% rename from cairo/test/reference/scale-down-source-surface-paint.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-down-source-surface-paint.ref.png diff --git a/cairo/test/reference/scale-offset-image.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-image.argb32.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-image.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-image.argb32.ref.png diff --git a/cairo/test/reference/scale-offset-image.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-image.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-image.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-image.base.argb32.ref.png diff --git a/cairo/test/reference/scale-offset-image.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-image.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-image.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-image.base.rgb24.ref.png diff --git a/cairo/test/reference/scale-offset-image.gl.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-image.gl.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-image.gl.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-image.gl.ref.png diff --git a/cairo/test/reference/scale-offset-image.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-image.image16.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-image.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-image.image16.ref.png diff --git a/cairo/test/reference/scale-offset-image.pdf.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-image.pdf.argb32.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-image.pdf.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-image.pdf.argb32.ref.png diff --git a/cairo/test/reference/scale-offset-image.pdf.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-image.pdf.rgb24.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-image.pdf.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-image.pdf.rgb24.ref.png diff --git a/cairo/test/reference/scale-offset-image.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-image.ps.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-image.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-image.ps.ref.png diff --git a/cairo/test/reference/scale-offset-image.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-image.quartz.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-image.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-image.quartz.ref.png diff --git a/cairo/test/reference/scale-offset-image.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-image.rgb24.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-image.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-image.rgb24.ref.png diff --git a/cairo/test/reference/scale-offset-image.script.xfail.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-image.script.xfail.png similarity index 100% rename from cairo/test/reference/scale-offset-image.script.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-image.script.xfail.png diff --git a/cairo/test/reference/scale-offset-image.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-image.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-image.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-image.traps.argb32.ref.png diff --git a/cairo/test/reference/scale-offset-image.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-image.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-image.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-image.traps.rgb24.ref.png diff --git a/cairo/test/reference/scale-offset-image.xfail.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-image.xfail.png similarity index 100% rename from cairo/test/reference/scale-offset-image.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-image.xfail.png diff --git a/cairo/test/reference/scale-offset-image.xlib-fallback.xfail.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-image.xlib-fallback.xfail.png similarity index 100% rename from cairo/test/reference/scale-offset-image.xlib-fallback.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-image.xlib-fallback.xfail.png diff --git a/cairo/test/reference/scale-offset-similar.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.argb32.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-similar.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.argb32.ref.png diff --git a/cairo/test/reference/scale-offset-similar.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-similar.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.base.argb32.ref.png diff --git a/cairo/test/reference/scale-offset-similar.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-similar.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.base.rgb24.ref.png diff --git a/cairo/test/reference/scale-offset-similar.gl.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.gl.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-similar.gl.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.gl.ref.png diff --git a/cairo/test/reference/scale-offset-similar.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.image16.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-similar.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.image16.ref.png diff --git a/cairo/test/reference/scale-offset-similar.pdf.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.pdf.argb32.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-similar.pdf.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.pdf.argb32.ref.png diff --git a/cairo/test/reference/scale-offset-similar.pdf.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.pdf.rgb24.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-similar.pdf.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.pdf.rgb24.ref.png diff --git a/cairo/test/reference/scale-offset-similar.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.ps.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-similar.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.ps.ref.png diff --git a/cairo/test/reference/scale-offset-similar.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.quartz.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-similar.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.quartz.ref.png diff --git a/cairo/test/reference/scale-offset-similar.recording.xfail.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.recording.xfail.png similarity index 100% rename from cairo/test/reference/scale-offset-similar.recording.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.recording.xfail.png diff --git a/cairo/test/reference/scale-offset-similar.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.rgb24.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-similar.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.rgb24.ref.png diff --git a/cairo/test/reference/scale-offset-similar.script.xfail.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.script.xfail.png similarity index 100% rename from cairo/test/reference/scale-offset-similar.script.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.script.xfail.png diff --git a/cairo/test/reference/scale-offset-similar.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-similar.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.traps.argb32.ref.png diff --git a/cairo/test/reference/scale-offset-similar.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-similar.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.traps.rgb24.ref.png diff --git a/cairo/test/reference/scale-offset-similar.xfail.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.xfail.png similarity index 100% rename from cairo/test/reference/scale-offset-similar.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.xfail.png diff --git a/cairo/test/reference/scale-offset-similar.xlib-fallback.xfail.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.xlib-fallback.xfail.png similarity index 100% rename from cairo/test/reference/scale-offset-similar.xlib-fallback.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.xlib-fallback.xfail.png diff --git a/cairo/test/reference/scale-offset-similar.xlib.xfail.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.xlib.xfail.png similarity index 100% rename from cairo/test/reference/scale-offset-similar.xlib.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-similar.xlib.xfail.png diff --git a/cairo/test/reference/scale-offset-xlib-fallback.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-xlib-fallback.rgb24.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-xlib-fallback.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-xlib-fallback.rgb24.ref.png diff --git a/cairo/test/reference/scale-offset-xlib-window.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-xlib-window.rgb24.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-xlib-window.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-xlib-window.rgb24.ref.png diff --git a/cairo/test/reference/scale-offset-xlib.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-xlib.argb32.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-xlib.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-xlib.argb32.ref.png diff --git a/cairo/test/reference/scale-offset-xlib.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-offset-xlib.rgb24.ref.png similarity index 100% rename from cairo/test/reference/scale-offset-xlib.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-offset-xlib.rgb24.ref.png diff --git a/cairo/test/reference/scale-source-surface-paint.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-source-surface-paint.argb32.ref.png similarity index 100% rename from cairo/test/reference/scale-source-surface-paint.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-source-surface-paint.argb32.ref.png diff --git a/cairo/test/reference/scale-source-surface-paint.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-source-surface-paint.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/scale-source-surface-paint.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-source-surface-paint.base.argb32.ref.png diff --git a/cairo/test/reference/scale-source-surface-paint.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-source-surface-paint.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/scale-source-surface-paint.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-source-surface-paint.base.rgb24.ref.png diff --git a/cairo/test/reference/scale-source-surface-paint.pdf.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/scale-source-surface-paint.pdf.argb32.xfail.png similarity index 100% rename from cairo/test/reference/scale-source-surface-paint.pdf.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/scale-source-surface-paint.pdf.argb32.xfail.png diff --git a/cairo/test/reference/scale-source-surface-paint.pdf.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/scale-source-surface-paint.pdf.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/scale-source-surface-paint.pdf.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/scale-source-surface-paint.pdf.rgb24.xfail.png diff --git a/cairo/test/reference/scale-source-surface-paint.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/scale-source-surface-paint.rgb24.ref.png similarity index 100% rename from cairo/test/reference/scale-source-surface-paint.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/scale-source-surface-paint.rgb24.ref.png diff --git a/cairo/test/reference/scale-source-surface-paint.svg.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/scale-source-surface-paint.svg.argb32.xfail.png similarity index 100% rename from cairo/test/reference/scale-source-surface-paint.svg.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/scale-source-surface-paint.svg.argb32.xfail.png diff --git a/cairo/test/reference/scale-source-surface-paint.svg.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/scale-source-surface-paint.svg.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/scale-source-surface-paint.svg.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/scale-source-surface-paint.svg.rgb24.xfail.png diff --git a/cairo/test/reference/select-font-face.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/select-font-face.argb32.ref.png similarity index 100% rename from cairo/test/reference/select-font-face.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/select-font-face.argb32.ref.png diff --git a/cairo/test/reference/select-font-face.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/select-font-face.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/select-font-face.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/select-font-face.base.argb32.ref.png diff --git a/cairo/test/reference/select-font-face.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/select-font-face.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/select-font-face.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/select-font-face.base.rgb24.ref.png diff --git a/cairo/test/reference/select-font-face.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/select-font-face.image16.ref.png similarity index 100% rename from cairo/test/reference/select-font-face.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/select-font-face.image16.ref.png diff --git a/cairo/test/reference/select-font-face.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/select-font-face.ps2.ref.png similarity index 100% rename from cairo/test/reference/select-font-face.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/select-font-face.ps2.ref.png diff --git a/cairo/test/reference/select-font-face.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/select-font-face.ps3.ref.png similarity index 100% rename from cairo/test/reference/select-font-face.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/select-font-face.ps3.ref.png diff --git a/cairo/test/reference/select-font-face.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/select-font-face.quartz.ref.png similarity index 100% rename from cairo/test/reference/select-font-face.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/select-font-face.quartz.ref.png diff --git a/cairo/test/reference/select-font-face.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/select-font-face.rgb24.ref.png similarity index 100% rename from cairo/test/reference/select-font-face.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/select-font-face.rgb24.ref.png diff --git a/cairo/test/reference/select-font-face.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/select-font-face.traps.ref.png similarity index 100% rename from cairo/test/reference/select-font-face.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/select-font-face.traps.ref.png diff --git a/cairo/test/reference/self-copy-overlap.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/self-copy-overlap.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/self-copy-overlap.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/self-copy-overlap.base.argb32.ref.png diff --git a/cairo/test/reference/self-copy-overlap.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/self-copy-overlap.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/self-copy-overlap.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/self-copy-overlap.base.rgb24.ref.png diff --git a/cairo/test/reference/self-copy-overlap.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/self-copy-overlap.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/self-copy-overlap.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/self-copy-overlap.mask.argb32.ref.png diff --git a/cairo/test/reference/self-copy-overlap.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/self-copy-overlap.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/self-copy-overlap.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/self-copy-overlap.mask.rgb24.ref.png diff --git a/cairo/test/reference/self-copy-overlap.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/self-copy-overlap.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/self-copy-overlap.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/self-copy-overlap.traps.argb32.ref.png diff --git a/cairo/test/reference/self-copy-overlap.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/self-copy-overlap.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/self-copy-overlap.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/self-copy-overlap.traps.rgb24.ref.png diff --git a/cairo/test/reference/self-copy.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/self-copy.argb32.ref.png similarity index 100% rename from cairo/test/reference/self-copy.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/self-copy.argb32.ref.png diff --git a/cairo/test/reference/self-copy.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/self-copy.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/self-copy.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/self-copy.base.argb32.ref.png diff --git a/cairo/test/reference/self-copy.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/self-copy.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/self-copy.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/self-copy.base.rgb24.ref.png diff --git a/cairo/test/reference/self-copy.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/self-copy.ps2.ref.png similarity index 100% rename from cairo/test/reference/self-copy.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/self-copy.ps2.ref.png diff --git a/cairo/test/reference/self-copy.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/self-copy.ps3.ref.png similarity index 100% rename from cairo/test/reference/self-copy.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/self-copy.ps3.ref.png diff --git a/cairo/test/reference/self-copy.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/self-copy.rgb24.ref.png similarity index 100% rename from cairo/test/reference/self-copy.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/self-copy.rgb24.ref.png diff --git a/cairo/test/reference/self-copy.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/self-copy.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/self-copy.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/self-copy.traps.argb32.ref.png diff --git a/cairo/test/reference/self-copy.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/self-copy.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/self-copy.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/self-copy.traps.rgb24.ref.png diff --git a/cairo/test/reference/self-intersecting.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/self-intersecting.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/self-intersecting.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/self-intersecting.base.argb32.ref.png diff --git a/cairo/test/reference/self-intersecting.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/self-intersecting.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/self-intersecting.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/self-intersecting.base.rgb24.ref.png diff --git a/cairo/test/reference/self-intersecting.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/self-intersecting.ps.ref.png similarity index 100% rename from cairo/test/reference/self-intersecting.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/self-intersecting.ps.ref.png diff --git a/cairo/test/reference/self-intersecting.quartz.xfail.png b/io2d/src/3rd-party/cairo/test/reference/self-intersecting.quartz.xfail.png similarity index 100% rename from cairo/test/reference/self-intersecting.quartz.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/self-intersecting.quartz.xfail.png diff --git a/cairo/test/reference/self-intersecting.ref.png b/io2d/src/3rd-party/cairo/test/reference/self-intersecting.ref.png similarity index 100% rename from cairo/test/reference/self-intersecting.ref.png rename to io2d/src/3rd-party/cairo/test/reference/self-intersecting.ref.png diff --git a/cairo/test/reference/self-intersecting.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/self-intersecting.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/self-intersecting.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/self-intersecting.traps.argb32.ref.png diff --git a/cairo/test/reference/self-intersecting.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/self-intersecting.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/self-intersecting.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/self-intersecting.traps.rgb24.ref.png diff --git a/cairo/test/reference/set-source.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/set-source.argb32.ref.png similarity index 100% rename from cairo/test/reference/set-source.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/set-source.argb32.ref.png diff --git a/cairo/test/reference/set-source.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/set-source.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/set-source.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/set-source.base.argb32.ref.png diff --git a/cairo/test/reference/set-source.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/set-source.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/set-source.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/set-source.base.rgb24.ref.png diff --git a/cairo/test/reference/set-source.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/set-source.rgb24.ref.png similarity index 100% rename from cairo/test/reference/set-source.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/set-source.rgb24.ref.png diff --git a/cairo/test/reference/shape-general-convex.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/shape-general-convex.argb32.ref.png similarity index 100% rename from cairo/test/reference/shape-general-convex.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/shape-general-convex.argb32.ref.png diff --git a/cairo/test/reference/shape-general-convex.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/shape-general-convex.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/shape-general-convex.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/shape-general-convex.base.argb32.ref.png diff --git a/cairo/test/reference/shape-general-convex.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/shape-general-convex.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/shape-general-convex.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/shape-general-convex.base.rgb24.ref.png diff --git a/cairo/test/reference/shape-general-convex.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/shape-general-convex.ps.ref.png similarity index 100% rename from cairo/test/reference/shape-general-convex.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/shape-general-convex.ps.ref.png diff --git a/cairo/test/reference/shape-general-convex.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/shape-general-convex.rgb24.ref.png similarity index 100% rename from cairo/test/reference/shape-general-convex.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/shape-general-convex.rgb24.ref.png diff --git a/cairo/test/reference/shape-general-convex.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/shape-general-convex.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/shape-general-convex.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/shape-general-convex.traps.argb32.ref.png diff --git a/cairo/test/reference/shape-general-convex.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/shape-general-convex.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/shape-general-convex.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/shape-general-convex.traps.rgb24.ref.png diff --git a/cairo/test/reference/shape-sierpinski.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/shape-sierpinski.argb32.ref.png similarity index 100% rename from cairo/test/reference/shape-sierpinski.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/shape-sierpinski.argb32.ref.png diff --git a/cairo/test/reference/shape-sierpinski.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/shape-sierpinski.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/shape-sierpinski.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/shape-sierpinski.base.argb32.ref.png diff --git a/cairo/test/reference/shape-sierpinski.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/shape-sierpinski.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/shape-sierpinski.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/shape-sierpinski.base.rgb24.ref.png diff --git a/cairo/test/reference/shape-sierpinski.pdf.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/shape-sierpinski.pdf.argb32.ref.png similarity index 100% rename from cairo/test/reference/shape-sierpinski.pdf.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/shape-sierpinski.pdf.argb32.ref.png diff --git a/cairo/test/reference/shape-sierpinski.pdf.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/shape-sierpinski.pdf.rgb24.ref.png similarity index 100% rename from cairo/test/reference/shape-sierpinski.pdf.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/shape-sierpinski.pdf.rgb24.ref.png diff --git a/cairo/test/reference/shape-sierpinski.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/shape-sierpinski.ps.ref.png similarity index 100% rename from cairo/test/reference/shape-sierpinski.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/shape-sierpinski.ps.ref.png diff --git a/cairo/test/reference/shape-sierpinski.ps3.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/shape-sierpinski.ps3.argb32.ref.png similarity index 100% rename from cairo/test/reference/shape-sierpinski.ps3.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/shape-sierpinski.ps3.argb32.ref.png diff --git a/cairo/test/reference/shape-sierpinski.ps3.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/shape-sierpinski.ps3.rgb24.ref.png similarity index 100% rename from cairo/test/reference/shape-sierpinski.ps3.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/shape-sierpinski.ps3.rgb24.ref.png diff --git a/cairo/test/reference/shape-sierpinski.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/shape-sierpinski.rgb24.ref.png similarity index 100% rename from cairo/test/reference/shape-sierpinski.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/shape-sierpinski.rgb24.ref.png diff --git a/cairo/test/reference/shape-sierpinski.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/shape-sierpinski.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/shape-sierpinski.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/shape-sierpinski.traps.argb32.ref.png diff --git a/cairo/test/reference/shape-sierpinski.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/shape-sierpinski.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/shape-sierpinski.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/shape-sierpinski.traps.rgb24.ref.png diff --git a/cairo/test/reference/show-glyphs-advance.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/show-glyphs-advance.argb32.ref.png similarity index 100% rename from cairo/test/reference/show-glyphs-advance.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/show-glyphs-advance.argb32.ref.png diff --git a/cairo/test/reference/show-glyphs-advance.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/show-glyphs-advance.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/show-glyphs-advance.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/show-glyphs-advance.base.argb32.ref.png diff --git a/cairo/test/reference/show-glyphs-advance.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/show-glyphs-advance.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/show-glyphs-advance.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/show-glyphs-advance.base.rgb24.ref.png diff --git a/cairo/test/reference/show-glyphs-advance.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/show-glyphs-advance.image16.ref.png similarity index 100% rename from cairo/test/reference/show-glyphs-advance.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/show-glyphs-advance.image16.ref.png diff --git a/cairo/test/reference/show-glyphs-advance.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/show-glyphs-advance.ps.ref.png similarity index 100% rename from cairo/test/reference/show-glyphs-advance.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/show-glyphs-advance.ps.ref.png diff --git a/cairo/test/reference/show-glyphs-advance.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/show-glyphs-advance.quartz.ref.png similarity index 100% rename from cairo/test/reference/show-glyphs-advance.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/show-glyphs-advance.quartz.ref.png diff --git a/cairo/test/reference/show-glyphs-advance.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/show-glyphs-advance.rgb24.ref.png similarity index 100% rename from cairo/test/reference/show-glyphs-advance.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/show-glyphs-advance.rgb24.ref.png diff --git a/cairo/test/reference/show-glyphs-advance.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/show-glyphs-advance.svg.ref.png similarity index 100% rename from cairo/test/reference/show-glyphs-advance.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/show-glyphs-advance.svg.ref.png diff --git a/cairo/test/reference/show-glyphs-advance.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/show-glyphs-advance.traps.ref.png similarity index 100% rename from cairo/test/reference/show-glyphs-advance.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/show-glyphs-advance.traps.ref.png diff --git a/cairo/test/reference/show-glyphs-many.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/show-glyphs-many.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/show-glyphs-many.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/show-glyphs-many.base.argb32.ref.png diff --git a/cairo/test/reference/show-glyphs-many.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/show-glyphs-many.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/show-glyphs-many.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/show-glyphs-many.base.rgb24.ref.png diff --git a/cairo/test/reference/show-glyphs-many.ref.png b/io2d/src/3rd-party/cairo/test/reference/show-glyphs-many.ref.png similarity index 100% rename from cairo/test/reference/show-glyphs-many.ref.png rename to io2d/src/3rd-party/cairo/test/reference/show-glyphs-many.ref.png diff --git a/cairo/test/reference/show-text-current-point.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/show-text-current-point.argb32.ref.png similarity index 100% rename from cairo/test/reference/show-text-current-point.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/show-text-current-point.argb32.ref.png diff --git a/cairo/test/reference/show-text-current-point.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/show-text-current-point.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/show-text-current-point.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/show-text-current-point.base.argb32.ref.png diff --git a/cairo/test/reference/show-text-current-point.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/show-text-current-point.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/show-text-current-point.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/show-text-current-point.base.rgb24.ref.png diff --git a/cairo/test/reference/show-text-current-point.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/show-text-current-point.image16.ref.png similarity index 100% rename from cairo/test/reference/show-text-current-point.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/show-text-current-point.image16.ref.png diff --git a/cairo/test/reference/show-text-current-point.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/show-text-current-point.ps2.ref.png similarity index 100% rename from cairo/test/reference/show-text-current-point.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/show-text-current-point.ps2.ref.png diff --git a/cairo/test/reference/show-text-current-point.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/show-text-current-point.ps3.ref.png similarity index 100% rename from cairo/test/reference/show-text-current-point.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/show-text-current-point.ps3.ref.png diff --git a/cairo/test/reference/show-text-current-point.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/show-text-current-point.quartz.ref.png similarity index 100% rename from cairo/test/reference/show-text-current-point.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/show-text-current-point.quartz.ref.png diff --git a/cairo/test/reference/show-text-current-point.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/show-text-current-point.rgb24.ref.png similarity index 100% rename from cairo/test/reference/show-text-current-point.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/show-text-current-point.rgb24.ref.png diff --git a/cairo/test/reference/show-text-current-point.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/show-text-current-point.traps.ref.png similarity index 100% rename from cairo/test/reference/show-text-current-point.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/show-text-current-point.traps.ref.png diff --git a/cairo/test/reference/skew-extreme.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/skew-extreme.argb32.ref.png similarity index 100% rename from cairo/test/reference/skew-extreme.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/skew-extreme.argb32.ref.png diff --git a/cairo/test/reference/skew-extreme.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/skew-extreme.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/skew-extreme.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/skew-extreme.base.argb32.ref.png diff --git a/cairo/test/reference/skew-extreme.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/skew-extreme.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/skew-extreme.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/skew-extreme.base.rgb24.ref.png diff --git a/cairo/test/reference/skew-extreme.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/skew-extreme.ps2.ref.png similarity index 100% rename from cairo/test/reference/skew-extreme.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/skew-extreme.ps2.ref.png diff --git a/cairo/test/reference/skew-extreme.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/skew-extreme.ps3.ref.png similarity index 100% rename from cairo/test/reference/skew-extreme.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/skew-extreme.ps3.ref.png diff --git a/cairo/test/reference/skew-extreme.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/skew-extreme.rgb24.ref.png similarity index 100% rename from cairo/test/reference/skew-extreme.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/skew-extreme.rgb24.ref.png diff --git a/cairo/test/reference/skew-extreme.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/skew-extreme.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/skew-extreme.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/skew-extreme.traps.argb32.ref.png diff --git a/cairo/test/reference/skew-extreme.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/skew-extreme.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/skew-extreme.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/skew-extreme.traps.rgb24.ref.png diff --git a/cairo/test/reference/smask-fill.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-fill.argb32.ref.png similarity index 100% rename from cairo/test/reference/smask-fill.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-fill.argb32.ref.png diff --git a/cairo/test/reference/smask-fill.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-fill.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/smask-fill.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-fill.base.argb32.ref.png diff --git a/cairo/test/reference/smask-fill.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-fill.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/smask-fill.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-fill.base.rgb24.ref.png diff --git a/cairo/test/reference/smask-fill.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-fill.image16.ref.png similarity index 100% rename from cairo/test/reference/smask-fill.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-fill.image16.ref.png diff --git a/cairo/test/reference/smask-fill.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-fill.pdf.ref.png similarity index 100% rename from cairo/test/reference/smask-fill.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-fill.pdf.ref.png diff --git a/cairo/test/reference/smask-fill.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-fill.quartz.ref.png similarity index 100% rename from cairo/test/reference/smask-fill.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-fill.quartz.ref.png diff --git a/cairo/test/reference/smask-fill.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-fill.rgb24.ref.png similarity index 100% rename from cairo/test/reference/smask-fill.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-fill.rgb24.ref.png diff --git a/cairo/test/reference/smask-fill.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-fill.svg.ref.png similarity index 100% rename from cairo/test/reference/smask-fill.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-fill.svg.ref.png diff --git a/cairo/test/reference/smask-fill.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-fill.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/smask-fill.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-fill.traps.argb32.ref.png diff --git a/cairo/test/reference/smask-fill.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-fill.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/smask-fill.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-fill.traps.rgb24.ref.png diff --git a/cairo/test/reference/smask-image-mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-image-mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/smask-image-mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-image-mask.argb32.ref.png diff --git a/cairo/test/reference/smask-image-mask.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-image-mask.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/smask-image-mask.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-image-mask.base.argb32.ref.png diff --git a/cairo/test/reference/smask-image-mask.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-image-mask.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/smask-image-mask.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-image-mask.base.rgb24.ref.png diff --git a/cairo/test/reference/smask-image-mask.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-image-mask.pdf.ref.png similarity index 100% rename from cairo/test/reference/smask-image-mask.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-image-mask.pdf.ref.png diff --git a/cairo/test/reference/smask-image-mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-image-mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/smask-image-mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-image-mask.rgb24.ref.png diff --git a/cairo/test/reference/smask-mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/smask-mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-mask.argb32.ref.png diff --git a/cairo/test/reference/smask-mask.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-mask.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/smask-mask.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-mask.base.argb32.ref.png diff --git a/cairo/test/reference/smask-mask.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-mask.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/smask-mask.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-mask.base.rgb24.ref.png diff --git a/cairo/test/reference/smask-mask.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-mask.image16.ref.png similarity index 100% rename from cairo/test/reference/smask-mask.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-mask.image16.ref.png diff --git a/cairo/test/reference/smask-mask.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-mask.pdf.ref.png similarity index 100% rename from cairo/test/reference/smask-mask.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-mask.pdf.ref.png diff --git a/cairo/test/reference/smask-mask.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-mask.quartz.ref.png similarity index 100% rename from cairo/test/reference/smask-mask.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-mask.quartz.ref.png diff --git a/cairo/test/reference/smask-mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/smask-mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-mask.rgb24.ref.png diff --git a/cairo/test/reference/smask-mask.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-mask.svg.ref.png similarity index 100% rename from cairo/test/reference/smask-mask.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-mask.svg.ref.png diff --git a/cairo/test/reference/smask-paint.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-paint.argb32.ref.png similarity index 100% rename from cairo/test/reference/smask-paint.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-paint.argb32.ref.png diff --git a/cairo/test/reference/smask-paint.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-paint.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/smask-paint.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-paint.base.argb32.ref.png diff --git a/cairo/test/reference/smask-paint.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-paint.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/smask-paint.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-paint.base.rgb24.ref.png diff --git a/cairo/test/reference/smask-paint.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-paint.image16.ref.png similarity index 100% rename from cairo/test/reference/smask-paint.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-paint.image16.ref.png diff --git a/cairo/test/reference/smask-paint.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-paint.pdf.ref.png similarity index 100% rename from cairo/test/reference/smask-paint.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-paint.pdf.ref.png diff --git a/cairo/test/reference/smask-paint.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-paint.quartz.ref.png similarity index 100% rename from cairo/test/reference/smask-paint.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-paint.quartz.ref.png diff --git a/cairo/test/reference/smask-paint.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-paint.rgb24.ref.png similarity index 100% rename from cairo/test/reference/smask-paint.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-paint.rgb24.ref.png diff --git a/cairo/test/reference/smask-paint.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-paint.svg.ref.png similarity index 100% rename from cairo/test/reference/smask-paint.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-paint.svg.ref.png diff --git a/cairo/test/reference/smask-stroke.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-stroke.argb32.ref.png similarity index 100% rename from cairo/test/reference/smask-stroke.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-stroke.argb32.ref.png diff --git a/cairo/test/reference/smask-stroke.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-stroke.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/smask-stroke.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-stroke.base.argb32.ref.png diff --git a/cairo/test/reference/smask-stroke.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-stroke.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/smask-stroke.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-stroke.base.rgb24.ref.png diff --git a/cairo/test/reference/smask-stroke.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-stroke.image16.ref.png similarity index 100% rename from cairo/test/reference/smask-stroke.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-stroke.image16.ref.png diff --git a/cairo/test/reference/smask-stroke.pdf.xfail.png b/io2d/src/3rd-party/cairo/test/reference/smask-stroke.pdf.xfail.png similarity index 100% rename from cairo/test/reference/smask-stroke.pdf.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/smask-stroke.pdf.xfail.png diff --git a/cairo/test/reference/smask-stroke.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-stroke.quartz.ref.png similarity index 100% rename from cairo/test/reference/smask-stroke.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-stroke.quartz.ref.png diff --git a/cairo/test/reference/smask-stroke.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-stroke.rgb24.ref.png similarity index 100% rename from cairo/test/reference/smask-stroke.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-stroke.rgb24.ref.png diff --git a/cairo/test/reference/smask-stroke.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-stroke.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/smask-stroke.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-stroke.traps.argb32.ref.png diff --git a/cairo/test/reference/smask-stroke.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-stroke.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/smask-stroke.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-stroke.traps.rgb24.ref.png diff --git a/cairo/test/reference/smask-text.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-text.argb32.ref.png similarity index 100% rename from cairo/test/reference/smask-text.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-text.argb32.ref.png diff --git a/cairo/test/reference/smask-text.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-text.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/smask-text.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-text.base.argb32.ref.png diff --git a/cairo/test/reference/smask-text.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-text.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/smask-text.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-text.base.rgb24.ref.png diff --git a/cairo/test/reference/smask-text.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-text.image16.ref.png similarity index 100% rename from cairo/test/reference/smask-text.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-text.image16.ref.png diff --git a/cairo/test/reference/smask-text.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-text.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/smask-text.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-text.mask.argb32.ref.png diff --git a/cairo/test/reference/smask-text.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-text.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/smask-text.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-text.mask.rgb24.ref.png diff --git a/cairo/test/reference/smask-text.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-text.pdf.ref.png similarity index 100% rename from cairo/test/reference/smask-text.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-text.pdf.ref.png diff --git a/cairo/test/reference/smask-text.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-text.ps2.ref.png similarity index 100% rename from cairo/test/reference/smask-text.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-text.ps2.ref.png diff --git a/cairo/test/reference/smask-text.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-text.ps3.ref.png similarity index 100% rename from cairo/test/reference/smask-text.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-text.ps3.ref.png diff --git a/cairo/test/reference/smask-text.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-text.quartz.ref.png similarity index 100% rename from cairo/test/reference/smask-text.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-text.quartz.ref.png diff --git a/cairo/test/reference/smask-text.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-text.rgb24.ref.png similarity index 100% rename from cairo/test/reference/smask-text.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-text.rgb24.ref.png diff --git a/cairo/test/reference/smask-text.script.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-text.script.ref.png similarity index 100% rename from cairo/test/reference/smask-text.script.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-text.script.ref.png diff --git a/cairo/test/reference/smask-text.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-text.svg.ref.png similarity index 100% rename from cairo/test/reference/smask-text.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-text.svg.ref.png diff --git a/cairo/test/reference/smask-text.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-text.traps.ref.png similarity index 100% rename from cairo/test/reference/smask-text.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-text.traps.ref.png diff --git a/cairo/test/reference/smask-text.xlib-fallback.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask-text.xlib-fallback.ref.png similarity index 100% rename from cairo/test/reference/smask-text.xlib-fallback.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask-text.xlib-fallback.ref.png diff --git a/cairo/test/reference/smask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask.argb32.ref.png similarity index 100% rename from cairo/test/reference/smask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask.argb32.ref.png diff --git a/cairo/test/reference/smask.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/smask.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask.base.argb32.ref.png diff --git a/cairo/test/reference/smask.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/smask.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask.base.rgb24.ref.png diff --git a/cairo/test/reference/smask.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask.image16.ref.png similarity index 100% rename from cairo/test/reference/smask.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask.image16.ref.png diff --git a/cairo/test/reference/smask.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/smask.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask.mask.argb32.ref.png diff --git a/cairo/test/reference/smask.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/smask.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask.mask.rgb24.ref.png diff --git a/cairo/test/reference/smask.pdf.xfail.png b/io2d/src/3rd-party/cairo/test/reference/smask.pdf.xfail.png similarity index 100% rename from cairo/test/reference/smask.pdf.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/smask.pdf.xfail.png diff --git a/cairo/test/reference/smask.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask.ps.ref.png similarity index 100% rename from cairo/test/reference/smask.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask.ps.ref.png diff --git a/cairo/test/reference/smask.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask.quartz.ref.png similarity index 100% rename from cairo/test/reference/smask.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask.quartz.ref.png diff --git a/cairo/test/reference/smask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/smask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask.rgb24.ref.png diff --git a/cairo/test/reference/smask.script.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask.script.ref.png similarity index 100% rename from cairo/test/reference/smask.script.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask.script.ref.png diff --git a/cairo/test/reference/smask.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask.svg.ref.png similarity index 100% rename from cairo/test/reference/smask.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask.svg.ref.png diff --git a/cairo/test/reference/smask.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask.traps.ref.png similarity index 100% rename from cairo/test/reference/smask.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask.traps.ref.png diff --git a/cairo/test/reference/smask.xlib-fallback.ref.png b/io2d/src/3rd-party/cairo/test/reference/smask.xlib-fallback.ref.png similarity index 100% rename from cairo/test/reference/smask.xlib-fallback.ref.png rename to io2d/src/3rd-party/cairo/test/reference/smask.xlib-fallback.ref.png diff --git a/cairo/test/reference/solid-pattern-cache-stress.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/solid-pattern-cache-stress.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/solid-pattern-cache-stress.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/solid-pattern-cache-stress.base.argb32.ref.png diff --git a/cairo/test/reference/solid-pattern-cache-stress.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/solid-pattern-cache-stress.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/solid-pattern-cache-stress.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/solid-pattern-cache-stress.base.rgb24.ref.png diff --git a/cairo/test/reference/solid-pattern-cache-stress.ref.png b/io2d/src/3rd-party/cairo/test/reference/solid-pattern-cache-stress.ref.png similarity index 100% rename from cairo/test/reference/solid-pattern-cache-stress.ref.png rename to io2d/src/3rd-party/cairo/test/reference/solid-pattern-cache-stress.ref.png diff --git a/cairo/test/reference/source-clip-scale.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/source-clip-scale.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/source-clip-scale.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/source-clip-scale.base.argb32.ref.png diff --git a/cairo/test/reference/source-clip-scale.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/source-clip-scale.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/source-clip-scale.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/source-clip-scale.base.rgb24.ref.png diff --git a/cairo/test/reference/source-clip-scale.gl.ref.png b/io2d/src/3rd-party/cairo/test/reference/source-clip-scale.gl.ref.png similarity index 100% rename from cairo/test/reference/source-clip-scale.gl.ref.png rename to io2d/src/3rd-party/cairo/test/reference/source-clip-scale.gl.ref.png diff --git a/cairo/test/reference/source-clip-scale.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/source-clip-scale.pdf.ref.png similarity index 100% rename from cairo/test/reference/source-clip-scale.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/source-clip-scale.pdf.ref.png diff --git a/cairo/test/reference/source-clip-scale.ps2.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/source-clip-scale.ps2.argb32.ref.png similarity index 100% rename from cairo/test/reference/source-clip-scale.ps2.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/source-clip-scale.ps2.argb32.ref.png diff --git a/cairo/test/reference/source-clip-scale.ps2.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/source-clip-scale.ps2.rgb24.ref.png similarity index 100% rename from cairo/test/reference/source-clip-scale.ps2.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/source-clip-scale.ps2.rgb24.ref.png diff --git a/cairo/test/reference/source-clip-scale.ps3.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/source-clip-scale.ps3.argb32.ref.png similarity index 100% rename from cairo/test/reference/source-clip-scale.ps3.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/source-clip-scale.ps3.argb32.ref.png diff --git a/cairo/test/reference/source-clip-scale.ps3.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/source-clip-scale.ps3.rgb24.ref.png similarity index 100% rename from cairo/test/reference/source-clip-scale.ps3.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/source-clip-scale.ps3.rgb24.ref.png diff --git a/cairo/test/reference/source-clip-scale.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/source-clip-scale.quartz.ref.png similarity index 100% rename from cairo/test/reference/source-clip-scale.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/source-clip-scale.quartz.ref.png diff --git a/cairo/test/reference/source-clip-scale.recording.ref.png b/io2d/src/3rd-party/cairo/test/reference/source-clip-scale.recording.ref.png similarity index 100% rename from cairo/test/reference/source-clip-scale.recording.ref.png rename to io2d/src/3rd-party/cairo/test/reference/source-clip-scale.recording.ref.png diff --git a/cairo/test/reference/source-clip-scale.ref.png b/io2d/src/3rd-party/cairo/test/reference/source-clip-scale.ref.png similarity index 100% rename from cairo/test/reference/source-clip-scale.ref.png rename to io2d/src/3rd-party/cairo/test/reference/source-clip-scale.ref.png diff --git a/cairo/test/reference/source-clip-scale.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/source-clip-scale.svg.ref.png similarity index 100% rename from cairo/test/reference/source-clip-scale.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/source-clip-scale.svg.ref.png diff --git a/cairo/test/reference/source-clip.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/source-clip.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/source-clip.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/source-clip.base.argb32.ref.png diff --git a/cairo/test/reference/source-clip.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/source-clip.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/source-clip.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/source-clip.base.rgb24.ref.png diff --git a/cairo/test/reference/source-clip.ref.png b/io2d/src/3rd-party/cairo/test/reference/source-clip.ref.png similarity index 100% rename from cairo/test/reference/source-clip.ref.png rename to io2d/src/3rd-party/cairo/test/reference/source-clip.ref.png diff --git a/cairo/test/reference/source-surface-scale-paint.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/source-surface-scale-paint.argb32.ref.png similarity index 100% rename from cairo/test/reference/source-surface-scale-paint.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/source-surface-scale-paint.argb32.ref.png diff --git a/cairo/test/reference/source-surface-scale-paint.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/source-surface-scale-paint.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/source-surface-scale-paint.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/source-surface-scale-paint.base.argb32.ref.png diff --git a/cairo/test/reference/source-surface-scale-paint.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/source-surface-scale-paint.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/source-surface-scale-paint.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/source-surface-scale-paint.base.rgb24.ref.png diff --git a/cairo/test/reference/source-surface-scale-paint.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/source-surface-scale-paint.rgb24.ref.png similarity index 100% rename from cairo/test/reference/source-surface-scale-paint.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/source-surface-scale-paint.rgb24.ref.png diff --git a/cairo/test/reference/spline-decomposition.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/spline-decomposition.argb32.ref.png similarity index 100% rename from cairo/test/reference/spline-decomposition.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/spline-decomposition.argb32.ref.png diff --git a/cairo/test/reference/spline-decomposition.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/spline-decomposition.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/spline-decomposition.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/spline-decomposition.base.argb32.ref.png diff --git a/cairo/test/reference/spline-decomposition.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/spline-decomposition.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/spline-decomposition.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/spline-decomposition.base.rgb24.ref.png diff --git a/cairo/test/reference/spline-decomposition.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/spline-decomposition.image16.ref.png similarity index 100% rename from cairo/test/reference/spline-decomposition.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/spline-decomposition.image16.ref.png diff --git a/cairo/test/reference/spline-decomposition.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/spline-decomposition.pdf.ref.png similarity index 100% rename from cairo/test/reference/spline-decomposition.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/spline-decomposition.pdf.ref.png diff --git a/cairo/test/reference/spline-decomposition.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/spline-decomposition.ps.ref.png similarity index 100% rename from cairo/test/reference/spline-decomposition.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/spline-decomposition.ps.ref.png diff --git a/cairo/test/reference/spline-decomposition.quartz.xfail.png b/io2d/src/3rd-party/cairo/test/reference/spline-decomposition.quartz.xfail.png similarity index 100% rename from cairo/test/reference/spline-decomposition.quartz.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/spline-decomposition.quartz.xfail.png diff --git a/cairo/test/reference/spline-decomposition.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/spline-decomposition.rgb24.ref.png similarity index 100% rename from cairo/test/reference/spline-decomposition.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/spline-decomposition.rgb24.ref.png diff --git a/cairo/test/reference/spline-decomposition.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/spline-decomposition.svg.ref.png similarity index 100% rename from cairo/test/reference/spline-decomposition.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/spline-decomposition.svg.ref.png diff --git a/cairo/test/reference/spline-decomposition.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/spline-decomposition.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/spline-decomposition.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/spline-decomposition.traps.argb32.ref.png diff --git a/cairo/test/reference/spline-decomposition.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/spline-decomposition.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/spline-decomposition.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/spline-decomposition.traps.rgb24.ref.png diff --git a/cairo/test/reference/stride-12-image.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/stride-12-image.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/stride-12-image.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stride-12-image.base.argb32.ref.png diff --git a/cairo/test/reference/stride-12-image.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/stride-12-image.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/stride-12-image.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stride-12-image.base.rgb24.ref.png diff --git a/cairo/test/reference/stride-12-image.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/stride-12-image.image16.ref.png similarity index 100% rename from cairo/test/reference/stride-12-image.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stride-12-image.image16.ref.png diff --git a/cairo/test/reference/stride-12-image.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/stride-12-image.ps.ref.png similarity index 100% rename from cairo/test/reference/stride-12-image.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stride-12-image.ps.ref.png diff --git a/cairo/test/reference/stride-12-image.ref.png b/io2d/src/3rd-party/cairo/test/reference/stride-12-image.ref.png similarity index 100% rename from cairo/test/reference/stride-12-image.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stride-12-image.ref.png diff --git a/cairo/test/reference/stride-12-xlib-fallback.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/stride-12-xlib-fallback.rgb24.ref.png similarity index 100% rename from cairo/test/reference/stride-12-xlib-fallback.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stride-12-xlib-fallback.rgb24.ref.png diff --git a/cairo/test/reference/stride-12-xlib-window.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/stride-12-xlib-window.rgb24.ref.png similarity index 100% rename from cairo/test/reference/stride-12-xlib-window.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stride-12-xlib-window.rgb24.ref.png diff --git a/cairo/test/reference/stride-12-xlib.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/stride-12-xlib.argb32.ref.png similarity index 100% rename from cairo/test/reference/stride-12-xlib.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stride-12-xlib.argb32.ref.png diff --git a/cairo/test/reference/stride-12-xlib.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/stride-12-xlib.rgb24.ref.png similarity index 100% rename from cairo/test/reference/stride-12-xlib.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stride-12-xlib.rgb24.ref.png diff --git a/cairo/test/reference/stroke-clipped.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-clipped.ref.png similarity index 100% rename from cairo/test/reference/stroke-clipped.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-clipped.ref.png diff --git a/cairo/test/reference/stroke-ctm-caps.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-ctm-caps.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/stroke-ctm-caps.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-ctm-caps.base.argb32.ref.png diff --git a/cairo/test/reference/stroke-ctm-caps.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-ctm-caps.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/stroke-ctm-caps.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-ctm-caps.base.rgb24.ref.png diff --git a/cairo/test/reference/stroke-ctm-caps.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-ctm-caps.image16.ref.png similarity index 100% rename from cairo/test/reference/stroke-ctm-caps.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-ctm-caps.image16.ref.png diff --git a/cairo/test/reference/stroke-ctm-caps.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-ctm-caps.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/stroke-ctm-caps.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-ctm-caps.mask.argb32.ref.png diff --git a/cairo/test/reference/stroke-ctm-caps.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-ctm-caps.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/stroke-ctm-caps.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-ctm-caps.mask.rgb24.ref.png diff --git a/cairo/test/reference/stroke-ctm-caps.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-ctm-caps.ps2.ref.png similarity index 100% rename from cairo/test/reference/stroke-ctm-caps.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-ctm-caps.ps2.ref.png diff --git a/cairo/test/reference/stroke-ctm-caps.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-ctm-caps.ps3.ref.png similarity index 100% rename from cairo/test/reference/stroke-ctm-caps.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-ctm-caps.ps3.ref.png diff --git a/cairo/test/reference/stroke-ctm-caps.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-ctm-caps.quartz.ref.png similarity index 100% rename from cairo/test/reference/stroke-ctm-caps.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-ctm-caps.quartz.ref.png diff --git a/cairo/test/reference/stroke-ctm-caps.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-ctm-caps.ref.png similarity index 100% rename from cairo/test/reference/stroke-ctm-caps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-ctm-caps.ref.png diff --git a/cairo/test/reference/stroke-ctm-caps.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-ctm-caps.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/stroke-ctm-caps.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-ctm-caps.traps.argb32.ref.png diff --git a/cairo/test/reference/stroke-ctm-caps.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-ctm-caps.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/stroke-ctm-caps.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-ctm-caps.traps.rgb24.ref.png diff --git a/cairo/test/reference/stroke-image.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-image.argb32.ref.png similarity index 100% rename from cairo/test/reference/stroke-image.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-image.argb32.ref.png diff --git a/cairo/test/reference/stroke-image.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-image.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/stroke-image.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-image.base.argb32.ref.png diff --git a/cairo/test/reference/stroke-image.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-image.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/stroke-image.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-image.base.rgb24.ref.png diff --git a/cairo/test/reference/stroke-image.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-image.image16.ref.png similarity index 100% rename from cairo/test/reference/stroke-image.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-image.image16.ref.png diff --git a/cairo/test/reference/stroke-image.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-image.pdf.ref.png similarity index 100% rename from cairo/test/reference/stroke-image.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-image.pdf.ref.png diff --git a/cairo/test/reference/stroke-image.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-image.ps.ref.png similarity index 100% rename from cairo/test/reference/stroke-image.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-image.ps.ref.png diff --git a/cairo/test/reference/stroke-image.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-image.quartz.ref.png similarity index 100% rename from cairo/test/reference/stroke-image.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-image.quartz.ref.png diff --git a/cairo/test/reference/stroke-image.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-image.rgb24.ref.png similarity index 100% rename from cairo/test/reference/stroke-image.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-image.rgb24.ref.png diff --git a/cairo/test/reference/stroke-image.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-image.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/stroke-image.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-image.traps.argb32.ref.png diff --git a/cairo/test/reference/stroke-image.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-image.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/stroke-image.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-image.traps.rgb24.ref.png diff --git a/cairo/test/reference/stroke-open-box.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-open-box.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/stroke-open-box.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-open-box.base.argb32.ref.png diff --git a/cairo/test/reference/stroke-open-box.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-open-box.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/stroke-open-box.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-open-box.base.rgb24.ref.png diff --git a/cairo/test/reference/stroke-open-box.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-open-box.ref.png similarity index 100% rename from cairo/test/reference/stroke-open-box.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-open-box.ref.png diff --git a/cairo/test/reference/stroke-pattern.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-pattern.argb32.ref.png similarity index 100% rename from cairo/test/reference/stroke-pattern.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-pattern.argb32.ref.png diff --git a/cairo/test/reference/stroke-pattern.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-pattern.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/stroke-pattern.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-pattern.base.argb32.ref.png diff --git a/cairo/test/reference/stroke-pattern.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-pattern.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/stroke-pattern.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-pattern.base.rgb24.ref.png diff --git a/cairo/test/reference/stroke-pattern.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-pattern.rgb24.ref.png similarity index 100% rename from cairo/test/reference/stroke-pattern.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-pattern.rgb24.ref.png diff --git a/cairo/test/reference/stroke-pattern.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-pattern.traps.ref.png similarity index 100% rename from cairo/test/reference/stroke-pattern.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-pattern.traps.ref.png diff --git a/cairo/test/reference/stroke-xlib-fallback.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-xlib-fallback.rgb24.ref.png similarity index 100% rename from cairo/test/reference/stroke-xlib-fallback.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-xlib-fallback.rgb24.ref.png diff --git a/cairo/test/reference/stroke-xlib-window.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-xlib-window.rgb24.ref.png similarity index 100% rename from cairo/test/reference/stroke-xlib-window.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-xlib-window.rgb24.ref.png diff --git a/cairo/test/reference/stroke-xlib.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-xlib.argb32.ref.png similarity index 100% rename from cairo/test/reference/stroke-xlib.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-xlib.argb32.ref.png diff --git a/cairo/test/reference/stroke-xlib.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/stroke-xlib.rgb24.ref.png similarity index 100% rename from cairo/test/reference/stroke-xlib.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/stroke-xlib.rgb24.ref.png diff --git a/cairo/test/reference/subsurface-image-repeat.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-image-repeat.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/subsurface-image-repeat.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-image-repeat.base.argb32.ref.png diff --git a/cairo/test/reference/subsurface-image-repeat.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-image-repeat.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/subsurface-image-repeat.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-image-repeat.base.rgb24.ref.png diff --git a/cairo/test/reference/subsurface-image-repeat.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-image-repeat.image16.ref.png similarity index 100% rename from cairo/test/reference/subsurface-image-repeat.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-image-repeat.image16.ref.png diff --git a/cairo/test/reference/subsurface-image-repeat.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-image-repeat.ref.png similarity index 100% rename from cairo/test/reference/subsurface-image-repeat.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-image-repeat.ref.png diff --git a/cairo/test/reference/subsurface-modify-child.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-modify-child.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/subsurface-modify-child.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-modify-child.base.argb32.ref.png diff --git a/cairo/test/reference/subsurface-modify-child.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-modify-child.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/subsurface-modify-child.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-modify-child.base.rgb24.ref.png diff --git a/cairo/test/reference/subsurface-modify-child.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-modify-child.ref.png similarity index 100% rename from cairo/test/reference/subsurface-modify-child.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-modify-child.ref.png diff --git a/cairo/test/reference/subsurface-modify-parent.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-modify-parent.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/subsurface-modify-parent.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-modify-parent.base.argb32.ref.png diff --git a/cairo/test/reference/subsurface-modify-parent.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-modify-parent.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/subsurface-modify-parent.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-modify-parent.base.rgb24.ref.png diff --git a/cairo/test/reference/subsurface-modify-parent.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-modify-parent.ref.png similarity index 100% rename from cairo/test/reference/subsurface-modify-parent.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-modify-parent.ref.png diff --git a/cairo/test/reference/subsurface-outside-target.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-outside-target.argb32.ref.png similarity index 100% rename from cairo/test/reference/subsurface-outside-target.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-outside-target.argb32.ref.png diff --git a/cairo/test/reference/subsurface-outside-target.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-outside-target.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/subsurface-outside-target.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-outside-target.base.argb32.ref.png diff --git a/cairo/test/reference/subsurface-outside-target.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-outside-target.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/subsurface-outside-target.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-outside-target.base.rgb24.ref.png diff --git a/cairo/test/reference/subsurface-outside-target.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-outside-target.rgb24.ref.png similarity index 100% rename from cairo/test/reference/subsurface-outside-target.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-outside-target.rgb24.ref.png diff --git a/cairo/test/reference/subsurface-pad.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-pad.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/subsurface-pad.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-pad.base.argb32.ref.png diff --git a/cairo/test/reference/subsurface-pad.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-pad.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/subsurface-pad.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-pad.base.rgb24.ref.png diff --git a/cairo/test/reference/subsurface-pad.quartz.xfail.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-pad.quartz.xfail.png similarity index 100% rename from cairo/test/reference/subsurface-pad.quartz.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-pad.quartz.xfail.png diff --git a/cairo/test/reference/subsurface-pad.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-pad.ref.png similarity index 100% rename from cairo/test/reference/subsurface-pad.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-pad.ref.png diff --git a/cairo/test/reference/subsurface-reflect.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-reflect.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/subsurface-reflect.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-reflect.base.argb32.ref.png diff --git a/cairo/test/reference/subsurface-reflect.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-reflect.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/subsurface-reflect.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-reflect.base.rgb24.ref.png diff --git a/cairo/test/reference/subsurface-reflect.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-reflect.ref.png similarity index 100% rename from cairo/test/reference/subsurface-reflect.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-reflect.ref.png diff --git a/cairo/test/reference/subsurface-repeat.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-repeat.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/subsurface-repeat.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-repeat.base.argb32.ref.png diff --git a/cairo/test/reference/subsurface-repeat.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-repeat.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/subsurface-repeat.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-repeat.base.rgb24.ref.png diff --git a/cairo/test/reference/subsurface-repeat.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-repeat.ref.png similarity index 100% rename from cairo/test/reference/subsurface-repeat.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-repeat.ref.png diff --git a/cairo/test/reference/subsurface-scale.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-scale.argb32.ref.png similarity index 100% rename from cairo/test/reference/subsurface-scale.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-scale.argb32.ref.png diff --git a/cairo/test/reference/subsurface-scale.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-scale.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/subsurface-scale.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-scale.base.argb32.ref.png diff --git a/cairo/test/reference/subsurface-scale.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-scale.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/subsurface-scale.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-scale.base.rgb24.ref.png diff --git a/cairo/test/reference/subsurface-scale.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-scale.rgb24.ref.png similarity index 100% rename from cairo/test/reference/subsurface-scale.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-scale.rgb24.ref.png diff --git a/cairo/test/reference/subsurface-scale.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-scale.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/subsurface-scale.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-scale.traps.argb32.ref.png diff --git a/cairo/test/reference/subsurface-scale.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-scale.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/subsurface-scale.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-scale.traps.rgb24.ref.png diff --git a/cairo/test/reference/subsurface-similar-repeat.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-similar-repeat.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/subsurface-similar-repeat.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-similar-repeat.base.argb32.ref.png diff --git a/cairo/test/reference/subsurface-similar-repeat.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-similar-repeat.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/subsurface-similar-repeat.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-similar-repeat.base.rgb24.ref.png diff --git a/cairo/test/reference/subsurface-similar-repeat.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface-similar-repeat.ref.png similarity index 100% rename from cairo/test/reference/subsurface-similar-repeat.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface-similar-repeat.ref.png diff --git a/cairo/test/reference/subsurface.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface.argb32.ref.png similarity index 100% rename from cairo/test/reference/subsurface.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface.argb32.ref.png diff --git a/cairo/test/reference/subsurface.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/subsurface.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface.base.argb32.ref.png diff --git a/cairo/test/reference/subsurface.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/subsurface.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface.base.rgb24.ref.png diff --git a/cairo/test/reference/subsurface.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface.image16.ref.png similarity index 100% rename from cairo/test/reference/subsurface.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface.image16.ref.png diff --git a/cairo/test/reference/subsurface.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface.ps.ref.png similarity index 100% rename from cairo/test/reference/subsurface.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface.ps.ref.png diff --git a/cairo/test/reference/subsurface.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface.rgb24.ref.png similarity index 100% rename from cairo/test/reference/subsurface.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface.rgb24.ref.png diff --git a/cairo/test/reference/subsurface.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/subsurface.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface.traps.argb32.ref.png diff --git a/cairo/test/reference/subsurface.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/subsurface.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/subsurface.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/subsurface.traps.rgb24.ref.png diff --git a/cairo/test/reference/surface-pattern-big-scale-down.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-big-scale-down.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-big-scale-down.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-big-scale-down.base.argb32.ref.png diff --git a/cairo/test/reference/surface-pattern-big-scale-down.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-big-scale-down.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-big-scale-down.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-big-scale-down.base.rgb24.ref.png diff --git a/cairo/test/reference/surface-pattern-big-scale-down.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-big-scale-down.ps.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-big-scale-down.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-big-scale-down.ps.ref.png diff --git a/cairo/test/reference/surface-pattern-big-scale-down.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-big-scale-down.quartz.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-big-scale-down.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-big-scale-down.quartz.ref.png diff --git a/cairo/test/reference/surface-pattern-big-scale-down.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-big-scale-down.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-big-scale-down.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-big-scale-down.ref.png diff --git a/cairo/test/reference/surface-pattern-operator.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-operator.argb32.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-operator.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-operator.argb32.ref.png diff --git a/cairo/test/reference/surface-pattern-operator.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-operator.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-operator.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-operator.base.argb32.ref.png diff --git a/cairo/test/reference/surface-pattern-operator.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-operator.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-operator.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-operator.base.rgb24.ref.png diff --git a/cairo/test/reference/surface-pattern-operator.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-operator.image16.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-operator.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-operator.image16.ref.png diff --git a/cairo/test/reference/surface-pattern-operator.pdf.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-operator.pdf.argb32.xfail.png similarity index 100% rename from cairo/test/reference/surface-pattern-operator.pdf.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-operator.pdf.argb32.xfail.png diff --git a/cairo/test/reference/surface-pattern-operator.pdf.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-operator.pdf.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/surface-pattern-operator.pdf.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-operator.pdf.rgb24.xfail.png diff --git a/cairo/test/reference/surface-pattern-operator.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-operator.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-operator.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-operator.quartz.argb32.ref.png diff --git a/cairo/test/reference/surface-pattern-operator.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-operator.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-operator.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-operator.quartz.rgb24.ref.png diff --git a/cairo/test/reference/surface-pattern-operator.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-operator.rgb24.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-operator.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-operator.rgb24.ref.png diff --git a/cairo/test/reference/surface-pattern-operator.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-operator.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-operator.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-operator.traps.argb32.ref.png diff --git a/cairo/test/reference/surface-pattern-operator.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-operator.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-operator.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-operator.traps.rgb24.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-down-extend-none.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-none.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-down-extend-none.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-none.base.argb32.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-down-extend-none.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-none.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-down-extend-none.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-none.base.rgb24.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-down-extend-none.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-none.quartz.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-down-extend-none.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-none.quartz.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-down-extend-none.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-none.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-down-extend-none.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-none.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-down-extend-pad.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-pad.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-down-extend-pad.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-pad.base.argb32.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-down-extend-pad.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-pad.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-down-extend-pad.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-pad.base.rgb24.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-down-extend-pad.quartz.xfail.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-pad.quartz.xfail.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-down-extend-pad.quartz.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-pad.quartz.xfail.png diff --git a/cairo/test/reference/surface-pattern-scale-down-extend-pad.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-pad.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-down-extend-pad.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-pad.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-down-extend-reflect.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-reflect.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-down-extend-reflect.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-reflect.base.argb32.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-down-extend-reflect.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-reflect.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-down-extend-reflect.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-reflect.base.rgb24.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-down-extend-reflect.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-reflect.quartz.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-down-extend-reflect.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-reflect.quartz.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-down-extend-reflect.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-reflect.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-down-extend-reflect.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-reflect.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-down-extend-repeat.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-repeat.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-down-extend-repeat.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-repeat.base.argb32.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-down-extend-repeat.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-repeat.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-down-extend-repeat.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-repeat.base.rgb24.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-down-extend-repeat.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-repeat.quartz.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-down-extend-repeat.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-repeat.quartz.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-down-extend-repeat.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-repeat.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-down-extend-repeat.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down-extend-repeat.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-down.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down.argb32.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-down.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down.argb32.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-down.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-down.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down.base.argb32.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-down.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-down.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down.base.rgb24.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-down.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down.image16.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-down.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down.image16.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-down.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down.pdf.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-down.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down.pdf.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-down.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down.ps2.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-down.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down.ps2.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-down.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down.ps3.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-down.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down.ps3.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-down.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down.quartz.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-down.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down.quartz.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-down.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down.rgb24.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-down.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-down.rgb24.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-up.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-up.argb32.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-up.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-up.argb32.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-up.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-up.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-up.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-up.base.argb32.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-up.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-up.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-up.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-up.base.rgb24.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-up.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-up.image16.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-up.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-up.image16.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-up.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-up.pdf.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-up.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-up.pdf.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-up.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-up.ps2.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-up.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-up.ps2.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-up.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-up.ps3.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-up.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-up.ps3.ref.png diff --git a/cairo/test/reference/surface-pattern-scale-up.quartz.xfail.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-up.quartz.xfail.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-up.quartz.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-up.quartz.xfail.png diff --git a/cairo/test/reference/surface-pattern-scale-up.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-up.rgb24.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern-scale-up.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern-scale-up.rgb24.ref.png diff --git a/cairo/test/reference/surface-pattern.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern.argb32.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern.argb32.ref.png diff --git a/cairo/test/reference/surface-pattern.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern.base.argb32.ref.png diff --git a/cairo/test/reference/surface-pattern.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern.base.rgb24.ref.png diff --git a/cairo/test/reference/surface-pattern.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern.image16.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern.image16.ref.png diff --git a/cairo/test/reference/surface-pattern.pdf.xfail.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern.pdf.xfail.png similarity index 100% rename from cairo/test/reference/surface-pattern.pdf.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern.pdf.xfail.png diff --git a/cairo/test/reference/surface-pattern.ps.xfail.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern.ps.xfail.png similarity index 100% rename from cairo/test/reference/surface-pattern.ps.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern.ps.xfail.png diff --git a/cairo/test/reference/surface-pattern.quartz.xfail.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern.quartz.xfail.png similarity index 100% rename from cairo/test/reference/surface-pattern.quartz.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern.quartz.xfail.png diff --git a/cairo/test/reference/surface-pattern.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern.rgb24.ref.png similarity index 100% rename from cairo/test/reference/surface-pattern.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern.rgb24.ref.png diff --git a/cairo/test/reference/surface-pattern.svg.xfail.png b/io2d/src/3rd-party/cairo/test/reference/surface-pattern.svg.xfail.png similarity index 100% rename from cairo/test/reference/surface-pattern.svg.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/surface-pattern.svg.xfail.png diff --git a/cairo/test/reference/svg-surface-source.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/svg-surface-source.argb32.ref.png similarity index 100% rename from cairo/test/reference/svg-surface-source.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/svg-surface-source.argb32.ref.png diff --git a/cairo/test/reference/svg-surface-source.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/svg-surface-source.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/svg-surface-source.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/svg-surface-source.base.argb32.ref.png diff --git a/cairo/test/reference/svg-surface-source.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/svg-surface-source.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/svg-surface-source.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/svg-surface-source.base.rgb24.ref.png diff --git a/cairo/test/reference/svg-surface-source.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/svg-surface-source.image16.ref.png similarity index 100% rename from cairo/test/reference/svg-surface-source.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/svg-surface-source.image16.ref.png diff --git a/cairo/test/reference/svg-surface-source.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/svg-surface-source.rgb24.ref.png similarity index 100% rename from cairo/test/reference/svg-surface-source.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/svg-surface-source.rgb24.ref.png diff --git a/cairo/test/reference/svg-surface-source.svg12.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/svg-surface-source.svg12.argb32.xfail.png similarity index 100% rename from cairo/test/reference/svg-surface-source.svg12.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/svg-surface-source.svg12.argb32.xfail.png diff --git a/cairo/test/reference/svg-surface-source.svg12.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/svg-surface-source.svg12.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/svg-surface-source.svg12.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/svg-surface-source.svg12.rgb24.xfail.png diff --git a/cairo/test/reference/text-antialias-gray.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-gray.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-gray.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-gray.argb32.ref.png diff --git a/cairo/test/reference/text-antialias-gray.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-gray.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-gray.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-gray.base.argb32.ref.png diff --git a/cairo/test/reference/text-antialias-gray.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-gray.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-gray.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-gray.base.rgb24.ref.png diff --git a/cairo/test/reference/text-antialias-gray.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-gray.image16.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-gray.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-gray.image16.ref.png diff --git a/cairo/test/reference/text-antialias-gray.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-gray.quartz.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-gray.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-gray.quartz.ref.png diff --git a/cairo/test/reference/text-antialias-gray.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-gray.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-gray.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-gray.rgb24.ref.png diff --git a/cairo/test/reference/text-antialias-gray.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-gray.traps.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-gray.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-gray.traps.ref.png diff --git a/cairo/test/reference/text-antialias-none.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-none.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-none.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-none.base.argb32.ref.png diff --git a/cairo/test/reference/text-antialias-none.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-none.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-none.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-none.base.rgb24.ref.png diff --git a/cairo/test/reference/text-antialias-none.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-none.quartz.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-none.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-none.quartz.ref.png diff --git a/cairo/test/reference/text-antialias-none.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-none.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-none.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-none.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-bgr.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-bgr.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-bgr.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-bgr.argb32.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-bgr.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-bgr.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-bgr.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-bgr.base.argb32.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-bgr.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-bgr.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-bgr.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-bgr.base.rgb24.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-bgr.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-bgr.image16.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-bgr.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-bgr.image16.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-bgr.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-bgr.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-bgr.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-bgr.mask.argb32.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-bgr.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-bgr.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-bgr.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-bgr.mask.rgb24.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-bgr.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-bgr.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-bgr.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-bgr.rgb24.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-bgr.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-bgr.traps.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-bgr.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-bgr.traps.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-rgb.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-rgb.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-rgb.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-rgb.argb32.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-rgb.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-rgb.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-rgb.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-rgb.base.argb32.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-rgb.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-rgb.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-rgb.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-rgb.base.rgb24.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-rgb.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-rgb.image16.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-rgb.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-rgb.image16.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-rgb.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-rgb.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-rgb.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-rgb.mask.argb32.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-rgb.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-rgb.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-rgb.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-rgb.mask.rgb24.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-rgb.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-rgb.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-rgb.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-rgb.rgb24.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-rgb.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-rgb.traps.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-rgb.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-rgb.traps.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-vbgr.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vbgr.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-vbgr.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vbgr.argb32.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-vbgr.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vbgr.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-vbgr.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vbgr.base.argb32.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-vbgr.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vbgr.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-vbgr.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vbgr.base.rgb24.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-vbgr.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vbgr.image16.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-vbgr.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vbgr.image16.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-vbgr.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vbgr.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-vbgr.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vbgr.mask.argb32.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-vbgr.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vbgr.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-vbgr.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vbgr.mask.rgb24.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-vbgr.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vbgr.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-vbgr.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vbgr.rgb24.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-vbgr.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vbgr.traps.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-vbgr.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vbgr.traps.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-vrgb.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vrgb.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-vrgb.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vrgb.argb32.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-vrgb.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vrgb.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-vrgb.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vrgb.base.argb32.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-vrgb.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vrgb.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-vrgb.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vrgb.base.rgb24.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-vrgb.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vrgb.image16.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-vrgb.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vrgb.image16.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-vrgb.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vrgb.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-vrgb.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vrgb.mask.argb32.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-vrgb.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vrgb.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-vrgb.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vrgb.mask.rgb24.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-vrgb.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vrgb.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-vrgb.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vrgb.rgb24.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel-vrgb.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vrgb.traps.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel-vrgb.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel-vrgb.traps.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel.argb32.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel.base.argb32.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel.base.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel.base.argb32.xfail.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel.base.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel.base.argb32.xfail.png diff --git a/cairo/test/reference/text-antialias-subpixel.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel.base.rgb24.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel.base.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel.base.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel.base.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel.base.rgb24.xfail.png diff --git a/cairo/test/reference/text-antialias-subpixel.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel.image16.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel.image16.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel.mask.argb32.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel.mask.rgb24.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel.quartz.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel.quartz.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel.rgb24.ref.png diff --git a/cairo/test/reference/text-antialias-subpixel.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel.traps.ref.png similarity index 100% rename from cairo/test/reference/text-antialias-subpixel.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-antialias-subpixel.traps.ref.png diff --git a/cairo/test/reference/text-glyph-range.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-glyph-range.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-glyph-range.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-glyph-range.argb32.ref.png diff --git a/cairo/test/reference/text-glyph-range.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-glyph-range.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-glyph-range.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-glyph-range.base.argb32.ref.png diff --git a/cairo/test/reference/text-glyph-range.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-glyph-range.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-glyph-range.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-glyph-range.base.rgb24.ref.png diff --git a/cairo/test/reference/text-glyph-range.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-glyph-range.image16.ref.png similarity index 100% rename from cairo/test/reference/text-glyph-range.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-glyph-range.image16.ref.png diff --git a/cairo/test/reference/text-glyph-range.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-glyph-range.ps.ref.png similarity index 100% rename from cairo/test/reference/text-glyph-range.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-glyph-range.ps.ref.png diff --git a/cairo/test/reference/text-glyph-range.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-glyph-range.quartz.ref.png similarity index 100% rename from cairo/test/reference/text-glyph-range.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-glyph-range.quartz.ref.png diff --git a/cairo/test/reference/text-glyph-range.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-glyph-range.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-glyph-range.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-glyph-range.rgb24.ref.png diff --git a/cairo/test/reference/text-glyph-range.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-glyph-range.traps.ref.png similarity index 100% rename from cairo/test/reference/text-glyph-range.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-glyph-range.traps.ref.png diff --git a/cairo/test/reference/text-pattern.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-pattern.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-pattern.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-pattern.argb32.ref.png diff --git a/cairo/test/reference/text-pattern.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-pattern.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-pattern.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-pattern.base.argb32.ref.png diff --git a/cairo/test/reference/text-pattern.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-pattern.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-pattern.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-pattern.base.rgb24.ref.png diff --git a/cairo/test/reference/text-pattern.pdf.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-pattern.pdf.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-pattern.pdf.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-pattern.pdf.argb32.ref.png diff --git a/cairo/test/reference/text-pattern.pdf.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-pattern.pdf.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-pattern.pdf.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-pattern.pdf.rgb24.ref.png diff --git a/cairo/test/reference/text-pattern.ps2.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-pattern.ps2.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-pattern.ps2.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-pattern.ps2.argb32.ref.png diff --git a/cairo/test/reference/text-pattern.ps2.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-pattern.ps2.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-pattern.ps2.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-pattern.ps2.rgb24.ref.png diff --git a/cairo/test/reference/text-pattern.ps3.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-pattern.ps3.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-pattern.ps3.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-pattern.ps3.argb32.ref.png diff --git a/cairo/test/reference/text-pattern.ps3.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-pattern.ps3.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-pattern.ps3.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-pattern.ps3.rgb24.ref.png diff --git a/cairo/test/reference/text-pattern.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-pattern.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-pattern.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-pattern.quartz.argb32.ref.png diff --git a/cairo/test/reference/text-pattern.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-pattern.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-pattern.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-pattern.quartz.rgb24.ref.png diff --git a/cairo/test/reference/text-pattern.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-pattern.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-pattern.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-pattern.rgb24.ref.png diff --git a/cairo/test/reference/text-pattern.svg.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-pattern.svg.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-pattern.svg.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-pattern.svg.argb32.ref.png diff --git a/cairo/test/reference/text-pattern.svg.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-pattern.svg.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-pattern.svg.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-pattern.svg.rgb24.ref.png diff --git a/cairo/test/reference/text-pattern.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-pattern.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-pattern.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-pattern.traps.argb32.ref.png diff --git a/cairo/test/reference/text-pattern.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-pattern.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-pattern.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-pattern.traps.rgb24.ref.png diff --git a/cairo/test/reference/text-rotate.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-rotate.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-rotate.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-rotate.base.argb32.ref.png diff --git a/cairo/test/reference/text-rotate.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-rotate.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-rotate.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-rotate.base.rgb24.ref.png diff --git a/cairo/test/reference/text-rotate.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-rotate.image16.ref.png similarity index 100% rename from cairo/test/reference/text-rotate.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-rotate.image16.ref.png diff --git a/cairo/test/reference/text-rotate.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-rotate.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-rotate.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-rotate.mask.argb32.ref.png diff --git a/cairo/test/reference/text-rotate.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-rotate.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-rotate.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-rotate.mask.rgb24.ref.png diff --git a/cairo/test/reference/text-rotate.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-rotate.pdf.ref.png similarity index 100% rename from cairo/test/reference/text-rotate.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-rotate.pdf.ref.png diff --git a/cairo/test/reference/text-rotate.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-rotate.ps.ref.png similarity index 100% rename from cairo/test/reference/text-rotate.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-rotate.ps.ref.png diff --git a/cairo/test/reference/text-rotate.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-rotate.quartz.ref.png similarity index 100% rename from cairo/test/reference/text-rotate.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-rotate.quartz.ref.png diff --git a/cairo/test/reference/text-rotate.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-rotate.ref.png similarity index 100% rename from cairo/test/reference/text-rotate.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-rotate.ref.png diff --git a/cairo/test/reference/text-rotate.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-rotate.svg.ref.png similarity index 100% rename from cairo/test/reference/text-rotate.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-rotate.svg.ref.png diff --git a/cairo/test/reference/text-rotate.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-rotate.traps.ref.png similarity index 100% rename from cairo/test/reference/text-rotate.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-rotate.traps.ref.png diff --git a/cairo/test/reference/text-rotate.xlib-fallback.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-rotate.xlib-fallback.ref.png similarity index 100% rename from cairo/test/reference/text-rotate.xlib-fallback.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-rotate.xlib-fallback.ref.png diff --git a/cairo/test/reference/text-transform.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-transform.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-transform.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-transform.base.argb32.ref.png diff --git a/cairo/test/reference/text-transform.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-transform.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-transform.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-transform.base.rgb24.ref.png diff --git a/cairo/test/reference/text-transform.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-transform.image16.ref.png similarity index 100% rename from cairo/test/reference/text-transform.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-transform.image16.ref.png diff --git a/cairo/test/reference/text-transform.pdf.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-transform.pdf.argb32.ref.png similarity index 100% rename from cairo/test/reference/text-transform.pdf.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-transform.pdf.argb32.ref.png diff --git a/cairo/test/reference/text-transform.pdf.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-transform.pdf.rgb24.ref.png similarity index 100% rename from cairo/test/reference/text-transform.pdf.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-transform.pdf.rgb24.ref.png diff --git a/cairo/test/reference/text-transform.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-transform.ps2.ref.png similarity index 100% rename from cairo/test/reference/text-transform.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-transform.ps2.ref.png diff --git a/cairo/test/reference/text-transform.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-transform.ps3.ref.png similarity index 100% rename from cairo/test/reference/text-transform.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-transform.ps3.ref.png diff --git a/cairo/test/reference/text-transform.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-transform.ref.png similarity index 100% rename from cairo/test/reference/text-transform.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-transform.ref.png diff --git a/cairo/test/reference/text-transform.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/text-transform.svg.ref.png similarity index 100% rename from cairo/test/reference/text-transform.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/text-transform.svg.ref.png diff --git a/cairo/test/reference/tiger.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/tiger.argb32.ref.png similarity index 100% rename from cairo/test/reference/tiger.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/tiger.argb32.ref.png diff --git a/cairo/test/reference/tiger.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/tiger.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/tiger.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/tiger.base.argb32.ref.png diff --git a/cairo/test/reference/tiger.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/tiger.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/tiger.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/tiger.base.rgb24.ref.png diff --git a/cairo/test/reference/tiger.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/tiger.rgb24.ref.png similarity index 100% rename from cairo/test/reference/tiger.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/tiger.rgb24.ref.png diff --git a/cairo/test/reference/tiger.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/tiger.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/tiger.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/tiger.traps.argb32.ref.png diff --git a/cairo/test/reference/tiger.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/tiger.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/tiger.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/tiger.traps.rgb24.ref.png diff --git a/cairo/test/reference/tighten-bounds.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/tighten-bounds.argb32.ref.png similarity index 100% rename from cairo/test/reference/tighten-bounds.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/tighten-bounds.argb32.ref.png diff --git a/cairo/test/reference/tighten-bounds.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/tighten-bounds.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/tighten-bounds.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/tighten-bounds.base.argb32.ref.png diff --git a/cairo/test/reference/tighten-bounds.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/tighten-bounds.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/tighten-bounds.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/tighten-bounds.base.rgb24.ref.png diff --git a/cairo/test/reference/tighten-bounds.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/tighten-bounds.rgb24.ref.png similarity index 100% rename from cairo/test/reference/tighten-bounds.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/tighten-bounds.rgb24.ref.png diff --git a/cairo/test/reference/tighten-bounds.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/tighten-bounds.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/tighten-bounds.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/tighten-bounds.traps.argb32.ref.png diff --git a/cairo/test/reference/tighten-bounds.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/tighten-bounds.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/tighten-bounds.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/tighten-bounds.traps.rgb24.ref.png diff --git a/cairo/test/reference/transforms.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/transforms.argb32.ref.png similarity index 100% rename from cairo/test/reference/transforms.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/transforms.argb32.ref.png diff --git a/cairo/test/reference/transforms.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/transforms.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/transforms.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/transforms.base.argb32.ref.png diff --git a/cairo/test/reference/transforms.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/transforms.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/transforms.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/transforms.base.rgb24.ref.png diff --git a/cairo/test/reference/transforms.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/transforms.image16.ref.png similarity index 100% rename from cairo/test/reference/transforms.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/transforms.image16.ref.png diff --git a/cairo/test/reference/transforms.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/transforms.ps2.ref.png similarity index 100% rename from cairo/test/reference/transforms.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/transforms.ps2.ref.png diff --git a/cairo/test/reference/transforms.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/transforms.ps3.ref.png similarity index 100% rename from cairo/test/reference/transforms.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/transforms.ps3.ref.png diff --git a/cairo/test/reference/transforms.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/transforms.rgb24.ref.png similarity index 100% rename from cairo/test/reference/transforms.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/transforms.rgb24.ref.png diff --git a/cairo/test/reference/transforms.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/transforms.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/transforms.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/transforms.traps.argb32.ref.png diff --git a/cairo/test/reference/transforms.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/transforms.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/transforms.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/transforms.traps.rgb24.ref.png diff --git a/cairo/test/reference/translate-show-surface.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/translate-show-surface.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/translate-show-surface.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/translate-show-surface.base.argb32.ref.png diff --git a/cairo/test/reference/translate-show-surface.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/translate-show-surface.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/translate-show-surface.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/translate-show-surface.base.rgb24.ref.png diff --git a/cairo/test/reference/translate-show-surface.ref.png b/io2d/src/3rd-party/cairo/test/reference/translate-show-surface.ref.png similarity index 100% rename from cairo/test/reference/translate-show-surface.ref.png rename to io2d/src/3rd-party/cairo/test/reference/translate-show-surface.ref.png diff --git a/cairo/test/reference/trap-clip.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/trap-clip.argb32.ref.png similarity index 100% rename from cairo/test/reference/trap-clip.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/trap-clip.argb32.ref.png diff --git a/cairo/test/reference/trap-clip.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/trap-clip.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/trap-clip.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/trap-clip.base.argb32.ref.png diff --git a/cairo/test/reference/trap-clip.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/trap-clip.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/trap-clip.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/trap-clip.base.rgb24.ref.png diff --git a/cairo/test/reference/trap-clip.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/trap-clip.image16.ref.png similarity index 100% rename from cairo/test/reference/trap-clip.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/trap-clip.image16.ref.png diff --git a/cairo/test/reference/trap-clip.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/trap-clip.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/trap-clip.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/trap-clip.mask.argb32.ref.png diff --git a/cairo/test/reference/trap-clip.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/trap-clip.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/trap-clip.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/trap-clip.mask.rgb24.ref.png diff --git a/cairo/test/reference/trap-clip.ps2.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/trap-clip.ps2.argb32.ref.png similarity index 100% rename from cairo/test/reference/trap-clip.ps2.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/trap-clip.ps2.argb32.ref.png diff --git a/cairo/test/reference/trap-clip.ps2.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/trap-clip.ps2.rgb24.ref.png similarity index 100% rename from cairo/test/reference/trap-clip.ps2.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/trap-clip.ps2.rgb24.ref.png diff --git a/cairo/test/reference/trap-clip.ps3.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/trap-clip.ps3.argb32.ref.png similarity index 100% rename from cairo/test/reference/trap-clip.ps3.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/trap-clip.ps3.argb32.ref.png diff --git a/cairo/test/reference/trap-clip.ps3.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/trap-clip.ps3.rgb24.ref.png similarity index 100% rename from cairo/test/reference/trap-clip.ps3.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/trap-clip.ps3.rgb24.ref.png diff --git a/cairo/test/reference/trap-clip.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/trap-clip.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/trap-clip.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/trap-clip.quartz.argb32.ref.png diff --git a/cairo/test/reference/trap-clip.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/trap-clip.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/trap-clip.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/trap-clip.quartz.rgb24.ref.png diff --git a/cairo/test/reference/trap-clip.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/trap-clip.rgb24.ref.png similarity index 100% rename from cairo/test/reference/trap-clip.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/trap-clip.rgb24.ref.png diff --git a/cairo/test/reference/trap-clip.test-paginated.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/trap-clip.test-paginated.argb32.ref.png similarity index 100% rename from cairo/test/reference/trap-clip.test-paginated.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/trap-clip.test-paginated.argb32.ref.png diff --git a/cairo/test/reference/trap-clip.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/trap-clip.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/trap-clip.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/trap-clip.traps.argb32.ref.png diff --git a/cairo/test/reference/trap-clip.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/trap-clip.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/trap-clip.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/trap-clip.traps.rgb24.ref.png diff --git a/cairo/test/reference/twin-antialias-gray.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-gray.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-gray.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-gray.base.argb32.ref.png diff --git a/cairo/test/reference/twin-antialias-gray.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-gray.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-gray.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-gray.base.rgb24.ref.png diff --git a/cairo/test/reference/twin-antialias-gray.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-gray.image16.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-gray.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-gray.image16.ref.png diff --git a/cairo/test/reference/twin-antialias-gray.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-gray.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-gray.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-gray.mask.argb32.ref.png diff --git a/cairo/test/reference/twin-antialias-gray.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-gray.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-gray.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-gray.mask.rgb24.ref.png diff --git a/cairo/test/reference/twin-antialias-gray.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-gray.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-gray.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-gray.ref.png diff --git a/cairo/test/reference/twin-antialias-gray.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-gray.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-gray.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-gray.traps.argb32.ref.png diff --git a/cairo/test/reference/twin-antialias-gray.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-gray.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-gray.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-gray.traps.rgb24.ref.png diff --git a/cairo/test/reference/twin-antialias-mixed.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-mixed.argb32.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-mixed.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-mixed.argb32.ref.png diff --git a/cairo/test/reference/twin-antialias-mixed.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-mixed.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-mixed.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-mixed.base.argb32.ref.png diff --git a/cairo/test/reference/twin-antialias-mixed.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-mixed.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-mixed.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-mixed.base.rgb24.ref.png diff --git a/cairo/test/reference/twin-antialias-mixed.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-mixed.image16.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-mixed.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-mixed.image16.ref.png diff --git a/cairo/test/reference/twin-antialias-mixed.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-mixed.rgb24.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-mixed.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-mixed.rgb24.ref.png diff --git a/cairo/test/reference/twin-antialias-mixed.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-mixed.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-mixed.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-mixed.traps.argb32.ref.png diff --git a/cairo/test/reference/twin-antialias-mixed.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-mixed.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-mixed.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-mixed.traps.rgb24.ref.png diff --git a/cairo/test/reference/twin-antialias-none.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-none.argb32.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-none.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-none.argb32.ref.png diff --git a/cairo/test/reference/twin-antialias-none.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-none.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-none.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-none.base.argb32.ref.png diff --git a/cairo/test/reference/twin-antialias-none.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-none.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-none.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-none.base.rgb24.ref.png diff --git a/cairo/test/reference/twin-antialias-none.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-none.rgb24.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-none.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-none.rgb24.ref.png diff --git a/cairo/test/reference/twin-antialias-none.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-none.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-none.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-none.traps.argb32.ref.png diff --git a/cairo/test/reference/twin-antialias-none.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-none.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-none.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-none.traps.rgb24.ref.png diff --git a/cairo/test/reference/twin-antialias-subpixel.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-subpixel.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-subpixel.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-subpixel.base.argb32.ref.png diff --git a/cairo/test/reference/twin-antialias-subpixel.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-subpixel.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-subpixel.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-subpixel.base.rgb24.ref.png diff --git a/cairo/test/reference/twin-antialias-subpixel.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-subpixel.image16.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-subpixel.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-subpixel.image16.ref.png diff --git a/cairo/test/reference/twin-antialias-subpixel.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-subpixel.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-subpixel.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-subpixel.mask.argb32.ref.png diff --git a/cairo/test/reference/twin-antialias-subpixel.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-subpixel.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-subpixel.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-subpixel.mask.rgb24.ref.png diff --git a/cairo/test/reference/twin-antialias-subpixel.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-subpixel.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-subpixel.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-subpixel.ref.png diff --git a/cairo/test/reference/twin-antialias-subpixel.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-subpixel.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-subpixel.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-subpixel.traps.argb32.ref.png diff --git a/cairo/test/reference/twin-antialias-subpixel.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin-antialias-subpixel.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/twin-antialias-subpixel.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin-antialias-subpixel.traps.rgb24.ref.png diff --git a/cairo/test/reference/twin.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/twin.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin.base.argb32.ref.png diff --git a/cairo/test/reference/twin.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/twin.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin.base.rgb24.ref.png diff --git a/cairo/test/reference/twin.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin.image16.ref.png similarity index 100% rename from cairo/test/reference/twin.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin.image16.ref.png diff --git a/cairo/test/reference/twin.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/twin.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin.mask.argb32.ref.png diff --git a/cairo/test/reference/twin.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/twin.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin.mask.rgb24.ref.png diff --git a/cairo/test/reference/twin.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin.ps.ref.png similarity index 100% rename from cairo/test/reference/twin.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin.ps.ref.png diff --git a/cairo/test/reference/twin.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin.ref.png similarity index 100% rename from cairo/test/reference/twin.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin.ref.png diff --git a/cairo/test/reference/twin.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin.svg.ref.png similarity index 100% rename from cairo/test/reference/twin.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin.svg.ref.png diff --git a/cairo/test/reference/twin.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/twin.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin.traps.argb32.ref.png diff --git a/cairo/test/reference/twin.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/twin.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/twin.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/twin.traps.rgb24.ref.png diff --git a/cairo/test/reference/unaligned-box.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/unaligned-box.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/unaligned-box.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unaligned-box.base.argb32.ref.png diff --git a/cairo/test/reference/unaligned-box.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/unaligned-box.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/unaligned-box.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unaligned-box.base.rgb24.ref.png diff --git a/cairo/test/reference/unaligned-box.ref.png b/io2d/src/3rd-party/cairo/test/reference/unaligned-box.ref.png similarity index 100% rename from cairo/test/reference/unaligned-box.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unaligned-box.ref.png diff --git a/cairo/test/reference/unaligned-box.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/unaligned-box.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/unaligned-box.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unaligned-box.traps.argb32.ref.png diff --git a/cairo/test/reference/unaligned-box.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/unaligned-box.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/unaligned-box.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unaligned-box.traps.rgb24.ref.png diff --git a/cairo/test/reference/unantialiased-shapes.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/unantialiased-shapes.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/unantialiased-shapes.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unantialiased-shapes.base.argb32.ref.png diff --git a/cairo/test/reference/unantialiased-shapes.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/unantialiased-shapes.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/unantialiased-shapes.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unantialiased-shapes.base.rgb24.ref.png diff --git a/cairo/test/reference/unantialiased-shapes.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/unantialiased-shapes.quartz.ref.png similarity index 100% rename from cairo/test/reference/unantialiased-shapes.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unantialiased-shapes.quartz.ref.png diff --git a/cairo/test/reference/unantialiased-shapes.ref.png b/io2d/src/3rd-party/cairo/test/reference/unantialiased-shapes.ref.png similarity index 100% rename from cairo/test/reference/unantialiased-shapes.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unantialiased-shapes.ref.png diff --git a/cairo/test/reference/unantialiased-shapes.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/unantialiased-shapes.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/unantialiased-shapes.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unantialiased-shapes.traps.argb32.ref.png diff --git a/cairo/test/reference/unantialiased-shapes.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/unantialiased-shapes.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/unantialiased-shapes.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unantialiased-shapes.traps.rgb24.ref.png diff --git a/cairo/test/reference/unbounded-operator.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/unbounded-operator.argb32.ref.png similarity index 100% rename from cairo/test/reference/unbounded-operator.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unbounded-operator.argb32.ref.png diff --git a/cairo/test/reference/unbounded-operator.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/unbounded-operator.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/unbounded-operator.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unbounded-operator.base.argb32.ref.png diff --git a/cairo/test/reference/unbounded-operator.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/unbounded-operator.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/unbounded-operator.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unbounded-operator.base.rgb24.ref.png diff --git a/cairo/test/reference/unbounded-operator.gl.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/unbounded-operator.gl.argb32.xfail.png similarity index 100% rename from cairo/test/reference/unbounded-operator.gl.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/unbounded-operator.gl.argb32.xfail.png diff --git a/cairo/test/reference/unbounded-operator.gl.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/unbounded-operator.gl.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/unbounded-operator.gl.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/unbounded-operator.gl.rgb24.xfail.png diff --git a/cairo/test/reference/unbounded-operator.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/unbounded-operator.image16.ref.png similarity index 100% rename from cairo/test/reference/unbounded-operator.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unbounded-operator.image16.ref.png diff --git a/cairo/test/reference/unbounded-operator.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/unbounded-operator.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/unbounded-operator.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unbounded-operator.mask.argb32.ref.png diff --git a/cairo/test/reference/unbounded-operator.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/unbounded-operator.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/unbounded-operator.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unbounded-operator.mask.rgb24.ref.png diff --git a/cairo/test/reference/unbounded-operator.pdf.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/unbounded-operator.pdf.argb32.ref.png similarity index 100% rename from cairo/test/reference/unbounded-operator.pdf.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unbounded-operator.pdf.argb32.ref.png diff --git a/cairo/test/reference/unbounded-operator.ps2.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/unbounded-operator.ps2.argb32.ref.png similarity index 100% rename from cairo/test/reference/unbounded-operator.ps2.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unbounded-operator.ps2.argb32.ref.png diff --git a/cairo/test/reference/unbounded-operator.ps3.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/unbounded-operator.ps3.argb32.ref.png similarity index 100% rename from cairo/test/reference/unbounded-operator.ps3.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unbounded-operator.ps3.argb32.ref.png diff --git a/cairo/test/reference/unbounded-operator.quartz.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/unbounded-operator.quartz.argb32.ref.png similarity index 100% rename from cairo/test/reference/unbounded-operator.quartz.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unbounded-operator.quartz.argb32.ref.png diff --git a/cairo/test/reference/unbounded-operator.quartz.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/unbounded-operator.quartz.rgb24.ref.png similarity index 100% rename from cairo/test/reference/unbounded-operator.quartz.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unbounded-operator.quartz.rgb24.ref.png diff --git a/cairo/test/reference/unbounded-operator.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/unbounded-operator.rgb24.ref.png similarity index 100% rename from cairo/test/reference/unbounded-operator.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unbounded-operator.rgb24.ref.png diff --git a/cairo/test/reference/unbounded-operator.svg12.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/unbounded-operator.svg12.argb32.ref.png similarity index 100% rename from cairo/test/reference/unbounded-operator.svg12.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unbounded-operator.svg12.argb32.ref.png diff --git a/cairo/test/reference/unbounded-operator.svg12.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/unbounded-operator.svg12.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/unbounded-operator.svg12.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/unbounded-operator.svg12.rgb24.xfail.png diff --git a/cairo/test/reference/unbounded-operator.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/unbounded-operator.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/unbounded-operator.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unbounded-operator.traps.argb32.ref.png diff --git a/cairo/test/reference/unbounded-operator.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/unbounded-operator.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/unbounded-operator.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unbounded-operator.traps.rgb24.ref.png diff --git a/cairo/test/reference/unclosed-strokes.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/unclosed-strokes.argb32.ref.png similarity index 100% rename from cairo/test/reference/unclosed-strokes.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unclosed-strokes.argb32.ref.png diff --git a/cairo/test/reference/unclosed-strokes.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/unclosed-strokes.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/unclosed-strokes.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unclosed-strokes.base.argb32.ref.png diff --git a/cairo/test/reference/unclosed-strokes.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/unclosed-strokes.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/unclosed-strokes.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unclosed-strokes.base.rgb24.ref.png diff --git a/cairo/test/reference/unclosed-strokes.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/unclosed-strokes.rgb24.ref.png similarity index 100% rename from cairo/test/reference/unclosed-strokes.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unclosed-strokes.rgb24.ref.png diff --git a/cairo/test/reference/unclosed-strokes.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/unclosed-strokes.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/unclosed-strokes.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unclosed-strokes.traps.argb32.ref.png diff --git a/cairo/test/reference/unclosed-strokes.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/unclosed-strokes.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/unclosed-strokes.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/unclosed-strokes.traps.rgb24.ref.png diff --git a/cairo/test/reference/user-font-mask.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-mask.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/user-font-mask.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-mask.base.argb32.ref.png diff --git a/cairo/test/reference/user-font-mask.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-mask.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/user-font-mask.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-mask.base.rgb24.ref.png diff --git a/cairo/test/reference/user-font-mask.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-mask.image16.ref.png similarity index 100% rename from cairo/test/reference/user-font-mask.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-mask.image16.ref.png diff --git a/cairo/test/reference/user-font-mask.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-mask.pdf.ref.png similarity index 100% rename from cairo/test/reference/user-font-mask.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-mask.pdf.ref.png diff --git a/cairo/test/reference/user-font-mask.ps2.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-mask.ps2.ref.png similarity index 100% rename from cairo/test/reference/user-font-mask.ps2.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-mask.ps2.ref.png diff --git a/cairo/test/reference/user-font-mask.ps3.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-mask.ps3.ref.png similarity index 100% rename from cairo/test/reference/user-font-mask.ps3.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-mask.ps3.ref.png diff --git a/cairo/test/reference/user-font-mask.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-mask.ref.png similarity index 100% rename from cairo/test/reference/user-font-mask.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-mask.ref.png diff --git a/cairo/test/reference/user-font-mask.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-mask.svg.ref.png similarity index 100% rename from cairo/test/reference/user-font-mask.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-mask.svg.ref.png diff --git a/cairo/test/reference/user-font-proxy.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-proxy.argb32.ref.png similarity index 100% rename from cairo/test/reference/user-font-proxy.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-proxy.argb32.ref.png diff --git a/cairo/test/reference/user-font-proxy.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-proxy.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/user-font-proxy.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-proxy.base.argb32.ref.png diff --git a/cairo/test/reference/user-font-proxy.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-proxy.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/user-font-proxy.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-proxy.base.rgb24.ref.png diff --git a/cairo/test/reference/user-font-proxy.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-proxy.image16.ref.png similarity index 100% rename from cairo/test/reference/user-font-proxy.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-proxy.image16.ref.png diff --git a/cairo/test/reference/user-font-proxy.pdf.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-proxy.pdf.argb32.ref.png similarity index 100% rename from cairo/test/reference/user-font-proxy.pdf.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-proxy.pdf.argb32.ref.png diff --git a/cairo/test/reference/user-font-proxy.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-proxy.pdf.ref.png similarity index 100% rename from cairo/test/reference/user-font-proxy.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-proxy.pdf.ref.png diff --git a/cairo/test/reference/user-font-proxy.pdf.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-proxy.pdf.rgb24.ref.png similarity index 100% rename from cairo/test/reference/user-font-proxy.pdf.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-proxy.pdf.rgb24.ref.png diff --git a/cairo/test/reference/user-font-proxy.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-proxy.ps.ref.png similarity index 100% rename from cairo/test/reference/user-font-proxy.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-proxy.ps.ref.png diff --git a/cairo/test/reference/user-font-proxy.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-proxy.quartz.ref.png similarity index 100% rename from cairo/test/reference/user-font-proxy.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-proxy.quartz.ref.png diff --git a/cairo/test/reference/user-font-proxy.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-proxy.rgb24.ref.png similarity index 100% rename from cairo/test/reference/user-font-proxy.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-proxy.rgb24.ref.png diff --git a/cairo/test/reference/user-font-proxy.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-proxy.svg.ref.png similarity index 100% rename from cairo/test/reference/user-font-proxy.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-proxy.svg.ref.png diff --git a/cairo/test/reference/user-font-proxy.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-proxy.traps.ref.png similarity index 100% rename from cairo/test/reference/user-font-proxy.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-proxy.traps.ref.png diff --git a/cairo/test/reference/user-font-rescale.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-rescale.argb32.ref.png similarity index 100% rename from cairo/test/reference/user-font-rescale.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-rescale.argb32.ref.png diff --git a/cairo/test/reference/user-font-rescale.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-rescale.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/user-font-rescale.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-rescale.base.argb32.ref.png diff --git a/cairo/test/reference/user-font-rescale.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-rescale.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/user-font-rescale.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-rescale.base.rgb24.ref.png diff --git a/cairo/test/reference/user-font-rescale.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-rescale.image16.ref.png similarity index 100% rename from cairo/test/reference/user-font-rescale.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-rescale.image16.ref.png diff --git a/cairo/test/reference/user-font-rescale.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-rescale.ps.ref.png similarity index 100% rename from cairo/test/reference/user-font-rescale.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-rescale.ps.ref.png diff --git a/cairo/test/reference/user-font-rescale.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-rescale.quartz.ref.png similarity index 100% rename from cairo/test/reference/user-font-rescale.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-rescale.quartz.ref.png diff --git a/cairo/test/reference/user-font-rescale.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-rescale.rgb24.ref.png similarity index 100% rename from cairo/test/reference/user-font-rescale.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-rescale.rgb24.ref.png diff --git a/cairo/test/reference/user-font-rescale.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-rescale.svg.ref.png similarity index 100% rename from cairo/test/reference/user-font-rescale.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-rescale.svg.ref.png diff --git a/cairo/test/reference/user-font-rescale.traps.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font-rescale.traps.ref.png similarity index 100% rename from cairo/test/reference/user-font-rescale.traps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font-rescale.traps.ref.png diff --git a/cairo/test/reference/user-font.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/user-font.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font.base.argb32.ref.png diff --git a/cairo/test/reference/user-font.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/user-font.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font.base.rgb24.ref.png diff --git a/cairo/test/reference/user-font.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font.image16.ref.png similarity index 100% rename from cairo/test/reference/user-font.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font.image16.ref.png diff --git a/cairo/test/reference/user-font.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/user-font.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font.mask.argb32.ref.png diff --git a/cairo/test/reference/user-font.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/user-font.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font.mask.rgb24.ref.png diff --git a/cairo/test/reference/user-font.pdf.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font.pdf.ref.png similarity index 100% rename from cairo/test/reference/user-font.pdf.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font.pdf.ref.png diff --git a/cairo/test/reference/user-font.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font.ps.ref.png similarity index 100% rename from cairo/test/reference/user-font.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font.ps.ref.png diff --git a/cairo/test/reference/user-font.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font.quartz.ref.png similarity index 100% rename from cairo/test/reference/user-font.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font.quartz.ref.png diff --git a/cairo/test/reference/user-font.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font.ref.png similarity index 100% rename from cairo/test/reference/user-font.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font.ref.png diff --git a/cairo/test/reference/user-font.svg.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font.svg.ref.png similarity index 100% rename from cairo/test/reference/user-font.svg.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font.svg.ref.png diff --git a/cairo/test/reference/user-font.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/user-font.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font.traps.argb32.ref.png diff --git a/cairo/test/reference/user-font.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/user-font.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/user-font.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/user-font.traps.rgb24.ref.png diff --git a/cairo/test/reference/white-in-noop.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/white-in-noop.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/white-in-noop.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/white-in-noop.base.argb32.ref.png diff --git a/cairo/test/reference/white-in-noop.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/white-in-noop.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/white-in-noop.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/white-in-noop.base.rgb24.ref.png diff --git a/cairo/test/reference/white-in-noop.ref.png b/io2d/src/3rd-party/cairo/test/reference/white-in-noop.ref.png similarity index 100% rename from cairo/test/reference/white-in-noop.ref.png rename to io2d/src/3rd-party/cairo/test/reference/white-in-noop.ref.png diff --git a/cairo/test/reference/world-map-fill.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/world-map-fill.argb32.ref.png similarity index 100% rename from cairo/test/reference/world-map-fill.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/world-map-fill.argb32.ref.png diff --git a/cairo/test/reference/world-map-fill.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/world-map-fill.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/world-map-fill.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/world-map-fill.base.argb32.ref.png diff --git a/cairo/test/reference/world-map-fill.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/world-map-fill.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/world-map-fill.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/world-map-fill.base.rgb24.ref.png diff --git a/cairo/test/reference/world-map-fill.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/world-map-fill.image16.ref.png similarity index 100% rename from cairo/test/reference/world-map-fill.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/world-map-fill.image16.ref.png diff --git a/cairo/test/reference/world-map-fill.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/world-map-fill.rgb24.ref.png similarity index 100% rename from cairo/test/reference/world-map-fill.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/world-map-fill.rgb24.ref.png diff --git a/cairo/test/reference/world-map-fill.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/world-map-fill.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/world-map-fill.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/world-map-fill.traps.argb32.ref.png diff --git a/cairo/test/reference/world-map-fill.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/world-map-fill.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/world-map-fill.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/world-map-fill.traps.rgb24.ref.png diff --git a/cairo/test/reference/world-map-stroke.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/world-map-stroke.argb32.ref.png similarity index 100% rename from cairo/test/reference/world-map-stroke.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/world-map-stroke.argb32.ref.png diff --git a/cairo/test/reference/world-map-stroke.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/world-map-stroke.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/world-map-stroke.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/world-map-stroke.base.argb32.ref.png diff --git a/cairo/test/reference/world-map-stroke.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/world-map-stroke.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/world-map-stroke.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/world-map-stroke.base.rgb24.ref.png diff --git a/cairo/test/reference/world-map-stroke.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/world-map-stroke.image16.ref.png similarity index 100% rename from cairo/test/reference/world-map-stroke.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/world-map-stroke.image16.ref.png diff --git a/cairo/test/reference/world-map-stroke.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/world-map-stroke.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/world-map-stroke.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/world-map-stroke.mask.argb32.ref.png diff --git a/cairo/test/reference/world-map-stroke.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/world-map-stroke.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/world-map-stroke.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/world-map-stroke.mask.rgb24.ref.png diff --git a/cairo/test/reference/world-map-stroke.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/world-map-stroke.rgb24.ref.png similarity index 100% rename from cairo/test/reference/world-map-stroke.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/world-map-stroke.rgb24.ref.png diff --git a/cairo/test/reference/world-map-stroke.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/world-map-stroke.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/world-map-stroke.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/world-map-stroke.traps.argb32.ref.png diff --git a/cairo/test/reference/world-map-stroke.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/world-map-stroke.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/world-map-stroke.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/world-map-stroke.traps.rgb24.ref.png diff --git a/cairo/test/reference/world-map.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/world-map.argb32.ref.png similarity index 100% rename from cairo/test/reference/world-map.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/world-map.argb32.ref.png diff --git a/cairo/test/reference/world-map.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/world-map.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/world-map.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/world-map.base.argb32.ref.png diff --git a/cairo/test/reference/world-map.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/world-map.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/world-map.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/world-map.base.rgb24.ref.png diff --git a/cairo/test/reference/world-map.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/world-map.image16.ref.png similarity index 100% rename from cairo/test/reference/world-map.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/world-map.image16.ref.png diff --git a/cairo/test/reference/world-map.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/world-map.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/world-map.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/world-map.mask.argb32.ref.png diff --git a/cairo/test/reference/world-map.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/world-map.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/world-map.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/world-map.mask.rgb24.ref.png diff --git a/cairo/test/reference/world-map.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/world-map.rgb24.ref.png similarity index 100% rename from cairo/test/reference/world-map.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/world-map.rgb24.ref.png diff --git a/cairo/test/reference/world-map.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/world-map.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/world-map.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/world-map.traps.argb32.ref.png diff --git a/cairo/test/reference/world-map.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/world-map.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/world-map.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/world-map.traps.rgb24.ref.png diff --git a/cairo/test/reference/xcb-huge-image-shm.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcb-huge-image-shm.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/xcb-huge-image-shm.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcb-huge-image-shm.base.argb32.ref.png diff --git a/cairo/test/reference/xcb-huge-image-shm.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcb-huge-image-shm.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/xcb-huge-image-shm.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcb-huge-image-shm.base.rgb24.ref.png diff --git a/cairo/test/reference/xcb-huge-image-shm.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcb-huge-image-shm.ref.png similarity index 100% rename from cairo/test/reference/xcb-huge-image-shm.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcb-huge-image-shm.ref.png diff --git a/cairo/test/reference/xcb-huge-subimage.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcb-huge-subimage.ref.png similarity index 100% rename from cairo/test/reference/xcb-huge-subimage.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcb-huge-subimage.ref.png diff --git a/cairo/test/reference/xcb-snapshot-assert.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcb-snapshot-assert.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/xcb-snapshot-assert.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcb-snapshot-assert.base.argb32.ref.png diff --git a/cairo/test/reference/xcb-snapshot-assert.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcb-snapshot-assert.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/xcb-snapshot-assert.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcb-snapshot-assert.base.rgb24.ref.png diff --git a/cairo/test/reference/xcb-snapshot-assert.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcb-snapshot-assert.ref.png similarity index 100% rename from cairo/test/reference/xcb-snapshot-assert.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcb-snapshot-assert.ref.png diff --git a/cairo/test/reference/xcb-stress-cache.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcb-stress-cache.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/xcb-stress-cache.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcb-stress-cache.base.argb32.ref.png diff --git a/cairo/test/reference/xcb-stress-cache.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcb-stress-cache.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/xcb-stress-cache.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcb-stress-cache.base.rgb24.ref.png diff --git a/cairo/test/reference/xcb-stress-cache.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcb-stress-cache.ref.png similarity index 100% rename from cairo/test/reference/xcb-stress-cache.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcb-stress-cache.ref.png diff --git a/cairo/test/reference/xcb-surface-source.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcb-surface-source.argb32.ref.png similarity index 100% rename from cairo/test/reference/xcb-surface-source.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcb-surface-source.argb32.ref.png diff --git a/cairo/test/reference/xcb-surface-source.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcb-surface-source.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/xcb-surface-source.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcb-surface-source.base.argb32.ref.png diff --git a/cairo/test/reference/xcb-surface-source.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcb-surface-source.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/xcb-surface-source.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcb-surface-source.base.rgb24.ref.png diff --git a/cairo/test/reference/xcb-surface-source.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcb-surface-source.image16.ref.png similarity index 100% rename from cairo/test/reference/xcb-surface-source.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcb-surface-source.image16.ref.png diff --git a/cairo/test/reference/xcb-surface-source.ps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcb-surface-source.ps.argb32.ref.png similarity index 100% rename from cairo/test/reference/xcb-surface-source.ps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcb-surface-source.ps.argb32.ref.png diff --git a/cairo/test/reference/xcb-surface-source.ps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcb-surface-source.ps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/xcb-surface-source.ps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcb-surface-source.ps.rgb24.ref.png diff --git a/cairo/test/reference/xcb-surface-source.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcb-surface-source.rgb24.ref.png similarity index 100% rename from cairo/test/reference/xcb-surface-source.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcb-surface-source.rgb24.ref.png diff --git a/cairo/test/reference/xcomposite-projection.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcomposite-projection.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/xcomposite-projection.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcomposite-projection.base.argb32.ref.png diff --git a/cairo/test/reference/xcomposite-projection.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcomposite-projection.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/xcomposite-projection.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcomposite-projection.base.rgb24.ref.png diff --git a/cairo/test/reference/xcomposite-projection.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcomposite-projection.image16.ref.png similarity index 100% rename from cairo/test/reference/xcomposite-projection.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcomposite-projection.image16.ref.png diff --git a/cairo/test/reference/xcomposite-projection.mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcomposite-projection.mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/xcomposite-projection.mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcomposite-projection.mask.argb32.ref.png diff --git a/cairo/test/reference/xcomposite-projection.mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcomposite-projection.mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/xcomposite-projection.mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcomposite-projection.mask.rgb24.ref.png diff --git a/cairo/test/reference/xcomposite-projection.quartz.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcomposite-projection.quartz.ref.png similarity index 100% rename from cairo/test/reference/xcomposite-projection.quartz.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcomposite-projection.quartz.ref.png diff --git a/cairo/test/reference/xcomposite-projection.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcomposite-projection.ref.png similarity index 100% rename from cairo/test/reference/xcomposite-projection.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcomposite-projection.ref.png diff --git a/cairo/test/reference/xcomposite-projection.traps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcomposite-projection.traps.argb32.ref.png similarity index 100% rename from cairo/test/reference/xcomposite-projection.traps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcomposite-projection.traps.argb32.ref.png diff --git a/cairo/test/reference/xcomposite-projection.traps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/xcomposite-projection.traps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/xcomposite-projection.traps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xcomposite-projection.traps.rgb24.ref.png diff --git a/cairo/test/reference/xlib-expose-event.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/xlib-expose-event.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/xlib-expose-event.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xlib-expose-event.base.argb32.ref.png diff --git a/cairo/test/reference/xlib-expose-event.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/xlib-expose-event.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/xlib-expose-event.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xlib-expose-event.base.rgb24.ref.png diff --git a/cairo/test/reference/xlib-expose-event.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/xlib-expose-event.image16.ref.png similarity index 100% rename from cairo/test/reference/xlib-expose-event.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xlib-expose-event.image16.ref.png diff --git a/cairo/test/reference/xlib-expose-event.ps.ref.png b/io2d/src/3rd-party/cairo/test/reference/xlib-expose-event.ps.ref.png similarity index 100% rename from cairo/test/reference/xlib-expose-event.ps.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xlib-expose-event.ps.ref.png diff --git a/cairo/test/reference/xlib-expose-event.ref.png b/io2d/src/3rd-party/cairo/test/reference/xlib-expose-event.ref.png similarity index 100% rename from cairo/test/reference/xlib-expose-event.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xlib-expose-event.ref.png diff --git a/cairo/test/reference/xlib-surface-source.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/xlib-surface-source.argb32.ref.png similarity index 100% rename from cairo/test/reference/xlib-surface-source.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xlib-surface-source.argb32.ref.png diff --git a/cairo/test/reference/xlib-surface-source.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/xlib-surface-source.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/xlib-surface-source.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xlib-surface-source.base.argb32.ref.png diff --git a/cairo/test/reference/xlib-surface-source.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/xlib-surface-source.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/xlib-surface-source.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xlib-surface-source.base.rgb24.ref.png diff --git a/cairo/test/reference/xlib-surface-source.image16.ref.png b/io2d/src/3rd-party/cairo/test/reference/xlib-surface-source.image16.ref.png similarity index 100% rename from cairo/test/reference/xlib-surface-source.image16.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xlib-surface-source.image16.ref.png diff --git a/cairo/test/reference/xlib-surface-source.ps.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/xlib-surface-source.ps.argb32.ref.png similarity index 100% rename from cairo/test/reference/xlib-surface-source.ps.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xlib-surface-source.ps.argb32.ref.png diff --git a/cairo/test/reference/xlib-surface-source.ps.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/xlib-surface-source.ps.rgb24.ref.png similarity index 100% rename from cairo/test/reference/xlib-surface-source.ps.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xlib-surface-source.ps.rgb24.ref.png diff --git a/cairo/test/reference/xlib-surface-source.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/xlib-surface-source.rgb24.ref.png similarity index 100% rename from cairo/test/reference/xlib-surface-source.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/xlib-surface-source.rgb24.ref.png diff --git a/cairo/test/reference/xlib-surface-source.svg12.argb32.xfail.png b/io2d/src/3rd-party/cairo/test/reference/xlib-surface-source.svg12.argb32.xfail.png similarity index 100% rename from cairo/test/reference/xlib-surface-source.svg12.argb32.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/xlib-surface-source.svg12.argb32.xfail.png diff --git a/cairo/test/reference/xlib-surface-source.svg12.rgb24.xfail.png b/io2d/src/3rd-party/cairo/test/reference/xlib-surface-source.svg12.rgb24.xfail.png similarity index 100% rename from cairo/test/reference/xlib-surface-source.svg12.rgb24.xfail.png rename to io2d/src/3rd-party/cairo/test/reference/xlib-surface-source.svg12.rgb24.xfail.png diff --git a/cairo/test/reference/zero-alpha.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/zero-alpha.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/zero-alpha.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/zero-alpha.base.argb32.ref.png diff --git a/cairo/test/reference/zero-alpha.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/zero-alpha.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/zero-alpha.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/zero-alpha.base.rgb24.ref.png diff --git a/cairo/test/reference/zero-alpha.ref.png b/io2d/src/3rd-party/cairo/test/reference/zero-alpha.ref.png similarity index 100% rename from cairo/test/reference/zero-alpha.ref.png rename to io2d/src/3rd-party/cairo/test/reference/zero-alpha.ref.png diff --git a/cairo/test/reference/zero-mask.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/zero-mask.argb32.ref.png similarity index 100% rename from cairo/test/reference/zero-mask.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/zero-mask.argb32.ref.png diff --git a/cairo/test/reference/zero-mask.base.argb32.ref.png b/io2d/src/3rd-party/cairo/test/reference/zero-mask.base.argb32.ref.png similarity index 100% rename from cairo/test/reference/zero-mask.base.argb32.ref.png rename to io2d/src/3rd-party/cairo/test/reference/zero-mask.base.argb32.ref.png diff --git a/cairo/test/reference/zero-mask.base.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/zero-mask.base.rgb24.ref.png similarity index 100% rename from cairo/test/reference/zero-mask.base.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/zero-mask.base.rgb24.ref.png diff --git a/cairo/test/reference/zero-mask.rgb24.ref.png b/io2d/src/3rd-party/cairo/test/reference/zero-mask.rgb24.ref.png similarity index 100% rename from cairo/test/reference/zero-mask.rgb24.ref.png rename to io2d/src/3rd-party/cairo/test/reference/zero-mask.rgb24.ref.png diff --git a/cairo/test/reflected-stroke.c b/io2d/src/3rd-party/cairo/test/reflected-stroke.c similarity index 100% rename from cairo/test/reflected-stroke.c rename to io2d/src/3rd-party/cairo/test/reflected-stroke.c diff --git a/cairo/test/rel-path.c b/io2d/src/3rd-party/cairo/test/rel-path.c similarity index 100% rename from cairo/test/rel-path.c rename to io2d/src/3rd-party/cairo/test/rel-path.c diff --git a/cairo/test/rgb24-ignore-alpha.c b/io2d/src/3rd-party/cairo/test/rgb24-ignore-alpha.c similarity index 100% rename from cairo/test/rgb24-ignore-alpha.c rename to io2d/src/3rd-party/cairo/test/rgb24-ignore-alpha.c diff --git a/cairo/test/romedalen.jpg b/io2d/src/3rd-party/cairo/test/romedalen.jpg similarity index 100% rename from cairo/test/romedalen.jpg rename to io2d/src/3rd-party/cairo/test/romedalen.jpg diff --git a/cairo/test/romedalen.png b/io2d/src/3rd-party/cairo/test/romedalen.png similarity index 100% rename from cairo/test/romedalen.png rename to io2d/src/3rd-party/cairo/test/romedalen.png diff --git a/cairo/test/rotate-image-surface-paint.c b/io2d/src/3rd-party/cairo/test/rotate-image-surface-paint.c similarity index 100% rename from cairo/test/rotate-image-surface-paint.c rename to io2d/src/3rd-party/cairo/test/rotate-image-surface-paint.c diff --git a/cairo/test/rotated-clip.c b/io2d/src/3rd-party/cairo/test/rotated-clip.c similarity index 100% rename from cairo/test/rotated-clip.c rename to io2d/src/3rd-party/cairo/test/rotated-clip.c diff --git a/cairo/test/rounded-rectangle-fill.c b/io2d/src/3rd-party/cairo/test/rounded-rectangle-fill.c similarity index 100% rename from cairo/test/rounded-rectangle-fill.c rename to io2d/src/3rd-party/cairo/test/rounded-rectangle-fill.c diff --git a/cairo/test/rounded-rectangle-stroke.c b/io2d/src/3rd-party/cairo/test/rounded-rectangle-stroke.c similarity index 100% rename from cairo/test/rounded-rectangle-stroke.c rename to io2d/src/3rd-party/cairo/test/rounded-rectangle-stroke.c diff --git a/cairo/test/run-cairo-test-suite.sh b/io2d/src/3rd-party/cairo/test/run-cairo-test-suite.sh similarity index 100% rename from cairo/test/run-cairo-test-suite.sh rename to io2d/src/3rd-party/cairo/test/run-cairo-test-suite.sh diff --git a/cairo/test/sample.c b/io2d/src/3rd-party/cairo/test/sample.c similarity index 100% rename from cairo/test/sample.c rename to io2d/src/3rd-party/cairo/test/sample.c diff --git a/cairo/test/scale-down-source-surface-paint.c b/io2d/src/3rd-party/cairo/test/scale-down-source-surface-paint.c similarity index 100% rename from cairo/test/scale-down-source-surface-paint.c rename to io2d/src/3rd-party/cairo/test/scale-down-source-surface-paint.c diff --git a/cairo/test/scale-offset-image.c b/io2d/src/3rd-party/cairo/test/scale-offset-image.c similarity index 100% rename from cairo/test/scale-offset-image.c rename to io2d/src/3rd-party/cairo/test/scale-offset-image.c diff --git a/cairo/test/scale-offset-similar.c b/io2d/src/3rd-party/cairo/test/scale-offset-similar.c similarity index 100% rename from cairo/test/scale-offset-similar.c rename to io2d/src/3rd-party/cairo/test/scale-offset-similar.c diff --git a/cairo/test/scale-source-surface-paint.c b/io2d/src/3rd-party/cairo/test/scale-source-surface-paint.c similarity index 100% rename from cairo/test/scale-source-surface-paint.c rename to io2d/src/3rd-party/cairo/test/scale-source-surface-paint.c diff --git a/cairo/test/scaled-font-zero-matrix.c b/io2d/src/3rd-party/cairo/test/scaled-font-zero-matrix.c similarity index 100% rename from cairo/test/scaled-font-zero-matrix.c rename to io2d/src/3rd-party/cairo/test/scaled-font-zero-matrix.c diff --git a/cairo/test/scarab.jpg b/io2d/src/3rd-party/cairo/test/scarab.jpg similarity index 100% rename from cairo/test/scarab.jpg rename to io2d/src/3rd-party/cairo/test/scarab.jpg diff --git a/cairo/test/select-font-face.c b/io2d/src/3rd-party/cairo/test/select-font-face.c similarity index 100% rename from cairo/test/select-font-face.c rename to io2d/src/3rd-party/cairo/test/select-font-face.c diff --git a/cairo/test/select-font-no-show-text.c b/io2d/src/3rd-party/cairo/test/select-font-no-show-text.c similarity index 100% rename from cairo/test/select-font-no-show-text.c rename to io2d/src/3rd-party/cairo/test/select-font-no-show-text.c diff --git a/cairo/test/self-copy-overlap.c b/io2d/src/3rd-party/cairo/test/self-copy-overlap.c similarity index 100% rename from cairo/test/self-copy-overlap.c rename to io2d/src/3rd-party/cairo/test/self-copy-overlap.c diff --git a/cairo/test/self-copy.c b/io2d/src/3rd-party/cairo/test/self-copy.c similarity index 100% rename from cairo/test/self-copy.c rename to io2d/src/3rd-party/cairo/test/self-copy.c diff --git a/cairo/test/self-intersecting.c b/io2d/src/3rd-party/cairo/test/self-intersecting.c similarity index 100% rename from cairo/test/self-intersecting.c rename to io2d/src/3rd-party/cairo/test/self-intersecting.c diff --git a/cairo/test/set-source.c b/io2d/src/3rd-party/cairo/test/set-source.c similarity index 100% rename from cairo/test/set-source.c rename to io2d/src/3rd-party/cairo/test/set-source.c diff --git a/cairo/test/shape-general-convex.c b/io2d/src/3rd-party/cairo/test/shape-general-convex.c similarity index 100% rename from cairo/test/shape-general-convex.c rename to io2d/src/3rd-party/cairo/test/shape-general-convex.c diff --git a/cairo/test/shape-sierpinski.c b/io2d/src/3rd-party/cairo/test/shape-sierpinski.c similarity index 100% rename from cairo/test/shape-sierpinski.c rename to io2d/src/3rd-party/cairo/test/shape-sierpinski.c diff --git a/cairo/test/show-glyphs-advance.c b/io2d/src/3rd-party/cairo/test/show-glyphs-advance.c similarity index 100% rename from cairo/test/show-glyphs-advance.c rename to io2d/src/3rd-party/cairo/test/show-glyphs-advance.c diff --git a/cairo/test/show-glyphs-many.c b/io2d/src/3rd-party/cairo/test/show-glyphs-many.c similarity index 100% rename from cairo/test/show-glyphs-many.c rename to io2d/src/3rd-party/cairo/test/show-glyphs-many.c diff --git a/cairo/test/show-text-current-point.c b/io2d/src/3rd-party/cairo/test/show-text-current-point.c similarity index 100% rename from cairo/test/show-text-current-point.c rename to io2d/src/3rd-party/cairo/test/show-text-current-point.c diff --git a/cairo/test/skew-extreme.c b/io2d/src/3rd-party/cairo/test/skew-extreme.c similarity index 100% rename from cairo/test/skew-extreme.c rename to io2d/src/3rd-party/cairo/test/skew-extreme.c diff --git a/cairo/test/smask-fill.c b/io2d/src/3rd-party/cairo/test/smask-fill.c similarity index 100% rename from cairo/test/smask-fill.c rename to io2d/src/3rd-party/cairo/test/smask-fill.c diff --git a/cairo/test/smask-image-mask.c b/io2d/src/3rd-party/cairo/test/smask-image-mask.c similarity index 100% rename from cairo/test/smask-image-mask.c rename to io2d/src/3rd-party/cairo/test/smask-image-mask.c diff --git a/cairo/test/smask-mask.c b/io2d/src/3rd-party/cairo/test/smask-mask.c similarity index 100% rename from cairo/test/smask-mask.c rename to io2d/src/3rd-party/cairo/test/smask-mask.c diff --git a/cairo/test/smask-paint.c b/io2d/src/3rd-party/cairo/test/smask-paint.c similarity index 100% rename from cairo/test/smask-paint.c rename to io2d/src/3rd-party/cairo/test/smask-paint.c diff --git a/cairo/test/smask-stroke.c b/io2d/src/3rd-party/cairo/test/smask-stroke.c similarity index 100% rename from cairo/test/smask-stroke.c rename to io2d/src/3rd-party/cairo/test/smask-stroke.c diff --git a/cairo/test/smask-text.c b/io2d/src/3rd-party/cairo/test/smask-text.c similarity index 100% rename from cairo/test/smask-text.c rename to io2d/src/3rd-party/cairo/test/smask-text.c diff --git a/cairo/test/smask.c b/io2d/src/3rd-party/cairo/test/smask.c similarity index 100% rename from cairo/test/smask.c rename to io2d/src/3rd-party/cairo/test/smask.c diff --git a/cairo/test/solid-pattern-cache-stress.c b/io2d/src/3rd-party/cairo/test/solid-pattern-cache-stress.c similarity index 100% rename from cairo/test/solid-pattern-cache-stress.c rename to io2d/src/3rd-party/cairo/test/solid-pattern-cache-stress.c diff --git a/cairo/test/source-clip-scale.c b/io2d/src/3rd-party/cairo/test/source-clip-scale.c similarity index 100% rename from cairo/test/source-clip-scale.c rename to io2d/src/3rd-party/cairo/test/source-clip-scale.c diff --git a/cairo/test/source-clip.c b/io2d/src/3rd-party/cairo/test/source-clip.c similarity index 100% rename from cairo/test/source-clip.c rename to io2d/src/3rd-party/cairo/test/source-clip.c diff --git a/cairo/test/source-surface-scale-paint.c b/io2d/src/3rd-party/cairo/test/source-surface-scale-paint.c similarity index 100% rename from cairo/test/source-surface-scale-paint.c rename to io2d/src/3rd-party/cairo/test/source-surface-scale-paint.c diff --git a/cairo/test/spline-decomposition.c b/io2d/src/3rd-party/cairo/test/spline-decomposition.c similarity index 100% rename from cairo/test/spline-decomposition.c rename to io2d/src/3rd-party/cairo/test/spline-decomposition.c diff --git a/cairo/test/stride-12-image.c b/io2d/src/3rd-party/cairo/test/stride-12-image.c similarity index 100% rename from cairo/test/stride-12-image.c rename to io2d/src/3rd-party/cairo/test/stride-12-image.c diff --git a/cairo/test/stroke-clipped.c b/io2d/src/3rd-party/cairo/test/stroke-clipped.c similarity index 100% rename from cairo/test/stroke-clipped.c rename to io2d/src/3rd-party/cairo/test/stroke-clipped.c diff --git a/cairo/test/stroke-ctm-caps.c b/io2d/src/3rd-party/cairo/test/stroke-ctm-caps.c similarity index 100% rename from cairo/test/stroke-ctm-caps.c rename to io2d/src/3rd-party/cairo/test/stroke-ctm-caps.c diff --git a/cairo/test/stroke-image.c b/io2d/src/3rd-party/cairo/test/stroke-image.c similarity index 100% rename from cairo/test/stroke-image.c rename to io2d/src/3rd-party/cairo/test/stroke-image.c diff --git a/cairo/test/stroke-open-box.c b/io2d/src/3rd-party/cairo/test/stroke-open-box.c similarity index 100% rename from cairo/test/stroke-open-box.c rename to io2d/src/3rd-party/cairo/test/stroke-open-box.c diff --git a/cairo/test/stroke-pattern.c b/io2d/src/3rd-party/cairo/test/stroke-pattern.c similarity index 100% rename from cairo/test/stroke-pattern.c rename to io2d/src/3rd-party/cairo/test/stroke-pattern.c diff --git a/cairo/test/subsurface-image-repeat.c b/io2d/src/3rd-party/cairo/test/subsurface-image-repeat.c similarity index 100% rename from cairo/test/subsurface-image-repeat.c rename to io2d/src/3rd-party/cairo/test/subsurface-image-repeat.c diff --git a/cairo/test/subsurface-modify-child.c b/io2d/src/3rd-party/cairo/test/subsurface-modify-child.c similarity index 100% rename from cairo/test/subsurface-modify-child.c rename to io2d/src/3rd-party/cairo/test/subsurface-modify-child.c diff --git a/cairo/test/subsurface-modify-parent.c b/io2d/src/3rd-party/cairo/test/subsurface-modify-parent.c similarity index 100% rename from cairo/test/subsurface-modify-parent.c rename to io2d/src/3rd-party/cairo/test/subsurface-modify-parent.c diff --git a/cairo/test/subsurface-outside-target.c b/io2d/src/3rd-party/cairo/test/subsurface-outside-target.c similarity index 100% rename from cairo/test/subsurface-outside-target.c rename to io2d/src/3rd-party/cairo/test/subsurface-outside-target.c diff --git a/cairo/test/subsurface-pad.c b/io2d/src/3rd-party/cairo/test/subsurface-pad.c similarity index 100% rename from cairo/test/subsurface-pad.c rename to io2d/src/3rd-party/cairo/test/subsurface-pad.c diff --git a/cairo/test/subsurface-reflect.c b/io2d/src/3rd-party/cairo/test/subsurface-reflect.c similarity index 100% rename from cairo/test/subsurface-reflect.c rename to io2d/src/3rd-party/cairo/test/subsurface-reflect.c diff --git a/cairo/test/subsurface-repeat.c b/io2d/src/3rd-party/cairo/test/subsurface-repeat.c similarity index 100% rename from cairo/test/subsurface-repeat.c rename to io2d/src/3rd-party/cairo/test/subsurface-repeat.c diff --git a/cairo/test/subsurface-scale.c b/io2d/src/3rd-party/cairo/test/subsurface-scale.c similarity index 100% rename from cairo/test/subsurface-scale.c rename to io2d/src/3rd-party/cairo/test/subsurface-scale.c diff --git a/cairo/test/subsurface-similar-repeat.c b/io2d/src/3rd-party/cairo/test/subsurface-similar-repeat.c similarity index 100% rename from cairo/test/subsurface-similar-repeat.c rename to io2d/src/3rd-party/cairo/test/subsurface-similar-repeat.c diff --git a/cairo/test/subsurface.c b/io2d/src/3rd-party/cairo/test/subsurface.c similarity index 100% rename from cairo/test/subsurface.c rename to io2d/src/3rd-party/cairo/test/subsurface.c diff --git a/cairo/test/surface-finish-twice.c b/io2d/src/3rd-party/cairo/test/surface-finish-twice.c similarity index 100% rename from cairo/test/surface-finish-twice.c rename to io2d/src/3rd-party/cairo/test/surface-finish-twice.c diff --git a/cairo/test/surface-pattern-big-scale-down.c b/io2d/src/3rd-party/cairo/test/surface-pattern-big-scale-down.c similarity index 100% rename from cairo/test/surface-pattern-big-scale-down.c rename to io2d/src/3rd-party/cairo/test/surface-pattern-big-scale-down.c diff --git a/cairo/test/surface-pattern-operator.c b/io2d/src/3rd-party/cairo/test/surface-pattern-operator.c similarity index 100% rename from cairo/test/surface-pattern-operator.c rename to io2d/src/3rd-party/cairo/test/surface-pattern-operator.c diff --git a/cairo/test/surface-pattern-scale-down-extend.c b/io2d/src/3rd-party/cairo/test/surface-pattern-scale-down-extend.c similarity index 100% rename from cairo/test/surface-pattern-scale-down-extend.c rename to io2d/src/3rd-party/cairo/test/surface-pattern-scale-down-extend.c diff --git a/cairo/test/surface-pattern-scale-down.c b/io2d/src/3rd-party/cairo/test/surface-pattern-scale-down.c similarity index 100% rename from cairo/test/surface-pattern-scale-down.c rename to io2d/src/3rd-party/cairo/test/surface-pattern-scale-down.c diff --git a/cairo/test/surface-pattern-scale-up.c b/io2d/src/3rd-party/cairo/test/surface-pattern-scale-up.c similarity index 100% rename from cairo/test/surface-pattern-scale-up.c rename to io2d/src/3rd-party/cairo/test/surface-pattern-scale-up.c diff --git a/cairo/test/surface-pattern.c b/io2d/src/3rd-party/cairo/test/surface-pattern.c similarity index 100% rename from cairo/test/surface-pattern.c rename to io2d/src/3rd-party/cairo/test/surface-pattern.c diff --git a/cairo/test/surface-source.c b/io2d/src/3rd-party/cairo/test/surface-source.c similarity index 100% rename from cairo/test/surface-source.c rename to io2d/src/3rd-party/cairo/test/surface-source.c diff --git a/cairo/test/svg-clip.c b/io2d/src/3rd-party/cairo/test/svg-clip.c similarity index 100% rename from cairo/test/svg-clip.c rename to io2d/src/3rd-party/cairo/test/svg-clip.c diff --git a/cairo/test/svg-surface-source.c b/io2d/src/3rd-party/cairo/test/svg-surface-source.c similarity index 100% rename from cairo/test/svg-surface-source.c rename to io2d/src/3rd-party/cairo/test/svg-surface-source.c diff --git a/cairo/test/svg-surface.c b/io2d/src/3rd-party/cairo/test/svg-surface.c similarity index 100% rename from cairo/test/svg-surface.c rename to io2d/src/3rd-party/cairo/test/svg-surface.c diff --git a/cairo/test/svg2png.c b/io2d/src/3rd-party/cairo/test/svg2png.c similarity index 100% rename from cairo/test/svg2png.c rename to io2d/src/3rd-party/cairo/test/svg2png.c diff --git a/cairo/test/testsvg b/io2d/src/3rd-party/cairo/test/testsvg similarity index 100% rename from cairo/test/testsvg rename to io2d/src/3rd-party/cairo/test/testsvg diff --git a/cairo/test/testtable.js b/io2d/src/3rd-party/cairo/test/testtable.js similarity index 100% rename from cairo/test/testtable.js rename to io2d/src/3rd-party/cairo/test/testtable.js diff --git a/cairo/test/text-antialias-subpixel.c b/io2d/src/3rd-party/cairo/test/text-antialias-subpixel.c similarity index 100% rename from cairo/test/text-antialias-subpixel.c rename to io2d/src/3rd-party/cairo/test/text-antialias-subpixel.c diff --git a/cairo/test/text-antialias.c b/io2d/src/3rd-party/cairo/test/text-antialias.c similarity index 100% rename from cairo/test/text-antialias.c rename to io2d/src/3rd-party/cairo/test/text-antialias.c diff --git a/cairo/test/text-cache-crash.c b/io2d/src/3rd-party/cairo/test/text-cache-crash.c similarity index 100% rename from cairo/test/text-cache-crash.c rename to io2d/src/3rd-party/cairo/test/text-cache-crash.c diff --git a/cairo/test/text-glyph-range.c b/io2d/src/3rd-party/cairo/test/text-glyph-range.c similarity index 100% rename from cairo/test/text-glyph-range.c rename to io2d/src/3rd-party/cairo/test/text-glyph-range.c diff --git a/cairo/test/text-pattern.c b/io2d/src/3rd-party/cairo/test/text-pattern.c similarity index 100% rename from cairo/test/text-pattern.c rename to io2d/src/3rd-party/cairo/test/text-pattern.c diff --git a/cairo/test/text-rotate.c b/io2d/src/3rd-party/cairo/test/text-rotate.c similarity index 100% rename from cairo/test/text-rotate.c rename to io2d/src/3rd-party/cairo/test/text-rotate.c diff --git a/cairo/test/text-transform.c b/io2d/src/3rd-party/cairo/test/text-transform.c similarity index 100% rename from cairo/test/text-transform.c rename to io2d/src/3rd-party/cairo/test/text-transform.c diff --git a/cairo/test/text-zero-len.c b/io2d/src/3rd-party/cairo/test/text-zero-len.c similarity index 100% rename from cairo/test/text-zero-len.c rename to io2d/src/3rd-party/cairo/test/text-zero-len.c diff --git a/cairo/test/tiger.c b/io2d/src/3rd-party/cairo/test/tiger.c similarity index 100% rename from cairo/test/tiger.c rename to io2d/src/3rd-party/cairo/test/tiger.c diff --git a/cairo/test/tiger.inc b/io2d/src/3rd-party/cairo/test/tiger.inc similarity index 100% rename from cairo/test/tiger.inc rename to io2d/src/3rd-party/cairo/test/tiger.inc diff --git a/cairo/test/tighten-bounds.c b/io2d/src/3rd-party/cairo/test/tighten-bounds.c similarity index 100% rename from cairo/test/tighten-bounds.c rename to io2d/src/3rd-party/cairo/test/tighten-bounds.c diff --git a/cairo/test/toy-font-face.c b/io2d/src/3rd-party/cairo/test/toy-font-face.c similarity index 100% rename from cairo/test/toy-font-face.c rename to io2d/src/3rd-party/cairo/test/toy-font-face.c diff --git a/cairo/test/transforms.c b/io2d/src/3rd-party/cairo/test/transforms.c similarity index 100% rename from cairo/test/transforms.c rename to io2d/src/3rd-party/cairo/test/transforms.c diff --git a/cairo/test/translate-show-surface.c b/io2d/src/3rd-party/cairo/test/translate-show-surface.c similarity index 100% rename from cairo/test/translate-show-surface.c rename to io2d/src/3rd-party/cairo/test/translate-show-surface.c diff --git a/cairo/test/trap-clip.c b/io2d/src/3rd-party/cairo/test/trap-clip.c similarity index 100% rename from cairo/test/trap-clip.c rename to io2d/src/3rd-party/cairo/test/trap-clip.c diff --git a/cairo/test/twin-antialias-gray.c b/io2d/src/3rd-party/cairo/test/twin-antialias-gray.c similarity index 100% rename from cairo/test/twin-antialias-gray.c rename to io2d/src/3rd-party/cairo/test/twin-antialias-gray.c diff --git a/cairo/test/twin-antialias-mixed.c b/io2d/src/3rd-party/cairo/test/twin-antialias-mixed.c similarity index 100% rename from cairo/test/twin-antialias-mixed.c rename to io2d/src/3rd-party/cairo/test/twin-antialias-mixed.c diff --git a/cairo/test/twin-antialias-none.c b/io2d/src/3rd-party/cairo/test/twin-antialias-none.c similarity index 100% rename from cairo/test/twin-antialias-none.c rename to io2d/src/3rd-party/cairo/test/twin-antialias-none.c diff --git a/cairo/test/twin-antialias-subpixel.c b/io2d/src/3rd-party/cairo/test/twin-antialias-subpixel.c similarity index 100% rename from cairo/test/twin-antialias-subpixel.c rename to io2d/src/3rd-party/cairo/test/twin-antialias-subpixel.c diff --git a/cairo/test/twin.c b/io2d/src/3rd-party/cairo/test/twin.c similarity index 100% rename from cairo/test/twin.c rename to io2d/src/3rd-party/cairo/test/twin.c diff --git a/cairo/test/unaligned-box.c b/io2d/src/3rd-party/cairo/test/unaligned-box.c similarity index 100% rename from cairo/test/unaligned-box.c rename to io2d/src/3rd-party/cairo/test/unaligned-box.c diff --git a/cairo/test/unantialiased-shapes.c b/io2d/src/3rd-party/cairo/test/unantialiased-shapes.c similarity index 100% rename from cairo/test/unantialiased-shapes.c rename to io2d/src/3rd-party/cairo/test/unantialiased-shapes.c diff --git a/cairo/test/unbounded-operator.c b/io2d/src/3rd-party/cairo/test/unbounded-operator.c similarity index 100% rename from cairo/test/unbounded-operator.c rename to io2d/src/3rd-party/cairo/test/unbounded-operator.c diff --git a/cairo/test/unclosed-strokes.c b/io2d/src/3rd-party/cairo/test/unclosed-strokes.c similarity index 100% rename from cairo/test/unclosed-strokes.c rename to io2d/src/3rd-party/cairo/test/unclosed-strokes.c diff --git a/cairo/test/user-data.c b/io2d/src/3rd-party/cairo/test/user-data.c similarity index 100% rename from cairo/test/user-data.c rename to io2d/src/3rd-party/cairo/test/user-data.c diff --git a/cairo/test/user-font-mask.c b/io2d/src/3rd-party/cairo/test/user-font-mask.c similarity index 100% rename from cairo/test/user-font-mask.c rename to io2d/src/3rd-party/cairo/test/user-font-mask.c diff --git a/cairo/test/user-font-proxy.c b/io2d/src/3rd-party/cairo/test/user-font-proxy.c similarity index 100% rename from cairo/test/user-font-proxy.c rename to io2d/src/3rd-party/cairo/test/user-font-proxy.c diff --git a/cairo/test/user-font-rescale.c b/io2d/src/3rd-party/cairo/test/user-font-rescale.c similarity index 100% rename from cairo/test/user-font-rescale.c rename to io2d/src/3rd-party/cairo/test/user-font-rescale.c diff --git a/cairo/test/user-font.c b/io2d/src/3rd-party/cairo/test/user-font.c similarity index 100% rename from cairo/test/user-font.c rename to io2d/src/3rd-party/cairo/test/user-font.c diff --git a/cairo/test/white-in-noop.c b/io2d/src/3rd-party/cairo/test/white-in-noop.c similarity index 100% rename from cairo/test/white-in-noop.c rename to io2d/src/3rd-party/cairo/test/white-in-noop.c diff --git a/cairo/test/world-map.c b/io2d/src/3rd-party/cairo/test/world-map.c similarity index 100% rename from cairo/test/world-map.c rename to io2d/src/3rd-party/cairo/test/world-map.c diff --git a/cairo/test/world-map.h b/io2d/src/3rd-party/cairo/test/world-map.h similarity index 100% rename from cairo/test/world-map.h rename to io2d/src/3rd-party/cairo/test/world-map.h diff --git a/cairo/test/xcb-huge-image-shm.c b/io2d/src/3rd-party/cairo/test/xcb-huge-image-shm.c similarity index 100% rename from cairo/test/xcb-huge-image-shm.c rename to io2d/src/3rd-party/cairo/test/xcb-huge-image-shm.c diff --git a/cairo/test/xcb-huge-subimage.c b/io2d/src/3rd-party/cairo/test/xcb-huge-subimage.c similarity index 100% rename from cairo/test/xcb-huge-subimage.c rename to io2d/src/3rd-party/cairo/test/xcb-huge-subimage.c diff --git a/cairo/test/xcb-snapshot-assert.c b/io2d/src/3rd-party/cairo/test/xcb-snapshot-assert.c similarity index 100% rename from cairo/test/xcb-snapshot-assert.c rename to io2d/src/3rd-party/cairo/test/xcb-snapshot-assert.c diff --git a/cairo/test/xcb-stress-cache.c b/io2d/src/3rd-party/cairo/test/xcb-stress-cache.c similarity index 100% rename from cairo/test/xcb-stress-cache.c rename to io2d/src/3rd-party/cairo/test/xcb-stress-cache.c diff --git a/cairo/test/xcb-surface-source.c b/io2d/src/3rd-party/cairo/test/xcb-surface-source.c similarity index 100% rename from cairo/test/xcb-surface-source.c rename to io2d/src/3rd-party/cairo/test/xcb-surface-source.c diff --git a/cairo/test/xcomposite-projection.c b/io2d/src/3rd-party/cairo/test/xcomposite-projection.c similarity index 100% rename from cairo/test/xcomposite-projection.c rename to io2d/src/3rd-party/cairo/test/xcomposite-projection.c diff --git a/cairo/test/xlib-expose-event.c b/io2d/src/3rd-party/cairo/test/xlib-expose-event.c similarity index 100% rename from cairo/test/xlib-expose-event.c rename to io2d/src/3rd-party/cairo/test/xlib-expose-event.c diff --git a/cairo/test/xlib-surface-source.c b/io2d/src/3rd-party/cairo/test/xlib-surface-source.c similarity index 100% rename from cairo/test/xlib-surface-source.c rename to io2d/src/3rd-party/cairo/test/xlib-surface-source.c diff --git a/cairo/test/xlib-surface.c b/io2d/src/3rd-party/cairo/test/xlib-surface.c similarity index 100% rename from cairo/test/xlib-surface.c rename to io2d/src/3rd-party/cairo/test/xlib-surface.c diff --git a/cairo/test/zero-alpha.c b/io2d/src/3rd-party/cairo/test/zero-alpha.c similarity index 100% rename from cairo/test/zero-alpha.c rename to io2d/src/3rd-party/cairo/test/zero-alpha.c diff --git a/cairo/test/zero-mask.c b/io2d/src/3rd-party/cairo/test/zero-mask.c similarity index 100% rename from cairo/test/zero-mask.c rename to io2d/src/3rd-party/cairo/test/zero-mask.c diff --git a/cairo/util/.gitignore b/io2d/src/3rd-party/cairo/util/.gitignore similarity index 100% rename from cairo/util/.gitignore rename to io2d/src/3rd-party/cairo/util/.gitignore diff --git a/cairo/util/COPYING b/io2d/src/3rd-party/cairo/util/COPYING similarity index 100% rename from cairo/util/COPYING rename to io2d/src/3rd-party/cairo/util/COPYING diff --git a/cairo/util/Makefile.am b/io2d/src/3rd-party/cairo/util/Makefile.am similarity index 100% rename from cairo/util/Makefile.am rename to io2d/src/3rd-party/cairo/util/Makefile.am diff --git a/cairo/util/README b/io2d/src/3rd-party/cairo/util/README similarity index 100% rename from cairo/util/README rename to io2d/src/3rd-party/cairo/util/README diff --git a/cairo/util/backtrace-symbols.c b/io2d/src/3rd-party/cairo/util/backtrace-symbols.c similarity index 100% rename from cairo/util/backtrace-symbols.c rename to io2d/src/3rd-party/cairo/util/backtrace-symbols.c diff --git a/cairo/util/cairo-api-update b/io2d/src/3rd-party/cairo/util/cairo-api-update similarity index 100% rename from cairo/util/cairo-api-update rename to io2d/src/3rd-party/cairo/util/cairo-api-update diff --git a/cairo/util/cairo-fdr/Makefile.am b/io2d/src/3rd-party/cairo/util/cairo-fdr/Makefile.am similarity index 100% rename from cairo/util/cairo-fdr/Makefile.am rename to io2d/src/3rd-party/cairo/util/cairo-fdr/Makefile.am diff --git a/cairo/util/cairo-fdr/fdr.c b/io2d/src/3rd-party/cairo/util/cairo-fdr/fdr.c similarity index 100% rename from cairo/util/cairo-fdr/fdr.c rename to io2d/src/3rd-party/cairo/util/cairo-fdr/fdr.c diff --git a/cairo/util/cairo-gobject/Makefile.am b/io2d/src/3rd-party/cairo/util/cairo-gobject/Makefile.am similarity index 100% rename from cairo/util/cairo-gobject/Makefile.am rename to io2d/src/3rd-party/cairo/util/cairo-gobject/Makefile.am diff --git a/cairo/util/cairo-gobject/cairo-gobject-enums.c b/io2d/src/3rd-party/cairo/util/cairo-gobject/cairo-gobject-enums.c similarity index 100% rename from cairo/util/cairo-gobject/cairo-gobject-enums.c rename to io2d/src/3rd-party/cairo/util/cairo-gobject/cairo-gobject-enums.c diff --git a/cairo/util/cairo-gobject/cairo-gobject-structs.c b/io2d/src/3rd-party/cairo/util/cairo-gobject/cairo-gobject-structs.c similarity index 100% rename from cairo/util/cairo-gobject/cairo-gobject-structs.c rename to io2d/src/3rd-party/cairo/util/cairo-gobject/cairo-gobject-structs.c diff --git a/cairo/util/cairo-gobject/cairo-gobject.h b/io2d/src/3rd-party/cairo/util/cairo-gobject/cairo-gobject.h similarity index 100% rename from cairo/util/cairo-gobject/cairo-gobject.h rename to io2d/src/3rd-party/cairo/util/cairo-gobject/cairo-gobject.h diff --git a/cairo/util/cairo-missing/Makefile.am b/io2d/src/3rd-party/cairo/util/cairo-missing/Makefile.am similarity index 100% rename from cairo/util/cairo-missing/Makefile.am rename to io2d/src/3rd-party/cairo/util/cairo-missing/Makefile.am diff --git a/cairo/util/cairo-missing/Makefile.sources b/io2d/src/3rd-party/cairo/util/cairo-missing/Makefile.sources similarity index 100% rename from cairo/util/cairo-missing/Makefile.sources rename to io2d/src/3rd-party/cairo/util/cairo-missing/Makefile.sources diff --git a/cairo/util/cairo-missing/Makefile.win32 b/io2d/src/3rd-party/cairo/util/cairo-missing/Makefile.win32 similarity index 100% rename from cairo/util/cairo-missing/Makefile.win32 rename to io2d/src/3rd-party/cairo/util/cairo-missing/Makefile.win32 diff --git a/cairo/util/cairo-missing/cairo-missing.h b/io2d/src/3rd-party/cairo/util/cairo-missing/cairo-missing.h similarity index 100% rename from cairo/util/cairo-missing/cairo-missing.h rename to io2d/src/3rd-party/cairo/util/cairo-missing/cairo-missing.h diff --git a/cairo/util/cairo-missing/getline.c b/io2d/src/3rd-party/cairo/util/cairo-missing/getline.c similarity index 100% rename from cairo/util/cairo-missing/getline.c rename to io2d/src/3rd-party/cairo/util/cairo-missing/getline.c diff --git a/cairo/util/cairo-missing/strndup.c b/io2d/src/3rd-party/cairo/util/cairo-missing/strndup.c similarity index 100% rename from cairo/util/cairo-missing/strndup.c rename to io2d/src/3rd-party/cairo/util/cairo-missing/strndup.c diff --git a/cairo/util/cairo-script/.gitignore b/io2d/src/3rd-party/cairo/util/cairo-script/.gitignore similarity index 100% rename from cairo/util/cairo-script/.gitignore rename to io2d/src/3rd-party/cairo/util/cairo-script/.gitignore diff --git a/cairo/util/cairo-script/COPYING b/io2d/src/3rd-party/cairo/util/cairo-script/COPYING similarity index 100% rename from cairo/util/cairo-script/COPYING rename to io2d/src/3rd-party/cairo/util/cairo-script/COPYING diff --git a/cairo/util/cairo-script/Makefile.am b/io2d/src/3rd-party/cairo/util/cairo-script/Makefile.am similarity index 100% rename from cairo/util/cairo-script/Makefile.am rename to io2d/src/3rd-party/cairo/util/cairo-script/Makefile.am diff --git a/cairo/util/cairo-script/Makefile.sources b/io2d/src/3rd-party/cairo/util/cairo-script/Makefile.sources similarity index 100% rename from cairo/util/cairo-script/Makefile.sources rename to io2d/src/3rd-party/cairo/util/cairo-script/Makefile.sources diff --git a/cairo/util/cairo-script/Makefile.win32 b/io2d/src/3rd-party/cairo/util/cairo-script/Makefile.win32 similarity index 100% rename from cairo/util/cairo-script/Makefile.win32 rename to io2d/src/3rd-party/cairo/util/cairo-script/Makefile.win32 diff --git a/cairo/util/cairo-script/cairo-script-file.c b/io2d/src/3rd-party/cairo/util/cairo-script/cairo-script-file.c similarity index 100% rename from cairo/util/cairo-script/cairo-script-file.c rename to io2d/src/3rd-party/cairo/util/cairo-script/cairo-script-file.c diff --git a/cairo/util/cairo-script/cairo-script-hash.c b/io2d/src/3rd-party/cairo/util/cairo-script/cairo-script-hash.c similarity index 100% rename from cairo/util/cairo-script/cairo-script-hash.c rename to io2d/src/3rd-party/cairo/util/cairo-script/cairo-script-hash.c diff --git a/cairo/util/cairo-script/cairo-script-interpreter.c b/io2d/src/3rd-party/cairo/util/cairo-script/cairo-script-interpreter.c similarity index 100% rename from cairo/util/cairo-script/cairo-script-interpreter.c rename to io2d/src/3rd-party/cairo/util/cairo-script/cairo-script-interpreter.c diff --git a/cairo/util/cairo-script/cairo-script-interpreter.h b/io2d/src/3rd-party/cairo/util/cairo-script/cairo-script-interpreter.h similarity index 100% rename from cairo/util/cairo-script/cairo-script-interpreter.h rename to io2d/src/3rd-party/cairo/util/cairo-script/cairo-script-interpreter.h diff --git a/cairo/util/cairo-script/cairo-script-objects.c b/io2d/src/3rd-party/cairo/util/cairo-script/cairo-script-objects.c similarity index 100% rename from cairo/util/cairo-script/cairo-script-objects.c rename to io2d/src/3rd-party/cairo/util/cairo-script/cairo-script-objects.c diff --git a/cairo/util/cairo-script/cairo-script-operators.c b/io2d/src/3rd-party/cairo/util/cairo-script/cairo-script-operators.c similarity index 100% rename from cairo/util/cairo-script/cairo-script-operators.c rename to io2d/src/3rd-party/cairo/util/cairo-script/cairo-script-operators.c diff --git a/cairo/util/cairo-script/cairo-script-private.h b/io2d/src/3rd-party/cairo/util/cairo-script/cairo-script-private.h similarity index 100% rename from cairo/util/cairo-script/cairo-script-private.h rename to io2d/src/3rd-party/cairo/util/cairo-script/cairo-script-private.h diff --git a/cairo/util/cairo-script/cairo-script-scanner.c b/io2d/src/3rd-party/cairo/util/cairo-script/cairo-script-scanner.c similarity index 100% rename from cairo/util/cairo-script/cairo-script-scanner.c rename to io2d/src/3rd-party/cairo/util/cairo-script/cairo-script-scanner.c diff --git a/cairo/util/cairo-script/cairo-script-stack.c b/io2d/src/3rd-party/cairo/util/cairo-script/cairo-script-stack.c similarity index 100% rename from cairo/util/cairo-script/cairo-script-stack.c rename to io2d/src/3rd-party/cairo/util/cairo-script/cairo-script-stack.c diff --git a/cairo/util/cairo-script/csi-bind.c b/io2d/src/3rd-party/cairo/util/cairo-script/csi-bind.c similarity index 100% rename from cairo/util/cairo-script/csi-bind.c rename to io2d/src/3rd-party/cairo/util/cairo-script/csi-bind.c diff --git a/cairo/util/cairo-script/csi-exec.c b/io2d/src/3rd-party/cairo/util/cairo-script/csi-exec.c similarity index 100% rename from cairo/util/cairo-script/csi-exec.c rename to io2d/src/3rd-party/cairo/util/cairo-script/csi-exec.c diff --git a/cairo/util/cairo-script/csi-replay.c b/io2d/src/3rd-party/cairo/util/cairo-script/csi-replay.c similarity index 100% rename from cairo/util/cairo-script/csi-replay.c rename to io2d/src/3rd-party/cairo/util/cairo-script/csi-replay.c diff --git a/cairo/util/cairo-script/csi-trace.c b/io2d/src/3rd-party/cairo/util/cairo-script/csi-trace.c similarity index 100% rename from cairo/util/cairo-script/csi-trace.c rename to io2d/src/3rd-party/cairo/util/cairo-script/csi-trace.c diff --git a/cairo/util/cairo-script/examples/Makefile.am b/io2d/src/3rd-party/cairo/util/cairo-script/examples/Makefile.am similarity index 100% rename from cairo/util/cairo-script/examples/Makefile.am rename to io2d/src/3rd-party/cairo/util/cairo-script/examples/Makefile.am diff --git a/cairo/util/cairo-script/examples/dragon.cs b/io2d/src/3rd-party/cairo/util/cairo-script/examples/dragon.cs similarity index 100% rename from cairo/util/cairo-script/examples/dragon.cs rename to io2d/src/3rd-party/cairo/util/cairo-script/examples/dragon.cs diff --git a/cairo/util/cairo-script/examples/hilbert.cs b/io2d/src/3rd-party/cairo/util/cairo-script/examples/hilbert.cs similarity index 100% rename from cairo/util/cairo-script/examples/hilbert.cs rename to io2d/src/3rd-party/cairo/util/cairo-script/examples/hilbert.cs diff --git a/cairo/util/cairo-script/examples/infinichess.cs b/io2d/src/3rd-party/cairo/util/cairo-script/examples/infinichess.cs similarity index 100% rename from cairo/util/cairo-script/examples/infinichess.cs rename to io2d/src/3rd-party/cairo/util/cairo-script/examples/infinichess.cs diff --git a/cairo/util/cairo-script/examples/interference.cs b/io2d/src/3rd-party/cairo/util/cairo-script/examples/interference.cs similarity index 100% rename from cairo/util/cairo-script/examples/interference.cs rename to io2d/src/3rd-party/cairo/util/cairo-script/examples/interference.cs diff --git a/cairo/util/cairo-script/examples/pythagoras-tree.cs b/io2d/src/3rd-party/cairo/util/cairo-script/examples/pythagoras-tree.cs similarity index 100% rename from cairo/util/cairo-script/examples/pythagoras-tree.cs rename to io2d/src/3rd-party/cairo/util/cairo-script/examples/pythagoras-tree.cs diff --git a/cairo/util/cairo-script/examples/sierpinski.cs b/io2d/src/3rd-party/cairo/util/cairo-script/examples/sierpinski.cs similarity index 100% rename from cairo/util/cairo-script/examples/sierpinski.cs rename to io2d/src/3rd-party/cairo/util/cairo-script/examples/sierpinski.cs diff --git a/cairo/util/cairo-script/examples/wedgeAnnulus_crop_ybRings.cs b/io2d/src/3rd-party/cairo/util/cairo-script/examples/wedgeAnnulus_crop_ybRings.cs similarity index 100% rename from cairo/util/cairo-script/examples/wedgeAnnulus_crop_ybRings.cs rename to io2d/src/3rd-party/cairo/util/cairo-script/examples/wedgeAnnulus_crop_ybRings.cs diff --git a/cairo/util/cairo-script/examples/world-map.cs b/io2d/src/3rd-party/cairo/util/cairo-script/examples/world-map.cs similarity index 100% rename from cairo/util/cairo-script/examples/world-map.cs rename to io2d/src/3rd-party/cairo/util/cairo-script/examples/world-map.cs diff --git a/cairo/util/cairo-script/examples/zrusin.cs b/io2d/src/3rd-party/cairo/util/cairo-script/examples/zrusin.cs similarity index 100% rename from cairo/util/cairo-script/examples/zrusin.cs rename to io2d/src/3rd-party/cairo/util/cairo-script/examples/zrusin.cs diff --git a/cairo/util/cairo-sphinx/.gitignore b/io2d/src/3rd-party/cairo/util/cairo-sphinx/.gitignore similarity index 100% rename from cairo/util/cairo-sphinx/.gitignore rename to io2d/src/3rd-party/cairo/util/cairo-sphinx/.gitignore diff --git a/cairo/util/cairo-sphinx/Makefile.am b/io2d/src/3rd-party/cairo/util/cairo-sphinx/Makefile.am similarity index 100% rename from cairo/util/cairo-sphinx/Makefile.am rename to io2d/src/3rd-party/cairo/util/cairo-sphinx/Makefile.am diff --git a/cairo/util/cairo-sphinx/fdr.c b/io2d/src/3rd-party/cairo/util/cairo-sphinx/fdr.c similarity index 100% rename from cairo/util/cairo-sphinx/fdr.c rename to io2d/src/3rd-party/cairo/util/cairo-sphinx/fdr.c diff --git a/cairo/util/cairo-sphinx/sphinx.c b/io2d/src/3rd-party/cairo/util/cairo-sphinx/sphinx.c similarity index 100% rename from cairo/util/cairo-sphinx/sphinx.c rename to io2d/src/3rd-party/cairo/util/cairo-sphinx/sphinx.c diff --git a/cairo/util/cairo-trace/.gitignore b/io2d/src/3rd-party/cairo/util/cairo-trace/.gitignore similarity index 100% rename from cairo/util/cairo-trace/.gitignore rename to io2d/src/3rd-party/cairo/util/cairo-trace/.gitignore diff --git a/cairo/util/cairo-trace/COPYING b/io2d/src/3rd-party/cairo/util/cairo-trace/COPYING similarity index 100% rename from cairo/util/cairo-trace/COPYING rename to io2d/src/3rd-party/cairo/util/cairo-trace/COPYING diff --git a/cairo/util/cairo-trace/COPYING-GPL-3 b/io2d/src/3rd-party/cairo/util/cairo-trace/COPYING-GPL-3 similarity index 100% rename from cairo/util/cairo-trace/COPYING-GPL-3 rename to io2d/src/3rd-party/cairo/util/cairo-trace/COPYING-GPL-3 diff --git a/cairo/util/cairo-trace/Makefile.am b/io2d/src/3rd-party/cairo/util/cairo-trace/Makefile.am similarity index 100% rename from cairo/util/cairo-trace/Makefile.am rename to io2d/src/3rd-party/cairo/util/cairo-trace/Makefile.am diff --git a/cairo/util/cairo-trace/cairo-trace.in b/io2d/src/3rd-party/cairo/util/cairo-trace/cairo-trace.in similarity index 100% rename from cairo/util/cairo-trace/cairo-trace.in rename to io2d/src/3rd-party/cairo/util/cairo-trace/cairo-trace.in diff --git a/cairo/util/cairo-trace/lookup-symbol.c b/io2d/src/3rd-party/cairo/util/cairo-trace/lookup-symbol.c similarity index 100% rename from cairo/util/cairo-trace/lookup-symbol.c rename to io2d/src/3rd-party/cairo/util/cairo-trace/lookup-symbol.c diff --git a/cairo/util/cairo-trace/lookup-symbol.h b/io2d/src/3rd-party/cairo/util/cairo-trace/lookup-symbol.h similarity index 100% rename from cairo/util/cairo-trace/lookup-symbol.h rename to io2d/src/3rd-party/cairo/util/cairo-trace/lookup-symbol.h diff --git a/cairo/util/cairo-trace/trace.c b/io2d/src/3rd-party/cairo/util/cairo-trace/trace.c similarity index 100% rename from cairo/util/cairo-trace/trace.c rename to io2d/src/3rd-party/cairo/util/cairo-trace/trace.c diff --git a/cairo/util/cairo-view b/io2d/src/3rd-party/cairo/util/cairo-view similarity index 100% rename from cairo/util/cairo-view rename to io2d/src/3rd-party/cairo/util/cairo-view diff --git a/cairo/util/cairo.modules b/io2d/src/3rd-party/cairo/util/cairo.modules similarity index 100% rename from cairo/util/cairo.modules rename to io2d/src/3rd-party/cairo/util/cairo.modules diff --git a/cairo/util/font-view.c b/io2d/src/3rd-party/cairo/util/font-view.c similarity index 100% rename from cairo/util/font-view.c rename to io2d/src/3rd-party/cairo/util/font-view.c diff --git a/cairo/util/malloc-stats.c b/io2d/src/3rd-party/cairo/util/malloc-stats.c similarity index 100% rename from cairo/util/malloc-stats.c rename to io2d/src/3rd-party/cairo/util/malloc-stats.c diff --git a/cairo/util/show-contour.c b/io2d/src/3rd-party/cairo/util/show-contour.c similarity index 100% rename from cairo/util/show-contour.c rename to io2d/src/3rd-party/cairo/util/show-contour.c diff --git a/cairo/util/show-edges.c b/io2d/src/3rd-party/cairo/util/show-edges.c similarity index 100% rename from cairo/util/show-edges.c rename to io2d/src/3rd-party/cairo/util/show-edges.c diff --git a/cairo/util/show-events.c b/io2d/src/3rd-party/cairo/util/show-events.c similarity index 100% rename from cairo/util/show-events.c rename to io2d/src/3rd-party/cairo/util/show-events.c diff --git a/cairo/util/show-polygon.c b/io2d/src/3rd-party/cairo/util/show-polygon.c similarity index 100% rename from cairo/util/show-polygon.c rename to io2d/src/3rd-party/cairo/util/show-polygon.c diff --git a/cairo/util/show-traps.c b/io2d/src/3rd-party/cairo/util/show-traps.c similarity index 100% rename from cairo/util/show-traps.c rename to io2d/src/3rd-party/cairo/util/show-traps.c diff --git a/cairo/util/trace-to-xml.c b/io2d/src/3rd-party/cairo/util/trace-to-xml.c similarity index 100% rename from cairo/util/trace-to-xml.c rename to io2d/src/3rd-party/cairo/util/trace-to-xml.c diff --git a/cairo/util/waterfall b/io2d/src/3rd-party/cairo/util/waterfall similarity index 100% rename from cairo/util/waterfall rename to io2d/src/3rd-party/cairo/util/waterfall diff --git a/cairo/util/xml-to-trace.c b/io2d/src/3rd-party/cairo/util/xml-to-trace.c similarity index 100% rename from cairo/util/xml-to-trace.c rename to io2d/src/3rd-party/cairo/util/xml-to-trace.c diff --git a/cairo/util/xr2cairo b/io2d/src/3rd-party/cairo/util/xr2cairo similarity index 100% rename from cairo/util/xr2cairo rename to io2d/src/3rd-party/cairo/util/xr2cairo diff --git a/pixman/.gitignore b/io2d/src/3rd-party/pixman/.gitignore similarity index 100% rename from pixman/.gitignore rename to io2d/src/3rd-party/pixman/.gitignore diff --git a/pixman/AUTHORS b/io2d/src/3rd-party/pixman/AUTHORS similarity index 100% rename from pixman/AUTHORS rename to io2d/src/3rd-party/pixman/AUTHORS diff --git a/io2d/src/3rd-party/pixman/CMakeLists.txt b/io2d/src/3rd-party/pixman/CMakeLists.txt new file mode 100644 index 0000000..2294069 --- /dev/null +++ b/io2d/src/3rd-party/pixman/CMakeLists.txt @@ -0,0 +1,47 @@ +cmake_minimum_required(VERSION 2.8.12) + +project(pixman C) + +set(PIXMAN_SRC + pixman/pixman.c pixman/pixman-access.c + pixman/pixman-access-accessors.c pixman/pixman-bits-image.c + pixman/pixman-combine32.c pixman/pixman-combine-float.c + pixman/pixman-conical-gradient.c pixman/pixman-filter.c + pixman/pixman-x86.c pixman/pixman-mips.c + pixman/pixman-arm.c pixman/pixman-ppc.c + pixman/pixman-edge.c pixman/pixman-edge-accessors.c + pixman/pixman-fast-path.c pixman/pixman-glyph.c + pixman/pixman-general.c pixman/pixman-gradient-walker.c + pixman/pixman-image.c pixman/pixman-implementation.c + pixman/pixman-linear-gradient.c pixman/pixman-matrix.c + pixman/pixman-noop.c pixman/pixman-radial-gradient.c + pixman/pixman-region16.c pixman/pixman-region32.c + pixman/pixman-solid-fill.c pixman/pixman-timer.c + pixman/pixman-trap.c pixman/pixman-utils.c +) + +add_library(pixman ${PIXMAN_SRC}) + +target_include_directories(pixman PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/pixman + ${CMAKE_CURRENT_BINARY_DIR} +) + +option(USE_SSE2 "use SSE2 compiler intrinsics" ON) +if (USE_SSE2 AND CMAKE_COMPILER_IS_GNU_C) + list(APPEND PIXMAN_SRC pixman/pixman-sse2.c) + target_compile_definitions(pixman PRIVATE USE_SSE2) +endif() + +include(CheckIncludeFiles) +target_compile_definitions(pixman PRIVATE HAVE_CONFIG_H) +check_include_files(pthread.h HAVE_PTHREADS) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/config.h) + +set(PIXMAN_VERSION_MAJOR 0) +set(PIXMAN_VERSION_MINOR 33) +set(PIXMAN_VERSION_MICRO 1) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pixman/pixman-version.h.in + ${CMAKE_CURRENT_BINARY_DIR}/pixman-version.h) diff --git a/pixman/CODING_STYLE b/io2d/src/3rd-party/pixman/CODING_STYLE similarity index 100% rename from pixman/CODING_STYLE rename to io2d/src/3rd-party/pixman/CODING_STYLE diff --git a/pixman/COPYING b/io2d/src/3rd-party/pixman/COPYING similarity index 100% rename from pixman/COPYING rename to io2d/src/3rd-party/pixman/COPYING diff --git a/pixman/ChangeLog b/io2d/src/3rd-party/pixman/ChangeLog similarity index 100% rename from pixman/ChangeLog rename to io2d/src/3rd-party/pixman/ChangeLog diff --git a/pixman/INSTALL b/io2d/src/3rd-party/pixman/INSTALL similarity index 100% rename from pixman/INSTALL rename to io2d/src/3rd-party/pixman/INSTALL diff --git a/pixman/Makefile.am b/io2d/src/3rd-party/pixman/Makefile.am similarity index 100% rename from pixman/Makefile.am rename to io2d/src/3rd-party/pixman/Makefile.am diff --git a/pixman/Makefile.win32 b/io2d/src/3rd-party/pixman/Makefile.win32 similarity index 100% rename from pixman/Makefile.win32 rename to io2d/src/3rd-party/pixman/Makefile.win32 diff --git a/pixman/Makefile.win32.common b/io2d/src/3rd-party/pixman/Makefile.win32.common similarity index 100% rename from pixman/Makefile.win32.common rename to io2d/src/3rd-party/pixman/Makefile.win32.common diff --git a/pixman/NEWS b/io2d/src/3rd-party/pixman/NEWS similarity index 100% rename from pixman/NEWS rename to io2d/src/3rd-party/pixman/NEWS diff --git a/pixman/README b/io2d/src/3rd-party/pixman/README similarity index 100% rename from pixman/README rename to io2d/src/3rd-party/pixman/README diff --git a/pixman/RELEASING b/io2d/src/3rd-party/pixman/RELEASING similarity index 100% rename from pixman/RELEASING rename to io2d/src/3rd-party/pixman/RELEASING diff --git a/pixman/autogen.sh b/io2d/src/3rd-party/pixman/autogen.sh similarity index 100% rename from pixman/autogen.sh rename to io2d/src/3rd-party/pixman/autogen.sh diff --git a/io2d/src/3rd-party/pixman/config.h.cmake b/io2d/src/3rd-party/pixman/config.h.cmake new file mode 100644 index 0000000..1f022ce --- /dev/null +++ b/io2d/src/3rd-party/pixman/config.h.cmake @@ -0,0 +1,2 @@ +#cmakedefine HAVE_PTHREADS 1 +#define PACKAGE 1 diff --git a/pixman/configure.ac b/io2d/src/3rd-party/pixman/configure.ac similarity index 100% rename from pixman/configure.ac rename to io2d/src/3rd-party/pixman/configure.ac diff --git a/pixman/demos/Makefile.am b/io2d/src/3rd-party/pixman/demos/Makefile.am similarity index 100% rename from pixman/demos/Makefile.am rename to io2d/src/3rd-party/pixman/demos/Makefile.am diff --git a/pixman/demos/alpha-test.c b/io2d/src/3rd-party/pixman/demos/alpha-test.c similarity index 100% rename from pixman/demos/alpha-test.c rename to io2d/src/3rd-party/pixman/demos/alpha-test.c diff --git a/pixman/demos/checkerboard.c b/io2d/src/3rd-party/pixman/demos/checkerboard.c similarity index 100% rename from pixman/demos/checkerboard.c rename to io2d/src/3rd-party/pixman/demos/checkerboard.c diff --git a/pixman/demos/clip-in.c b/io2d/src/3rd-party/pixman/demos/clip-in.c similarity index 100% rename from pixman/demos/clip-in.c rename to io2d/src/3rd-party/pixman/demos/clip-in.c diff --git a/pixman/demos/clip-test.c b/io2d/src/3rd-party/pixman/demos/clip-test.c similarity index 100% rename from pixman/demos/clip-test.c rename to io2d/src/3rd-party/pixman/demos/clip-test.c diff --git a/pixman/demos/composite-test.c b/io2d/src/3rd-party/pixman/demos/composite-test.c similarity index 100% rename from pixman/demos/composite-test.c rename to io2d/src/3rd-party/pixman/demos/composite-test.c diff --git a/pixman/demos/conical-test.c b/io2d/src/3rd-party/pixman/demos/conical-test.c similarity index 100% rename from pixman/demos/conical-test.c rename to io2d/src/3rd-party/pixman/demos/conical-test.c diff --git a/pixman/demos/convolution-test.c b/io2d/src/3rd-party/pixman/demos/convolution-test.c similarity index 100% rename from pixman/demos/convolution-test.c rename to io2d/src/3rd-party/pixman/demos/convolution-test.c diff --git a/pixman/demos/gradient-test.c b/io2d/src/3rd-party/pixman/demos/gradient-test.c similarity index 100% rename from pixman/demos/gradient-test.c rename to io2d/src/3rd-party/pixman/demos/gradient-test.c diff --git a/pixman/demos/gtk-utils.c b/io2d/src/3rd-party/pixman/demos/gtk-utils.c similarity index 100% rename from pixman/demos/gtk-utils.c rename to io2d/src/3rd-party/pixman/demos/gtk-utils.c diff --git a/pixman/demos/gtk-utils.h b/io2d/src/3rd-party/pixman/demos/gtk-utils.h similarity index 100% rename from pixman/demos/gtk-utils.h rename to io2d/src/3rd-party/pixman/demos/gtk-utils.h diff --git a/pixman/demos/linear-gradient.c b/io2d/src/3rd-party/pixman/demos/linear-gradient.c similarity index 100% rename from pixman/demos/linear-gradient.c rename to io2d/src/3rd-party/pixman/demos/linear-gradient.c diff --git a/pixman/demos/parrot.c b/io2d/src/3rd-party/pixman/demos/parrot.c similarity index 100% rename from pixman/demos/parrot.c rename to io2d/src/3rd-party/pixman/demos/parrot.c diff --git a/pixman/demos/parrot.jpg b/io2d/src/3rd-party/pixman/demos/parrot.jpg similarity index 100% rename from pixman/demos/parrot.jpg rename to io2d/src/3rd-party/pixman/demos/parrot.jpg diff --git a/pixman/demos/quad2quad.c b/io2d/src/3rd-party/pixman/demos/quad2quad.c similarity index 100% rename from pixman/demos/quad2quad.c rename to io2d/src/3rd-party/pixman/demos/quad2quad.c diff --git a/pixman/demos/radial-test.c b/io2d/src/3rd-party/pixman/demos/radial-test.c similarity index 100% rename from pixman/demos/radial-test.c rename to io2d/src/3rd-party/pixman/demos/radial-test.c diff --git a/pixman/demos/scale.c b/io2d/src/3rd-party/pixman/demos/scale.c similarity index 100% rename from pixman/demos/scale.c rename to io2d/src/3rd-party/pixman/demos/scale.c diff --git a/pixman/demos/scale.ui b/io2d/src/3rd-party/pixman/demos/scale.ui similarity index 100% rename from pixman/demos/scale.ui rename to io2d/src/3rd-party/pixman/demos/scale.ui diff --git a/pixman/demos/screen-test.c b/io2d/src/3rd-party/pixman/demos/screen-test.c similarity index 100% rename from pixman/demos/screen-test.c rename to io2d/src/3rd-party/pixman/demos/screen-test.c diff --git a/pixman/demos/srgb-test.c b/io2d/src/3rd-party/pixman/demos/srgb-test.c similarity index 100% rename from pixman/demos/srgb-test.c rename to io2d/src/3rd-party/pixman/demos/srgb-test.c diff --git a/pixman/demos/srgb-trap-test.c b/io2d/src/3rd-party/pixman/demos/srgb-trap-test.c similarity index 100% rename from pixman/demos/srgb-trap-test.c rename to io2d/src/3rd-party/pixman/demos/srgb-trap-test.c diff --git a/pixman/demos/trap-test.c b/io2d/src/3rd-party/pixman/demos/trap-test.c similarity index 100% rename from pixman/demos/trap-test.c rename to io2d/src/3rd-party/pixman/demos/trap-test.c diff --git a/pixman/demos/tri-test.c b/io2d/src/3rd-party/pixman/demos/tri-test.c similarity index 100% rename from pixman/demos/tri-test.c rename to io2d/src/3rd-party/pixman/demos/tri-test.c diff --git a/pixman/demos/zone_plate.png b/io2d/src/3rd-party/pixman/demos/zone_plate.png similarity index 100% rename from pixman/demos/zone_plate.png rename to io2d/src/3rd-party/pixman/demos/zone_plate.png diff --git a/pixman/pixman-1-uninstalled.pc.in b/io2d/src/3rd-party/pixman/pixman-1-uninstalled.pc.in similarity index 100% rename from pixman/pixman-1-uninstalled.pc.in rename to io2d/src/3rd-party/pixman/pixman-1-uninstalled.pc.in diff --git a/pixman/pixman-1.pc.in b/io2d/src/3rd-party/pixman/pixman-1.pc.in similarity index 100% rename from pixman/pixman-1.pc.in rename to io2d/src/3rd-party/pixman/pixman-1.pc.in diff --git a/pixman/pixman/Makefile.am b/io2d/src/3rd-party/pixman/pixman/Makefile.am similarity index 100% rename from pixman/pixman/Makefile.am rename to io2d/src/3rd-party/pixman/pixman/Makefile.am diff --git a/pixman/pixman/Makefile.sources b/io2d/src/3rd-party/pixman/pixman/Makefile.sources similarity index 100% rename from pixman/pixman/Makefile.sources rename to io2d/src/3rd-party/pixman/pixman/Makefile.sources diff --git a/pixman/pixman/Makefile.win32 b/io2d/src/3rd-party/pixman/pixman/Makefile.win32 similarity index 100% rename from pixman/pixman/Makefile.win32 rename to io2d/src/3rd-party/pixman/pixman/Makefile.win32 diff --git a/pixman/pixman/loongson-mmintrin.h b/io2d/src/3rd-party/pixman/pixman/loongson-mmintrin.h similarity index 100% rename from pixman/pixman/loongson-mmintrin.h rename to io2d/src/3rd-party/pixman/pixman/loongson-mmintrin.h diff --git a/pixman/pixman/make-srgb.pl b/io2d/src/3rd-party/pixman/pixman/make-srgb.pl similarity index 100% rename from pixman/pixman/make-srgb.pl rename to io2d/src/3rd-party/pixman/pixman/make-srgb.pl diff --git a/pixman/pixman/pixman-access-accessors.c b/io2d/src/3rd-party/pixman/pixman/pixman-access-accessors.c similarity index 100% rename from pixman/pixman/pixman-access-accessors.c rename to io2d/src/3rd-party/pixman/pixman/pixman-access-accessors.c diff --git a/pixman/pixman/pixman-access.c b/io2d/src/3rd-party/pixman/pixman/pixman-access.c similarity index 100% rename from pixman/pixman/pixman-access.c rename to io2d/src/3rd-party/pixman/pixman/pixman-access.c diff --git a/pixman/pixman/pixman-accessor.h b/io2d/src/3rd-party/pixman/pixman/pixman-accessor.h similarity index 100% rename from pixman/pixman/pixman-accessor.h rename to io2d/src/3rd-party/pixman/pixman/pixman-accessor.h diff --git a/pixman/pixman/pixman-arm-common.h b/io2d/src/3rd-party/pixman/pixman/pixman-arm-common.h similarity index 100% rename from pixman/pixman/pixman-arm-common.h rename to io2d/src/3rd-party/pixman/pixman/pixman-arm-common.h diff --git a/pixman/pixman/pixman-arm-detect-win32.asm b/io2d/src/3rd-party/pixman/pixman/pixman-arm-detect-win32.asm similarity index 100% rename from pixman/pixman/pixman-arm-detect-win32.asm rename to io2d/src/3rd-party/pixman/pixman/pixman-arm-detect-win32.asm diff --git a/pixman/pixman/pixman-arm-neon-asm-bilinear.S b/io2d/src/3rd-party/pixman/pixman/pixman-arm-neon-asm-bilinear.S similarity index 100% rename from pixman/pixman/pixman-arm-neon-asm-bilinear.S rename to io2d/src/3rd-party/pixman/pixman/pixman-arm-neon-asm-bilinear.S diff --git a/pixman/pixman/pixman-arm-neon-asm.S b/io2d/src/3rd-party/pixman/pixman/pixman-arm-neon-asm.S similarity index 100% rename from pixman/pixman/pixman-arm-neon-asm.S rename to io2d/src/3rd-party/pixman/pixman/pixman-arm-neon-asm.S diff --git a/pixman/pixman/pixman-arm-neon-asm.h b/io2d/src/3rd-party/pixman/pixman/pixman-arm-neon-asm.h similarity index 100% rename from pixman/pixman/pixman-arm-neon-asm.h rename to io2d/src/3rd-party/pixman/pixman/pixman-arm-neon-asm.h diff --git a/pixman/pixman/pixman-arm-neon.c b/io2d/src/3rd-party/pixman/pixman/pixman-arm-neon.c similarity index 100% rename from pixman/pixman/pixman-arm-neon.c rename to io2d/src/3rd-party/pixman/pixman/pixman-arm-neon.c diff --git a/pixman/pixman/pixman-arm-simd-asm-scaled.S b/io2d/src/3rd-party/pixman/pixman/pixman-arm-simd-asm-scaled.S similarity index 100% rename from pixman/pixman/pixman-arm-simd-asm-scaled.S rename to io2d/src/3rd-party/pixman/pixman/pixman-arm-simd-asm-scaled.S diff --git a/pixman/pixman/pixman-arm-simd-asm.S b/io2d/src/3rd-party/pixman/pixman/pixman-arm-simd-asm.S similarity index 100% rename from pixman/pixman/pixman-arm-simd-asm.S rename to io2d/src/3rd-party/pixman/pixman/pixman-arm-simd-asm.S diff --git a/pixman/pixman/pixman-arm-simd-asm.h b/io2d/src/3rd-party/pixman/pixman/pixman-arm-simd-asm.h similarity index 100% rename from pixman/pixman/pixman-arm-simd-asm.h rename to io2d/src/3rd-party/pixman/pixman/pixman-arm-simd-asm.h diff --git a/pixman/pixman/pixman-arm-simd.c b/io2d/src/3rd-party/pixman/pixman/pixman-arm-simd.c similarity index 100% rename from pixman/pixman/pixman-arm-simd.c rename to io2d/src/3rd-party/pixman/pixman/pixman-arm-simd.c diff --git a/pixman/pixman/pixman-arm.c b/io2d/src/3rd-party/pixman/pixman/pixman-arm.c similarity index 100% rename from pixman/pixman/pixman-arm.c rename to io2d/src/3rd-party/pixman/pixman/pixman-arm.c diff --git a/pixman/pixman/pixman-bits-image.c b/io2d/src/3rd-party/pixman/pixman/pixman-bits-image.c similarity index 100% rename from pixman/pixman/pixman-bits-image.c rename to io2d/src/3rd-party/pixman/pixman/pixman-bits-image.c diff --git a/pixman/pixman/pixman-combine-float.c b/io2d/src/3rd-party/pixman/pixman/pixman-combine-float.c similarity index 100% rename from pixman/pixman/pixman-combine-float.c rename to io2d/src/3rd-party/pixman/pixman/pixman-combine-float.c diff --git a/pixman/pixman/pixman-combine32.c b/io2d/src/3rd-party/pixman/pixman/pixman-combine32.c similarity index 100% rename from pixman/pixman/pixman-combine32.c rename to io2d/src/3rd-party/pixman/pixman/pixman-combine32.c diff --git a/pixman/pixman/pixman-combine32.h b/io2d/src/3rd-party/pixman/pixman/pixman-combine32.h similarity index 100% rename from pixman/pixman/pixman-combine32.h rename to io2d/src/3rd-party/pixman/pixman/pixman-combine32.h diff --git a/pixman/pixman/pixman-compiler.h b/io2d/src/3rd-party/pixman/pixman/pixman-compiler.h similarity index 100% rename from pixman/pixman/pixman-compiler.h rename to io2d/src/3rd-party/pixman/pixman/pixman-compiler.h diff --git a/pixman/pixman/pixman-conical-gradient.c b/io2d/src/3rd-party/pixman/pixman/pixman-conical-gradient.c similarity index 100% rename from pixman/pixman/pixman-conical-gradient.c rename to io2d/src/3rd-party/pixman/pixman/pixman-conical-gradient.c diff --git a/pixman/pixman/pixman-edge-accessors.c b/io2d/src/3rd-party/pixman/pixman/pixman-edge-accessors.c similarity index 100% rename from pixman/pixman/pixman-edge-accessors.c rename to io2d/src/3rd-party/pixman/pixman/pixman-edge-accessors.c diff --git a/pixman/pixman/pixman-edge-imp.h b/io2d/src/3rd-party/pixman/pixman/pixman-edge-imp.h similarity index 100% rename from pixman/pixman/pixman-edge-imp.h rename to io2d/src/3rd-party/pixman/pixman/pixman-edge-imp.h diff --git a/pixman/pixman/pixman-edge.c b/io2d/src/3rd-party/pixman/pixman/pixman-edge.c similarity index 100% rename from pixman/pixman/pixman-edge.c rename to io2d/src/3rd-party/pixman/pixman/pixman-edge.c diff --git a/pixman/pixman/pixman-fast-path.c b/io2d/src/3rd-party/pixman/pixman/pixman-fast-path.c similarity index 100% rename from pixman/pixman/pixman-fast-path.c rename to io2d/src/3rd-party/pixman/pixman/pixman-fast-path.c diff --git a/pixman/pixman/pixman-filter.c b/io2d/src/3rd-party/pixman/pixman/pixman-filter.c similarity index 100% rename from pixman/pixman/pixman-filter.c rename to io2d/src/3rd-party/pixman/pixman/pixman-filter.c diff --git a/pixman/pixman/pixman-general.c b/io2d/src/3rd-party/pixman/pixman/pixman-general.c similarity index 100% rename from pixman/pixman/pixman-general.c rename to io2d/src/3rd-party/pixman/pixman/pixman-general.c diff --git a/pixman/pixman/pixman-glyph.c b/io2d/src/3rd-party/pixman/pixman/pixman-glyph.c similarity index 100% rename from pixman/pixman/pixman-glyph.c rename to io2d/src/3rd-party/pixman/pixman/pixman-glyph.c diff --git a/pixman/pixman/pixman-gradient-walker.c b/io2d/src/3rd-party/pixman/pixman/pixman-gradient-walker.c similarity index 100% rename from pixman/pixman/pixman-gradient-walker.c rename to io2d/src/3rd-party/pixman/pixman/pixman-gradient-walker.c diff --git a/pixman/pixman/pixman-image.c b/io2d/src/3rd-party/pixman/pixman/pixman-image.c similarity index 100% rename from pixman/pixman/pixman-image.c rename to io2d/src/3rd-party/pixman/pixman/pixman-image.c diff --git a/pixman/pixman/pixman-implementation.c b/io2d/src/3rd-party/pixman/pixman/pixman-implementation.c similarity index 100% rename from pixman/pixman/pixman-implementation.c rename to io2d/src/3rd-party/pixman/pixman/pixman-implementation.c diff --git a/pixman/pixman/pixman-inlines.h b/io2d/src/3rd-party/pixman/pixman/pixman-inlines.h similarity index 100% rename from pixman/pixman/pixman-inlines.h rename to io2d/src/3rd-party/pixman/pixman/pixman-inlines.h diff --git a/pixman/pixman/pixman-linear-gradient.c b/io2d/src/3rd-party/pixman/pixman/pixman-linear-gradient.c similarity index 100% rename from pixman/pixman/pixman-linear-gradient.c rename to io2d/src/3rd-party/pixman/pixman/pixman-linear-gradient.c diff --git a/pixman/pixman/pixman-matrix.c b/io2d/src/3rd-party/pixman/pixman/pixman-matrix.c similarity index 100% rename from pixman/pixman/pixman-matrix.c rename to io2d/src/3rd-party/pixman/pixman/pixman-matrix.c diff --git a/pixman/pixman/pixman-mips-dspr2-asm.S b/io2d/src/3rd-party/pixman/pixman/pixman-mips-dspr2-asm.S similarity index 100% rename from pixman/pixman/pixman-mips-dspr2-asm.S rename to io2d/src/3rd-party/pixman/pixman/pixman-mips-dspr2-asm.S diff --git a/pixman/pixman/pixman-mips-dspr2-asm.h b/io2d/src/3rd-party/pixman/pixman/pixman-mips-dspr2-asm.h similarity index 100% rename from pixman/pixman/pixman-mips-dspr2-asm.h rename to io2d/src/3rd-party/pixman/pixman/pixman-mips-dspr2-asm.h diff --git a/pixman/pixman/pixman-mips-dspr2.c b/io2d/src/3rd-party/pixman/pixman/pixman-mips-dspr2.c similarity index 100% rename from pixman/pixman/pixman-mips-dspr2.c rename to io2d/src/3rd-party/pixman/pixman/pixman-mips-dspr2.c diff --git a/pixman/pixman/pixman-mips-dspr2.h b/io2d/src/3rd-party/pixman/pixman/pixman-mips-dspr2.h similarity index 100% rename from pixman/pixman/pixman-mips-dspr2.h rename to io2d/src/3rd-party/pixman/pixman/pixman-mips-dspr2.h diff --git a/pixman/pixman/pixman-mips-memcpy-asm.S b/io2d/src/3rd-party/pixman/pixman/pixman-mips-memcpy-asm.S similarity index 100% rename from pixman/pixman/pixman-mips-memcpy-asm.S rename to io2d/src/3rd-party/pixman/pixman/pixman-mips-memcpy-asm.S diff --git a/pixman/pixman/pixman-mips.c b/io2d/src/3rd-party/pixman/pixman/pixman-mips.c similarity index 100% rename from pixman/pixman/pixman-mips.c rename to io2d/src/3rd-party/pixman/pixman/pixman-mips.c diff --git a/pixman/pixman/pixman-mmx.c b/io2d/src/3rd-party/pixman/pixman/pixman-mmx.c similarity index 100% rename from pixman/pixman/pixman-mmx.c rename to io2d/src/3rd-party/pixman/pixman/pixman-mmx.c diff --git a/pixman/pixman/pixman-noop.c b/io2d/src/3rd-party/pixman/pixman/pixman-noop.c similarity index 100% rename from pixman/pixman/pixman-noop.c rename to io2d/src/3rd-party/pixman/pixman/pixman-noop.c diff --git a/pixman/pixman/pixman-ppc.c b/io2d/src/3rd-party/pixman/pixman/pixman-ppc.c similarity index 100% rename from pixman/pixman/pixman-ppc.c rename to io2d/src/3rd-party/pixman/pixman/pixman-ppc.c diff --git a/pixman/pixman/pixman-private.h b/io2d/src/3rd-party/pixman/pixman/pixman-private.h similarity index 100% rename from pixman/pixman/pixman-private.h rename to io2d/src/3rd-party/pixman/pixman/pixman-private.h diff --git a/pixman/pixman/pixman-radial-gradient.c b/io2d/src/3rd-party/pixman/pixman/pixman-radial-gradient.c similarity index 100% rename from pixman/pixman/pixman-radial-gradient.c rename to io2d/src/3rd-party/pixman/pixman/pixman-radial-gradient.c diff --git a/pixman/pixman/pixman-region.c b/io2d/src/3rd-party/pixman/pixman/pixman-region.c similarity index 100% rename from pixman/pixman/pixman-region.c rename to io2d/src/3rd-party/pixman/pixman/pixman-region.c diff --git a/pixman/pixman/pixman-region16.c b/io2d/src/3rd-party/pixman/pixman/pixman-region16.c similarity index 100% rename from pixman/pixman/pixman-region16.c rename to io2d/src/3rd-party/pixman/pixman/pixman-region16.c diff --git a/pixman/pixman/pixman-region32.c b/io2d/src/3rd-party/pixman/pixman/pixman-region32.c similarity index 100% rename from pixman/pixman/pixman-region32.c rename to io2d/src/3rd-party/pixman/pixman/pixman-region32.c diff --git a/pixman/pixman/pixman-solid-fill.c b/io2d/src/3rd-party/pixman/pixman/pixman-solid-fill.c similarity index 100% rename from pixman/pixman/pixman-solid-fill.c rename to io2d/src/3rd-party/pixman/pixman/pixman-solid-fill.c diff --git a/pixman/pixman/pixman-sse2.c b/io2d/src/3rd-party/pixman/pixman/pixman-sse2.c similarity index 100% rename from pixman/pixman/pixman-sse2.c rename to io2d/src/3rd-party/pixman/pixman/pixman-sse2.c diff --git a/pixman/pixman/pixman-ssse3.c b/io2d/src/3rd-party/pixman/pixman/pixman-ssse3.c similarity index 100% rename from pixman/pixman/pixman-ssse3.c rename to io2d/src/3rd-party/pixman/pixman/pixman-ssse3.c diff --git a/pixman/pixman/pixman-timer.c b/io2d/src/3rd-party/pixman/pixman/pixman-timer.c similarity index 100% rename from pixman/pixman/pixman-timer.c rename to io2d/src/3rd-party/pixman/pixman/pixman-timer.c diff --git a/pixman/pixman/pixman-trap.c b/io2d/src/3rd-party/pixman/pixman/pixman-trap.c similarity index 100% rename from pixman/pixman/pixman-trap.c rename to io2d/src/3rd-party/pixman/pixman/pixman-trap.c diff --git a/pixman/pixman/pixman-utils.c b/io2d/src/3rd-party/pixman/pixman/pixman-utils.c similarity index 100% rename from pixman/pixman/pixman-utils.c rename to io2d/src/3rd-party/pixman/pixman/pixman-utils.c diff --git a/pixman/pixman/pixman-version.h.in b/io2d/src/3rd-party/pixman/pixman/pixman-version.h.in similarity index 100% rename from pixman/pixman/pixman-version.h.in rename to io2d/src/3rd-party/pixman/pixman/pixman-version.h.in diff --git a/pixman/pixman/pixman-vmx.c b/io2d/src/3rd-party/pixman/pixman/pixman-vmx.c similarity index 100% rename from pixman/pixman/pixman-vmx.c rename to io2d/src/3rd-party/pixman/pixman/pixman-vmx.c diff --git a/pixman/pixman/pixman-x86.c b/io2d/src/3rd-party/pixman/pixman/pixman-x86.c similarity index 100% rename from pixman/pixman/pixman-x86.c rename to io2d/src/3rd-party/pixman/pixman/pixman-x86.c diff --git a/pixman/pixman/pixman.c b/io2d/src/3rd-party/pixman/pixman/pixman.c similarity index 100% rename from pixman/pixman/pixman.c rename to io2d/src/3rd-party/pixman/pixman/pixman.c diff --git a/pixman/pixman/pixman.h b/io2d/src/3rd-party/pixman/pixman/pixman.h similarity index 100% rename from pixman/pixman/pixman.h rename to io2d/src/3rd-party/pixman/pixman/pixman.h diff --git a/pixman/pixman/rounding.txt b/io2d/src/3rd-party/pixman/pixman/rounding.txt similarity index 100% rename from pixman/pixman/rounding.txt rename to io2d/src/3rd-party/pixman/pixman/rounding.txt diff --git a/pixman/pixman/solaris-hwcap.mapfile b/io2d/src/3rd-party/pixman/pixman/solaris-hwcap.mapfile similarity index 100% rename from pixman/pixman/solaris-hwcap.mapfile rename to io2d/src/3rd-party/pixman/pixman/solaris-hwcap.mapfile diff --git a/pixman/test/Makefile.am b/io2d/src/3rd-party/pixman/test/Makefile.am similarity index 100% rename from pixman/test/Makefile.am rename to io2d/src/3rd-party/pixman/test/Makefile.am diff --git a/pixman/test/Makefile.sources b/io2d/src/3rd-party/pixman/test/Makefile.sources similarity index 100% rename from pixman/test/Makefile.sources rename to io2d/src/3rd-party/pixman/test/Makefile.sources diff --git a/pixman/test/Makefile.win32 b/io2d/src/3rd-party/pixman/test/Makefile.win32 similarity index 100% rename from pixman/test/Makefile.win32 rename to io2d/src/3rd-party/pixman/test/Makefile.win32 diff --git a/pixman/test/a1-trap-test.c b/io2d/src/3rd-party/pixman/test/a1-trap-test.c similarity index 100% rename from pixman/test/a1-trap-test.c rename to io2d/src/3rd-party/pixman/test/a1-trap-test.c diff --git a/pixman/test/affine-test.c b/io2d/src/3rd-party/pixman/test/affine-test.c similarity index 100% rename from pixman/test/affine-test.c rename to io2d/src/3rd-party/pixman/test/affine-test.c diff --git a/pixman/test/alpha-loop.c b/io2d/src/3rd-party/pixman/test/alpha-loop.c similarity index 100% rename from pixman/test/alpha-loop.c rename to io2d/src/3rd-party/pixman/test/alpha-loop.c diff --git a/pixman/test/alphamap.c b/io2d/src/3rd-party/pixman/test/alphamap.c similarity index 100% rename from pixman/test/alphamap.c rename to io2d/src/3rd-party/pixman/test/alphamap.c diff --git a/pixman/test/blitters-test.c b/io2d/src/3rd-party/pixman/test/blitters-test.c similarity index 100% rename from pixman/test/blitters-test.c rename to io2d/src/3rd-party/pixman/test/blitters-test.c diff --git a/pixman/test/check-formats.c b/io2d/src/3rd-party/pixman/test/check-formats.c similarity index 100% rename from pixman/test/check-formats.c rename to io2d/src/3rd-party/pixman/test/check-formats.c diff --git a/pixman/test/combiner-test.c b/io2d/src/3rd-party/pixman/test/combiner-test.c similarity index 100% rename from pixman/test/combiner-test.c rename to io2d/src/3rd-party/pixman/test/combiner-test.c diff --git a/pixman/test/composite-traps-test.c b/io2d/src/3rd-party/pixman/test/composite-traps-test.c similarity index 100% rename from pixman/test/composite-traps-test.c rename to io2d/src/3rd-party/pixman/test/composite-traps-test.c diff --git a/pixman/test/composite.c b/io2d/src/3rd-party/pixman/test/composite.c similarity index 100% rename from pixman/test/composite.c rename to io2d/src/3rd-party/pixman/test/composite.c diff --git a/pixman/test/fetch-test.c b/io2d/src/3rd-party/pixman/test/fetch-test.c similarity index 100% rename from pixman/test/fetch-test.c rename to io2d/src/3rd-party/pixman/test/fetch-test.c diff --git a/pixman/test/fuzzer-find-diff.pl b/io2d/src/3rd-party/pixman/test/fuzzer-find-diff.pl similarity index 100% rename from pixman/test/fuzzer-find-diff.pl rename to io2d/src/3rd-party/pixman/test/fuzzer-find-diff.pl diff --git a/pixman/test/glyph-test.c b/io2d/src/3rd-party/pixman/test/glyph-test.c similarity index 100% rename from pixman/test/glyph-test.c rename to io2d/src/3rd-party/pixman/test/glyph-test.c diff --git a/pixman/test/gradient-crash-test.c b/io2d/src/3rd-party/pixman/test/gradient-crash-test.c similarity index 100% rename from pixman/test/gradient-crash-test.c rename to io2d/src/3rd-party/pixman/test/gradient-crash-test.c diff --git a/pixman/test/infinite-loop.c b/io2d/src/3rd-party/pixman/test/infinite-loop.c similarity index 100% rename from pixman/test/infinite-loop.c rename to io2d/src/3rd-party/pixman/test/infinite-loop.c diff --git a/pixman/test/lowlevel-blt-bench.c b/io2d/src/3rd-party/pixman/test/lowlevel-blt-bench.c similarity index 100% rename from pixman/test/lowlevel-blt-bench.c rename to io2d/src/3rd-party/pixman/test/lowlevel-blt-bench.c diff --git a/pixman/test/matrix-test.c b/io2d/src/3rd-party/pixman/test/matrix-test.c similarity index 100% rename from pixman/test/matrix-test.c rename to io2d/src/3rd-party/pixman/test/matrix-test.c diff --git a/pixman/test/oob-test.c b/io2d/src/3rd-party/pixman/test/oob-test.c similarity index 100% rename from pixman/test/oob-test.c rename to io2d/src/3rd-party/pixman/test/oob-test.c diff --git a/pixman/test/pdf-op-test.c b/io2d/src/3rd-party/pixman/test/pdf-op-test.c similarity index 100% rename from pixman/test/pdf-op-test.c rename to io2d/src/3rd-party/pixman/test/pdf-op-test.c diff --git a/pixman/test/pixel-test.c b/io2d/src/3rd-party/pixman/test/pixel-test.c similarity index 100% rename from pixman/test/pixel-test.c rename to io2d/src/3rd-party/pixman/test/pixel-test.c diff --git a/pixman/test/prng-test.c b/io2d/src/3rd-party/pixman/test/prng-test.c similarity index 100% rename from pixman/test/prng-test.c rename to io2d/src/3rd-party/pixman/test/prng-test.c diff --git a/pixman/test/radial-perf-test.c b/io2d/src/3rd-party/pixman/test/radial-perf-test.c similarity index 100% rename from pixman/test/radial-perf-test.c rename to io2d/src/3rd-party/pixman/test/radial-perf-test.c diff --git a/pixman/test/region-contains-test.c b/io2d/src/3rd-party/pixman/test/region-contains-test.c similarity index 100% rename from pixman/test/region-contains-test.c rename to io2d/src/3rd-party/pixman/test/region-contains-test.c diff --git a/pixman/test/region-test.c b/io2d/src/3rd-party/pixman/test/region-test.c similarity index 100% rename from pixman/test/region-test.c rename to io2d/src/3rd-party/pixman/test/region-test.c diff --git a/pixman/test/region-translate-test.c b/io2d/src/3rd-party/pixman/test/region-translate-test.c similarity index 100% rename from pixman/test/region-translate-test.c rename to io2d/src/3rd-party/pixman/test/region-translate-test.c diff --git a/pixman/test/rotate-test.c b/io2d/src/3rd-party/pixman/test/rotate-test.c similarity index 100% rename from pixman/test/rotate-test.c rename to io2d/src/3rd-party/pixman/test/rotate-test.c diff --git a/pixman/test/scaling-bench.c b/io2d/src/3rd-party/pixman/test/scaling-bench.c similarity index 100% rename from pixman/test/scaling-bench.c rename to io2d/src/3rd-party/pixman/test/scaling-bench.c diff --git a/pixman/test/scaling-crash-test.c b/io2d/src/3rd-party/pixman/test/scaling-crash-test.c similarity index 100% rename from pixman/test/scaling-crash-test.c rename to io2d/src/3rd-party/pixman/test/scaling-crash-test.c diff --git a/pixman/test/scaling-helpers-test.c b/io2d/src/3rd-party/pixman/test/scaling-helpers-test.c similarity index 100% rename from pixman/test/scaling-helpers-test.c rename to io2d/src/3rd-party/pixman/test/scaling-helpers-test.c diff --git a/pixman/test/scaling-test.c b/io2d/src/3rd-party/pixman/test/scaling-test.c similarity index 100% rename from pixman/test/scaling-test.c rename to io2d/src/3rd-party/pixman/test/scaling-test.c diff --git a/pixman/test/stress-test.c b/io2d/src/3rd-party/pixman/test/stress-test.c similarity index 100% rename from pixman/test/stress-test.c rename to io2d/src/3rd-party/pixman/test/stress-test.c diff --git a/pixman/test/thread-test.c b/io2d/src/3rd-party/pixman/test/thread-test.c similarity index 100% rename from pixman/test/thread-test.c rename to io2d/src/3rd-party/pixman/test/thread-test.c diff --git a/pixman/test/trap-crasher.c b/io2d/src/3rd-party/pixman/test/trap-crasher.c similarity index 100% rename from pixman/test/trap-crasher.c rename to io2d/src/3rd-party/pixman/test/trap-crasher.c diff --git a/pixman/test/utils-prng.c b/io2d/src/3rd-party/pixman/test/utils-prng.c similarity index 100% rename from pixman/test/utils-prng.c rename to io2d/src/3rd-party/pixman/test/utils-prng.c diff --git a/pixman/test/utils-prng.h b/io2d/src/3rd-party/pixman/test/utils-prng.h similarity index 100% rename from pixman/test/utils-prng.h rename to io2d/src/3rd-party/pixman/test/utils-prng.h diff --git a/pixman/test/utils.c b/io2d/src/3rd-party/pixman/test/utils.c similarity index 100% rename from pixman/test/utils.c rename to io2d/src/3rd-party/pixman/test/utils.c diff --git a/pixman/test/utils.h b/io2d/src/3rd-party/pixman/test/utils.h similarity index 100% rename from pixman/test/utils.h rename to io2d/src/3rd-party/pixman/test/utils.h diff --git a/io2d/src/CMakeLists.txt b/io2d/src/CMakeLists.txt new file mode 100644 index 0000000..4841a05 --- /dev/null +++ b/io2d/src/CMakeLists.txt @@ -0,0 +1,68 @@ +cmake_minimum_required(VERSION 2.8.12) + +project(io2d CXX) + +set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_EXTENSIONS OFF) + +add_subdirectory(3rd-party) +set(CAIRO_INCLUDE_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/3rd-party/cairo/src + ${CMAKE_CURRENT_SOURCE_DIR}/3rd-party/cairo/ + ${CMAKE_CURRENT_BINARY_DIR}/3rd-party/cairo) +set(CAIRO_LIBRARY cairo) + +set(IO2D_SRC + brush.cpp + device.cpp + display_surface-common.cpp + font_extents.cpp + font_resource.cpp + font_resource_factory.cpp + font_options.cpp + glyph_run.cpp + image_surface.cpp + io2d_error_category.cpp + linear_brush_factory.cpp + mapped_surface.cpp + matrix_2d.cpp + mesh_brush_factory.cpp + path.cpp + path_data.cpp + path_data_item.cpp + path_factory.cpp + radial_brush_factory.cpp + rectangle.cpp + rgba_color.cpp + solid_color_brush_factory.cpp + standalone_functions.cpp + surface.cpp + surface_brush_factory.cpp + text_extents.cpp + vector_2d.cpp +) + +if (WIN32) + list(APPEND IO2D_SRC display_surface-win32.cpp) +endif() + +if (CAIRO_HAS_XCB_SURFACE) + list(APPEND IO2D_SRC display_surface-xcb.cpp) +endif() + + +add_library(io2d ${IO2D_SRC}) +target_link_libraries(io2d ${CAIRO_LIBRARY}) +target_include_directories(io2d PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/../include + ${CAIRO_INCLUDE_DIR} +) + +if (WIN32) + target_compile_definitions(io2d PUBLIC + _WIN32_WINNT=0x0600 CAIRO_WIN32_STATIC_BUILD UNICODE) +endif() + +if (CAIRO_HAS_XCB_SURFACE) + target_compile_definitions(io2d PUBLIC USE_XCB) +endif() diff --git a/N3888_RefImpl/src/brush.cpp b/io2d/src/brush.cpp similarity index 100% rename from N3888_RefImpl/src/brush.cpp rename to io2d/src/brush.cpp diff --git a/N3888_RefImpl/src/device.cpp b/io2d/src/device.cpp similarity index 100% rename from N3888_RefImpl/src/device.cpp rename to io2d/src/device.cpp diff --git a/N3888_RefImpl/src/display_surface-common.cpp b/io2d/src/display_surface-common.cpp similarity index 73% rename from N3888_RefImpl/src/display_surface-common.cpp rename to io2d/src/display_surface-common.cpp index b40ba19..f0d214b 100644 --- a/N3888_RefImpl/src/display_surface-common.cpp +++ b/io2d/src/display_surface-common.cpp @@ -1,10 +1,14 @@ #include "io2d.h" #include "xio2dhelpers.h" #include "xcairoenumhelpers.h" +#include +#include +#include using namespace std; using namespace std::experimental; using namespace std::experimental::io2d; +using namespace std::chrono; void display_surface::_All_dimensions(int w, int h, int dw, int dh) { dimensions(w, h); @@ -14,25 +18,19 @@ void display_surface::_All_dimensions(int w, int h, int dw, int dh) { // Note: cairo_surface_flush(_Native_surface.get()); must be called after calling this function. void display_surface::_Render_for_scaling_uniform_or_letterbox() { const cairo_filter_t cairoFilter = CAIRO_FILTER_GOOD; + +// static auto previousTime = steady_clock::now(); + if (_Width == _Display_width && _Height == _Display_height) { cairo_set_source_surface(_Native_context.get(), _Surface.get(), 0.0, 0.0); cairo_paint(_Native_context.get()); } else { - if (_Scaling == std::experimental::io2d::scaling::letterbox) { - cairo_pattern_set_extend(_Letterbox_brush.native_handle(), _Extend_to_cairo_extend_t(_Letterbox_brush.extend())); - cairo_pattern_set_filter(_Letterbox_brush.native_handle(), _Filter_to_cairo_filter_t(_Letterbox_brush.filter())); - cairo_matrix_t cPttnMatrix; - cairo_matrix_init(&cPttnMatrix, _Letterbox_brush.matrix().m00(), _Letterbox_brush.matrix().m01(), _Letterbox_brush.matrix().m10(), _Letterbox_brush.matrix().m11(), _Letterbox_brush.matrix().m20(), _Letterbox_brush.matrix().m21()); - cairo_pattern_set_matrix(_Letterbox_brush.native_handle(), &cPttnMatrix); - cairo_set_source(_Native_context.get(), _Letterbox_brush.native_handle()); - cairo_paint(_Native_context.get()); - } const auto whRatio = static_cast(_Width) / static_cast(_Height); const auto displayWHRatio = static_cast(_Display_width) / static_cast(_Display_height); cairo_matrix_t ctm; auto nativeContext = _Native_context.get(); - cairo_save(nativeContext); + //cairo_save(nativeContext); double rectX, rectY, rectWidth, rectHeight; if (whRatio < displayWHRatio) { cairo_new_path(nativeContext); @@ -46,6 +44,25 @@ void display_surface::_Render_for_scaling_uniform_or_letterbox() { const auto heightRatio = static_cast(_Height) / static_cast(_Display_height); cairo_matrix_init_scale(&ctm, heightRatio, heightRatio); cairo_matrix_translate(&ctm, -rectX, 0.0); + unique_ptr pat(cairo_pattern_create_for_surface(_Surface.get()), &cairo_pattern_destroy); + cairo_pattern_set_matrix(pat.get(), &ctm); + cairo_pattern_set_extend(pat.get(), CAIRO_EXTEND_NONE); + cairo_pattern_set_filter(pat.get(), cairoFilter); + cairo_set_source(_Native_context.get(), pat.get()); + cairo_fill(_Native_context.get()); + //cairo_restore(nativeContext); + if (_Scaling == std::experimental::io2d::scaling::letterbox) { + const auto lboxWidth = trunc((static_cast(_Display_width) - rectWidth) / 2.0); + cairo_rectangle(nativeContext, 0.0, 0.0, lboxWidth, rectHeight); + cairo_rectangle(nativeContext, rectWidth + lboxWidth, 0.0, lboxWidth, rectHeight); + cairo_pattern_set_extend(_Letterbox_brush.native_handle(), _Extend_to_cairo_extend_t(_Letterbox_brush.extend())); + cairo_pattern_set_filter(_Letterbox_brush.native_handle(), _Filter_to_cairo_filter_t(_Letterbox_brush.filter())); + cairo_matrix_t cPttnMatrix; + cairo_matrix_init(&cPttnMatrix, _Letterbox_brush.matrix().m00(), _Letterbox_brush.matrix().m01(), _Letterbox_brush.matrix().m10(), _Letterbox_brush.matrix().m11(), _Letterbox_brush.matrix().m20(), _Letterbox_brush.matrix().m21()); + cairo_pattern_set_matrix(_Letterbox_brush.native_handle(), &cPttnMatrix); + cairo_set_source(_Native_context.get(), _Letterbox_brush.native_handle()); + cairo_fill(_Native_context.get()); + } } else { cairo_new_path(nativeContext); @@ -59,21 +76,40 @@ void display_surface::_Render_for_scaling_uniform_or_letterbox() { const auto widthRatio = static_cast(_Width) / static_cast(_Display_width); cairo_matrix_init_scale(&ctm, widthRatio, widthRatio); cairo_matrix_translate(&ctm, 0.0, -rectY); + unique_ptr pat(cairo_pattern_create_for_surface(_Surface.get()), &cairo_pattern_destroy); + cairo_pattern_set_matrix(pat.get(), &ctm); + cairo_pattern_set_extend(pat.get(), CAIRO_EXTEND_NONE); + cairo_pattern_set_filter(pat.get(), cairoFilter); + cairo_set_source(_Native_context.get(), pat.get()); + cairo_fill(_Native_context.get()); + //cairo_restore(nativeContext); + if (_Scaling == std::experimental::io2d::scaling::letterbox) { + const auto lboxHeight = trunc((static_cast(_Display_height) - rectHeight) / 2.0); + cairo_rectangle(nativeContext, 0.0, 0.0, rectWidth, lboxHeight); + cairo_rectangle(nativeContext, 0.0, rectHeight + lboxHeight, rectWidth, lboxHeight); + cairo_pattern_set_extend(_Letterbox_brush.native_handle(), _Extend_to_cairo_extend_t(_Letterbox_brush.extend())); + cairo_pattern_set_filter(_Letterbox_brush.native_handle(), _Filter_to_cairo_filter_t(_Letterbox_brush.filter())); + cairo_matrix_t cPttnMatrix; + cairo_matrix_init(&cPttnMatrix, _Letterbox_brush.matrix().m00(), _Letterbox_brush.matrix().m01(), _Letterbox_brush.matrix().m10(), _Letterbox_brush.matrix().m11(), _Letterbox_brush.matrix().m20(), _Letterbox_brush.matrix().m21()); + cairo_pattern_set_matrix(_Letterbox_brush.native_handle(), &cPttnMatrix); + cairo_set_source(_Native_context.get(), _Letterbox_brush.native_handle()); + cairo_fill(_Native_context.get()); + } } - unique_ptr pat(cairo_pattern_create_for_surface(_Surface.get()), &cairo_pattern_destroy); - cairo_pattern_set_matrix(pat.get(), &ctm); - cairo_pattern_set_extend(pat.get(), CAIRO_EXTEND_NONE); - cairo_pattern_set_filter(pat.get(), cairoFilter); - cairo_set_source(_Native_context.get(), pat.get()); - cairo_fill(_Native_context.get()); - cairo_restore(nativeContext); } + +// auto currentTime = steady_clock::now(); +// auto elapsedTimeIncrement = static_cast(duration_cast(currentTime - previousTime).count()); +// previousTime = currentTime; +// stringstream timingStr; +// timingStr << "timing: " << elapsedTimeIncrement / 1'000'000.0 << endl; +// cerr << timingStr.str().c_str(); } void display_surface::_Render_to_native_surface() { const cairo_filter_t cairoFilter = CAIRO_FILTER_GOOD; cairo_surface_flush(_Surface.get()); - cairo_save(_Native_context.get()); +// cairo_save(_Native_context.get()); cairo_set_operator(_Native_context.get(), CAIRO_OPERATOR_SOURCE); if (_User_scaling_fn != nullptr) { bool letterbox = false; @@ -182,7 +218,7 @@ void display_surface::_Render_to_native_surface() { } } - cairo_restore(_Native_context.get()); +// cairo_restore(_Native_context.get()); // This call to cairo_surface_flush is needed for Win32 surfaces to update. cairo_surface_flush(_Native_surface.get()); } @@ -305,6 +341,34 @@ void display_surface::auto_clear(bool val) noexcept { _Auto_clear = val; } +void display_surface::refresh_rate(experimental::io2d::refresh_rate rr) noexcept { + if (rr == experimental::io2d::refresh_rate::fixed && _Refresh_rate != rr) { + _Elapsed_draw_time = 0.0; + } + _Refresh_rate = rr; +} + +bool display_surface::desired_frame_rate(double fps) noexcept { + if (!isfinite(fps)) { + return true; + } + if (fps < _Minimum_frame_rate) { + _Desired_frame_rate = _Minimum_frame_rate; + return true; + } + if (fps > _Maximum_frame_rate) { + _Desired_frame_rate = _Maximum_frame_rate; + return true; + } + _Desired_frame_rate = fps; + + return false; +} + +void display_surface::redraw_required() noexcept { + _Redraw_requested.store(true, std::memory_order_release); +} + format display_surface::format() const noexcept { return _Format; } @@ -359,3 +423,15 @@ experimental::io2d::brush display_surface::letterbox_brush() const noexcept { bool display_surface::auto_clear() const noexcept { return _Auto_clear; } + +experimental::io2d::refresh_rate display_surface::refresh_rate() const noexcept { + return _Refresh_rate; +} + +double display_surface::desired_frame_rate() const noexcept { + return _Desired_frame_rate; +} + +double display_surface::elapsed_draw_time() const noexcept { + return _Elapsed_draw_time / 1'000'000.0; +} diff --git a/N3888_RefImpl/src/display_surface-win32.cpp b/io2d/src/display_surface-win32.cpp similarity index 83% rename from N3888_RefImpl/src/display_surface-win32.cpp rename to io2d/src/display_surface-win32.cpp index 1355ffd..a6bb82e 100644 --- a/N3888_RefImpl/src/display_surface-win32.cpp +++ b/io2d/src/display_surface-win32.cpp @@ -2,8 +2,10 @@ #include "xio2dhelpers.h" #include "xcairoenumhelpers.h" #include "cairo-win32.h" +#include using namespace std; +using namespace std::chrono; using namespace std::experimental::io2d; [[noreturn]] @@ -213,6 +215,10 @@ display_surface::display_surface(display_surface&& other) noexcept , _Auto_clear(move(other._Auto_clear)) , _Window_style(move(other._Window_style)) , _Hwnd(move(other._Hwnd)) + , _Refresh_rate(move(other._Refresh_rate)) + , _Desired_frame_rate(move(other._Desired_frame_rate)) + , _Redraw_requested(other._Redraw_requested.load()) + , _Elapsed_draw_time(move(other._Elapsed_draw_time)) , _Native_surface(move(other._Native_surface)) , _Native_context(move(other._Native_context)) { other._Draw_fn = nullptr; @@ -236,6 +242,10 @@ display_surface& display_surface::operator=(display_surface&& other) noexcept { _Auto_clear = move(other._Auto_clear); _Window_style = move(other._Window_style); _Hwnd = move(other._Hwnd); + _Refresh_rate = move(other._Refresh_rate); + _Desired_frame_rate = move(other._Desired_frame_rate); + _Redraw_requested = other._Redraw_requested.load(); + _Elapsed_draw_time = move(other._Elapsed_draw_time); _Native_surface = move(other._Native_surface); _Native_context = move(other._Native_context); @@ -251,11 +261,11 @@ namespace { once_flag _Window_class_registered_flag; } -display_surface::display_surface(int preferredWidth, int preferredHeight, experimental::io2d::format preferredFormat, experimental::io2d::scaling scl) - : display_surface(preferredWidth, preferredHeight, preferredFormat, preferredWidth, preferredHeight, scl) { +display_surface::display_surface(int preferredWidth, int preferredHeight, experimental::io2d::format preferredFormat, experimental::io2d::scaling scl, experimental::io2d::refresh_rate rr, double desiredFramerate) + : display_surface(preferredWidth, preferredHeight, preferredFormat, preferredWidth, preferredHeight, scl, rr, desiredFramerate) { } -display_surface::display_surface(int preferredWidth, int preferredHeight, experimental::io2d::format preferredFormat, int preferredDisplayWidth, int preferredDisplayHeight, experimental::io2d::scaling scl) +display_surface::display_surface(int preferredWidth, int preferredHeight, experimental::io2d::format preferredFormat, int preferredDisplayWidth, int preferredDisplayHeight, experimental::io2d::scaling scl, experimental::io2d::refresh_rate rr, double fps) : surface({ nullptr, nullptr }, preferredFormat, _Cairo_content_t_to_content(_Cairo_content_t_for_cairo_format_t(_Format_to_cairo_format_t(preferredFormat)))) , _Default_brush(cairo_pattern_create_rgba(0.0, 0.0, 0.0, 1.0)) , _Display_width(preferredDisplayWidth) @@ -270,6 +280,9 @@ display_surface::display_surface(int preferredWidth, int preferredHeight, experi , _Auto_clear(false) , _Window_style(WS_OVERLAPPEDWINDOW | WS_VISIBLE) , _Hwnd(nullptr) + , _Refresh_rate(rr) + , _Desired_frame_rate(fps) + , _Redraw_requested(true) , _Native_surface(nullptr, &cairo_surface_destroy) , _Native_context(nullptr, &cairo_destroy) { call_once(_Window_class_registered_flag, _MyRegisterClass, static_cast(GetModuleHandleW(nullptr))); @@ -278,6 +291,9 @@ display_surface::display_surface(int preferredWidth, int preferredHeight, experi if (preferredDisplayWidth <= 0 || preferredDisplayHeight <= 0 || preferredWidth <= 0 || preferredHeight <= 0 || preferredFormat == experimental::io2d::format::invalid) { throw invalid_argument("Invalid parameter."); } + if (fps <= _Minimum_frame_rate || !isfinite(fps)) { + throw system_error(make_error_code(errc::argument_out_of_domain)); + } RECT rc; rc.top = rc.left = 0; rc.right = preferredDisplayWidth; @@ -347,6 +363,7 @@ display_surface::display_surface(int preferredWidth, int preferredHeight, experi // We render to the fixed size surface. _Surface = unique_ptr(cairo_image_surface_create(_Format_to_cairo_format_t(_Format), _Width, _Height), &cairo_surface_destroy); _Context = unique_ptr(cairo_create(_Surface.get()), &cairo_destroy); + _Ensure_state(); } display_surface::~display_surface() { @@ -362,30 +379,65 @@ int display_surface::show() { if (_Draw_fn == nullptr) { throw system_error(make_error_code(errc::operation_would_block)); } + auto previousTime = steady_clock::now(); + _Elapsed_draw_time = 0.0; while (msg.message != WM_QUIT) { + auto currentTime = steady_clock::now(); + auto elapsedTimeIncrement = static_cast(duration_cast(currentTime - previousTime).count()); + _Elapsed_draw_time += elapsedTimeIncrement; + previousTime = currentTime; + if (!PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) { if (_Native_surface.get() != nullptr) { RECT clientRect; GetClientRect(_Hwnd, &clientRect); if (clientRect.right - clientRect.left != _Display_width || clientRect.bottom - clientRect.top != _Display_height) { // If there is a size mismatch we skip painting and resize the window instead. + auto dw = _Display_width; + auto dh = _Display_height; _Resize_window(); _Make_native_surface_and_context(); + if (dw != _Display_width || dh != _Display_height) { + if (_Size_change_fn != nullptr) { + _Size_change_fn(*this); + } + } continue; } else { - // Run user draw function: - if (_Draw_fn != nullptr) { - if (_Auto_clear) { - clear(); - } - _Draw_fn(*this); + bool redraw = true; + if (_Refresh_rate == experimental::io2d::refresh_rate::as_needed) { + redraw = _Redraw_requested.exchange(false, std::memory_order_acquire); } - else { - throw system_error(make_error_code(errc::operation_would_block)); + + const auto desiredElapsed = 1'000'000'000.0 / _Desired_frame_rate; + + if (_Refresh_rate == experimental::io2d::refresh_rate::fixed) { + // desiredElapsed is the amount of time, in nanoseconds, that must have passed before we should redraw. + redraw = _Elapsed_draw_time >= desiredElapsed; + } + if (redraw) { + // Run user draw function: + if (_Draw_fn != nullptr) { + if (_Auto_clear) { + clear(); + } + _Draw_fn(*this); + } + else { + throw system_error(make_error_code(errc::operation_would_block)); + } + _Render_to_native_surface(); + if (_Refresh_rate == experimental::io2d::refresh_rate::fixed) { + while (_Elapsed_draw_time >= desiredElapsed) { + _Elapsed_draw_time -= desiredElapsed; + } + } + else { + _Elapsed_draw_time = 0.0; + } } - _Render_to_native_surface(); } } } @@ -393,10 +445,20 @@ int display_surface::show() { if (msg.message != WM_QUIT) { TranslateMessage(&msg); DispatchMessage(&msg); + + if (msg.message == WM_PAINT) { + _Elapsed_draw_time = 0.0; + //if (_Refresh_rate == experimental::io2d::refresh_rate::fixed) { + // _Elapsed_draw_time -= elapsedTimeIncrement; + //} + //else { + // _Elapsed_draw_time = 0.0; + //} + } } } } - + _Elapsed_draw_time = 0.0; // I know that the C-style cast works and have not had a chance to come up with a safer C++-style cast that I can be sure also works so I'm disabling the warning. #ifdef _WIN32 #ifdef __clang__ @@ -415,4 +477,4 @@ int display_surface::show() { void display_surface::exit_show(int ms) noexcept { PostQuitMessage(0); -} \ No newline at end of file +} diff --git a/io2d/src/display_surface-xcb.cpp b/io2d/src/display_surface-xcb.cpp new file mode 100644 index 0000000..6294966 --- /dev/null +++ b/io2d/src/display_surface-xcb.cpp @@ -0,0 +1,519 @@ +#include "io2d.h" +#include "xio2dhelpers.h" +#include "xcairoenumhelpers.h" +#include +// #include +// #include +// #include +#include + +using namespace std; +using namespace std::chrono; +using namespace std::experimental::io2d; + +display_surface::native_handle_type display_surface::native_handle() const { + return{ { _Surface.get(), _Context.get() }, { _Native_surface.get(), _Native_context.get() }, _Connection.get(), _Connection_mutex, _Connection_ref_count, _Screen, _Wndw }; +} + +display_surface::display_surface(display_surface&& other) noexcept + : surface(move(other)) + , _Default_brush(move(other._Default_brush)) + , _Display_width(move(other._Display_width)) + , _Display_height(move(other._Display_height)) + , _Scaling(move(other._Scaling)) + , _Width(move(other._Width)) + , _Height(move(other._Height)) + , _Draw_fn(move(other._Draw_fn)) + , _Size_change_fn(move(other._Size_change_fn)) + , _User_scaling_fn(move(other._User_scaling_fn)) + , _Letterbox_brush(move(other._Letterbox_brush)) + , _Auto_clear(move(other._Auto_clear)) + , _Screen(move(other._Screen)) + , _Wndw(move(other._Wndw)) + , _Can_draw(move(other._Can_draw)) + , _Refresh_rate(move(other._Refresh_rate)) + , _Desired_frame_rate(move(other._Desired_frame_rate)) + , _Redraw_requested(other._Redraw_requested.load()) + , _Elapsed_draw_time(move(other._Elapsed_draw_time)) + , _Native_surface(move(other._Native_surface)) + , _Native_context(move(other._Native_context)) { + other._Draw_fn = nullptr; + other._Size_change_fn = nullptr; + other._Screen = nullptr; + other._Wndw = 0; +} + +display_surface& display_surface::operator=(display_surface&& other) noexcept { + if (this != &other) { + surface::operator=(move(other)); + _Default_brush = move(other._Default_brush); + _Display_width = move(other._Display_width); + _Display_height = move(other._Display_height); + _Scaling = move(other._Scaling); + _Width = move(other._Width); + _Height = move(other._Height); + _Draw_fn = move(other._Draw_fn); + _Size_change_fn = move(other._Size_change_fn); + _User_scaling_fn = move(other._User_scaling_fn); + _Letterbox_brush = move(other._Letterbox_brush); + _Auto_clear = move(other._Auto_clear); + _Screen = move(other._Screen); + _Wndw = move(other._Wndw); + _Can_draw = move(other._Can_draw); + _Refresh_rate = move(other._Refresh_rate); + _Desired_frame_rate = move(other._Desired_frame_rate); + _Redraw_requested = other._Redraw_requested.load(); + _Elapsed_draw_time = move(other._Elapsed_draw_time); + _Native_surface = move(other._Native_surface); + _Native_context = move(other._Native_context); + + other._Screen = nullptr; + other._Wndw = 0; + other._Draw_fn = nullptr; + other._Size_change_fn = nullptr; + other._Can_draw = false; + } + + return *this; +} + +mutex display_surface::_Connection_mutex; +unique_ptr display_surface::_Connection{ nullptr, &xcb_disconnect }; +int display_surface::_Connection_ref_count = 0; + +namespace { + xcb_atom_t _Wm_protocols; + xcb_atom_t _Wm_delete_window; +} + +void display_surface::_Make_native_surface_and_context() { + auto depthIter = xcb_screen_allowed_depths_iterator(_Screen); + xcb_visualtype_t* visual = nullptr; + for (; depthIter.rem != 0; xcb_depth_next(&depthIter)) { + auto visualIter = xcb_depth_visuals_iterator(depthIter.data); + for (; visualIter.rem != 0; xcb_visualtype_next(&visualIter)) { + if (_Screen->root_visual == visualIter.data->visual_id) { + visual = visualIter.data; + break; + } + } + } + + if (visual == nullptr) { + _Throw_if_failed_cairo_status_t(CAIRO_STATUS_NULL_POINTER); + } + + _Native_surface = unique_ptr(cairo_xcb_surface_create(_Connection.get(), _Wndw, visual, _Display_width, _Display_height), &cairo_surface_destroy); + _Native_context = unique_ptr(cairo_create(_Native_surface.get()), &cairo_destroy); + _Throw_if_failed_cairo_status_t(cairo_surface_status(_Native_surface.get())); + _Throw_if_failed_cairo_status_t(cairo_status(_Native_context.get())); +} + +void display_surface::_Resize_window() { + auto geometryCookie = xcb_get_geometry(_Connection.get(), _Wndw); + unique_ptr geometryReply(xcb_get_geometry_reply(_Connection.get(), geometryCookie, nullptr), &::free); + if (geometryReply == nullptr) { + _Throw_if_failed_cairo_status_t(CAIRO_STATUS_INVALID_STATUS); + } + + const uint32_t values[] = { static_cast(_Display_width), static_cast(_Display_height) }; + xcb_configure_window(_Connection.get(), _Wndw, XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT, values); + xcb_flush(_Connection.get()); +} + +display_surface::display_surface(int preferredWidth, int preferredHeight, experimental::io2d::format preferredFormat, experimental::io2d::scaling scl, experimental::io2d::refresh_rate rr, double fps) + : display_surface(preferredWidth, preferredHeight, preferredFormat, preferredWidth, preferredHeight, scl, rr, fps) { +} + +display_surface::display_surface(int preferredWidth, int preferredHeight, experimental::io2d::format preferredFormat, int preferredDisplayWidth, int preferredDisplayHeight, experimental::io2d::scaling scl, experimental::io2d::refresh_rate rr, double fps) + : surface({ nullptr, nullptr }, preferredFormat, _Cairo_content_t_to_content(_Cairo_content_t_for_cairo_format_t(_Format_to_cairo_format_t(preferredFormat)))) + , _Default_brush(cairo_pattern_create_rgba(0.0, 0.0, 0.0, 1.0)) + , _Display_width(preferredDisplayWidth) + , _Display_height(preferredDisplayHeight) + , _Scaling(scl) + , _Width(preferredWidth) + , _Height(preferredHeight) + , _Draw_fn() + , _Size_change_fn() + , _User_scaling_fn() + , _Letterbox_brush(cairo_pattern_create_rgba(0.0, 0.0, 0.0, 1.0)) + , _Auto_clear(false) + , _Screen(nullptr) + , _Wndw() + , _Can_draw(false) + , _Refresh_rate(rr) + , _Desired_frame_rate(fps) + , _Redraw_requested(true) + , _Native_surface(nullptr, &cairo_surface_destroy) + , _Native_context(nullptr, &cairo_destroy) { + if (preferredDisplayWidth <= 0 || preferredDisplayHeight <= 0 || preferredWidth <= 0 || preferredHeight <= 0 || preferredFormat == experimental::io2d::format::invalid) { + throw invalid_argument("Invalid parameter."); + } + if (fps <= _Minimum_frame_rate || !isfinite(fps)) { + throw system_error(make_error_code(errc::argument_out_of_domain)); + } + xcb_connection_t* connection = nullptr; + // Lock to increment the ref count. + { + lock_guard lg(_Connection_mutex); + _Connection_ref_count++; + } + int screenNumber = 0; + if (_Connection == nullptr) { + lock_guard lg(_Connection_mutex); + if (_Connection == nullptr) { + connection = xcb_connect(nullptr, &screenNumber); + if (connection == nullptr) { + _Connection_ref_count--; + throw system_error(make_error_code(errc::connection_refused)); + } + _Connection = unique_ptr(connection, &::xcb_disconnect); + } + } + auto setup = xcb_get_setup(connection); + _Screen = nullptr; + auto screenIter = xcb_setup_roots_iterator(setup); + for (; screenIter.rem != 0; --screenNumber, xcb_screen_next(&screenIter)) { + if (screenNumber == 0) { + _Screen = screenIter.data; + break; + } + } + if (_Screen == nullptr) { + lock_guard lg(_Connection_mutex); + _Connection_ref_count--; + throw system_error(make_error_code(errc::connection_aborted)); + } + + _Wndw = xcb_generate_id(connection); + uint32_t mask = XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK; + uint32_t values[2]; + values[0] = _Screen->black_pixel; + values[1] = XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_STRUCTURE_NOTIFY | XCB_EVENT_MASK_PROPERTY_CHANGE; + uint16_t x = 0; + uint16_t y = 0; + auto windowCookie = xcb_create_window_checked(connection, _Screen->root_depth, _Wndw, _Screen->root, x, y, static_cast(preferredDisplayWidth), static_cast(preferredDisplayHeight), _Window_border_width, XCB_WINDOW_CLASS_INPUT_OUTPUT, _Screen->root_visual, mask, values); + + xcb_generic_error_t* error = xcb_request_check(connection, windowCookie); + if (error != nullptr) { + lock_guard lg(_Connection_mutex); + _Connection_ref_count--; + throw system_error(make_error_code(errc::connection_aborted)); + } + + auto mapCookie = xcb_map_window_checked(connection, _Wndw); + xcb_generic_error_t* mapError = xcb_request_check(connection, mapCookie); + if (mapError != nullptr) { + lock_guard lg(_Connection_mutex); + _Connection_ref_count--; + throw system_error(make_error_code(errc::connection_aborted)); + } + + string wmProtocols = "WM_PROTOCOLS"; + auto wmProtocolsCookie = xcb_intern_atom(connection, 0, wmProtocols.size(), wmProtocols.c_str()); + unique_ptr wmProtocolsReply(xcb_intern_atom_reply(connection, wmProtocolsCookie, nullptr), &::free); + if (wmProtocolsReply == nullptr) { + lock_guard lg(_Connection_mutex); + _Connection_ref_count--; + throw system_error(make_error_code(errc::connection_aborted)); + } + _Wm_protocols = wmProtocolsReply->atom; + string wmDelWin = "WM_DELETE_WINDOW"; + auto wmDelWinCookie = xcb_intern_atom(connection, 0, wmDelWin.size(), wmDelWin.c_str()); + unique_ptr wmDelWinReply(xcb_intern_atom_reply(connection, wmDelWinCookie, nullptr), &::free); + if (wmDelWinReply == nullptr) { + lock_guard lg(_Connection_mutex); + _Connection_ref_count--; + throw system_error(make_error_code(errc::connection_aborted)); + } + _Wm_delete_window = (wmDelWinReply.get())->atom; + const uint8_t wmProtocolsDataFormat = 32; + const uint32_t wmProtocolsNumDataElements = 1; + xcb_change_property(connection, XCB_PROP_MODE_REPLACE, _Wndw, _Wm_protocols, XCB_ATOM_ATOM, wmProtocolsDataFormat, wmProtocolsNumDataElements, static_cast(&_Wm_delete_window)); +// stringstream wmAtomsStr; +// wmAtomsStr << "WM_PROTOCOLS: '" << to_string(_Wm_protocols) << "'" << endl << "WM_DELETE_WINDOW: '" << to_string(_Wm_delete_window) << "'" << endl; +// cerr << wmAtomsStr.str().c_str(); + xcb_flush(connection); + + _Surface = unique_ptr(cairo_image_surface_create(_Format_to_cairo_format_t(_Format), _Width, _Height), &cairo_surface_destroy); + _Context = unique_ptr(cairo_create(_Surface.get()), &cairo_destroy); + _Ensure_state(); +} + +display_surface::~display_surface() { + _Native_context.reset(); + _Native_surface.reset(); + if (_Wndw != 0) { + xcb_destroy_window(_Connection.get(), _Wndw); + _Wndw = 0; + } + lock_guard lg(_Connection_mutex); + _Connection_ref_count--; + assert(_Connection_ref_count >= 0); + if (_Connection_ref_count <= 0) { + _Connection_ref_count = 0; + _Connection = nullptr; + } +} + +namespace { + bool _Poll_for_xcb_event(unique_ptr& event, xcb_connection_t* c) { + event.reset(xcb_poll_for_event(c)); +// if (event != nullptr) { +// stringstream errorString; +// errorString << "response_type: '" << to_string(event->response_type) << "'" << endl; +// cerr << errorString.str().c_str(); +// } + return event != nullptr; + } +} + +int display_surface::show() { + bool exit = false; + unique_ptr event{ nullptr, &::free }; + + auto previousTime = steady_clock::now(); + _Elapsed_draw_time = 0.0; + while (!exit) { + auto currentTime = steady_clock::now(); + auto elapsedTimeIncrement = static_cast(duration_cast(currentTime - previousTime).count()); + _Elapsed_draw_time += elapsedTimeIncrement; + previousTime = currentTime; + while (_Poll_for_xcb_event(event, _Connection.get())) { +// const uint8_t userGeneratedEventMask = ~0x80; + switch (event->response_type & ~0x80) { + case 0: + { + xcb_generic_error_t* err = reinterpret_cast(event.get()); + _Throw_if_failed_cairo_status_t(CAIRO_STATUS_INVALID_STATUS); +// stringstream errorString; +// errorString << "Error event->response_type. Value of error_code is '" << to_string(err->error_code) << "'." << endl; +// cerr << errorString.str().c_str(); + } break; + // ExposureMask events: + case XCB_EXPOSE: + { + if (!_Can_draw && _Wndw != 0) { + _Make_native_surface_and_context(); + } + assert(_Native_surface != nullptr && _Native_context != nullptr); + _Can_draw = true; + if (_Draw_fn != nullptr) { + if (_Auto_clear) { + clear(); + } + _Draw_fn(*this); + } + else { + throw system_error(make_error_code(errc::operation_would_block)); + } + _Render_to_native_surface(); + + _Elapsed_draw_time = 0.0; + //if (_Refresh_rate == experimental::io2d::refresh_rate::fixed) { + // _Elapsed_draw_time -= elapsedTimeIncrement; + //} + //else { + // _Elapsed_draw_time = 0.0; + //} + } break; + // StructureNotifyMask events: + case XCB_CIRCULATE_NOTIFY: + { + } break; + case XCB_CONFIGURE_NOTIFY: + { + bool resized = false; + xcb_configure_notify_event_t* ev = reinterpret_cast(event.get()); + if (ev->width != _Display_width) { + _Display_width = ev->width; + resized = true; + } + if (ev->height != _Display_height) { + _Display_height = ev->height; + resized = true; + } + if (resized) { + cairo_xcb_surface_set_size(_Native_surface.get(), _Display_width, _Display_height); + if (_Size_change_fn != nullptr) { + _Size_change_fn(*this); + } + } + } break; + case XCB_DESTROY_NOTIFY: + { +// stringstream errorString; +// errorString << "XCB_DESTROY_NOTIFY" << endl; +// cerr << errorString.str().c_str(); + _Wndw = 0; + _Can_draw = false; + _Native_context.reset(); + _Native_surface.reset(); + exit = true; + } break; + case XCB_GRAVITY_NOTIFY: + { + } break; + case XCB_MAP_NOTIFY: + { + } break; + case XCB_REPARENT_NOTIFY: + { + } break; + case XCB_UNMAP_NOTIFY: + { +// stringstream errorString; +// errorString << "XCB_UNMAP_NOTIFY" << endl; +// cerr << errorString.str().c_str(); + // The window still exists, it has just been unmapped. + _Can_draw = false; + _Native_context.reset(); + _Native_surface.reset(); + } break; + // Might get them even though they are unrequested events (see http://www.x.org/releases/X11R7.7/doc/libX11/libX11/libX11.html#Event_Masks ): + case XCB_GRAPHICS_EXPOSURE: + { + if (_Can_draw) { + if (_Draw_fn != nullptr) { + if (_Auto_clear) { + clear(); + } + _Draw_fn(*this); + } + else { + throw system_error(make_error_code(errc::operation_would_block)); + } + _Render_to_native_surface(); + + _Elapsed_draw_time = 0.0; + //if (_Refresh_rate == experimental::io2d::refresh_rate::fixed) { + // _Elapsed_draw_time -= elapsedTimeIncrement; + //} + //else { + // _Elapsed_draw_time = 0.0; + //} + } + } break; + case XCB_NO_EXPOSURE: + { + } break; + case XCB_PROPERTY_NOTIFY: + { +// xcb_property_notify_event_t* ev = reinterpret_cast(event.get()); +// stringstream propStr; +// propStr << "Property notify for atom: '" << to_string(ev->atom) << "' with state '" << to_string(ev->state) << "'." << endl; +// cerr << propStr.str().c_str(); + } break; + // Unmasked events + case XCB_CLIENT_MESSAGE: + { + xcb_client_message_event_t* ev = reinterpret_cast(event.get()); + if (ev->format == 32 && static_cast(ev->data.data32[0]) == _Wm_delete_window) { +// stringstream errorString; +// errorString << "XCB_CLIENT_MESSAGE" << endl; +// cerr << errorString.str().c_str(); + _Can_draw = false; + _Native_context.reset(); + _Native_surface.reset(); + xcb_destroy_window(_Connection.get(), _Wndw); + xcb_flush(_Connection.get()); + _Wndw = 0; + exit = true; + } + else { +// stringstream clientMsgStr; +// clientMsgStr << "ClientMessage event type '" << to_string(ev->type) << "' for unknown event type"; +// // auto atomName = XGetAtomName(_Display.get(), event.xclient.message_type); +// // if (atomName != nullptr) { +// // try { +// // clientMsgStr << " (" << atomName << ")"; +// // } +// // catch (...) { +// // XFree(atomName); +// // } +// // XFree(atomName); +// // } +// clientMsgStr << ". Format is '" << to_string(ev->format) << "' and first value is '"; +// switch (ev->format) { +// case 8: +// { +// clientMsgStr << to_string(static_cast(ev->data.data8[0])).c_str(); +// } break; +// case 16: +// { +// clientMsgStr << to_string(ev->data.data16[0]).c_str(); +// } break; +// case 32: +// { +// clientMsgStr << to_string(ev->data.data32[0]).c_str(); +// } break; +// default: +// { +// assert("Unexpected format." && false); +// clientMsgStr << "(unexpected format)"; +// } break; +// } +// clientMsgStr << "'."; +// auto es = clientMsgStr.str().c_str(); +// cerr << es << endl; + } + } break; + case XCB_MAPPING_NOTIFY: + { + } break; + case XCB_SELECTION_CLEAR: + { + } break; + case XCB_SELECTION_NOTIFY: + { + } break; + case XCB_SELECTION_REQUEST: + { + } break; + default: + { +// stringstream errorString; +// errorString << "Unexpected event->response_type. Value is '" << to_string(event->response_type) << "'." << endl; +// cerr << errorString.str().c_str(); +// // assert(event->response_type >= 64 && event->response_type <= 127); + } break; + } + } + if (_Can_draw) { + bool redraw = true; + if (_Refresh_rate == experimental::io2d::refresh_rate::as_needed) { + redraw = _Redraw_requested.exchange(false, std::memory_order_acquire); + } + + auto desiredElapsed = 1'000'000'000.0 / _Desired_frame_rate; + + if (_Refresh_rate == experimental::io2d::refresh_rate::fixed) { + // desiredElapsed is the amount of time, in nanoseconds, that must have passed before we should redraw. + redraw = _Elapsed_draw_time >= desiredElapsed; + } + if (redraw) { + // Run user draw function: + if (_Draw_fn != nullptr) { + if (_Auto_clear) { + clear(); + } + _Draw_fn(*this); + } + else { + throw system_error(make_error_code(errc::operation_would_block)); + } + _Render_to_native_surface(); + if (_Refresh_rate == experimental::io2d::refresh_rate::fixed) { + while (_Elapsed_draw_time >= desiredElapsed) { + _Elapsed_draw_time -= desiredElapsed; + } + } + else { + _Elapsed_draw_time = 0.0; + } + } + } + } + _Elapsed_draw_time = 0.0; + return 0; +} diff --git a/N3888_RefImpl/src/display_surface-xlib.cpp b/io2d/src/display_surface-xlib.cpp similarity index 82% rename from N3888_RefImpl/src/display_surface-xlib.cpp rename to io2d/src/display_surface-xlib.cpp index 0e6ccea..38062c0 100644 --- a/N3888_RefImpl/src/display_surface-xlib.cpp +++ b/io2d/src/display_surface-xlib.cpp @@ -5,11 +5,13 @@ #include #include #include +#include // Only uncomment this if you need to do debugging. This will cause XSynchronize to be called for the _Display connection. //#define USE_X_SYNC_FOR_DEBUGGING using namespace std; +using namespace std::chrono; using namespace std::experimental::io2d; Bool display_surface::_X11_if_event_pred(::Display* display, ::XEvent* event, XPointer arg) { @@ -20,8 +22,8 @@ Bool display_surface::_X11_if_event_pred(::Display* display, ::XEvent* event, XP return False; } // Need to check for ExposureMask events, StructureNotifyMask events, and unmaskable events. - switch(event->type) { - // ExposureMask events: + switch (event->type) { + // ExposureMask events: case Expose: { if (event->xexpose.window == sfc->_Wndw) { @@ -124,6 +126,7 @@ Bool display_surface::_X11_if_event_pred(::Display* display, ::XEvent* event, XP // Return True so we can inspect it in the event loop for diagnostic purposes. return True; } + return false; } } return False; @@ -148,6 +151,10 @@ display_surface::display_surface(display_surface&& other) noexcept , _Auto_clear(move(other._Auto_clear)) , _Wndw(move(other._Wndw)) , _Can_draw(move(other._Can_draw)) + , _Refresh_rate(move(other._Refresh_rate)) + , _Desired_frame_rate(move(other._Desired_frame_rate)) + , _Redraw_requested(other._Redraw_requested.load()) + , _Elapsed_draw_time(move(other._Elapsed_draw_time)) , _Native_surface(move(other._Native_surface)) , _Native_context(move(other._Native_context)) { other._Draw_fn = nullptr; @@ -171,6 +178,10 @@ display_surface& display_surface::operator=(display_surface&& other) noexcept { _Auto_clear = move(other._Auto_clear); _Wndw = move(other._Wndw); _Can_draw = move(other._Can_draw); + _Refresh_rate = move(other._Refresh_rate); + _Desired_frame_rate = move(other._Desired_frame_rate); + _Redraw_requested = other._Redraw_requested.load(); + _Elapsed_draw_time = move(other._Elapsed_draw_time); _Native_surface = move(other._Native_surface); _Native_context = move(other._Native_context); @@ -212,18 +223,18 @@ void display_surface::_Resize_window() { _Throw_if_failed_cairo_status_t(CAIRO_STATUS_INVALID_STATUS); } if (width != static_cast(_Display_width) || height != static_cast(_Display_height)) { - XWindowChanges xwc{ }; + XWindowChanges xwc{}; xwc.width = _Display_width; xwc.height = _Display_height; XConfigureWindow(_Display.get(), _Wndw, CWWidth | CWHeight, &xwc); } } -display_surface::display_surface(int preferredWidth, int preferredHeight, experimental::io2d::format preferredFormat, experimental::io2d::scaling scl) - : display_surface(preferredWidth, preferredHeight, preferredFormat, preferredWidth, preferredHeight, scl) { +display_surface::display_surface(int preferredWidth, int preferredHeight, experimental::io2d::format preferredFormat, experimental::io2d::scaling scl, experimental::io2d::refresh_rate rr, double fps) + : display_surface(preferredWidth, preferredHeight, preferredFormat, preferredWidth, preferredHeight, scl, rr, fps) { } -display_surface::display_surface(int preferredWidth, int preferredHeight, experimental::io2d::format preferredFormat, int preferredDisplayWidth, int preferredDisplayHeight, experimental::io2d::scaling scl) +display_surface::display_surface(int preferredWidth, int preferredHeight, experimental::io2d::format preferredFormat, int preferredDisplayWidth, int preferredDisplayHeight, experimental::io2d::scaling scl, experimental::io2d::refresh_rate rr, double fps) : surface({ nullptr, nullptr }, preferredFormat, _Cairo_content_t_to_content(_Cairo_content_t_for_cairo_format_t(_Format_to_cairo_format_t(preferredFormat)))) , _Default_brush(cairo_pattern_create_rgba(0.0, 0.0, 0.0, 1.0)) , _Display_width(preferredDisplayWidth) @@ -238,11 +249,17 @@ display_surface::display_surface(int preferredWidth, int preferredHeight, experi , _Auto_clear(false) , _Wndw(None) , _Can_draw(false) + , _Refresh_rate(rr) + , _Desired_frame_rate(fps) + , _Redraw_requested(true) , _Native_surface(nullptr, &cairo_surface_destroy) , _Native_context(nullptr, &cairo_destroy) { if (preferredDisplayWidth <= 0 || preferredDisplayHeight <= 0 || preferredWidth <= 0 || preferredHeight <= 0 || preferredFormat == experimental::io2d::format::invalid) { throw invalid_argument("Invalid parameter."); } + if (fps <= _Minimum_frame_rate || !isfinite(fps)) { + throw system_error(make_error_code(errc::argument_out_of_domain)); + } Display* display = nullptr; // Lock to increment the ref count. { @@ -259,10 +276,10 @@ display_surface::display_surface(int preferredWidth, int preferredHeight, experi } _Display = unique_ptr(display, &XCloseDisplay); _Wm_delete_window = XInternAtom(display, "WM_DELETE_WINDOW", False); - #ifdef USE_X_SYNC_FOR_DEBUGGING +#ifdef USE_X_SYNC_FOR_DEBUGGING // DEBUGGING ONLY!!!!!! XSynchronize(display, True); - #endif +#endif } } display = _Display.get(); @@ -276,6 +293,7 @@ display_surface::display_surface(int preferredWidth, int preferredHeight, experi XMapWindow(display, _Wndw); _Surface = unique_ptr(cairo_image_surface_create(_Format_to_cairo_format_t(_Format), _Width, _Height), &cairo_surface_destroy); _Context = unique_ptr(cairo_create(_Surface.get()), &cairo_destroy); + _Ensure_state(); } display_surface::~display_surface() { @@ -298,10 +316,16 @@ int display_surface::show() { bool exit = false; XEvent event; + auto previousTime = steady_clock::now(); + _Elapsed_draw_time = 0.0; while (!exit) { + auto currentTime = steady_clock::now(); + auto elapsedTimeIncrement = static_cast(duration_cast(currentTime - previousTime).count()); + _Elapsed_draw_time += elapsedTimeIncrement; + previousTime = currentTime; while (XCheckIfEvent(_Display.get(), &event, &display_surface::_X11_if_event_pred, reinterpret_cast(this))) { - switch(event.type) { - // ExposureMask events: + switch (event.type) { + // ExposureMask events: case Expose: { if (!_Can_draw && _Wndw != None) { @@ -319,6 +343,14 @@ int display_surface::show() { throw system_error(make_error_code(errc::operation_would_block)); } _Render_to_native_surface(); + + _Elapsed_draw_time = 0.0; + //if (_Refresh_rate == experimental::io2d::refresh_rate::fixed) { + // _Elapsed_draw_time -= elapsedTimeIncrement; + //} + //else { + // _Elapsed_draw_time = 0.0; + //} } break; // StructureNotifyMask events: case CirculateNotify: @@ -337,6 +369,9 @@ int display_surface::show() { } if (resized) { cairo_xlib_surface_set_size(_Native_surface.get(), _Display_width, _Display_height); + if (_Size_change_fn != nullptr) { + _Size_change_fn(*this); + } } } break; case DestroyNotify: @@ -377,6 +412,14 @@ int display_surface::show() { throw system_error(make_error_code(errc::operation_would_block)); } _Render_to_native_surface(); + + _Elapsed_draw_time = 0.0; + //if (_Refresh_rate == experimental::io2d::refresh_rate::fixed) { + // _Elapsed_draw_time -= elapsedTimeIncrement; + //} + //else { + // _Elapsed_draw_time = 0.0; + //} } } break; case NoExpose: @@ -401,13 +444,13 @@ int display_surface::show() { try { clientMsgStr << " (" << atomName << ")"; } - catch(...) { + catch (...) { XFree(atomName); } XFree(atomName); } clientMsgStr << ". Format is '" << event.xclient.format << "' and first value is '"; - switch(event.xclient.format) { + switch (event.xclient.format) { case 8: { clientMsgStr << to_string(static_cast(event.xclient.data.b[0])).c_str(); @@ -449,22 +492,44 @@ int display_surface::show() { errorString << "Unexpected event.type. Value is '" << event.type << "'."; cerr << errorString.str().c_str(); assert(event.type >= 64 && event.type <= 127); - } + } break; } } if (_Can_draw) { - // Run user draw function: - if (_Draw_fn != nullptr) { - if (_Auto_clear) { - clear(); - } - _Draw_fn(*this); + bool redraw = true; + if (_Refresh_rate == experimental::io2d::refresh_rate::as_needed) { + redraw = _Redraw_requested.exchange(false, std::memory_order_acquire); + } + + auto desiredElapsed = 1'000'000'000.0 / _Desired_frame_rate; + + if (_Refresh_rate == experimental::io2d::refresh_rate::fixed) { + // desiredElapsed is the amount of time, in nanoseconds, that must have passed before we should redraw. + redraw = _Elapsed_draw_time >= desiredElapsed; } - else { - throw system_error(make_error_code(errc::operation_would_block)); + if (redraw) { + // Run user draw function: + if (_Draw_fn != nullptr) { + if (_Auto_clear) { + clear(); + } + _Draw_fn(*this); + } + else { + throw system_error(make_error_code(errc::operation_would_block)); + } + _Render_to_native_surface(); + if (_Refresh_rate == experimental::io2d::refresh_rate::fixed) { + while (_Elapsed_draw_time >= desiredElapsed) { + _Elapsed_draw_time -= desiredElapsed; + } + } + else { + _Elapsed_draw_time = 0.0; + } } - _Render_to_native_surface(); } } + _Elapsed_draw_time = 0.0; return 0; } diff --git a/N3888_RefImpl/src/font_extents.cpp b/io2d/src/font_extents.cpp similarity index 100% rename from N3888_RefImpl/src/font_extents.cpp rename to io2d/src/font_extents.cpp diff --git a/N3888_RefImpl/src/font_options.cpp b/io2d/src/font_options.cpp similarity index 100% rename from N3888_RefImpl/src/font_options.cpp rename to io2d/src/font_options.cpp diff --git a/io2d/src/font_resource.cpp b/io2d/src/font_resource.cpp new file mode 100644 index 0000000..b68428b --- /dev/null +++ b/io2d/src/font_resource.cpp @@ -0,0 +1,162 @@ +#include "io2d.h" +#include "xio2dhelpers.h" +#include "xcairoenumhelpers.h" + +using namespace std; +using namespace std::experimental::io2d; + +font_resource::font_resource(const font_resource_factory& f) + : _Scaled_font() + , _Font_family() + , _Font_slant(f.font_slant()) + , _Font_weight(f.font_weight()) + , _Font_options() { + cairo_matrix_t fm{ f.font_matrix().m00(), f.font_matrix().m01(), f.font_matrix().m10(), f.font_matrix().m11(), f.font_matrix().m20(), f.font_matrix().m21() }; + cairo_matrix_t sm{ f.surface_matrix().m00(), f.surface_matrix().m01(), f.surface_matrix().m10(), f.surface_matrix().m11(), f.surface_matrix().m20(), f.surface_matrix().m21() }; + auto fo = cairo_font_options_create(); + _Throw_if_failed_cairo_status_t(cairo_font_options_status(fo)); + _Font_options = shared_ptr(fo, &cairo_font_options_destroy); + cairo_font_options_set_antialias(fo, _Antialias_to_cairo_antialias_t(f.font_options().antialias())); + cairo_font_options_set_subpixel_order(fo, _Subpixel_order_to_cairo_subpixel_order_t(f.font_options().subpixel_order())); + _Font_family = make_shared(f.font_family()); + _Throw_if_failed_cairo_status_t(cairo_font_options_status(fo)); + auto sf = cairo_scaled_font_create(cairo_toy_font_face_create(f.font_family().c_str(), _Font_slant_to_cairo_font_slant_t(f.font_slant()), + _Font_weight_to_cairo_font_weight_t(f.font_weight())), &fm, &sm, fo); + _Scaled_font = shared_ptr(sf, &cairo_scaled_font_destroy); + _Throw_if_failed_cairo_status_t(cairo_scaled_font_status(sf)); +} + +font_resource::font_resource(const font_resource_factory& f, error_code& ec) noexcept + : _Scaled_font() + , _Font_family() + , _Font_slant(f.font_slant()) + , _Font_weight(f.font_weight()) + , _Font_options() { + cairo_matrix_t fm{ f.font_matrix().m00(), f.font_matrix().m01(), f.font_matrix().m10(), f.font_matrix().m11(), f.font_matrix().m20(), f.font_matrix().m21() }; + cairo_matrix_t sm{ f.surface_matrix().m00(), f.surface_matrix().m01(), f.surface_matrix().m10(), f.surface_matrix().m11(), f.surface_matrix().m20(), f.surface_matrix().m21() }; + auto fo = cairo_font_options_create(); + + ec = _Cairo_status_t_to_std_error_code(cairo_font_options_status(fo)); + if (static_cast(ec)) { + return; + } + + try { + _Font_options = shared_ptr(fo, &cairo_font_options_destroy); + } + catch (const bad_alloc&) { + ec = make_error_code(errc::not_enough_memory); + return; + } + catch (...) { + ec = make_error_code(io2d_error::invalid_status); + return; + } + cairo_font_options_set_antialias(fo, _Antialias_to_cairo_antialias_t(f.font_options().antialias())); + cairo_font_options_set_subpixel_order(fo, _Subpixel_order_to_cairo_subpixel_order_t(f.font_options().subpixel_order())); + + ec = _Cairo_status_t_to_std_error_code(cairo_font_options_status(fo)); + if (static_cast(ec)) { + return; + } + + try { + _Font_family = make_shared(f.font_family(ec)); + if (static_cast(ec)) { + return; + } + } + catch (const bad_alloc&) { + ec = make_error_code(errc::not_enough_memory); + return; + } + catch (...) { + ec = make_error_code(io2d_error::invalid_status); + return; + } + + if (static_cast(ec)) { + return; + } + + auto sf = cairo_scaled_font_create(cairo_toy_font_face_create(f.font_family().c_str(), _Font_slant_to_cairo_font_slant_t(f.font_slant()), + _Font_weight_to_cairo_font_weight_t(f.font_weight())), &fm, &sm, fo); + ec = _Cairo_status_t_to_std_error_code(cairo_scaled_font_status(sf)); + if (static_cast(ec)) { + return; + } + try { + _Scaled_font = shared_ptr(sf, &cairo_scaled_font_destroy); + } + catch (const bad_alloc&) { + ec = make_error_code(errc::not_enough_memory); + return; + } + catch (...) { + ec = make_error_code(io2d_error::invalid_status); + return; + } + ec.clear(); +} + +string font_resource::font_family() const { + return *_Font_family.get(); +} + +string font_resource::font_family(error_code& ec) const noexcept { + ::std::string s; + try { + s = *_Font_family.get(); + } + catch (const ::std::bad_alloc&) { + ec = make_error_code(errc::not_enough_memory); + return s; + } + catch (const ::std::length_error&) { + ec = make_error_code(errc::not_enough_memory); + return s; + } + ec.clear(); + return s; +} + +experimental::io2d::font_slant font_resource::font_slant() const noexcept { + return _Font_slant; +} + +experimental::io2d::font_weight font_resource::font_weight() const noexcept { + return _Font_weight; +} + +experimental::io2d::font_options font_resource::font_options() const noexcept { + return ::std::experimental::io2d::font_options(_Cairo_antialias_t_to_antialias(cairo_font_options_get_antialias(_Font_options.get())), + _Cairo_subpixel_order_t_to_subpixel_order(cairo_font_options_get_subpixel_order(_Font_options.get()))); +} + +matrix_2d font_resource::font_matrix() const noexcept { + cairo_matrix_t cm; + cairo_scaled_font_get_font_matrix(_Scaled_font.get(), &cm); + return matrix_2d(cm.xx, cm.xy, cm.yx, cm.yy, cm.x0, cm.y0); +} + +matrix_2d font_resource::surface_matrix() const noexcept { + cairo_matrix_t cm; + cairo_scaled_font_get_ctm(_Scaled_font.get(), &cm); + return matrix_2d(cm.xx, cm.xy, cm.yx, cm.yy, cm.x0, cm.y0); +} + +experimental::io2d::font_extents font_resource::font_extents() const noexcept { + cairo_font_extents_t fe; + cairo_scaled_font_extents(_Scaled_font.get(), &fe); + return experimental::io2d::font_extents(fe.ascent, fe.descent, fe.height); +} + +experimental::io2d::text_extents font_resource::text_extents(const string& utf8) const noexcept { + cairo_text_extents_t cte{}; + cairo_scaled_font_text_extents(_Scaled_font.get(), utf8.c_str(), &cte); + return experimental::io2d::text_extents(cte.x_bearing, cte.y_bearing, cte.width, cte.height, cte.x_advance, cte.y_advance); +} + +glyph_run font_resource::make_glyph_run(const string& utf8, const vector_2d& pos) const { + return glyph_run(*this, utf8, pos); +} diff --git a/io2d/src/font_resource_factory.cpp b/io2d/src/font_resource_factory.cpp new file mode 100644 index 0000000..1306f8b --- /dev/null +++ b/io2d/src/font_resource_factory.cpp @@ -0,0 +1,213 @@ +#include "io2d.h" +#include "xio2dhelpers.h" +#include "xcairoenumhelpers.h" +#include + +using namespace std; +using namespace std::experimental::io2d; + +font_resource_factory& font_resource_factory::operator=(font_resource_factory&& other) noexcept { + if (this != &other) { + _Family.swap(other._Family); + _Font_slant = move(other._Font_slant); + _Font_weight = move(other._Font_weight); + _Font_options = move(other._Font_options); + _Font_matrix = move(other._Font_matrix); + _Surface_matrix = move(other._Surface_matrix); + } + return *this; +} + +font_resource_factory::font_resource_factory(const ::std::string& family, ::std::experimental::io2d::font_slant fs, ::std::experimental::io2d::font_weight fw, + const ::std::experimental::io2d::matrix_2d& fm, const ::std::experimental::io2d::font_options& fo, const ::std::experimental::io2d::matrix_2d& sm) + : _Family() + , _Font_slant(fs) + , _Font_weight(fw) + , _Font_options(fo) + , _Font_matrix(fm) + , _Surface_matrix(sm) { + // This logic exists to get the name of the font family that the system actually chose rather than just returning the requested family to the user. + auto font = cairo_toy_font_face_create(family.c_str(), _Font_slant_to_cairo_font_slant_t(fs), _Font_weight_to_cairo_font_weight_t(fw)); + unique_ptr ff(font, &cairo_font_face_destroy); + _Throw_if_failed_cairo_status_t(cairo_font_face_status(font)); + _Family = cairo_toy_font_face_get_family(font); +} + +font_resource_factory::font_resource_factory(const ::std::string& family, + error_code& ec, ::std::experimental::io2d::font_slant fs, ::std::experimental::io2d::font_weight fw, const ::std::experimental::io2d::matrix_2d& fm, + const ::std::experimental::io2d::font_options& fo, const ::std::experimental::io2d::matrix_2d& sm) noexcept + : _Family() + , _Font_slant(fs) + , _Font_weight(fw) + , _Font_options(fo) + , _Font_matrix(fm) + , _Surface_matrix(sm) { + auto font = cairo_toy_font_face_create(family.c_str(), _Font_slant_to_cairo_font_slant_t(fs), _Font_weight_to_cairo_font_weight_t(fw)); + unique_ptr ff(font, &cairo_font_face_destroy); + ec = _Cairo_status_t_to_std_error_code(cairo_font_face_status(font)); + if (static_cast(ec)) { + return; + } + ::std::string s; + try { + s = cairo_toy_font_face_get_family(font); + } + catch (const ::std::bad_alloc&) { + ec = make_error_code(errc::not_enough_memory); + return; + } + catch (const ::std::length_error&) { + ec = make_error_code(errc::not_enough_memory); + return; + } + _Family = move(s); + ec.clear(); +} + +void font_resource_factory::font_family(const string& f) { + auto font = cairo_toy_font_face_create(f.c_str(), _Font_slant_to_cairo_font_slant_t(_Font_slant), _Font_weight_to_cairo_font_weight_t(_Font_weight)); + unique_ptr ff(font, &cairo_font_face_destroy); + _Throw_if_failed_cairo_status_t(cairo_font_face_status(font)); + _Family = cairo_toy_font_face_get_family(font); +} + +void font_resource_factory::font_family(const string& f, error_code& ec) noexcept { + auto font = cairo_toy_font_face_create(f.c_str(), _Font_slant_to_cairo_font_slant_t(_Font_slant), _Font_weight_to_cairo_font_weight_t(_Font_weight)); + unique_ptr ff(font, &cairo_font_face_destroy); + ec = _Cairo_status_t_to_std_error_code(cairo_font_face_status(font)); + if (static_cast(ec)) { + return; + } + ::std::string s; + try { + s = cairo_toy_font_face_get_family(font); + } + catch (const ::std::bad_alloc&) { + ec = make_error_code(errc::not_enough_memory); + return; + } + catch (const ::std::length_error&) { + ec = make_error_code(errc::not_enough_memory); + return; + } + _Family = move(s); + ec.clear(); +} + +void font_resource_factory::font_slant(const ::std::experimental::io2d::font_slant fs) { + _Font_slant = fs; + auto font = cairo_toy_font_face_create(_Family.c_str(), _Font_slant_to_cairo_font_slant_t(_Font_slant), _Font_weight_to_cairo_font_weight_t(_Font_weight)); + unique_ptr ff(font, &cairo_font_face_destroy); + _Throw_if_failed_cairo_status_t(cairo_font_face_status(font)); + _Family = cairo_toy_font_face_get_family(font); +} + +void font_resource_factory::font_slant(const ::std::experimental::io2d::font_slant fs, ::std::error_code& ec) noexcept { + auto font = cairo_toy_font_face_create(_Family.c_str(), _Font_slant_to_cairo_font_slant_t(fs), _Font_weight_to_cairo_font_weight_t(_Font_weight)); + unique_ptr ff(font, &cairo_font_face_destroy); + ec = _Cairo_status_t_to_std_error_code(cairo_font_face_status(font)); + if (static_cast(ec)) { + return; + } + ::std::string s; + try { + s = cairo_toy_font_face_get_family(font); + } + catch (const ::std::bad_alloc&) { + ec = make_error_code(errc::not_enough_memory); + return; + } + catch (const ::std::length_error&) { + ec = make_error_code(errc::not_enough_memory); + return; + } + _Family = move(s); + _Font_slant = fs; + ec.clear(); +} + +void font_resource_factory::font_weight(::std::experimental::io2d::font_weight fw) { + auto font = cairo_toy_font_face_create(_Family.c_str(), _Font_slant_to_cairo_font_slant_t(_Font_slant), _Font_weight_to_cairo_font_weight_t(fw)); + unique_ptr ff(font, &cairo_font_face_destroy); + _Throw_if_failed_cairo_status_t(cairo_font_face_status(font)); + ::std::string s(cairo_toy_font_face_get_family(font)); + _Family = move(s); + _Font_weight = fw; +} + +void font_resource_factory::font_weight(::std::experimental::io2d::font_weight fw, ::std::error_code& ec) noexcept { + auto font = cairo_toy_font_face_create(_Family.c_str(), _Font_slant_to_cairo_font_slant_t(_Font_slant), _Font_weight_to_cairo_font_weight_t(fw)); + unique_ptr ff(font, &cairo_font_face_destroy); + ec = _Cairo_status_t_to_std_error_code(cairo_font_face_status(font)); + if (static_cast(ec)) { + return; + } + ::std::string s; + try { + s = cairo_toy_font_face_get_family(font); + } + catch (const ::std::bad_alloc&) { + ec = make_error_code(errc::not_enough_memory); + return; + } + catch (const ::std::length_error&) { + ec = make_error_code(errc::not_enough_memory); + return; + } + _Family = move(s); + _Font_weight = fw; + ec.clear(); +} + +void font_resource_factory::font_options(const ::std::experimental::io2d::font_options& fo) noexcept { + _Font_options = fo; +} + +void font_resource_factory::font_matrix(const matrix_2d& m) noexcept { + _Font_matrix = m; +} + +void font_resource_factory::surface_matrix(const matrix_2d & m) noexcept { + _Surface_matrix = m; +} + +::std::string font_resource_factory::font_family() const { + return _Family; +} + +::std::string font_resource_factory::font_family(::std::error_code& ec) const noexcept { + ::std::string s; + try { + s = _Family; + } + catch (const ::std::bad_alloc&) { + ec = make_error_code(errc::not_enough_memory); + return s; + } + catch (const ::std::length_error&) { + ec = make_error_code(errc::not_enough_memory); + return s; + } + ec.clear(); + return s; +} + +::std::experimental::io2d::font_slant font_resource_factory::font_slant() const noexcept { + return _Font_slant; +} + +::std::experimental::io2d::font_weight font_resource_factory::font_weight() const noexcept { + return _Font_weight; +} + +::std::experimental::io2d::font_options font_resource_factory::font_options() const noexcept { + return _Font_options; +} + +matrix_2d font_resource_factory::font_matrix() const noexcept { + return _Font_matrix; +} + +matrix_2d font_resource_factory::surface_matrix() const noexcept { + return _Surface_matrix; +} diff --git a/io2d/src/glyph_run.cpp b/io2d/src/glyph_run.cpp new file mode 100644 index 0000000..51052da --- /dev/null +++ b/io2d/src/glyph_run.cpp @@ -0,0 +1,184 @@ +#include "io2d.h" +#include "xio2dhelpers.h" +#include "xcairoenumhelpers.h" + +using namespace std; +using namespace std::experimental::io2d; + +glyph_run::glyph::glyph(glyph_run::glyph::index_type i, double x, double y) noexcept + : _Index(i) + , _X(x) + , _Y(y) + , _Native_glyph(nullptr) { +} + +void glyph_run::glyph::index(index_type i) noexcept { + _Index = i; + if (_Native_glyph != nullptr) { + (*_Native_glyph).index = i; + } +} + +void glyph_run::glyph::x(double val) noexcept { + _X = val; + if (_Native_glyph != nullptr) { + (*_Native_glyph).x = val; + } +} + +void glyph_run::glyph::y(double val) noexcept { + _Y = val; + if (_Native_glyph != nullptr) { + (*_Native_glyph).y = val; + } +} + +glyph_run::glyph::index_type glyph_run::glyph::index() const noexcept { + return _Index; +} + +double glyph_run::glyph::x() const noexcept { + return _X; +} + +double glyph_run::glyph::y() const noexcept { + return _Y; +} + +glyph_run::cluster::cluster(int glyphs, int bytes) noexcept + : _Glyph_count(glyphs) + , _Byte_count(bytes) + , _Native_cluster(nullptr) { +} + +void glyph_run::cluster::glyph_count(int count) noexcept { + _Glyph_count = count; + if (_Native_cluster != nullptr) { + (*_Native_cluster).num_glyphs = count; + } +} + +void glyph_run::cluster::byte_count(int count) noexcept { + _Byte_count = count; + if (_Native_cluster != nullptr) { + (*_Native_cluster).num_bytes = count; + } +} + +int glyph_run::cluster::glyph_count() const noexcept { + return _Glyph_count; +} + +int glyph_run::cluster::byte_count() const noexcept { + return _Byte_count; +} + +glyph_run& glyph_run::operator=(glyph_run&& other) noexcept { + if (this != &other) { + _Text_string.swap(other._Text_string); + _Font_resource = move(other._Font_resource); + _Glyphs = move(other._Glyphs); + _Clusters = move(other._Clusters); + _Cairo_glyphs = move(other._Cairo_glyphs); + _Cairo_text_clusters = move(other._Cairo_text_clusters); + _Position = move(other._Position); + _Text_cluster_flags = move(other._Text_cluster_flags); + } + return *this; +} + +glyph_run::glyph_run(const experimental::io2d::font_resource& fr, const ::std::string& utf8, const vector_2d& pos) + : _Text_string(utf8) + , _Font_resource(fr) + , _Glyphs() + , _Clusters() + , _Cairo_glyphs() + , _Cairo_text_clusters() + , _Position(pos) + , _Text_cluster_flags() { + //unique_ptr upcgt(nullptr, &cairo_glyph_free); + //unique_ptr upctc(nullptr, &cairo_text_cluster_free); + + cairo_glyph_t* cgt = nullptr; + int cgtCount = 0; + cairo_text_cluster_t* ctc = nullptr; + int ctcCount = 0; + auto status = cairo_scaled_font_text_to_glyphs(fr._Scaled_font.get(), pos.x(), pos.y(), utf8.c_str(), -1, &cgt, &cgtCount, &ctc, &ctcCount, &_Text_cluster_flags); + //upcgt.reset(cgt); + //upctc.reset(ctc); + try { + _Cairo_glyphs.reset(cgt, &cairo_glyph_free); + } + catch (...) { + cairo_text_cluster_free(ctc); + throw; + } + + _Cairo_text_clusters.reset(ctc, &cairo_text_cluster_free); + + //if (status != CAIRO_STATUS_SUCCESS) { + // if (cgt != nullptr) { + // cairo_glyph_free(cgt); + // } + // if (ctc != nullptr) { + // cairo_text_cluster_free(ctc); + // } + // _Throw_if_failed_cairo_status_t(status); + //} + + _Throw_if_failed_cairo_status_t(status); + + _Glyphs.reserve(static_cast::size_type>(cgtCount)); + + _Clusters.reserve(static_cast::size_type>(ctcCount)); + + for (int i = 0; i < cgtCount; ++i) { + const auto& val = cgt[i]; + _Glyphs.emplace_back(static_cast(val.index), val.x, val.y); + _Glyphs.rbegin()->_Native_glyph = cgt + i;//&(cgt[i]); + } + + for (int i = 0; i < ctcCount; ++i) { + const auto& val = ctc[i]; + _Clusters.emplace_back(val.num_glyphs, val.num_bytes); + _Clusters.rbegin()->_Native_cluster = ctc + i; + } +} + +vector& glyph_run::glyphs() noexcept { + return _Glyphs; +} + +vector& glyph_run::clusters() noexcept { + return _Clusters; +} + +const string& glyph_run::original_text() const noexcept { + return _Text_string; +} + +const vector& glyph_run::glyphs() const noexcept { + return _Glyphs; +} + +const vector& glyph_run::clusters() const noexcept { + return _Clusters; +} + +const experimental::io2d::font_resource& glyph_run::font_resource() const noexcept { + return _Font_resource; +} + +bool glyph_run::reversed_clusters() const noexcept { + return (_Text_cluster_flags & CAIRO_TEXT_CLUSTER_FLAG_BACKWARD) != 0; +} + +vector_2d glyph_run::position() const noexcept { + return _Position; +} + +text_extents glyph_run::extents() const noexcept { + cairo_text_extents_t cte{}; + cairo_scaled_font_glyph_extents(_Font_resource._Scaled_font.get(), _Cairo_glyphs.get(), static_cast(_Glyphs.size()), &cte); + return text_extents(cte.x_bearing, cte.y_bearing, cte.width, cte.height, cte.x_advance, cte.y_advance); +} diff --git a/N3888_RefImpl/src/image_surface.cpp b/io2d/src/image_surface.cpp similarity index 74% rename from N3888_RefImpl/src/image_surface.cpp rename to io2d/src/image_surface.cpp index fdfc21b..5610b58 100644 --- a/N3888_RefImpl/src/image_surface.cpp +++ b/io2d/src/image_surface.cpp @@ -61,47 +61,16 @@ image_surface::image_surface(vector& data, experimental::io2d::fo if (imageData == nullptr) { _Throw_if_failed_cairo_status_t(CAIRO_STATUS_NULL_POINTER); } - ::std::memcpy(imageData, data.data(), expected_size); + else { + ::std::memcpy(imageData, data.data(), expected_size); + } cairo_surface_mark_dirty(_Surface.get()); _Throw_if_failed_cairo_status_t(cairo_surface_status(_Surface.get())); cairo_set_miter_limit(_Context.get(), _Line_join_miter_miter_limit); _Throw_if_failed_cairo_status_t(cairo_status(_Context.get())); + _Ensure_state(); } -//image_surface::image_surface(const surface& other, experimental::io2d::format fmt, int width, int height) -// : surface({ nullptr, nullptr }, fmt, _Content_for_format(fmt)) { -// _Surface = unique_ptr(cairo_surface_create_similar_image(other.native_handle().csfce, _Format_to_cairo_format_t(fmt), width, height), &cairo_surface_destroy); -// _Throw_if_failed_cairo_status_t(cairo_surface_status(_Surface.get())); -// _Context = unique_ptr(cairo_create(_Surface.get()), &cairo_destroy); -// _Throw_if_failed_cairo_status_t(cairo_status(_Context.get())); -// cairo_set_miter_limit(_Context.get(), _Line_join_miter_miter_limit); -//} -// -//image_surface::image_surface(const surface& other, experimental::io2d::format fmt, int width, int height, error_code& ec) noexcept -// : surface({ nullptr, nullptr }, fmt, _Content_for_format(fmt), ec) { -// if (static_cast(ec)) { -// _Surface = nullptr; -// _Context = nullptr; -// return; -// } -// _Surface = unique_ptr(cairo_surface_create_similar_image(other.native_handle().csfce, _Format_to_cairo_format_t(fmt), width, height), &cairo_surface_destroy); -// ec = _Cairo_status_t_to_std_error_code(cairo_surface_status(_Surface.get())); -// if (static_cast(ec)) { -// _Surface = nullptr; -// _Context = nullptr; -// return; -// } -// _Context = unique_ptr(cairo_create(_Surface.get()), &cairo_destroy); -// ec = _Cairo_status_t_to_std_error_code(cairo_status(_Context.get())); -// if (static_cast(ec)) { -// _Surface = nullptr; -// _Context = nullptr; -// return; -// } -// cairo_set_miter_limit(_Context.get(), _Line_join_miter_miter_limit); -// ec.clear(); -//} - image_surface::~image_surface() { } @@ -118,7 +87,9 @@ void image_surface::data(const vector& data) { if (imageData == nullptr) { _Throw_if_failed_cairo_status_t(CAIRO_STATUS_NULL_POINTER); } - ::std::memcpy(imageData, data.data(), expected_size); + else { + ::std::memcpy(imageData, data.data(), expected_size); + } cairo_surface_mark_dirty(_Surface.get()); } @@ -144,7 +115,7 @@ void image_surface::data(const vector& data, error_code& ec) noex } vector image_surface::data() { - auto required_size = stride() * height(); + auto required_size = static_cast::size_type>(stride() * height()); vector data; //if (_Surface.get() == nullptr) { // _Throw_if_failed_cairo_status_t(CAIRO_STATUS_NULL_POINTER); @@ -157,7 +128,7 @@ vector image_surface::data() { } vector image_surface::data(error_code& ec) noexcept { - auto required_size = stride() * height(); + auto required_size = static_cast::size_type>(stride() * height()); // Relies on C++17 noexcept guarantee for vector default ctor (N4258, adopted 2014-11). vector data; //if (_Surface.get() == nullptr) { diff --git a/N3888_RefImpl/src/io2d_error_category.cpp b/io2d/src/io2d_error_category.cpp similarity index 100% rename from N3888_RefImpl/src/io2d_error_category.cpp rename to io2d/src/io2d_error_category.cpp diff --git a/N3888_RefImpl/src/linear_brush_factory.cpp b/io2d/src/linear_brush_factory.cpp similarity index 100% rename from N3888_RefImpl/src/linear_brush_factory.cpp rename to io2d/src/linear_brush_factory.cpp diff --git a/N3888_RefImpl/src/mapped_surface.cpp b/io2d/src/mapped_surface.cpp similarity index 100% rename from N3888_RefImpl/src/mapped_surface.cpp rename to io2d/src/mapped_surface.cpp diff --git a/N3888_RefImpl/src/matrix_2d.cpp b/io2d/src/matrix_2d.cpp similarity index 100% rename from N3888_RefImpl/src/matrix_2d.cpp rename to io2d/src/matrix_2d.cpp diff --git a/N3888_RefImpl/src/mesh_brush_factory.cpp b/io2d/src/mesh_brush_factory.cpp similarity index 100% rename from N3888_RefImpl/src/mesh_brush_factory.cpp rename to io2d/src/mesh_brush_factory.cpp diff --git a/N3888_RefImpl/src/path.cpp b/io2d/src/path.cpp similarity index 98% rename from N3888_RefImpl/src/path.cpp rename to io2d/src/path.cpp index d126c44..a45c438 100644 --- a/N3888_RefImpl/src/path.cpp +++ b/io2d/src/path.cpp @@ -193,16 +193,27 @@ path::path(const vector& pathData) auto ang1 = ad.angle_1(); auto ang2 = ad.angle_2(); while (ang2 < ang1) { +#if _Variable_templates_conditional_support_test + ang2 += two_pi; +#else ang2 += two_pi(); +#endif } vector_2d pt0, pt1, pt2, pt3; int bezCount = 1; double theta = ang2 - ang1; double phi; +#if _Variable_templates_conditional_support_test + while (theta >= half_pi) { + theta /= 2.0; + bezCount += bezCount; + } +#else while (theta >= half_pi()) { theta /= 2.0; bezCount += bezCount; } +#endif phi = theta / 2.0; auto cosPhi = cos(phi); auto sinPhi = sin(phi); @@ -282,16 +293,27 @@ path::path(const vector& pathData) auto ang1 = ad.angle_1(); auto ang2 = ad.angle_2(); while (ang2 > ang1) { +#if _Variable_templates_conditional_support_test + ang2 -= two_pi; +#else ang2 -= two_pi(); +#endif } vector_2d pt0, pt1, pt2, pt3; int bezCount = 1; double theta = ang1 - ang2; double phi; +#if _Variable_templates_conditional_support_test + while (theta >= half_pi) { + theta /= 2.0; + bezCount += bezCount; + } +#else while (theta >= half_pi()) { theta /= 2.0; bezCount += bezCount; } +#endif phi = theta / 2.0; auto cosPhi = cos(phi); auto sinPhi = sin(phi); diff --git a/N3888_RefImpl/src/path_data.cpp b/io2d/src/path_data.cpp similarity index 100% rename from N3888_RefImpl/src/path_data.cpp rename to io2d/src/path_data.cpp diff --git a/N3888_RefImpl/src/path_data_item.cpp b/io2d/src/path_data_item.cpp similarity index 99% rename from N3888_RefImpl/src/path_data_item.cpp rename to io2d/src/path_data_item.cpp index f288c25..d1e681b 100644 --- a/N3888_RefImpl/src/path_data_item.cpp +++ b/io2d/src/path_data_item.cpp @@ -18,7 +18,7 @@ path_data_item& path_data_item::operator=(path_data_item&& other) noexcept { _Type = move(other._Type); } return *this; -}; +} path_data_item::path_data_item(const arc& value) noexcept : _Has_data() diff --git a/N3888_RefImpl/src/path_factory.cpp b/io2d/src/path_factory.cpp similarity index 94% rename from N3888_RefImpl/src/path_factory.cpp rename to io2d/src/path_factory.cpp index 94cf3f4..0b70992 100644 --- a/N3888_RefImpl/src/path_factory.cpp +++ b/io2d/src/path_factory.cpp @@ -992,3 +992,39 @@ void path_factory::clear() noexcept { _Origin = { }; } +void path_factory::add_text(const font_resource& fr, const string& utf8, const vector_2d& pt) { + auto gr = fr.make_glyph_run(utf8, pt); + auto ext = gr.extents(); + double w = ext.width(); + double h = ext.height(); + cairo_matrix_t cm{}; + cairo_matrix_init_translate(&cm, -(pt.x() + ext.x_bearing()), -(pt.y() + ext.y_bearing())); + unique_ptr upimgSfc( + cairo_image_surface_create(CAIRO_FORMAT_ARGB32, _Double_to_int(w + 0.5), _Double_to_int(h + 0.5)), &cairo_surface_destroy + ); + unique_ptr upctxt(cairo_create(upimgSfc.get()), &cairo_destroy); + cairo_set_matrix(upctxt.get(), &cm); + cairo_new_path(upctxt.get()); + cairo_set_scaled_font(upctxt.get(), fr._Scaled_font.get()); + cairo_glyph_path(upctxt.get(), gr._Cairo_glyphs.get(), static_cast(gr.glyphs().size())); + unique_ptr uppth(cairo_copy_path(upctxt.get()), &cairo_path_destroy); + append(_Cairo_path_data_t_array_to_path_data_item_vector(*(uppth.get()))); +} + +void path_factory::add_glyph_run(const font_resource& fr, const glyph_run& gr) { + auto ext = gr.extents(); + double w = ext.width(); + double h = ext.height(); + cairo_matrix_t cm{}; + cairo_matrix_init_translate(&cm, -(gr.position().x() + ext.x_bearing()), -(gr.position().y() + ext.y_bearing())); + unique_ptr upimgSfc( + cairo_image_surface_create(CAIRO_FORMAT_ARGB32, _Double_to_int(w + 0.5), _Double_to_int(h + 0.5)), &cairo_surface_destroy + ); + unique_ptr upctxt(cairo_create(upimgSfc.get()), &cairo_destroy); + cairo_set_matrix(upctxt.get(), &cm); + cairo_new_path(upctxt.get()); + cairo_set_scaled_font(upctxt.get(), fr._Scaled_font.get()); + cairo_glyph_path(upctxt.get(), gr._Cairo_glyphs.get(), static_cast(gr.glyphs().size())); + unique_ptr uppth(cairo_copy_path(upctxt.get()), &cairo_path_destroy); + append(_Cairo_path_data_t_array_to_path_data_item_vector(*(uppth.get()))); +} diff --git a/N3888_RefImpl/src/radial_brush_factory.cpp b/io2d/src/radial_brush_factory.cpp similarity index 100% rename from N3888_RefImpl/src/radial_brush_factory.cpp rename to io2d/src/radial_brush_factory.cpp diff --git a/N3888_RefImpl/src/rectangle.cpp b/io2d/src/rectangle.cpp similarity index 100% rename from N3888_RefImpl/src/rectangle.cpp rename to io2d/src/rectangle.cpp diff --git a/N3888_RefImpl/src/rgba_color.cpp b/io2d/src/rgba_color.cpp similarity index 100% rename from N3888_RefImpl/src/rgba_color.cpp rename to io2d/src/rgba_color.cpp diff --git a/N3888_RefImpl/src/solid_color_brush_factory.cpp b/io2d/src/solid_color_brush_factory.cpp similarity index 100% rename from N3888_RefImpl/src/solid_color_brush_factory.cpp rename to io2d/src/solid_color_brush_factory.cpp diff --git a/N3888_RefImpl/src/standalone_functions.cpp b/io2d/src/standalone_functions.cpp similarity index 94% rename from N3888_RefImpl/src/standalone_functions.cpp rename to io2d/src/standalone_functions.cpp index 43ff524..2600fb8 100644 --- a/N3888_RefImpl/src/standalone_functions.cpp +++ b/io2d/src/standalone_functions.cpp @@ -16,8 +16,12 @@ namespace std { return ec; } - display_surface make_display_surface(int preferredWidth, int preferredHeight, format preferredFormat, scaling scl) { - return display_surface(preferredWidth, preferredHeight, preferredFormat, scl); + display_surface make_display_surface(int preferredWidth, int preferredHeight, format preferredFormat, scaling scl, refresh_rate rr, double desiredFramerate) { + return display_surface(preferredWidth, preferredHeight, preferredFormat, scl, rr, desiredFramerate); + } + + display_surface make_display_surface(int preferredWidth, int preferredHeight, format preferredFormat, int preferredDisplayWidth, int preferredDisplayHeight, scaling scl, refresh_rate rr, double desiredFramerate) { + return display_surface(preferredWidth, preferredHeight, preferredFormat, preferredDisplayWidth, preferredDisplayHeight,scl, rr, desiredFramerate); } image_surface make_image_surface(format fmt, int width, int height) { @@ -159,12 +163,20 @@ namespace std { vector _Get_arc_as_beziers(const vector_2d& center, double radius, double angle1, double angle2, bool arcNegative, bool hasCurrentPoint, const vector_2d& /*currentPoint*/, const vector_2d& origin, const matrix_2d& matrix) { if (arcNegative) { while (angle2 > angle1) { +#if _Variable_templates_conditional_support_test + angle2 -= two_pi; +#else angle2 -= two_pi(); +#endif } } else { while (angle2 < angle1) { +#if _Variable_templates_conditional_support_test + angle2 += two_pi; +#else angle2 += two_pi(); +#endif } } vector_2d pt0, pt1, pt2, pt3; @@ -181,10 +193,17 @@ namespace std { { // See: DeVeneza, Richard A., "How to determine the control points of a Bézier curve that approximates a small circular arc" (Nov. 2004) [ http://www.tinaja.com/glib/bezcirc2.pdf ]. +#if _Variable_templates_conditional_support_test + while (theta >= half_pi) { + theta /= 2.0; + bezierCount += bezierCount; + } +#else while (theta >= half_pi()) { theta /= 2.0; bezierCount += bezierCount; } +#endif phi = theta / 2.0; @@ -261,12 +280,20 @@ namespace std { vector _Get_arc_as_beziers(const vector_2d& center, double radius, double angle1, double angle2, error_code& ec, bool arcNegative, bool hasCurrentPoint, const vector_2d& /*currentPoint*/, const vector_2d& origin, const matrix_2d& matrix) noexcept { if (arcNegative) { while (angle2 > angle1) { +#if _Variable_templates_conditional_support_test + angle2 -= two_pi; +#else angle2 -= two_pi(); +#endif } } else { while (angle2 < angle1) { +#if _Variable_templates_conditional_support_test + angle2 += two_pi; +#else angle2 += two_pi(); +#endif } } vector_2d pt0, pt1, pt2, pt3; @@ -283,10 +310,17 @@ namespace std { { // See: DeVeneza, Richard A., "How to determine the control points of a Bézier curve that approximates a small circular arc" (Nov. 2004) [ http://www.tinaja.com/glib/bezcirc2.pdf ]. +#if _Variable_templates_conditional_support_test + while (theta >= half_pi) { + theta /= 2.0; + bezierCount += bezierCount; + } +#else while (theta >= half_pi()) { theta /= 2.0; bezierCount += bezierCount; } +#endif phi = theta / 2.0; @@ -395,12 +429,20 @@ namespace std { void _Get_arc_extents(const ::std::experimental::io2d::vector_2d& center, double radius, double angle1, double angle2, bool arcNegative, bool& hasCurrentPoint, ::std::experimental::io2d::vector_2d& currentPoint, ::std::experimental::io2d::vector_2d& transformedCurrentPoint, ::std::experimental::io2d::vector_2d& lastMoveToPoint, bool& hasExtents, vector_2d& exPt0, vector_2d& exPt1, ::std::experimental::io2d::vector_2d& origin, ::std::experimental::io2d::matrix_2d& transformMatrix) noexcept { if (arcNegative) { while (angle2 > angle1) { +#if _Variable_templates_conditional_support_test + angle2 -= two_pi; +#else angle2 -= two_pi(); +#endif } } else { while (angle2 < angle1) { +#if _Variable_templates_conditional_support_test + angle2 += two_pi; +#else angle2 += two_pi(); +#endif } } vector_2d pt0, pt1, pt2, pt3; @@ -417,10 +459,17 @@ namespace std { { // See: DeVeneza, Richard A., "How to determine the control points of a Bézier curve that approximates a small circular arc" (Nov. 2004) [ http://www.tinaja.com/glib/bezcirc2.pdf ]. - while (theta >= (half_pi())) { +#if _Variable_templates_conditional_support_test + while (theta >= half_pi) { theta /= 2.0; bezierCount += bezierCount; } +#else + while (theta >= half_pi()) { + theta /= 2.0; + bezierCount += bezierCount; + } +#endif phi = theta / 2.0; diff --git a/N3888_RefImpl/src/surface.cpp b/io2d/src/surface.cpp similarity index 77% rename from N3888_RefImpl/src/surface.cpp rename to io2d/src/surface.cpp index e2c1198..03c3345 100644 --- a/N3888_RefImpl/src/surface.cpp +++ b/io2d/src/surface.cpp @@ -6,6 +6,10 @@ using namespace std; using namespace std::experimental; using namespace std::experimental::io2d; +namespace { + const vector_2d _Font_default_size{ 16.0, 16.0 }; +} + void surface::_Ensure_state() { if (_Surface == nullptr || _Context == nullptr) { _Throw_if_failed_cairo_status_t(CAIRO_STATUS_NULL_POINTER); @@ -26,14 +30,7 @@ void surface::_Ensure_state() { cairo_new_path(_Context.get()); } matrix(_Transform_matrix); - if (_Font_face.get() != nullptr) { - font_face(*_Font_face); - } - else { - cairo_set_font_face(_Context.get(), nullptr); // Restore default font. - } - font_matrix(_Font_matrix); - font_options(_Font_options); + font_resource(_Font_resource); } void surface::_Ensure_state(error_code& ec) noexcept { @@ -62,21 +59,11 @@ void surface::_Ensure_state(error_code& ec) noexcept { cairo_new_path(_Context.get()); } matrix(_Transform_matrix); - if (_Font_face.get() != nullptr) { - font_face(*_Font_face, ec); - if (static_cast(ec)) { - return; - } - } - else { - cairo_set_font_face(_Context.get(), nullptr); // Restore default font. - } - font_matrix(_Font_matrix); - font_options(_Font_options); dashes(_Dashes, ec); if (static_cast(ec)) { return; } + font_resource(_Font_resource); ec.clear(); } @@ -100,14 +87,13 @@ surface::surface(format fmt, int width, int height) , _Current_path() , _Immediate_path() , _Transform_matrix(matrix_2d::init_identity()) - , _Font_face() - , _Font_matrix(matrix_2d::init_scale({ 10.0, 10.0 })) - , _Font_options(::std::experimental::io2d::antialias::default_antialias, ::std::experimental::io2d::subpixel_order::default_subpixel_order) + , _Font_resource(font_resource_factory()) , _Saved_state() { _Throw_if_failed_cairo_status_t(cairo_surface_status(_Surface.get())); _Throw_if_failed_cairo_status_t(cairo_status(_Context.get())); _Throw_if_failed_cairo_status_t(cairo_font_options_status(_Native_font_options.get())); _Throw_if_failed_cairo_status_t(cairo_pattern_status(_Brush.native_handle())); + _Ensure_state(); } surface::native_handle_type surface::native_handle() const { @@ -133,9 +119,7 @@ surface::surface(surface&& other) noexcept , _Current_path(move(other._Current_path)) , _Immediate_path(move(other._Immediate_path)) , _Transform_matrix(move(other._Transform_matrix)) - , _Font_face(move(other._Font_face)) - , _Font_matrix(move(other._Font_matrix)) - , _Font_options(move(other._Font_options)) + , _Font_resource(move(other._Font_resource)) , _Saved_state(move(other._Saved_state)) { } @@ -158,9 +142,7 @@ surface& surface::operator=(surface&& other) noexcept { _Current_path = move(other._Current_path); _Immediate_path = move(other._Immediate_path); _Transform_matrix = move(other._Transform_matrix); - _Font_face = move(other._Font_face); - _Font_matrix = move(other._Font_matrix); - _Font_options = move(other._Font_options); + _Font_resource = move(other._Font_resource); _Saved_state = move(other._Saved_state); } return *this; @@ -186,13 +168,19 @@ surface::surface(surface::native_handle_type nh, ::std::experimental::io2d::form , _Current_path() , _Immediate_path() , _Transform_matrix() - , _Font_face() - , _Font_matrix(matrix_2d::init_scale({ 10.0, 10.0 })) - , _Font_options(::std::experimental::io2d::antialias::default_antialias, ::std::experimental::io2d::subpixel_order::default_subpixel_order) + , _Font_resource(font_resource_factory()) , _Saved_state() { if (nh.csfce != nullptr) { _Throw_if_failed_cairo_status_t(cairo_surface_status(_Surface.get())); _Throw_if_failed_cairo_status_t(cairo_status(_Context.get())); + auto pf = path_factory{}; + unique_ptr upcpt{ cairo_copy_path(_Context.get()), &cairo_path_destroy }; + if (upcpt.get() == nullptr) { + _Throw_if_failed_cairo_status_t(CAIRO_STATUS_NULL_POINTER); + } + pf.append(_Cairo_path_data_t_array_to_path_data_item_vector(*(upcpt.get()))); + _Current_path = make_shared(pf); + _Ensure_state(); } _Throw_if_failed_cairo_status_t(cairo_font_options_status(_Native_font_options.get())); _Throw_if_failed_cairo_status_t(cairo_pattern_status(_Brush.native_handle())); @@ -219,9 +207,7 @@ surface::surface(surface::native_handle_type nh, ::std::experimental::io2d::form , _Current_path() , _Immediate_path() , _Transform_matrix(matrix_2d::init_identity()) - , _Font_face() - , _Font_matrix(matrix_2d::init_scale({ 10.0, 10.0 })) - , _Font_options(::std::experimental::io2d::antialias::default_antialias, ::std::experimental::io2d::subpixel_order::default_subpixel_order) + , _Font_resource(font_resource_factory()) , _Saved_state() { if (nh.csfce != nullptr) { if (static_cast(ec)) { @@ -257,6 +243,12 @@ surface::surface(surface::native_handle_type nh, ::std::experimental::io2d::form if (_Context.get() != nullptr) { cairo_set_miter_limit(_Context.get(), _Line_join_miter_miter_limit); } + _Ensure_state(ec); + if (static_cast(ec)) { + _Surface = nullptr; + _Context = nullptr; + return; + } ec.clear(); } @@ -278,14 +270,13 @@ surface::surface(const surface& other, ::std::experimental::io2d::content ctnt, , _Current_path() , _Immediate_path() , _Transform_matrix(matrix_2d::init_identity()) - , _Font_face() - , _Font_matrix(matrix_2d::init_scale({ 10.0, 10.0 })) - , _Font_options(::std::experimental::io2d::antialias::default_antialias, ::std::experimental::io2d::subpixel_order::default_subpixel_order) + , _Font_resource(font_resource_factory()) , _Saved_state() { _Throw_if_failed_cairo_status_t(cairo_surface_status(_Surface.get())); _Throw_if_failed_cairo_status_t(cairo_status(_Context.get())); _Throw_if_failed_cairo_status_t(cairo_font_options_status(_Native_font_options.get())); _Throw_if_failed_cairo_status_t(cairo_pattern_status(_Brush.native_handle())); + _Ensure_state(); } surface::~surface() { @@ -407,13 +398,13 @@ void surface::map(const ::std::function& act void surface::save() { cairo_save(_Context.get()); - _Saved_state.push(make_tuple(_Brush, _Antialias, _Dashes, _Fill_rule, _Line_cap, _Line_join, _Line_width, _Miter_limit, _Compositing_operator, _Current_path, _Immediate_path, _Transform_matrix, _Font_face, _Font_matrix, _Font_options)); + _Saved_state.push(make_tuple(_Brush, _Antialias, _Dashes, _Fill_rule, _Line_cap, _Line_join, _Line_width, _Miter_limit, _Compositing_operator, _Current_path, _Immediate_path, _Transform_matrix, _Font_resource)); } void surface::save(error_code& ec) noexcept { cairo_save(_Context.get()); try { - _Saved_state.push(make_tuple(_Brush, _Antialias, _Dashes, _Fill_rule, _Line_cap, _Line_join, _Line_width, _Miter_limit, _Compositing_operator, _Current_path, _Immediate_path, _Transform_matrix, _Font_face, _Font_matrix, _Font_options)); + _Saved_state.push(make_tuple(_Brush, _Antialias, _Dashes, _Fill_rule, _Line_cap, _Line_join, _Line_width, _Miter_limit, _Compositing_operator, _Current_path, _Immediate_path, _Transform_matrix, _Font_resource)); } catch (const bad_alloc&) { ec = make_error_code(errc::not_enough_memory); @@ -442,9 +433,7 @@ void surface::restore() { _Current_path = move(get<9>(t)); _Immediate_path = move(get<10>(t)); _Transform_matrix = get<11>(t); - _Font_face = move(get<12>(t)); - _Font_matrix = get<13>(t); - _Font_options = get<14>(t); + _Font_resource = move(get<12>(t)); } _Saved_state.pop(); @@ -471,9 +460,7 @@ void surface::restore(error_code& ec) noexcept { _Current_path = move(get<9>(t)); _Immediate_path = move(get<10>(t)); _Transform_matrix = get<11>(t); - _Font_face = move(get<12>(t)); - _Font_matrix = get<13>(t); - _Font_options = get<14>(t); + _Font_resource = move(get<12>(t)); } _Saved_state.pop(); @@ -668,10 +655,6 @@ void surface::paint(const ::std::experimental::io2d::brush& b) { paint(); } -void surface::paint(const surface& s, const vector_2d& origin, extend e, filter f) { - paint(s, matrix_2d{ 1.0, 0.0, 0.0, 1.0, origin.x(), origin.y() }, e, f); -} - void surface::paint(const surface& s, const matrix_2d& m, extend e, filter f) { cairo_set_source_surface(_Context.get(), s.native_handle().csfce, 0.0, 0.0); auto pat = cairo_get_source(_Context.get()); @@ -704,10 +687,6 @@ void surface::paint(const ::std::experimental::io2d::brush& b, double alpha) { paint(alpha); } -void surface::paint(const surface& s, double alpha, const vector_2d& origin, extend e, filter f) { - paint(s, alpha, matrix_2d{ 1.0, 0.0, 0.0, 1.0, origin.x(), origin.y() }, e, f); -} - void surface::paint(const surface& s, double alpha, const matrix_2d& m, extend e, filter f) { cairo_set_source_surface(_Context.get(), s.native_handle().csfce, 0.0, 0.0); auto pat = cairo_get_source(_Context.get()); @@ -740,10 +719,6 @@ void surface::fill(const ::std::experimental::io2d::brush& b) { fill(); } -void surface::fill(const surface& s, const vector_2d& origin, extend e, filter f) { - fill(s, matrix_2d{ 1.0, 0.0, 0.0, 1.0, origin.x(), origin.y() }, e, f); -} - void surface::fill(const surface& s, const matrix_2d& m, extend e, filter f) { cairo_set_source_surface(_Context.get(), s.native_handle().csfce, 0.0, 0.0); auto pat = cairo_get_source(_Context.get()); @@ -779,10 +754,6 @@ void surface::fill_immediate(const ::std::experimental::io2d::brush& b) { fill_immediate(); } -void surface::fill_immediate(const surface& s, const vector_2d& origin, extend e, filter f) { - fill_immediate(s, matrix_2d{ 1.0, 0.0, 0.0, 1.0, origin.x(), origin.y() }, e, f); -} - void surface::fill_immediate(const surface& s, const matrix_2d& m, extend e, filter f) { auto currPath = _Current_path; path(experimental::io2d::path(_Immediate_path)); @@ -818,10 +789,6 @@ void surface::stroke(const ::std::experimental::io2d::brush& b) { stroke(); } -void surface::stroke(const surface& s, const vector_2d& origin, extend e, filter f) { - stroke(s, matrix_2d{ 1.0, 0.0, 0.0, 1.0, origin.x(), origin.y() }, e, f); -} - void surface::stroke(const surface& s, const matrix_2d& m, extend e, filter f) { cairo_set_source_surface(_Context.get(), s.native_handle().csfce, 0.0, 0.0); auto pat = cairo_get_source(_Context.get()); @@ -857,10 +824,6 @@ void surface::stroke_immediate(const ::std::experimental::io2d::brush& b) { stroke_immediate(); } -void surface::stroke_immediate(const surface& s, const vector_2d& origin, extend e, filter f) { - stroke_immediate(s, matrix_2d{ 1.0, 0.0, 0.0, 1.0, origin.x(), origin.y() }, e, f); -} - void surface::stroke_immediate(const surface& s, const matrix_2d& m, extend e, filter f) { auto currPath = _Current_path; path(experimental::io2d::path(_Immediate_path)); @@ -896,10 +859,6 @@ void surface::mask(const ::std::experimental::io2d::brush& maskBrush, const ::st mask(maskBrush); } -void surface::mask(const ::std::experimental::io2d::brush& maskBrush, const surface& s, const vector_2d& origin, extend e, filter f) { - mask(maskBrush, s, matrix_2d{ 1.0, 0.0, 0.0, 1.0, origin.x(), origin.y() }, e, f); -} - void surface::mask(const ::std::experimental::io2d::brush& maskBrush, const surface& s, const matrix_2d& m, extend e, filter f) { cairo_set_source_surface(_Context.get(), s.native_handle().csfce, 0.0, 0.0); auto pat = cairo_get_source(_Context.get()); @@ -911,76 +870,60 @@ void surface::mask(const ::std::experimental::io2d::brush& maskBrush, const surf cairo_set_source_rgba(_Context.get(), 0.0, 0.0, 0.0, 0.0); } -void surface::mask(const surface& maskSurface) { +void surface::mask(surface& maskSurface, const matrix_2d& maskMatrix, extend maskExtend, filter maskFilter) { cairo_pattern_set_extend(_Brush.native_handle(), _Extend_to_cairo_extend_t(_Brush.extend())); cairo_pattern_set_filter(_Brush.native_handle(), _Filter_to_cairo_filter_t(_Brush.filter())); cairo_matrix_t cPttnMatrix; cairo_matrix_init(&cPttnMatrix, _Brush.matrix().m00(), _Brush.matrix().m01(), _Brush.matrix().m10(), _Brush.matrix().m11(), _Brush.matrix().m20(), _Brush.matrix().m21()); cairo_pattern_set_matrix(_Brush.native_handle(), &cPttnMatrix); cairo_set_source(_Context.get(), _Brush.native_handle()); - cairo_mask_surface(_Context.get(), maskSurface.native_handle().csfce, 0.0, 0.0); -} -void surface::mask(const surface& maskSurface, const rgba_color& c) { - solid_color_brush_factory factory(c); - brush(experimental::io2d::brush(factory)); - mask(maskSurface); -} + surface_brush_factory sbf(maskSurface); + experimental::io2d::brush maskBrush(sbf); + maskBrush.matrix(maskMatrix); + maskBrush.extend(maskExtend); + maskBrush.filter(maskFilter); -void surface::mask(const surface& maskSurface, const ::std::experimental::io2d::brush& b) { - brush(b); - mask(maskSurface); + mask(maskBrush); } -void surface::mask(const surface& maskSurface, const surface& s, const vector_2d& origin, extend e, filter f) { - mask(maskSurface, s, matrix_2d{ 1.0, 0.0, 0.0, 1.0, origin.x(), origin.y() }, e, f); -} +void surface::mask(surface& maskSurface, const rgba_color& c, const matrix_2d& maskMatrix, extend maskExtend, filter maskFilter) { + surface_brush_factory sbf(maskSurface); + experimental::io2d::brush maskBrush(sbf); + maskBrush.matrix(maskMatrix); + maskBrush.extend(maskExtend); + maskBrush.filter(maskFilter); -void surface::mask(const surface& maskSurface, const surface& s, const matrix_2d& m, extend e, filter f) { - cairo_set_source_surface(_Context.get(), s.native_handle().csfce, 0.0, 0.0); - auto pat = cairo_get_source(_Context.get()); - cairo_pattern_set_extend(pat, _Extend_to_cairo_extend_t(e)); - cairo_pattern_set_filter(pat, _Filter_to_cairo_filter_t(f)); - cairo_matrix_t cmat{ m.m00(), m.m01(), m.m10(), m.m11(), m.m20(), m.m21() }; - cairo_pattern_set_matrix(pat, &cmat); - cairo_mask_surface(_Context.get(), maskSurface.native_handle().csfce, 0.0, 0.0); - cairo_set_source_rgba(_Context.get(), 0.0, 0.0, 0.0, 0.0); + mask(maskBrush); + mask(maskBrush, c); } -void surface::mask(const surface& maskSurface, const vector_2d& maskOrigin) { - cairo_pattern_set_extend(_Brush.native_handle(), _Extend_to_cairo_extend_t(_Brush.extend())); - cairo_pattern_set_filter(_Brush.native_handle(), _Filter_to_cairo_filter_t(_Brush.filter())); - cairo_matrix_t cPttnMatrix; - cairo_matrix_init(&cPttnMatrix, _Brush.matrix().m00(), _Brush.matrix().m01(), _Brush.matrix().m10(), _Brush.matrix().m11(), _Brush.matrix().m20(), _Brush.matrix().m21()); - cairo_pattern_set_matrix(_Brush.native_handle(), &cPttnMatrix); - cairo_set_source(_Context.get(), _Brush.native_handle()); - cairo_mask_surface(_Context.get(), maskSurface.native_handle().csfce, maskOrigin.x(), maskOrigin.y()); -} +void surface::mask(surface& maskSurface, const ::std::experimental::io2d::brush& b, const matrix_2d& maskMatrix, extend maskExtend, filter maskFilter) { + surface_brush_factory sbf(maskSurface); + experimental::io2d::brush maskBrush(sbf); + maskBrush.matrix(maskMatrix); + maskBrush.extend(maskExtend); + maskBrush.filter(maskFilter); -void surface::mask(const surface& maskSurface, const vector_2d& maskOrigin, const rgba_color& c) { - solid_color_brush_factory factory(c); - brush(experimental::io2d::brush(factory)); - mask(maskSurface, maskOrigin); + mask(maskBrush, b); } -void surface::mask(const surface& maskSurface, const vector_2d& maskOrigin, const ::std::experimental::io2d::brush& b) { - brush(b); - mask(maskSurface, maskOrigin); -} +void surface::mask(surface& maskSurface, const surface& s, const matrix_2d& maskMatrix, const matrix_2d& m, extend maskExtend, extend e, filter maskFilter, filter f) { + //cairo_set_source_surface(_Context.get(), s.native_handle().csfce, 0.0, 0.0); + //auto pat = cairo_get_source(_Context.get()); + //cairo_pattern_set_extend(pat, _Extend_to_cairo_extend_t(e)); + //cairo_pattern_set_filter(pat, _Filter_to_cairo_filter_t(f)); + //cairo_matrix_t cmat{ m.m00(), m.m01(), m.m10(), m.m11(), m.m20(), m.m21() }; + //cairo_pattern_set_matrix(pat, &cmat); + //cairo_mask_surface(_Context.get(), maskSurface.native_handle().csfce, 0.0, 0.0); + //cairo_set_source_rgba(_Context.get(), 0.0, 0.0, 0.0, 0.0); + surface_brush_factory sbf(maskSurface); + experimental::io2d::brush maskBrush(sbf); + maskBrush.matrix(maskMatrix); + maskBrush.extend(maskExtend); + maskBrush.filter(maskFilter); -void surface::mask(const surface& maskSurface, const vector_2d& maskOrigin, const surface& s, const vector_2d& origin, extend e, filter f) { - mask(maskSurface, maskOrigin, s, matrix_2d{ 1.0, 0.0, 0.0, 1.0, origin.x(), origin.y() }, e, f); -} - -void surface::mask(const surface& maskSurface, const vector_2d& maskOrigin, const surface& s, const matrix_2d& m, extend e, filter f) { - cairo_set_source_surface(_Context.get(), s.native_handle().csfce, 0.0, 0.0); - auto pat = cairo_get_source(_Context.get()); - cairo_pattern_set_extend(pat, _Extend_to_cairo_extend_t(e)); - cairo_pattern_set_filter(pat, _Filter_to_cairo_filter_t(f)); - cairo_matrix_t cmat{ m.m00(), m.m01(), m.m10(), m.m11(), m.m20(), m.m21() }; - cairo_pattern_set_matrix(pat, &cmat); - cairo_mask_surface(_Context.get(), maskSurface.native_handle().csfce, maskOrigin.x(), maskOrigin.y()); - cairo_set_source_rgba(_Context.get(), 0.0, 0.0, 0.0, 0.0); + mask(maskBrush, s, m, e, f); } void surface::mask_immediate(const ::std::experimental::io2d::brush& maskBrush) { @@ -991,6 +934,12 @@ void surface::mask_immediate(const ::std::experimental::io2d::brush& maskBrush) cairo_matrix_t cPttnMatrix; cairo_matrix_init(&cPttnMatrix, _Brush.matrix().m00(), _Brush.matrix().m01(), _Brush.matrix().m10(), _Brush.matrix().m11(), _Brush.matrix().m20(), _Brush.matrix().m21()); cairo_pattern_set_matrix(_Brush.native_handle(), &cPttnMatrix); + + cairo_pattern_set_extend(maskBrush.native_handle(), _Extend_to_cairo_extend_t(maskBrush.extend())); + cairo_pattern_set_filter(maskBrush.native_handle(), _Filter_to_cairo_filter_t(maskBrush.filter())); + cairo_matrix_init(&cPttnMatrix, maskBrush.matrix().m00(), maskBrush.matrix().m01(), maskBrush.matrix().m10(), maskBrush.matrix().m11(), maskBrush.matrix().m20(), maskBrush.matrix().m21()); + cairo_pattern_set_matrix(maskBrush.native_handle(), &cPttnMatrix); + cairo_set_source(_Context.get(), _Brush.native_handle()); cairo_mask(_Context.get(), maskBrush.native_handle()); path(currPath); @@ -999,16 +948,12 @@ void surface::mask_immediate(const ::std::experimental::io2d::brush& maskBrush) void surface::mask_immediate(const ::std::experimental::io2d::brush& maskBrush, const rgba_color& c) { solid_color_brush_factory factory(c); brush(experimental::io2d::brush(factory)); - mask(maskBrush); + mask_immediate(maskBrush); } void surface::mask_immediate(const ::std::experimental::io2d::brush& maskBrush, const ::std::experimental::io2d::brush& b) { brush(b); - mask(maskBrush); -} - -void surface::mask_immediate(const ::std::experimental::io2d::brush& maskBrush, const surface& s, const vector_2d& origin, extend e, filter f) { - mask_immediate(maskBrush, s, matrix_2d{ 1.0, 0.0, 0.0, 1.0, origin.x(), origin.y() }, e, f); + mask_immediate(maskBrush); } void surface::mask_immediate(const ::std::experimental::io2d::brush& maskBrush, const surface& s, const matrix_2d& m, extend e, filter f) { @@ -1020,134 +965,146 @@ void surface::mask_immediate(const ::std::experimental::io2d::brush& maskBrush, cairo_pattern_set_filter(pat, _Filter_to_cairo_filter_t(f)); cairo_matrix_t cmat{ m.m00(), m.m01(), m.m10(), m.m11(), m.m20(), m.m21() }; cairo_pattern_set_matrix(pat, &cmat); + + cairo_pattern_set_extend(maskBrush.native_handle(), _Extend_to_cairo_extend_t(maskBrush.extend())); + cairo_pattern_set_filter(maskBrush.native_handle(), _Filter_to_cairo_filter_t(maskBrush.filter())); + cairo_matrix_init(&cmat, maskBrush.matrix().m00(), maskBrush.matrix().m01(), maskBrush.matrix().m10(), maskBrush.matrix().m11(), maskBrush.matrix().m20(), maskBrush.matrix().m21()); + cairo_pattern_set_matrix(maskBrush.native_handle(), &cmat); + cairo_mask(_Context.get(), maskBrush.native_handle()); cairo_set_source_rgba(_Context.get(), 0.0, 0.0, 0.0, 0.0); path(currPath); } -void surface::mask_immediate(const surface& maskSurface) { - auto currPath = _Current_path; - path(experimental::io2d::path(_Immediate_path)); - cairo_pattern_set_extend(_Brush.native_handle(), _Extend_to_cairo_extend_t(_Brush.extend())); - cairo_pattern_set_filter(_Brush.native_handle(), _Filter_to_cairo_filter_t(_Brush.filter())); - cairo_matrix_t cPttnMatrix; - cairo_matrix_init(&cPttnMatrix, _Brush.matrix().m00(), _Brush.matrix().m01(), _Brush.matrix().m10(), _Brush.matrix().m11(), _Brush.matrix().m20(), _Brush.matrix().m21()); - cairo_pattern_set_matrix(_Brush.native_handle(), &cPttnMatrix); - cairo_set_source(_Context.get(), _Brush.native_handle()); - cairo_mask_surface(_Context.get(), maskSurface.native_handle().csfce, 0.0, 0.0); - path(currPath); -} +void surface::mask_immediate(surface& maskSurface, const matrix_2d& maskMatrix, extend maskExtend, filter maskFilter) { + //auto currPath = _Current_path; + //path(experimental::io2d::path(_Immediate_path)); + //cairo_pattern_set_extend(_Brush.native_handle(), _Extend_to_cairo_extend_t(_Brush.extend())); + //cairo_pattern_set_filter(_Brush.native_handle(), _Filter_to_cairo_filter_t(_Brush.filter())); + //cairo_matrix_t cPttnMatrix; + //cairo_matrix_init(&cPttnMatrix, _Brush.matrix().m00(), _Brush.matrix().m01(), _Brush.matrix().m10(), _Brush.matrix().m11(), _Brush.matrix().m20(), _Brush.matrix().m21()); + //cairo_pattern_set_matrix(_Brush.native_handle(), &cPttnMatrix); + //cairo_set_source(_Context.get(), _Brush.native_handle()); + //cairo_mask_surface(_Context.get(), maskSurface.native_handle().csfce, 0.0, 0.0); + //path(currPath); + surface_brush_factory sbf(maskSurface); + experimental::io2d::brush maskBrush(sbf); + maskBrush.matrix(maskMatrix); + maskBrush.extend(maskExtend); + maskBrush.filter(maskFilter); -void surface::mask_immediate(const surface& maskSurface, const rgba_color& c) { - solid_color_brush_factory factory(c); - brush(experimental::io2d::brush(factory)); - mask_immediate(maskSurface); + mask_immediate(maskBrush); } -void surface::mask_immediate(const surface& maskSurface, const ::std::experimental::io2d::brush& b) { - brush(b); - mask_immediate(maskSurface); +void surface::mask_immediate(surface& maskSurface, const rgba_color& c, const matrix_2d& maskMatrix, extend maskExtend, filter maskFilter) { + surface_brush_factory sbf(maskSurface); + experimental::io2d::brush maskBrush(sbf); + maskBrush.matrix(maskMatrix); + maskBrush.extend(maskExtend); + maskBrush.filter(maskFilter); + + mask_immediate(maskBrush, c); } -void surface::mask_immediate(const surface& maskSurface, const surface& s, const vector_2d& origin, extend e, filter f) { - mask_immediate(maskSurface, s, matrix_2d{ 1.0, 0.0, 0.0, 1.0, origin.x(), origin.y() }, e, f); +void surface::mask_immediate(surface& maskSurface, const ::std::experimental::io2d::brush& b, const matrix_2d& maskMatrix, extend maskExtend, filter maskFilter) { + surface_brush_factory sbf(maskSurface); + experimental::io2d::brush maskBrush(sbf); + maskBrush.matrix(maskMatrix); + maskBrush.extend(maskExtend); + maskBrush.filter(maskFilter); + + mask_immediate(maskBrush, b); } -void surface::mask_immediate(const surface& maskSurface, const surface& s, const matrix_2d& m, extend e, filter f) { - auto currPath = _Current_path; - path(experimental::io2d::path(_Immediate_path)); - cairo_set_source_surface(_Context.get(), s.native_handle().csfce, 0.0, 0.0); - auto pat = cairo_get_source(_Context.get()); - cairo_pattern_set_extend(pat, _Extend_to_cairo_extend_t(e)); - cairo_pattern_set_filter(pat, _Filter_to_cairo_filter_t(f)); - cairo_matrix_t cmat{ m.m00(), m.m01(), m.m10(), m.m11(), m.m20(), m.m21() }; - cairo_pattern_set_matrix(pat, &cmat); - cairo_mask_surface(_Context.get(), maskSurface.native_handle().csfce, 0.0, 0.0); - cairo_set_source_rgba(_Context.get(), 0.0, 0.0, 0.0, 0.0); +void surface::mask_immediate(surface& maskSurface, const surface& s, const matrix_2d& maskMatrix, const matrix_2d& m, extend maskExtend, extend e, filter maskFilter, filter f) { + //auto currPath = _Current_path; + //path(experimental::io2d::path(_Immediate_path)); + //cairo_set_source_surface(_Context.get(), s.native_handle().csfce, 0.0, 0.0); + //auto pat = cairo_get_source(_Context.get()); + //cairo_pattern_set_extend(pat, _Extend_to_cairo_extend_t(e)); + //cairo_pattern_set_filter(pat, _Filter_to_cairo_filter_t(f)); + //cairo_matrix_t cmat{ m.m00(), m.m01(), m.m10(), m.m11(), m.m20(), m.m21() }; + //cairo_pattern_set_matrix(pat, &cmat); + //cairo_mask_surface(_Context.get(), maskSurface.native_handle().csfce, 0.0, 0.0); + //cairo_set_source_rgba(_Context.get(), 0.0, 0.0, 0.0, 0.0); + surface_brush_factory sbf(maskSurface); + experimental::io2d::brush maskBrush(sbf); + maskBrush.matrix(maskMatrix); + maskBrush.extend(maskExtend); + maskBrush.filter(maskFilter); + + mask_immediate(maskBrush, s, m, e, f); } -void surface::mask_immediate(const surface& maskSurface, const vector_2d& maskOrigin) { - auto currPath = _Current_path; - path(experimental::io2d::path(_Immediate_path)); +vector_2d surface::render_text(const string& utf8, const vector_2d& position) { + cairo_new_path(_Context.get()); + cairo_move_to(_Context.get(), position.x(), position.y()); cairo_pattern_set_extend(_Brush.native_handle(), _Extend_to_cairo_extend_t(_Brush.extend())); cairo_pattern_set_filter(_Brush.native_handle(), _Filter_to_cairo_filter_t(_Brush.filter())); cairo_matrix_t cPttnMatrix; cairo_matrix_init(&cPttnMatrix, _Brush.matrix().m00(), _Brush.matrix().m01(), _Brush.matrix().m10(), _Brush.matrix().m11(), _Brush.matrix().m20(), _Brush.matrix().m21()); cairo_pattern_set_matrix(_Brush.native_handle(), &cPttnMatrix); cairo_set_source(_Context.get(), _Brush.native_handle()); - cairo_mask_surface(_Context.get(), maskSurface.native_handle().csfce, maskOrigin.x(), maskOrigin.y()); - path(currPath); + cairo_show_text(_Context.get(), utf8.c_str()); + double x, y; + cairo_get_current_point(_Context.get(), &x, &y); + path(_Current_path); + return vector_2d{ x, y }; } -void surface::mask_immediate(const surface& maskSurface, const vector_2d& maskOrigin, const rgba_color& c) { +vector_2d surface::render_text(const string& utf8, const vector_2d& position, const rgba_color& c) { solid_color_brush_factory factory(c); brush(experimental::io2d::brush(factory)); - mask_immediate(maskSurface, maskOrigin); + return render_text(utf8, position); } -void surface::mask_immediate(const surface& maskSurface, const vector_2d& maskOrigin, const ::std::experimental::io2d::brush& b) { +vector_2d surface::render_text(const string& utf8, const vector_2d& position, const ::std::experimental::io2d::brush& b) { brush(b); - mask_immediate(maskSurface, maskOrigin); -} - -void surface::mask_immediate(const surface& maskSurface, const vector_2d& maskOrigin, const surface& s, const vector_2d& origin, extend e, filter f) { - mask_immediate(maskSurface, maskOrigin, s, matrix_2d{ 1.0, 0.0, 0.0, 1.0, origin.x(), origin.y() }, e, f); + return render_text(utf8, position); } -void surface::mask_immediate(const surface& maskSurface, const vector_2d& maskOrigin, const surface& s, const matrix_2d& m, extend e, filter f) { - auto currPath = _Current_path; - path(experimental::io2d::path(_Immediate_path)); +vector_2d surface::render_text(const string& utf8, const vector_2d& position, const surface& s, const matrix_2d& m, extend e, filter f) { cairo_set_source_surface(_Context.get(), s.native_handle().csfce, 0.0, 0.0); auto pat = cairo_get_source(_Context.get()); cairo_pattern_set_extend(pat, _Extend_to_cairo_extend_t(e)); cairo_pattern_set_filter(pat, _Filter_to_cairo_filter_t(f)); cairo_matrix_t cmat{ m.m00(), m.m01(), m.m10(), m.m11(), m.m20(), m.m21() }; cairo_pattern_set_matrix(pat, &cmat); - cairo_mask_surface(_Context.get(), maskSurface.native_handle().csfce, maskOrigin.x(), maskOrigin.y()); + auto result = render_text(utf8, position); cairo_set_source_rgba(_Context.get(), 0.0, 0.0, 0.0, 0.0); + return result; } -vector_2d surface::render_text(const string& utf8, const vector_2d& position) { - cairo_new_path(_Context.get()); - cairo_move_to(_Context.get(), position.x(), position.y()); +void surface::render_glyph_run(const glyph_run& gr) { cairo_pattern_set_extend(_Brush.native_handle(), _Extend_to_cairo_extend_t(_Brush.extend())); cairo_pattern_set_filter(_Brush.native_handle(), _Filter_to_cairo_filter_t(_Brush.filter())); cairo_matrix_t cPttnMatrix; cairo_matrix_init(&cPttnMatrix, _Brush.matrix().m00(), _Brush.matrix().m01(), _Brush.matrix().m10(), _Brush.matrix().m11(), _Brush.matrix().m20(), _Brush.matrix().m21()); cairo_pattern_set_matrix(_Brush.native_handle(), &cPttnMatrix); cairo_set_source(_Context.get(), _Brush.native_handle()); - cairo_show_text(_Context.get(), utf8.c_str()); - double x, y; - cairo_get_current_point(_Context.get(), &x, &y); - path(_Current_path); - return vector_2d{ x, y }; + cairo_show_text_glyphs(_Context.get(), gr.original_text().c_str(), static_cast(gr.original_text().length()), gr._Cairo_glyphs.get(), static_cast(gr.glyphs().size()), gr._Cairo_text_clusters.get(), static_cast(gr.clusters().size()), gr._Text_cluster_flags); } -vector_2d surface::render_text(const string& utf8, const vector_2d& position, const rgba_color& c) { +void surface::render_glyph_run(const glyph_run& gr, const rgba_color& c) { solid_color_brush_factory factory(c); brush(experimental::io2d::brush(factory)); - return render_text(utf8, position); + render_glyph_run(gr); } -vector_2d surface::render_text(const string& utf8, const vector_2d& position, const ::std::experimental::io2d::brush& b) { +void surface::render_glyph_run(const glyph_run& gr, const ::std::experimental::io2d::brush& b) { brush(b); - return render_text(utf8, position); -} - -vector_2d surface::render_text(const string& utf8, const vector_2d& position, const surface& s, const vector_2d& origin, extend e, filter f) { - return render_text(utf8, position, s, matrix_2d{ 1.0, 0.0, 0.0, 1.0, origin.x(), origin.y() }, e, f); + render_glyph_run(gr); } -vector_2d surface::render_text(const string& utf8, const vector_2d& position, const surface& s, const matrix_2d& m, extend e, filter f) { +void surface::render_glyph_run(const glyph_run& gr, const surface& s, const matrix_2d& m, extend e, filter f) { cairo_set_source_surface(_Context.get(), s.native_handle().csfce, 0.0, 0.0); auto pat = cairo_get_source(_Context.get()); cairo_pattern_set_extend(pat, _Extend_to_cairo_extend_t(e)); cairo_pattern_set_filter(pat, _Filter_to_cairo_filter_t(f)); cairo_matrix_t cmat{ m.m00(), m.m01(), m.m10(), m.m11(), m.m20(), m.m21() }; cairo_pattern_set_matrix(pat, &cmat); - auto result = render_text(utf8, position); + render_glyph_run(gr); cairo_set_source_rgba(_Context.get(), 0.0, 0.0, 0.0, 0.0); - return result; } void surface::matrix(const matrix_2d& m) { @@ -1175,70 +1132,14 @@ void surface::matrix(const matrix_2d& m, error_code& ec) noexcept { ec.clear(); } -void surface::font_face(const string& family, font_slant slant, font_weight weight) { - cairo_select_font_face(_Context.get(), family.c_str(), _Font_slant_to_cairo_font_slant_t(slant), _Font_weight_to_cairo_font_weight_t(weight)); -} - -void surface::font_size(double size) { - if (size <= 0.0) { - _Throw_if_failed_cairo_status_t(CAIRO_STATUS_INVALID_SIZE); - } - cairo_set_font_size(_Context.get(), size); -} - -void surface::font_size(double size, error_code& ec) noexcept { - if (size <= 0.0) { - ec = _Cairo_status_t_to_std_error_code(CAIRO_STATUS_INVALID_SIZE); - return; - } - cairo_set_font_size(_Context.get(), size); - ec.clear(); -} - -void surface::font_matrix(const matrix_2d& m) { - auto det = m.determinant(); - if (det == 0.0) { - _Throw_if_failed_cairo_status_t(CAIRO_STATUS_INVALID_MATRIX); - } - cairo_matrix_t cm{ m.m00(), m.m01(), m.m10(), m.m11(), m.m20(), m.m21() }; - cairo_set_font_matrix(_Context.get(), &cm); -} - -void surface::font_matrix(const matrix_2d& m, error_code& ec) noexcept { - auto det = m.determinant(ec); - if (static_cast(ec)) { - return; - } - if (det == 0.0) { - ec = _Cairo_status_t_to_std_error_code(CAIRO_STATUS_INVALID_MATRIX); - return; - } - cairo_matrix_t cm{ m.m00(), m.m01(), m.m10(), m.m11(), m.m20(), m.m21() }; - cairo_set_font_matrix(_Context.get(), &cm); - ec.clear(); -} - -void surface::font_options(const ::std::experimental::io2d::font_options& options) noexcept { - cairo_font_options_set_antialias(_Native_font_options.get(), _Antialias_to_cairo_antialias_t(options.antialias())); - cairo_font_options_set_subpixel_order(_Native_font_options.get(), _Subpixel_order_to_cairo_subpixel_order_t(options.subpixel_order())); - cairo_set_font_options(_Context.get(), _Native_font_options.get()); +void surface::font_resource(const experimental::io2d::font_resource& f) noexcept { + _Font_resource = f; + cairo_set_scaled_font(_Context.get(), f._Scaled_font.get()); } -void surface::font_face(const ::std::experimental::io2d::font_face& font_face) { - _Font_face = make_shared(font_face); - cairo_set_font_face(_Context.get(), font_face.native_handle()); -} - -void surface::font_face(const::std::experimental::io2d::font_face & f, ::std::error_code & ec) noexcept { - try { - _Font_face = make_shared(f); - } - catch (const bad_alloc&) { - ec = make_error_code(errc::not_enough_memory); - return; - } - cairo_set_font_face(_Context.get(), f.native_handle()); - ec.clear(); +void surface::font_resource(const ::std::string& family, double size, font_slant sl, font_weight w) { + _Font_resource = experimental::io2d::font_resource(font_resource_factory(family, sl, w, matrix_2d::init_scale({ size, size }))); + cairo_set_scaled_font(_Context.get(), _Font_resource._Scaled_font.get()); } brush surface::brush() const noexcept { @@ -1561,32 +1462,6 @@ vector_2d surface::surface_to_user_distance(const vector_2d& dpt) const { return im.transform_distance(dpt); } -matrix_2d surface::font_matrix() const noexcept { - cairo_matrix_t cm{}; - cairo_get_font_matrix(_Context.get(), &cm); - return{ cm.xx, cm.yx, cm.xy, cm.yy, cm.x0, cm.y0 }; -} - -// Note: This deviates from cairo in that we return the values that will actually wind up being used. -::std::experimental::io2d::font_options surface::font_options() const noexcept { - ::std::experimental::io2d::font_options fo(::std::experimental::io2d::antialias::default_antialias, ::std::experimental::io2d::subpixel_order::default_subpixel_order); - unique_ptr up(nullptr, &cairo_font_options_destroy); - cairo_get_font_options(_Context.get(), up.get()); - _Throw_if_failed_cairo_status_t(cairo_font_options_status(up.get())); - auto ca = _Cairo_antialias_t_to_antialias(cairo_font_options_get_antialias(up.get())); - auto cso = _Cairo_subpixel_order_t_to_subpixel_order(cairo_font_options_get_subpixel_order(up.get())); - cairo_get_font_options(_Context.get(), up.get()); - _Throw_if_failed_cairo_status_t(cairo_font_options_status(up.get())); - - return ::std::experimental::io2d::font_options( - (ca == ::std::experimental::io2d::antialias::default_antialias) ? _Cairo_antialias_t_to_antialias(cairo_font_options_get_antialias(up.get())) : ca, - (cso == ::std::experimental::io2d::subpixel_order::default_subpixel_order) ? _Cairo_subpixel_order_t_to_subpixel_order(cairo_font_options_get_subpixel_order(up.get())) : cso - ); -} - -::std::experimental::io2d::font_face surface::font_face() const { - auto ff = cairo_get_font_face(_Context.get()); - _Throw_if_failed_cairo_status_t(cairo_font_face_status(ff)); - // Cairo doesn't increase the font face's reference count when you call cairo_get_font_face so we do it manually. - return ::std::experimental::io2d::font_face(cairo_font_face_reference(ff)); +experimental::io2d::font_resource surface::font_resource() const noexcept { + return _Font_resource; } diff --git a/N3888_RefImpl/src/surface_brush_factory.cpp b/io2d/src/surface_brush_factory.cpp similarity index 100% rename from N3888_RefImpl/src/surface_brush_factory.cpp rename to io2d/src/surface_brush_factory.cpp diff --git a/N3888_RefImpl/src/text_extents.cpp b/io2d/src/text_extents.cpp similarity index 100% rename from N3888_RefImpl/src/text_extents.cpp rename to io2d/src/text_extents.cpp diff --git a/N3888_RefImpl/src/vector_2d.cpp b/io2d/src/vector_2d.cpp similarity index 100% rename from N3888_RefImpl/src/vector_2d.cpp rename to io2d/src/vector_2d.cpp diff --git a/libpng16/ANNOUNCE b/libpng16/ANNOUNCE deleted file mode 100644 index 39fcbd9..0000000 --- a/libpng16/ANNOUNCE +++ /dev/null @@ -1,63 +0,0 @@ - -Libpng 1.6.8beta03 - December 1, 2013 - -This is not intended to be a public release. It will be replaced -within a few weeks by a public version or by another test version. - -Files available for download: - -Source files with LF line endings (for Unix/Linux) and with a -"configure" script - - 1.6.8beta03.tar.xz (LZMA-compressed, recommended) - 1.6.8beta03.tar.gz - -Source files with CRLF line endings (for Windows), without the -"configure" script - - lp168b03.7z (LZMA-compressed, recommended) - lp168b03.zip - -Other information: - - 1.6.8beta03-README.txt - 1.6.8beta03-LICENSE.txt - Gnupg/*.asc (PGP armored detached signatures) - -Changes since the last public release (1.6.7): - -Version 1.6.8beta01 [December 1, 2013] - Changed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpread.c to - #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED to be consistent with - what is in pngpriv.h. - Moved prototype for png_handle_unknown() in pngpriv.h outside of - the #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED/#endif block. - Added "-Wall" to CFLAGS in contrib/pngminim/*/makefile - Conditionally compile some unused functions reported by -Wall in pngminim. - Fixed 'minimal' builds. Various obviously useful minimal configurations - don't build because of missing contrib/libtests test programs and - overly complex dependencies in scripts/pnglibconf.dfa. This change - adds contrib/conftest/*.dfa files that can be used in automatic build - scripts to ensure that these configurations continue to build. - Enabled WRITE_INVERT and WRITE_PACK in contrib/pngminim/encoder. - Fixed pngvalid 'fail' function declaration on the Intel C Compiler. - This reverts to the previous 'static' implementation and works round - the 'unused static function' warning by using PNG_UNUSED(). - -Version 1.6.8beta02 [November 30, 2013] - Removed or marked PNG_UNUSED some harmless "dead assignments" reported - by clang scan-build. - Changed tabs to 3 spaces in png_debug macros and changed '"%s"m' - to '"%s" m' to improve portability among compilers. - Changed png_free_default() to free() in pngtest.c - -Version 1.6.8beta03 [December 1, 2013] - Tidied up pngfix inits and fixed pngtest no-write builds. - -Send comments/corrections/commendations to png-mng-implement at lists.sf.net -(subscription required; visit -https://lists.sourceforge.net/lists/listinfo/png-mng-implement -to subscribe) -or to glennrp at users.sourceforge.net - -Glenn R-P diff --git a/libpng16/CHANGES b/libpng16/CHANGES deleted file mode 100644 index b20a168..0000000 --- a/libpng16/CHANGES +++ /dev/null @@ -1,4750 +0,0 @@ -#if 0 -CHANGES - changes for libpng - -Version 0.2 - added reader into png.h - fixed small problems in stub file - -Version 0.3 - added pull reader - split up pngwrite.c to several files - added pnglib.txt - added example.c - cleaned up writer, adding a few new transformations - fixed some bugs in writer - interfaced with zlib 0.5 - added K&R support - added check for 64 KB blocks for 16-bit machines - -Version 0.4 - cleaned up code and commented code - simplified time handling into png_time - created png_color_16 and png_color_8 to handle color needs - cleaned up color type defines - fixed various bugs - made various names more consistent - interfaced with zlib 0.71 - cleaned up zTXt reader and writer (using zlib's Reset functions) - split transformations into pngrtran.c and pngwtran.c - -Version 0.5 - interfaced with zlib 0.8 - fixed many reading and writing bugs - saved using 3 spaces instead of tabs - -Version 0.6 - added png_large_malloc() and png_large_free() - added png_size_t - cleaned up some compiler warnings - added png_start_read_image() - -Version 0.7 - cleaned up lots of bugs - finished dithering and other stuff - added test program - changed name from pnglib to libpng - -Version 0.71 [June, 1995] - changed pngtest.png for zlib 0.93 - fixed error in libpng.txt and example.c - -Version 0.8 - cleaned up some bugs - added png_set_filler() - split up pngstub.c into pngmem.c, pngio.c, and pngerror.c - added #define's to remove unwanted code - moved png_info_init() to png.c - added old_size into png_realloc() - added functions to manually set filtering and compression info - changed compression parameters based on image type - optimized filter selection code - added version info - changed external functions passing floats to doubles (k&r problems?) - put all the configurable stuff in pngconf.h - enabled png_set_shift to work with paletted images on read - added png_read_update_info() - updates info structure with transformations - -Version 0.81 [August, 1995] - incorporated Tim Wegner's medium model code (thanks, Tim) - -Version 0.82 [September, 1995] - [unspecified changes] - -Version 0.85 [December, 1995] - added more medium model code (almost everything's a far) - added i/o, error, and memory callback functions - fixed some bugs (16-bit, 4-bit interlaced, etc.) - added first run progressive reader (barely tested) - -Version 0.86 [January, 1996] - fixed bugs - improved documentation - -Version 0.87 [January, 1996] - fixed medium model bugs - fixed other bugs introduced in 0.85 and 0.86 - added some minor documentation - -Version 0.88 [January, 1996] - fixed progressive bugs - replaced tabs with spaces - cleaned up documentation - added callbacks for read/write and warning/error functions - -Version 0.89 [July, 1996] - Added new initialization API to make libpng work better with shared libs - we now have png_create_read_struct(), png_create_write_struct(), - png_create_info_struct(), png_destroy_read_struct(), and - png_destroy_write_struct() instead of the separate calls to - malloc and png_read_init(), png_info_init(), and png_write_init() - Changed warning/error callback functions to fix bug - this means you - should use the new initialization API if you were using the old - png_set_message_fn() calls, and that the old API no longer exists - so that people are aware that they need to change their code - Changed filter selection API to allow selection of multiple filters - since it didn't work in previous versions of libpng anyways - Optimized filter selection code - Fixed png_set_background() to allow using an arbitrary RGB color for - paletted images - Fixed gamma and background correction for paletted images, so - png_correct_palette is not needed unless you are correcting an - external palette (you will need to #define PNG_CORRECT_PALETTE_SUPPORTED - in pngconf.h) - if nobody uses this, it may disappear in the future. - Fixed bug with Borland 64K memory allocation (Alexander Lehmann) - Fixed bug in interlace handling (Smarasderagd, I think) - Added more error checking for writing and image to reduce invalid files - Separated read and write functions so that they won't both be linked - into a binary when only reading or writing functionality is used - New pngtest image also has interlacing and zTXt - Updated documentation to reflect new API - -Version 0.90 [January, 1997] - Made CRC errors/warnings on critical and ancillary chunks configurable - libpng will use the zlib CRC routines by (compile-time) default - Changed DOS small/medium model memory support - needs zlib 1.04 (Tim Wegner) - Added external C++ wrapper statements to png.h (Gilles Dauphin) - Allow PNG file to be read when some or all of file signature has already - been read from the beginning of the stream. ****This affects the size - of info_struct and invalidates all programs that use a shared libpng**** - Fixed png_filler() declarations - Fixed? background color conversions - Fixed order of error function pointers to match documentation - Current chunk name is now available in png_struct to reduce the number - of nearly identical error messages (will simplify multi-lingual - support when available) - Try to get ready for unknown-chunk callback functions: - - previously read critical chunks are flagged, so the chunk handling - routines can determine if the chunk is in the right place - - all chunk handling routines have the same prototypes, so we will - be able to handle all chunks via a callback mechanism - Try to fix Linux "setjmp" buffer size problems - Removed png_large_malloc, png_large_free, and png_realloc functions. - -Version 0.95 [March, 1997] - Fixed bug in pngwutil.c allocating "up_row" twice and "avg_row" never - Fixed bug in PNG file signature compares when start != 0 - Changed parameter type of png_set_filler(...filler...) from png_byte - to png_uint_32 - Added test for MACOS to ensure that both math.h and fp.h are not #included - Added macros for libpng to be compiled as a Windows DLL (Andreas Kupries) - Added "packswap" transformation, which changes the endianness of - packed-pixel bytes (Kevin Bracey) - Added "strip_alpha" transformation, which removes the alpha channel of - input images without using it (not necessarily a good idea) - Added "swap_alpha" transformation, which puts the alpha channel in front - of the color bytes instead of after - Removed all implicit variable tests which assume NULL == 0 (I think) - Changed several variables to "png_size_t" to show 16/32-bit limitations - Added new pCAL chunk read/write support - Added experimental filter selection weighting (Greg Roelofs) - Removed old png_set_rgbx() and png_set_xrgb() functions that have been - obsolete for about 2 years now (use png_set_filler() instead) - Added macros to read 16- and 32-bit ints directly from buffer, to be - used only on those systems that support it (namely PowerPC and 680x0) - With some testing, this may become the default for MACOS/PPC systems. - Only calculate CRC on data if we are going to use it - Added macros for zTXt compression type PNG_zTXt_COMPRESSION_??? - Added macros for simple libpng debugging output selectable at compile time - Removed PNG_READ_END_MODE in progressive reader (Smarasderagd) - More description of info_struct in libpng.txt and png.h - More instructions in example.c - More chunk types tested in pngtest.c - Renamed pngrcb.c to pngset.c, and all png_read_ functions to be - png_set_. We now have corresponding png_get_ - functions in pngget.c to get information in info_ptr. This isolates - the application from the internal organization of png_info_struct - (good for shared library implementations). - -Version 0.96 [May, 1997] - Fixed serious bug with < 8bpp images introduced in 0.95 - Fixed 256-color transparency bug (Greg Roelofs) - Fixed up documentation (Greg Roelofs, Laszlo Nyul) - Fixed "error" in pngconf.h for Linux setjmp() behavior - Fixed DOS medium model support (Tim Wegner) - Fixed png_check_keyword() for case with error in static string text - Added read of CRC after IEND chunk for embedded PNGs (Laszlo Nyul) - Added typecasts to quiet compiler errors - Added more debugging info - -Version 0.97 [January, 1998] - Removed PNG_USE_OWN_CRC capability - Relocated png_set_crc_action from pngrutil.c to pngrtran.c - Fixed typecasts of "new_key", etc. (Andreas Dilger) - Added RFC 1152 [sic] date support - Fixed bug in gamma handling of 4-bit grayscale - Added 2-bit grayscale gamma handling (Glenn R-P) - Added more typecasts. 65536L becomes (png_uint_32)65536L, etc. (Glenn R-P) - Minor corrections in libpng.txt - Added simple sRGB support (Glenn R-P) - Easier conditional compiling, e.g., - define PNG_READ/WRITE_NOT_FULLY_SUPPORTED; - all configurable options can be selected from command-line instead - of having to edit pngconf.h (Glenn R-P) - Fixed memory leak in pngwrite.c (free info_ptr->text) (Glenn R-P) - Added more conditions for png_do_background, to avoid changing - black pixels to background when a background is supplied and - no pixels are transparent - Repaired PNG_NO_STDIO behavior - Tested NODIV support and made it default behavior (Greg Roelofs) - Added "-m" option and PNGTEST_DEBUG_MEMORY to pngtest (John Bowler) - Regularized version numbering scheme and bumped shared-library major - version number to 2 to avoid problems with libpng 0.89 apps - (Greg Roelofs) - -Version 0.98 [January, 1998] - Cleaned up some typos in libpng.txt and in code documentation - Fixed memory leaks in pCAL chunk processing (Glenn R-P and John Bowler) - Cosmetic change "display_gamma" to "screen_gamma" in pngrtran.c - Changed recommendation about file_gamma for PC images to .51 from .45, - in example.c and libpng.txt, added comments to distinguish between - screen_gamma, viewing_gamma, and display_gamma. - Changed all references to RFC1152 to read RFC1123 and changed the - PNG_TIME_RFC1152_SUPPORTED macro to PNG_TIME_RFC1123_SUPPORTED - Added png_invert_alpha capability (Glenn R-P -- suggestion by Jon Vincent) - Changed srgb_intent from png_byte to int to avoid compiler bugs - -Version 0.99 [January 30, 1998] - Free info_ptr->text instead of end_info_ptr->text in pngread.c (John Bowler) - Fixed a longstanding "packswap" bug in pngtrans.c - Fixed some inconsistencies in pngconf.h that prevented compiling with - PNG_READ_GAMMA_SUPPORTED and PNG_READ_hIST_SUPPORTED undefined - Fixed some typos and made other minor rearrangement of libpng.txt (Andreas) - Changed recommendation about file_gamma for PC images to .50 from .51 in - example.c and libpng.txt, and changed file_gamma for sRGB images to .45 - Added a number of functions to access information from the png structure - png_get_image_height(), etc. (Glenn R-P, suggestion by Brad Pettit) - Added TARGET_MACOS similar to zlib-1.0.8 - Define PNG_ALWAYS_EXTERN when __MWERKS__ && WIN32 are defined - Added type casting to all png_malloc() function calls - -Version 0.99a [January 31, 1998] - Added type casts and parentheses to all returns that return a value.(Tim W.) - -Version 0.99b [February 4, 1998] - Added type cast png_uint_32 on malloc function calls where needed. - Changed type of num_hist from png_uint_32 to int (same as num_palette). - Added checks for rowbytes overflow, in case png_size_t is less than 32 bits. - Renamed makefile.elf to makefile.lnx. - -Version 0.99c [February 7, 1998] - More type casting. Removed erroneous overflow test in pngmem.c. - Added png_buffered_memcpy() and png_buffered_memset(), apply them to rowbytes. - Added UNIX manual pages libpng.3 (incorporating libpng.txt) and png.5. - -Version 0.99d [February 11, 1998] - Renamed "far_to_near()" "png_far_to_near()" - Revised libpng.3 - Version 99c "buffered" operations didn't work as intended. Replaced them - with png_memcpy_check() and png_memset_check(). - Added many "if (png_ptr == NULL) return" to quell compiler warnings about - unused png_ptr, mostly in pngget.c and pngset.c. - Check for overlength tRNS chunk present when indexed-color PLTE is read. - Cleaned up spelling errors in libpng.3/libpng.txt - Corrected a problem with png_get_tRNS() which returned undefined trans array - -Version 0.99e [February 28, 1998] - Corrected png_get_tRNS() again. - Add parentheses for easier reading of pngget.c, fixed "||" should be "&&". - Touched up example.c to make more of it compileable, although the entire - file still can't be compiled (Willem van Schaik) - Fixed a bug in png_do_shift() (Bryan Tsai) - Added a space in png.h prototype for png_write_chunk_start() - Replaced pngtest.png with one created with zlib 1.1.1 - Changed pngtest to report PASS even when file size is different (Jean-loup G.) - Corrected some logic errors in png_do_invert_alpha() (Chris Patterson) - -Version 0.99f [March 5, 1998] - Corrected a bug in pngpread() introduced in version 99c (Kevin Bracey) - Moved makefiles into a "scripts" directory, and added INSTALL instruction file - Added makefile.os2 and pngos2.def (A. Zabolotny) and makefile.s2x (W. Sebok) - Added pointers to "note on libpng versions" in makefile.lnx and README - Added row callback feature when reading and writing nonprogressive rows - and added a test of this feature in pngtest.c - Added user transform callbacks, with test of the feature in pngtest.c - -Version 0.99g [March 6, 1998, morning] - Minor changes to pngtest.c to suppress compiler warnings. - Removed "beta" language from documentation. - -Version 0.99h [March 6, 1998, evening] - Minor changes to previous minor changes to pngtest.c - Changed PNG_READ_NOT_FULLY_SUPPORTED to PNG_READ_TRANSFORMS_NOT_SUPPORTED - and added PNG_PROGRESSIVE_READ_NOT_SUPPORTED macro - Added user transform capability - -Version 1.00 [March 7, 1998] - Changed several typedefs in pngrutil.c - Added makefile.wat (Pawel Mrochen), updated makefile.tc3 (Willem van Schaik) - Replaced "while(1)" with "for(;;)" - Added PNGARG() to prototypes in pngtest.c and removed some prototypes - Updated some of the makefiles (Tom Lane) - Changed some typedefs (s_start, etc.) in pngrutil.c - Fixed dimensions of "short_months" array in pngwrite.c - Replaced ansi2knr.c with the one from jpeg-v6 - -Version 1.0.0 [March 8, 1998] - Changed name from 1.00 to 1.0.0 (Adam Costello) - Added smakefile.ppc (with SCOPTIONS.ppc) for Amiga PPC (Andreas Kleinert) - -Version 1.0.0a [March 9, 1998] - Fixed three bugs in pngrtran.c to make gamma+background handling consistent - (Greg Roelofs) - Changed format of the PNG_LIBPNG_VER integer to xyyzz instead of xyz - for major, minor, and bugfix releases. This is 10001. (Adam Costello, - Tom Lane) - Make months range from 1-12 in png_convert_to_rfc1123 - -Version 1.0.0b [March 13, 1998] - Quieted compiler complaints about two empty "for" loops in pngrutil.c - Minor changes to makefile.s2x - Removed #ifdef/#endif around a png_free() in pngread.c - -Version 1.0.1 [March 14, 1998] - Changed makefile.s2x to reduce security risk of using a relative pathname - Fixed some typos in the documentation (Greg). - Fixed a problem with value of "channels" returned by png_read_update_info() - -Version 1.0.1a [April 21, 1998] - Optimized Paeth calculations by replacing abs() function calls with intrinsics - plus other loop optimizations. Improves avg decoding speed by about 20%. - Commented out i386istic "align" compiler flags in makefile.lnx. - Reduced the default warning level in some makefiles, to make them consistent. - Removed references to IJG and JPEG in the ansi2knr.c copyright statement. - Fixed a bug in png_do_strip_filler with XXRRGGBB => RRGGBB transformation. - Added grayscale and 16-bit capability to png_do_read_filler(). - Fixed a bug in pngset.c, introduced in version 0.99c, that sets rowbytes - too large when writing an image with bit_depth < 8 (Bob Dellaca). - Corrected some bugs in the experimental weighted filtering heuristics. - Moved a misplaced pngrutil code block that truncates tRNS if it has more - than num_palette entries -- test was done before num_palette was defined. - Fixed a png_convert_to_rfc1123() bug that converts day 31 to 0 (Steve Eddins). - Changed compiler flags in makefile.wat for better optimization - (Pawel Mrochen). - -Version 1.0.1b [May 2, 1998] - Relocated png_do_gray_to_rgb() within png_do_read_transformations() (Greg). - Relocated the png_composite macros from pngrtran.c to png.h (Greg). - Added makefile.sco (contributed by Mike Hopkirk). - Fixed two bugs (missing definitions of "istop") introduced in libpng-1.0.1a. - Fixed a bug in pngrtran.c that would set channels=5 under some circumstances. - More work on the Paeth-filtering, achieving imperceptible speedup - (A Kleinert). - More work on loop optimization which may help when compiled with C++ - compilers. - Added warnings when people try to use transforms they've defined out. - Collapsed 4 "i" and "c" loops into single "i" loops in pngrtran and pngwtran. - Revised paragraph about png_set_expand() in libpng.txt and libpng.3 (Greg) - -Version 1.0.1c [May 11, 1998] - Fixed a bug in pngrtran.c (introduced in libpng-1.0.1a) where the masks for - filler bytes should have been 0xff instead of 0xf. - Added max_pixel_depth=32 in pngrutil.c when using FILLER with palette images. - Moved PNG_WRITE_WEIGHTED_FILTER_SUPPORTED and PNG_WRITE_FLUSH_SUPPORTED - out of the PNG_WRITE_TRANSFORMS_NOT_SUPPORTED block of pngconf.h - Added "PNG_NO_WRITE_TRANSFORMS" etc., as alternatives for *_NOT_SUPPORTED, - for consistency, in pngconf.h - Added individual "ifndef PNG_NO_[CAPABILITY]" in pngconf.h to make it easier - to remove unwanted capabilities via the compile line - Made some corrections to grammar (which, it's) in documentation (Greg). - Corrected example.c, use of row_pointers in png_write_image(). - -Version 1.0.1d [May 24, 1998] - Corrected several statements that used side effects illegally in pngrutil.c - and pngtrans.c, that were introduced in version 1.0.1b - Revised png_read_rows() to avoid repeated if-testing for NULL (A Kleinert) - More corrections to example.c, use of row_pointers in png_write_image() - and png_read_rows(). - Added pngdll.mak and pngdef.pas to scripts directory, contributed by - Bob Dellaca, to make a png32bd.dll with Borland C++ 4.5 - Fixed error in example.c with png_set_text: num_text is 3, not 2 (Guido V.) - Changed several loops from count-down to count-up, for consistency. - -Version 1.0.1e [June 6, 1998] - Revised libpng.txt and libpng.3 description of png_set_read|write_fn(), and - added warnings when people try to set png_read_fn and png_write_fn in - the same structure. - Added a test such that png_do_gamma will be done when num_trans==0 - for truecolor images that have defined a background. This corrects an - error that was introduced in libpng-0.90 that can cause gamma processing - to be skipped. - Added tests in png.h to include "trans" and "trans_values" in structures - when PNG_READ_BACKGROUND_SUPPORTED or PNG_READ_EXPAND_SUPPORTED is defined. - Add png_free(png_ptr->time_buffer) in png_destroy_read_struct() - Moved png_convert_to_rfc_1123() from pngwrite.c to png.c - Added capability for user-provided malloc_fn() and free_fn() functions, - and revised pngtest.c to demonstrate their use, replacing the - PNGTEST_DEBUG_MEM feature. - Added makefile.w32, for Microsoft C++ 4.0 and later (Tim Wegner). - -Version 1.0.2 [June 14, 1998] - Fixed two bugs in makefile.bor . - -Version 1.0.2a [December 30, 1998] - Replaced and extended code that was removed from png_set_filler() in 1.0.1a. - Fixed a bug in png_do_filler() that made it fail to write filler bytes in - the left-most pixel of each row (Kevin Bracey). - Changed "static pngcharp tIME_string" to "static char tIME_string[30]" - in pngtest.c (Duncan Simpson). - Fixed a bug in pngtest.c that caused pngtest to try to write a tIME chunk - even when no tIME chunk was present in the source file. - Fixed a problem in pngrutil.c: gray_to_rgb didn't always work with 16-bit. - Fixed a problem in png_read_push_finish_row(), which would not skip some - passes that it should skip, for images that are less than 3 pixels high. - Interchanged the order of calls to png_do_swap() and png_do_shift() - in pngwtran.c (John Cromer). - Added #ifdef PNG_DEBUG/#endif surrounding use of PNG_DEBUG in png.h . - Changed "bad adaptive filter type" from error to warning in pngrutil.c . - Fixed a documentation error about default filtering with 8-bit indexed-color. - Separated the PNG_NO_STDIO macro into PNG_NO_STDIO and PNG_NO_CONSOLE_IO - (L. Peter Deutsch). - Added png_set_rgb_to_gray() and png_get_rgb_to_gray_status() functions. - Added png_get_copyright() and png_get_header_version() functions. - Revised comments on png_set_progressive_read_fn() in libpng.txt and example.c - Added information about debugging in libpng.txt and libpng.3 . - Changed "ln -sf" to "ln -s -f" in makefile.s2x, makefile.lnx, and - makefile.sco. - Removed lines after Dynamic Dependencies" in makefile.aco . - Revised makefile.dec to make a shared library (Jeremie Petit). - Removed trailing blanks from all files. - -Version 1.0.2a [January 6, 1999] - Removed misplaced #endif and #ifdef PNG_NO_EXTERN near the end of png.h - Added "if" tests to silence complaints about unused png_ptr in png.h and png.c - Changed "check_if_png" function in example.c to return true (nonzero) if PNG. - Changed libpng.txt to demonstrate png_sig_cmp() instead of png_check_sig() - which is obsolete. - -Version 1.0.3 [January 14, 1999] - Added makefile.hux, for Hewlett Packard HPUX 10.20 and 11.00 (Jim Rice) - Added a statement of Y2K compliance in png.h, libpng.3, and Y2KINFO. - -Version 1.0.3a [August 12, 1999] - Added check for PNG_READ_INTERLACE_SUPPORTED in pngread.c; issue a warning - if an attempt is made to read an interlaced image when it's not supported. - Added check if png_ptr->trans is defined before freeing it in pngread.c - Modified the Y2K statement to include versions back to version 0.71 - Fixed a bug in the check for valid IHDR bit_depth/color_types in pngrutil.c - Modified makefile.wat (added -zp8 flag, ".symbolic", changed some comments) - Replaced leading blanks with tab characters in makefile.hux - Changed "dworkin.wustl.edu" to "ccrc.wustl.edu" in various documents. - Changed (float)red and (float)green to (double)red, (double)green - in png_set_rgb_to_gray() to avoid "promotion" problems in AIX. - Fixed a bug in pngconf.h that omitted when PNG_DEBUG==0 (K Bracey). - Reformatted libpng.3 and libpngpf.3 with proper fonts (script by J. vanZandt). - Updated documentation to refer to the PNG-1.2 specification. - Removed ansi2knr.c and left pointers to the latest source for ansi2knr.c - in makefile.knr, INSTALL, and README (L. Peter Deutsch) - Fixed bugs in calculation of the length of rowbytes when adding alpha - channels to 16-bit images, in pngrtran.c (Chris Nokleberg) - Added function png_set_user_transform_info() to store user_transform_ptr, - user_depth, and user_channels into the png_struct, and a function - png_get_user_transform_ptr() to retrieve the pointer (Chris Nokleberg) - Added function png_set_empty_plte_permitted() to make libpng useable - in MNG applications. - Corrected the typedef for png_free_ptr in png.h (Jesse Jones). - Correct gamma with srgb is 45455 instead of 45000 in pngrutil.c, to be - consistent with PNG-1.2, and allow variance of 500 before complaining. - Added assembler code contributed by Intel in file pngvcrd.c and modified - makefile.w32 to use it (Nirav Chhatrapati, INTEL Corporation, - Gilles Vollant) - Changed "ln -s -f" to "ln -f -s" in the makefiles to make Solaris happy. - Added some aliases for png_set_expand() in pngrtran.c, namely - png_set_expand_PLTE(), png_set_expand_depth(), and png_set_expand_tRNS() - (Greg Roelofs, in "PNG: The Definitive Guide"). - Added makefile.beo for BEOS on X86, contributed by Sander Stok. - -Version 1.0.3b [August 26, 1999] - Replaced 2147483647L several places with PNG_MAX_UINT macro, defined in png.h - Changed leading blanks to tabs in all makefiles. - Define PNG_USE_PNGVCRD in makefile.w32, to get MMX assembler code. - Made alternate versions of png_set_expand() in pngrtran.c, namely - png_set_gray_1_2_4_to_8, png_set_palette_to_rgb, and png_set_tRNS_to_alpha - (Greg Roelofs, in "PNG: The Definitive Guide"). Deleted the 1.0.3a aliases. - Relocated start of 'extern "C"' block in png.h so it doesn't include pngconf.h - Revised calculation of num_blocks in pngmem.c to avoid a potentially - negative shift distance, whose results are undefined in the C language. - Added a check in pngset.c to prevent writing multiple tIME chunks. - Added a check in pngwrite.c to detect invalid small window_bits sizes. - -Version 1.0.3d [September 4, 1999] - Fixed type casting of igamma in pngrutil.c - Added new png_expand functions to scripts/pngdef.pas and pngos2.def - Added a demo read_user_transform_fn that examines the row filters in pngtest.c - -Version 1.0.4 [September 24, 1999] - Define PNG_ALWAYS_EXTERN in pngconf.h if __STDC__ is defined - Delete #define PNG_INTERNAL and include "png.h" from pngasmrd.h - Made several minor corrections to pngtest.c - Renamed the makefiles with longer but more user friendly extensions. - Copied the PNG copyright and license to a separate LICENSE file. - Revised documentation, png.h, and example.c to remove reference to - "viewing_gamma" which no longer appears in the PNG specification. - Revised pngvcrd.c to use MMX code for interlacing only on the final pass. - Updated pngvcrd.c to use the faster C filter algorithms from libpng-1.0.1a - Split makefile.win32vc into two versions, makefile.vcawin32 (uses MMX - assembler code) and makefile.vcwin32 (doesn't). - Added a CPU timing report to pngtest.c (enabled by defining PNGTEST_TIMING) - Added a copy of pngnow.png to the distribution. - -Version 1.0.4a [September 25, 1999] - Increase max_pixel_depth in pngrutil.c if a user transform needs it. - Changed several division operations to right-shifts in pngvcrd.c - -Version 1.0.4b [September 30, 1999] - Added parentheses in line 3732 of pngvcrd.c - Added a comment in makefile.linux warning about buggy -O3 in pgcc 2.95.1 - -Version 1.0.4c [October 1, 1999] - Added a "png_check_version" function in png.c and pngtest.c that will generate - a helpful compiler error if an old png.h is found in the search path. - Changed type of png_user_transform_depth|channels from int to png_byte. - -Version 1.0.4d [October 6, 1999] - Changed 0.45 to 0.45455 in png_set_sRGB() - Removed unused PLTE entries from pngnow.png - Re-enabled some parts of pngvcrd.c (png_combine_row) that work properly. - -Version 1.0.4e [October 10, 1999] - Fixed sign error in pngvcrd.c (Greg Roelofs) - Replaced some instances of memcpy with simple assignments in pngvcrd (GR-P) - -Version 1.0.4f [October 15, 1999] - Surrounded example.c code with #if 0 .. #endif to prevent people from - inadvertently trying to compile it. - Changed png_get_header_version() from a function to a macro in png.h - Added type casting mostly in pngrtran.c and pngwtran.c - Removed some pointless "ptr = NULL" in pngmem.c - Added a "contrib" directory containing the source code from Greg's book. - -Version 1.0.5 [October 15, 1999] - Minor editing of the INSTALL and README files. - -Version 1.0.5a [October 23, 1999] - Added contrib/pngsuite and contrib/pngminus (Willem van Schaik) - Fixed a typo in the png_set_sRGB() function call in example.c (Jan Nijtmans) - Further optimization and bugfix of pngvcrd.c - Revised pngset.c so that it does not allocate or free memory in the user's - text_ptr structure. Instead, it makes its own copy. - Created separate write_end_info_struct in pngtest.c for a more severe test. - Added code in pngwrite.c to free info_ptr->text[i].key to stop a memory leak. - -Version 1.0.5b [November 23, 1999] - Moved PNG_FLAG_HAVE_CHUNK_HEADER, PNG_FLAG_BACKGROUND_IS_GRAY and - PNG_FLAG_WROTE_tIME from flags to mode. - Added png_write_info_before_PLTE() function. - Fixed some typecasting in contrib/gregbook/*.c - Updated scripts/makevms.com and added makevms.com to contrib/gregbook - and contrib/pngminus (Martin Zinser) - -Version 1.0.5c [November 26, 1999] - Moved png_get_header_version from png.h to png.c, to accommodate ansi2knr. - Removed all global arrays (according to PNG_NO_GLOBAL_ARRAYS macro), to - accommodate making DLL's: Moved usr_png_ver from global variable to function - png_get_header_ver() in png.c. Moved png_sig to png_sig_bytes in png.c and - eliminated use of png_sig in pngwutil.c. Moved the various png_CHNK arrays - into pngtypes.h. Eliminated use of global png_pass arrays. Declared the - png_CHNK and png_pass arrays to be "const". Made the global arrays - available to applications (although none are used in libpng itself) when - PNG_NO_GLOBAL_ARRAYS is not defined or when PNG_GLOBAL_ARRAYS is defined. - Removed some extraneous "-I" from contrib/pngminus/makefile.std - Changed the PNG_sRGB_INTENT macros in png.h to be consistent with PNG-1.2. - Change PNG_SRGB_INTENT to PNG_sRGB_INTENT in libpng.txt and libpng.3 - -Version 1.0.5d [November 29, 1999] - Add type cast (png_const_charp) two places in png.c - Eliminated pngtypes.h; use macros instead to declare PNG_CHNK arrays. - Renamed "PNG_GLOBAL_ARRAYS" to "PNG_USE_GLOBAL_ARRAYS" and made available - to applications a macro "PNG_USE_LOCAL_ARRAYS". - comment out (with #ifdef) all the new declarations when - PNG_USE_GLOBAL_ARRAYS is defined. - Added PNG_EXPORT_VAR macro to accommodate making DLL's. - -Version 1.0.5e [November 30, 1999] - Added iCCP, iTXt, and sPLT support; added "lang" member to the png_text - structure; refactored the inflate/deflate support to make adding new chunks - with trailing compressed parts easier in the future, and added new functions - png_free_iCCP, png_free_pCAL, png_free_sPLT, png_free_text, png_get_iCCP, - png_get_spalettes, png_set_iCCP, png_set_spalettes (Eric S. Raymond). - NOTE: Applications that write text chunks MUST define png_text->lang - before calling png_set_text(). It must be set to NULL if you want to - write tEXt or zTXt chunks. If you want your application to be able to - run with older versions of libpng, use - - #ifdef PNG_iTXt_SUPPORTED - png_text[i].lang = NULL; - #endif - - Changed png_get_oFFs() and png_set_oFFs() to use signed rather than unsigned - offsets (Eric S. Raymond). - Combined PNG_READ_cHNK_SUPPORTED and PNG_WRITE_cHNK_SUPPORTED macros into - PNG_cHNK_SUPPORTED and combined the three types of PNG_text_SUPPORTED - macros, leaving the separate macros also available. - Removed comments on #endifs at the end of many short, non-nested #if-blocks. - -Version 1.0.5f [December 6, 1999] - Changed makefile.solaris to issue a warning about potential problems when - the ucb "ld" is in the path ahead of the ccs "ld". - Removed "- [date]" from the "synopsis" line in libpng.3 and libpngpf.3. - Added sCAL chunk support (Eric S. Raymond). - -Version 1.0.5g [December 7, 1999] - Fixed "png_free_spallettes" typo in png.h - Added code to handle new chunks in pngpread.c - Moved PNG_CHNK string macro definitions outside of PNG_NO_EXTERN block - Added "translated_key" to png_text structure and png_write_iTXt(). - Added code in pngwrite.c to work around a newly discovered zlib bug. - -Version 1.0.5h [December 10, 1999] - NOTE: regarding the note for version 1.0.5e, the following must also - be included in your code: - png_text[i].translated_key = NULL; - Unknown chunk handling is now supported. - Option to eliminate all floating point support was added. Some new - fixed-point functions such as png_set_gAMA_fixed() were added. - Expanded tabs and removed trailing blanks in source files. - -Version 1.0.5i [December 13, 1999] - Added some type casts to silence compiler warnings. - Renamed "png_free_spalette" to "png_free_spalettes" for consistency. - Removed leading blanks from a #define in pngvcrd.c - Added some parameters to the new png_set_keep_unknown_chunks() function. - Added a test for up->location != 0 in the first instance of writing - unknown chunks in pngwrite.c - Changed "num" to "i" in png_free_spalettes() and png_free_unknowns() to - prevent recursion. - Added png_free_hIST() function. - Various patches to fix bugs in the sCAL and integer cHRM processing, - and to add some convenience macros for use with sCAL. - -Version 1.0.5j [December 21, 1999] - Changed "unit" parameter of png_write_sCAL from png_byte to int, to work - around buggy compilers. - Added new type "png_fixed_point" for integers that hold float*100000 values - Restored backward compatibility of tEXt/zTXt chunk processing: - Restored the first four members of png_text to the same order as v.1.0.5d. - Added members "lang_key" and "itxt_length" to png_text struct. Set - text_length=0 when "text" contains iTXt data. Use the "compression" - member to distinguish among tEXt/zTXt/iTXt types. Added - PNG_ITXT_COMPRESSION_NONE (1) and PNG_ITXT_COMPRESSION_zTXt(2) macros. - The "Note" above, about backward incompatibility of libpng-1.0.5e, no - longer applies. - Fixed png_read|write_iTXt() to read|write parameters in the right order, - and to write the iTXt chunk after IDAT if it appears in the end_ptr. - Added pnggccrd.c, version of pngvcrd.c Intel assembler for gcc (Greg Roelofs) - Reversed the order of trying to write floating-point and fixed-point gAMA. - -Version 1.0.5k [December 27, 1999] - Added many parentheses, e.g., "if (a && b & c)" becomes "if (a && (b & c))" - Added png_handle_as_unknown() function (Glenn) - Added png_free_chunk_list() function and chunk_list and num_chunk_list members - of png_ptr. - Eliminated erroneous warnings about multiple sPLT chunks and sPLT-after-PLTE. - Fixed a libpng-1.0.5h bug in pngrutil.c that was issuing erroneous warnings - about ignoring incorrect gAMA with sRGB (gAMA was in fact not ignored) - Added png_free_tRNS(); png_set_tRNS() now malloc's its own trans array (ESR). - Define png_get_int_32 when oFFs chunk is supported as well as when pCAL is. - Changed type of proflen from png_int_32 to png_uint_32 in png_get_iCCP(). - -Version 1.0.5l [January 1, 2000] - Added functions png_set_read_user_chunk_fn() and png_get_user_chunk_ptr() - for setting a callback function to handle unknown chunks and for - retrieving the associated user pointer (Glenn). - -Version 1.0.5m [January 7, 2000] - Added high-level functions png_read_png(), png_write_png(), png_free_pixels(). - -Version 1.0.5n [January 9, 2000] - Added png_free_PLTE() function, and modified png_set_PLTE() to malloc its - own memory for info_ptr->palette. This makes it safe for the calling - application to free its copy of the palette any time after it calls - png_set_PLTE(). - -Version 1.0.5o [January 20, 2000] - Cosmetic changes only (removed some trailing blanks and TABs) - -Version 1.0.5p [January 31, 2000] - Renamed pngdll.mak to makefile.bd32 - Cosmetic changes in pngtest.c - -Version 1.0.5q [February 5, 2000] - Relocated the makefile.solaris warning about PATH problems. - Fixed pngvcrd.c bug by pushing/popping registers in mmxsupport (Bruce Oberg) - Revised makefile.gcmmx - Added PNG_SETJMP_SUPPORTED, PNG_SETJMP_NOT_SUPPORTED, and PNG_ABORT() macros - -Version 1.0.5r [February 7, 2000] - Removed superfluous prototype for png_get_itxt from png.h - Fixed a bug in pngrtran.c that improperly expanded the background color. - Return *num_text=0 from png_get_text() when appropriate, and fix documentation - of png_get_text() in libpng.txt/libpng.3. - -Version 1.0.5s [February 18, 2000] - Added "png_jmp_env()" macro to pngconf.h, to help people migrate to the - new error handler that's planned for the next libpng release, and changed - example.c, pngtest.c, and contrib programs to use this macro. - Revised some of the DLL-export macros in pngconf.h (Greg Roelofs) - Fixed a bug in png_read_png() that caused it to fail to expand some images - that it should have expanded. - Fixed some mistakes in the unused and undocumented INCH_CONVERSIONS functions - in pngget.c - Changed the allocation of palette, history, and trans arrays back to - the version 1.0.5 method (linking instead of copying) which restores - backward compatibility with version 1.0.5. Added some remarks about - that in example.c. Added "free_me" member to info_ptr and png_ptr - and added png_free_data() function. - Updated makefile.linux and makefile.gccmmx to make directories conditionally. - Made cosmetic changes to pngasmrd.h - Added png_set_rows() and png_get_rows(), for use with png_read|write_png(). - Modified png_read_png() to allocate info_ptr->row_pointers only if it - hasn't already been allocated. - -Version 1.0.5t [March 4, 2000] - Changed png_jmp_env() migration aiding macro to png_jmpbuf(). - Fixed "interlace" typo (should be "interlaced") in contrib/gregbook/read2-x.c - Fixed bug with use of PNG_BEFORE_IHDR bit in png_ptr->mode, introduced when - PNG_FLAG_HAVE_CHUNK_HEADER was moved into png_ptr->mode in version 1.0.5b - Files in contrib/gregbook were revised to use png_jmpbuf() and to select - a 24-bit visual if one is available, and to allow abbreviated options. - Files in contrib/pngminus were revised to use the png_jmpbuf() macro. - Removed spaces in makefile.linux and makefile.gcmmx, introduced in 1.0.5s - -Version 1.0.5u [March 5, 2000] - Simplified the code that detects old png.h in png.c and pngtest.c - Renamed png_spalette (_p, _pp) to png_sPLT_t (_tp, _tpp) - Increased precision of rgb_to_gray calculations from 8 to 15 bits and - added png_set_rgb_to_gray_fixed() function. - Added makefile.bc32 (32-bit Borland C++, C mode) - -Version 1.0.5v [March 11, 2000] - Added some parentheses to the png_jmpbuf macro definition. - Updated references to the zlib home page, which has moved to freesoftware.com. - Corrected bugs in documentation regarding png_read_row() and png_write_row(). - Updated documentation of png_rgb_to_gray calculations in libpng.3/libpng.txt. - Renamed makefile.borland,turboc3 back to makefile.bor,tc3 as in version 1.0.3, - revised borland makefiles; added makefile.ibmvac3 and makefile.gcc (Cosmin) - -Version 1.0.6 [March 20, 2000] - Minor revisions of makefile.bor, libpng.txt, and gregbook/rpng2-win.c - Added makefile.sggcc (SGI IRIX with gcc) - -Version 1.0.6d [April 7, 2000] - Changed sprintf() to strcpy() in png_write_sCAL_s() to work without STDIO - Added data_length parameter to png_decompress_chunk() function - Revised documentation to remove reference to abandoned png_free_chnk functions - Fixed an error in png_rgb_to_gray_fixed() - Revised example.c, usage of png_destroy_write_struct(). - Renamed makefile.ibmvac3 to makefile.ibmc, added libpng.icc IBM project file - Added a check for info_ptr->free_me&PNG_FREE_TEXT when freeing text in png.c - Simplify png_sig_bytes() function to remove use of non-ISO-C strdup(). - -Version 1.0.6e [April 9, 2000] - Added png_data_freer() function. - In the code that checks for over-length tRNS chunks, added check of - info_ptr->num_trans as well as png_ptr->num_trans (Matthias Benckmann) - Minor revisions of libpng.txt/libpng.3. - Check for existing data and free it if the free_me flag is set, in png_set_*() - and png_handle_*(). - Only define PNG_WEIGHTED_FILTERS_SUPPORTED when PNG_FLOATING_POINT_SUPPORTED - is defined. - Changed several instances of PNG_NO_CONSOLE_ID to PNG_NO_STDIO in pngrutil.c - and mentioned the purposes of the two macros in libpng.txt/libpng.3. - -Version 1.0.6f [April 14, 2000] - Revised png_set_iCCP() and png_set_rows() to avoid prematurely freeing data. - Add checks in png_set_text() for NULL members of the input text structure. - Revised libpng.txt/libpng.3. - Removed superfluous prototype for png_set_iTXt from png.h - Removed "else" from pngread.c, after png_error(), and changed "0" to "length". - Changed several png_errors about malformed ancillary chunks to png_warnings. - -Version 1.0.6g [April 24, 2000] - Added png_pass-* arrays to pnggccrd.c when PNG_USE_LOCAL_ARRAYS is defined. - Relocated paragraph about png_set_background() in libpng.3/libpng.txt - and other revisions (Matthias Benckmann) - Relocated info_ptr->free_me, png_ptr->free_me, and other info_ptr and - png_ptr members to restore binary compatibility with libpng-1.0.5 - (breaks compatibility with libpng-1.0.6). - -Version 1.0.6h [April 24, 2000] - Changed shared library so-number pattern from 2.x.y.z to xy.z (this builds - libpng.so.10 & libpng.so.10.6h instead of libpng.so.2 & libpng.so.2.1.0.6h) - This is a temporary change for test purposes. - -Version 1.0.6i [May 2, 2000] - Rearranged some members at the end of png_info and png_struct, to put - unknown_chunks_num and free_me within the original size of the png_structs - and free_me, png_read_user_fn, and png_free_fn within the original png_info, - because some old applications allocate the structs directly instead of - using png_create_*(). - Added documentation of user memory functions in libpng.txt/libpng.3 - Modified png_read_png so that it will use user_allocated row_pointers - if present, unless free_me directs that it be freed, and added description - of the use of png_set_rows() and png_get_rows() in libpng.txt/libpng.3. - Added PNG_LEGACY_SUPPORTED macro, and #ifdef out all new (since version - 1.00) members of png_struct and png_info, to regain binary compatibility - when you define this macro. Capabilities lost in this event - are user transforms (new in version 1.0.0),the user transform pointer - (new in version 1.0.2), rgb_to_gray (new in 1.0.5), iCCP, sCAL, sPLT, - the high-level interface, and unknown chunks support (all new in 1.0.6). - This was necessary because of old applications that allocate the structs - directly as authors were instructed to do in libpng-0.88 and earlier, - instead of using png_create_*(). - Added modes PNG_CREATED_READ_STRUCT and PNG_CREATED_WRITE_STRUCT which - can be used to detect codes that directly allocate the structs, and - code to check these modes in png_read_init() and png_write_init() and - generate a libpng error if the modes aren't set and PNG_LEGACY_SUPPORTED - was not defined. - Added makefile.intel and updated makefile.watcom (Pawel Mrochen) - -Version 1.0.6j [May 3, 2000] - Overloaded png_read_init() and png_write_init() with macros that convert - calls to png_read_init_2() or png_write_init_2() that check the version - and structure sizes. - -Version 1.0.7beta11 [May 7, 2000] - Removed the new PNG_CREATED_READ_STRUCT and PNG_CREATED_WRITE_STRUCT modes - which are no longer used. - Eliminated the three new members of png_text when PNG_LEGACY_SUPPORTED is - defined or when neither PNG_READ_iTXt_SUPPORTED nor PNG_WRITE_iTXT_SUPPORTED - is defined. - Made PNG_NO_READ|WRITE_iTXt the default setting, to avoid memory - overrun when old applications fill the info_ptr->text structure directly. - Added PNGAPI macro, and added it to the definitions of all exported functions. - Relocated version macro definitions ahead of the includes of zlib.h and - pngconf.h in png.h. - -Version 1.0.7beta12 [May 12, 2000] - Revised pngset.c to avoid a problem with expanding the png_debug macro. - Deleted some extraneous defines from pngconf.h - Made PNG_NO_CONSOLE_IO the default condition when PNG_BUILD_DLL is defined. - Use MSC _RPTn debugging instead of fprintf if _MSC_VER is defined. - Added png_access_version_number() function. - Check for mask&PNG_FREE_CHNK (for TEXT, SCAL, PCAL) in png_free_data(). - Expanded libpng.3/libpng.txt information about png_data_freer(). - -Version 1.0.7beta14 [May 17, 2000] (beta13 was not published) - Changed pnggccrd.c and pngvcrd.c to handle bad adaptive filter types as - warnings instead of errors, as pngrutil.c does. - Set the PNG_INFO_IDAT valid flag in png_set_rows() so png_write_png() - will actually write IDATs. - Made the default PNG_USE_LOCAL_ARRAYS depend on PNG_DLL instead of WIN32. - Make png_free_data() ignore its final parameter except when freeing data - that can have multiple instances (text, sPLT, unknowns). - Fixed a new bug in png_set_rows(). - Removed info_ptr->valid tests from png_free_data(), as in version 1.0.5. - Added png_set_invalid() function. - Fixed incorrect illustrations of png_destroy_write_struct() in example.c. - -Version 1.0.7beta15 [May 30, 2000] - Revised the deliberately erroneous Linux setjmp code in pngconf.h to produce - fewer error messages. - Rearranged checks for Z_OK to check the most likely path first in pngpread.c - and pngwutil.c. - Added checks in pngtest.c for png_create_*() returning NULL, and mentioned - in libpng.txt/libpng.3 the need for applications to check this. - Changed names of png_default_*() functions in pngtest to pngtest_*(). - Changed return type of png_get_x|y_offset_*() from png_uint_32 to png_int_32. - Fixed some bugs in the unused PNG_INCH_CONVERSIONS functions in pngget.c - Set each pointer to NULL after freeing it in png_free_data(). - Worked around a problem in pngconf.h; AIX's strings.h defines an "index" - macro that conflicts with libpng's png_color_16.index. (Dimitri - Papadapoulos) - Added "msvc" directory with MSVC++ project files (Simon-Pierre Cadieux). - -Version 1.0.7beta16 [June 4, 2000] - Revised the workaround of AIX string.h "index" bug. - Added a check for overlength PLTE chunk in pngrutil.c. - Added PNG_NO_POINTER_INDEXING macro to use array-indexing instead of pointer - indexing in pngrutil.c and pngwutil.c to accommodate a buggy compiler. - Added a warning in png_decompress_chunk() when it runs out of data, e.g. - when it tries to read an erroneous PhotoShop iCCP chunk. - Added PNG_USE_DLL macro. - Revised the copyright/disclaimer/license notice. - Added contrib/msvctest directory - -Version 1.0.7rc1 [June 9, 2000] - Corrected the definition of PNG_TRANSFORM_INVERT_ALPHA (0x0400 not 0x0200) - Added contrib/visupng directory (Willem van Schaik) - -Version 1.0.7beta18 [June 23, 2000] - Revised PNGAPI definition, and pngvcrd.c to work with __GCC__ - and do not redefine PNGAPI if it is passed in via a compiler directive. - Revised visupng/PngFile.c to remove returns from within the Try block. - Removed leading underscores from "_PNG_H" and "_PNG_SAVE_BSD_SOURCE" macros. - Updated contrib/visupng/cexcept.h to version 1.0.0. - Fixed bugs in pngwrite.c and pngwutil.c that prevented writing iCCP chunks. - -Version 1.0.7rc2 [June 28, 2000] - Updated license to include disclaimers required by UCITA. - Fixed "DJBPP" typo in pnggccrd.c introduced in beta18. - -Version 1.0.7 [July 1, 2000] - Revised the definition of "trans_values" in libpng.3/libpng.txt - -Version 1.0.8beta1 [July 8, 2000] - Added png_free(png_ptr, key) two places in pngpread.c to stop memory leaks. - Changed PNG_NO_STDIO to PNG_NO_CONSOLE_IO, several places in pngrutil.c and - pngwutil.c. - Changed PNG_EXPORT_VAR to use PNG_IMPEXP, in pngconf.h. - Removed unused "#include " from png.c - Added WindowsCE support. - Revised pnggccrd.c to work with gcc-2.95.2 and in the Cygwin environment. - -Version 1.0.8beta2 [July 10, 2000] - Added project files to the wince directory and made further revisions - of pngtest.c, pngrio.c, and pngwio.c in support of WindowsCE. - -Version 1.0.8beta3 [July 11, 2000] - Only set the PNG_FLAG_FREE_TRNS or PNG_FREE_TRNS flag in png_handle_tRNS() - for indexed-color input files to avoid potential double-freeing trans array - under some unusual conditions; problem was introduced in version 1.0.6f. - Further revisions to pngtest.c and files in the wince subdirectory. - -Version 1.0.8beta4 [July 14, 2000] - Added the files pngbar.png and pngbar.jpg to the distribution. - Added makefile.cygwin, and cygwin support in pngconf.h - Added PNG_NO_ZALLOC_ZERO macro (makes png_zalloc skip zeroing memory) - -Version 1.0.8rc1 [July 16, 2000] - Revised png_debug() macros and statements to eliminate compiler warnings. - -Version 1.0.8 [July 24, 2000] - Added png_flush() in pngwrite.c, after png_write_IEND(). - Updated makefile.hpux to build a shared library. - -Version 1.0.9beta1 [November 10, 2000] - Fixed typo in scripts/makefile.hpux - Updated makevms.com in scripts and contrib/* and contrib/* (Martin Zinser) - Fixed seqence-point bug in contrib/pngminus/png2pnm (Martin Zinser) - Changed "cdrom.com" in documentation to "libpng.org" - Revised pnggccrd.c to get it all working, and updated makefile.gcmmx (Greg). - Changed type of "params" from voidp to png_voidp in png_read|write_png(). - Make sure PNGAPI and PNG_IMPEXP are defined in pngconf.h. - Revised the 3 instances of WRITEFILE in pngtest.c. - Relocated "msvc" and "wince" project subdirectories into "dll" subdirectory. - Updated png.rc in dll/msvc project - Revised makefile.dec to define and use LIBPATH and INCPATH - Increased size of global png_libpng_ver[] array from 12 to 18 chars. - Made global png_libpng_ver[], png_sig[] and png_pass_*[] arrays const. - Removed duplicate png_crc_finish() from png_handle_bKGD() function. - Added a warning when application calls png_read_update_info() multiple times. - Revised makefile.cygwin - Fixed bugs in iCCP support in pngrutil.c and pngwutil.c. - Replaced png_set_empty_plte_permitted() with png_permit_mng_features(). - -Version 1.0.9beta2 [November 19, 2000] - Renamed the "dll" subdirectory "projects". - Added borland project files to "projects" subdirectory. - Set VS_FF_PRERELEASE and VS_FF_PATCHED flags in msvc/png.rc when appropriate. - Add error message in png_set_compression_buffer_size() when malloc fails. - -Version 1.0.9beta3 [November 23, 2000] - Revised PNG_LIBPNG_BUILD_TYPE macro in png.h, used in the msvc project. - Removed the png_flush() in pngwrite.c that crashes some applications - that don't set png_output_flush_fn. - Added makefile.macosx and makefile.aix to scripts directory. - -Version 1.0.9beta4 [December 1, 2000] - Change png_chunk_warning to png_warning in png_check_keyword(). - Increased the first part of msg buffer from 16 to 18 in png_chunk_error(). - -Version 1.0.9beta5 [December 15, 2000] - Added support for filter method 64 (for PNG datastreams embedded in MNG). - -Version 1.0.9beta6 [December 18, 2000] - Revised png_set_filter() to accept filter method 64 when appropriate. - Added new PNG_HAVE_PNG_SIGNATURE bit to png_ptr->mode and use it to - help prevent applications from using MNG features in PNG datastreams. - Added png_permit_mng_features() function. - Revised libpng.3/libpng.txt. Changed "filter type" to "filter method". - -Version 1.0.9rc1 [December 23, 2000] - Revised test for PNG_HAVE_PNG_SIGNATURE in pngrutil.c - Fixed error handling of unknown compression type in png_decompress_chunk(). - In pngconf.h, define __cdecl when _MSC_VER is defined. - -Version 1.0.9beta7 [December 28, 2000] - Changed PNG_TEXT_COMPRESSION_zTXt to PNG_COMPRESSION_TYPE_BASE several places. - Revised memory management in png_set_hIST and png_handle_hIST in a backward - compatible manner. PLTE and tRNS were revised similarly. - Revised the iCCP chunk reader to ignore trailing garbage. - -Version 1.0.9beta8 [January 12, 2001] - Moved pngasmrd.h into pngconf.h. - Improved handling of out-of-spec garbage iCCP chunks generated by PhotoShop. - -Version 1.0.9beta9 [January 15, 2001] - Added png_set_invalid, png_permit_mng_features, and png_mmx_supported to - wince and msvc project module definition files. - Minor revision of makefile.cygwin. - Fixed bug with progressive reading of narrow interlaced images in pngpread.c - -Version 1.0.9beta10 [January 16, 2001] - Do not typedef png_FILE_p in pngconf.h when PNG_NO_STDIO is defined. - Fixed "png_mmx_supported" typo in project definition files. - -Version 1.0.9beta11 [January 19, 2001] - Updated makefile.sgi to make shared library. - Removed png_mmx_support() function and disabled PNG_MNG_FEATURES_SUPPORTED - by default, for the benefit of DLL forward compatibility. These will - be re-enabled in version 1.2.0. - -Version 1.0.9rc2 [January 22, 2001] - Revised cygwin support. - -Version 1.0.9 [January 31, 2001] - Added check of cygwin's ALL_STATIC in pngconf.h - Added "-nommx" parameter to contrib/gregbook/rpng2-win and rpng2-x demos. - -Version 1.0.10beta1 [March 14, 2001] - Revised makefile.dec, makefile.sgi, and makefile.sggcc; added makefile.hpgcc. - Reformatted libpng.3 to eliminate bad line breaks. - Added checks for _mmx_supported in the read_filter_row function of pnggccrd.c - Added prototype for png_mmx_support() near the top of pnggccrd.c - Moved some error checking from png_handle_IHDR to png_set_IHDR. - Added PNG_NO_READ_SUPPORTED and PNG_NO_WRITE_SUPPORTED macros. - Revised png_mmx_support() function in pnggccrd.c - Restored version 1.0.8 PNG_WRITE_EMPTY_PLTE_SUPPORTED behavior in pngwutil.c - Fixed memory leak in contrib/visupng/PngFile.c - Fixed bugs in png_combine_row() in pnggccrd.c and pngvcrd.c (C version) - Added warnings when retrieving or setting gamma=0. - Increased the first part of msg buffer from 16 to 18 in png_chunk_warning(). - -Version 1.0.10rc1 [March 23, 2001] - Changed all instances of memcpy, strcpy, and strlen to png_memcpy, png_strcpy, - and png_strlen. - Revised png_mmx_supported() function in pnggccrd.c to return proper value. - Fixed bug in progressive reading (pngpread.c) with small images (height < 8). - -Version 1.0.10 [March 30, 2001] - Deleted extraneous space (introduced in 1.0.9) from line 42 of makefile.cygwin - Added beos project files (Chris Herborth) - -Version 1.0.11beta1 [April 3, 2001] - Added type casts on several png_malloc() calls (Dimitri Papadapoulos). - Removed a no-longer needed AIX work-around from pngconf.h - Changed several "//" single-line comments to C-style in pnggccrd.c - -Version 1.0.11beta2 [April 11, 2001] - Removed PNGAPI from several functions whose prototypes did not have PNGAPI. - Updated scripts/pngos2.def - -Version 1.0.11beta3 [April 14, 2001] - Added checking the results of many instances of png_malloc() for NULL - -Version 1.0.11beta4 [April 20, 2001] - Undid the changes from version 1.0.11beta3. Added a check for NULL return - from user's malloc_fn(). - Removed some useless type casts of the NULL pointer. - Added makefile.netbsd - -Version 1.0.11 [April 27, 2001] - Revised makefile.netbsd - -Version 1.0.12beta1 [May 14, 2001] - Test for Windows platform in pngconf.h when including malloc.h (Emmanuel Blot) - Updated makefile.cygwin and handling of Cygwin's ALL_STATIC in pngconf.h - Added some never-to-be-executed code in pnggccrd.c to quiet compiler warnings. - Eliminated the png_error about apps using png_read|write_init(). Instead, - libpng will reallocate the png_struct and info_struct if they are too small. - This retains future binary compatibility for old applications written for - libpng-0.88 and earlier. - -Version 1.2.0beta1 [May 6, 2001] - Bumped DLLNUM to 2. - Re-enabled PNG_MNG_FEATURES_SUPPORTED and enabled PNG_ASSEMBLER_CODE_SUPPORTED - by default. - Added runtime selection of MMX features. - Added png_set_strip_error_numbers function and related macros. - -Version 1.2.0beta2 [May 7, 2001] - Finished merging 1.2.0beta1 with version 1.0.11 - Added a check for attempts to read or write PLTE in grayscale PNG datastreams. - -Version 1.2.0beta3 [May 17, 2001] - Enabled user memory function by default. - Modified png_create_struct so it passes user mem_ptr to user memory allocator. - Increased png_mng_features flag from png_byte to png_uint_32. - Bumped shared-library (so-number) and dll-number to 3. - -Version 1.2.0beta4 [June 23, 2001] - Check for missing profile length field in iCCP chunk and free chunk_data - in case of truncated iCCP chunk. - Bumped shared-library number to 3 in makefile.sgi and makefile.sggcc - Bumped dll-number from 2 to 3 in makefile.cygwin - Revised contrib/gregbook/rpng*-x.c to avoid a memory leak and to exit cleanly - if user attempts to run it on an 8-bit display. - Updated contrib/gregbook - Use png_malloc instead of png_zalloc to allocate palette in pngset.c - Updated makefile.ibmc - Added some typecasts to eliminate gcc 3.0 warnings. Changed prototypes - of png_write_oFFS width and height from png_uint_32 to png_int_32. - Updated example.c - Revised prototypes for png_debug_malloc and png_debug_free in pngtest.c - -Version 1.2.0beta5 [August 8, 2001] - Revised contrib/gregbook - Revised makefile.gcmmx - Revised pnggccrd.c to conditionally compile some thread-unsafe code only - when PNG_THREAD_UNSAFE_OK is defined. - Added tests to prevent pngwutil.c from writing a bKGD or tRNS chunk with - value exceeding 2^bit_depth-1 - Revised makefile.sgi and makefile.sggcc - Replaced calls to fprintf(stderr,...) with png_warning() in pnggccrd.c - Removed restriction that do_invert_mono only operate on 1-bit opaque files - -Version 1.2.0 [September 1, 2001] - Changed a png_warning() to png_debug() in pnggccrd.c - Fixed contrib/gregbook/rpng-x.c, rpng2-x.c to avoid crash with XFreeGC(). - -Version 1.2.1beta1 [October 19, 2001] - Revised makefile.std in contrib/pngminus - Include background_1 in png_struct regardless of gamma support. - Revised makefile.netbsd and makefile.macosx, added makefile.darwin. - Revised example.c to provide more details about using row_callback(). - -Version 1.2.1beta2 [October 25, 2001] - Added type cast to each NULL appearing in a function call, except for - WINCE functions. - Added makefile.so9. - -Version 1.2.1beta3 [October 27, 2001] - Removed type casts from all NULLs. - Simplified png_create_struct_2(). - -Version 1.2.1beta4 [November 7, 2001] - Revised png_create_info_struct() and png_creat_struct_2(). - Added error message if png_write_info() was omitted. - Type cast NULLs appearing in function calls when _NO_PROTO or - PNG_TYPECAST_NULL is defined. - -Version 1.2.1rc1 [November 24, 2001] - Type cast NULLs appearing in function calls except when PNG_NO_TYPECAST_NULL - is defined. - Changed typecast of "size" argument to png_size_t in pngmem.c calls to - the user malloc_fn, to agree with the prototype in png.h - Added a pop/push operation to pnggccrd.c, to preserve Eflag (Maxim Sobolev) - Updated makefile.sgi to recognize LIBPATH and INCPATH. - Updated various makefiles so "make clean" does not remove previous major - version of the shared library. - -Version 1.2.1rc2 [December 4, 2001] - Always allocate 256-entry internal palette, hist, and trans arrays, to - avoid out-of-bounds memory reference caused by invalid PNG datastreams. - Added a check for prefix_length > data_length in iCCP chunk handler. - -Version 1.2.1 [December 7, 2001] - None. - -Version 1.2.2beta1 [February 22, 2002] - Fixed a bug with reading the length of iCCP profiles (Larry Reeves). - Revised makefile.linux, makefile.gcmmx, and makefile.sgi to generate - libpng.a, libpng12.so (not libpng.so.3), and libpng12/png.h - Revised makefile.darwin to remove "-undefined suppress" option. - Added checks for gamma and chromaticity values over 21474.83, which exceed - the limit for PNG unsigned 32-bit integers when encoded. - Revised calls to png_create_read_struct() and png_create_write_struct() - for simpler debugging. - Revised png_zalloc() so zlib handles errors (uses PNG_FLAG_MALLOC_NULL_MEM_OK) - -Version 1.2.2beta2 [February 23, 2002] - Check chunk_length and idat_size for invalid (over PNG_MAX_UINT) lengths. - Check for invalid image dimensions in png_get_IHDR. - Added missing "fi;" in the install target of the SGI makefiles. - Added install-static to all makefiles that make shared libraries. - Always do gamma compensation when image is partially transparent. - -Version 1.2.2beta3 [March 7, 2002] - Compute background.gray and background_1.gray even when color_type is RGB - in case image gets reduced to gray later. - Modified shared-library makefiles to install pkgconfig/libpngNN.pc. - Export (with PNGAPI) png_zalloc, png_zfree, and png_handle_as_unknown - Removed unused png_write_destroy_info prototype from png.h - Eliminated incorrect use of width_mmx from pnggccrd.c in pixel_bytes == 8 case - Added install-shared target to all makefiles that make shared libraries. - Stopped a double free of palette, hist, and trans when not using free_me. - Added makefile.32sunu for Sun Ultra 32 and makefile.64sunu for Sun Ultra 64. - -Version 1.2.2beta4 [March 8, 2002] - Compute background.gray and background_1.gray even when color_type is RGB - in case image gets reduced to gray later (Jason Summers). - Relocated a misplaced /bin/rm in the "install-shared" makefile targets - Added PNG_1_0_X macro which can be used to build a 1.0.x-compatible library. - -Version 1.2.2beta5 [March 26, 2002] - Added missing PNGAPI to several function definitions. - Check for invalid bit_depth or color_type in png_get_IHDR(), and - check for missing PLTE or IHDR in png_push_read_chunk() (Matthias Clasen). - Revised iTXt support to accept NULL for lang and lang_key. - Compute gamma for color components of background even when color_type is gray. - Changed "()" to "{}" in scripts/libpng.pc.in. - Revised makefiles to put png.h and pngconf.h only in $prefix/include/libpngNN - Revised makefiles to make symlink to libpng.so.NN in addition to libpngNN.so - -Version 1.2.2beta6 [March 31, 2002] - -Version 1.0.13beta1 [March 31, 2002] - Prevent png_zalloc() from trying to memset memory that it failed to acquire. - Add typecasts of PNG_MAX_UINT in pngset_cHRM_fixed() (Matt Holgate). - Ensure that the right function (user or default) is used to free the - png_struct after an error in png_create_read_struct_2(). - -Version 1.2.2rc1 [April 7, 2002] - -Version 1.0.13rc1 [April 7, 2002] - Save the ebx register in pnggccrd.c (Sami Farin) - Add "mem_ptr = png_ptr->mem_ptr" in png_destroy_write_struct() (Paul Gardner). - Updated makefiles to put headers in include/libpng and remove old include/*.h. - -Version 1.2.2 [April 15, 2002] - -Version 1.0.13 [April 15, 2002] - Revised description of png_set_filter() in libpng.3/libpng.txt. - Revised makefile.netbsd and added makefile.neNNbsd and makefile.freebsd - -Version 1.0.13patch01 [April 17, 2002] - -Version 1.2.2patch01 [April 17, 2002] - Changed ${PNGMAJ}.${PNGVER} bug to ${PNGVER} in makefile.sgi and - makefile.sggcc - Fixed VER -> PNGVER typo in makefile.macosx and added install-static to - install - Added install: target to makefile.32sunu and makefile.64sunu - -Version 1.0.13patch03 [April 18, 2002] - -Version 1.2.2patch03 [April 18, 2002] - Revised 15 makefiles to link libpng.a to libpngNN.a and the include libpng - subdirectory to libpngNN subdirectory without the full pathname. - Moved generation of libpng.pc from "install" to "all" in 15 makefiles. - -Version 1.2.3rc1 [April 28, 2002] - Added install-man target to 15 makefiles (Dimitri Papadopolous-Orfanos). - Added $(DESTDIR) feature to 24 makefiles (Tim Mooney) - Fixed bug with $prefix, should be $(prefix) in makefile.hpux. - Updated cygwin-specific portion of pngconf.h and revised makefile.cygwin - Added a link from libpngNN.pc to libpng.pc in 15 makefiles. - Added links from include/libpngNN/*.h to include/*.h in 24 makefiles. - Revised makefile.darwin to make relative links without full pathname. - Added setjmp() at the end of png_create_*_struct_2() in case user forgets - to put one in their application. - Restored png_zalloc() and png_zfree() prototypes to version 1.2.1 and - removed them from module definition files. - -Version 1.2.3rc2 [May 1, 2002] - Fixed bug in reporting number of channels in pngget.c and pngset.c, - that was introduced in version 1.2.2beta5. - Exported png_zalloc(), png_zfree(), png_default_read(), png_default_write(), - png_default_flush(), and png_push_fill_buffer() and included them in - module definition files. - Added "libpng.pc" dependency to the "install-shared" target in 15 makefiles. - -Version 1.2.3rc3 [May 1, 2002] - Revised prototype for png_default_flush() - Remove old libpng.pc and libpngNN.pc before installing new ones. - -Version 1.2.3rc4 [May 2, 2002] - Typos in *.def files (png_default_read|write -> png_default_read|write_data) - In makefiles, changed rm libpng.NN.pc to rm libpngNN.pc - Added libpng-config and libpngNN-config and modified makefiles to install - them. - Changed $(MANPATH) to $(DESTDIR)$(MANPATH) in makefiles - Added "Win32 DLL VB" configuration to projects/msvc/libpng.dsp - -Version 1.2.3rc5 [May 11, 2002] - Changed "error" and "message" in prototypes to "error_message" and - "warning_message" to avoid namespace conflict. - Revised 15 makefiles to build libpng-config from libpng-config-*.in - Once more restored png_zalloc and png_zfree to regular nonexported form. - Restored png_default_read|write_data, png_default_flush, png_read_fill_buffer - to nonexported form, but with PNGAPI, and removed them from module def - files. - -Version 1.2.3rc6 [May 14, 2002] - Removed "PNGAPI" from png_zalloc() and png_zfree() in png.c - Changed "Gz" to "Gd" in projects/msvc/libpng.dsp and zlib.dsp. - Removed leftover libpng-config "sed" script from four makefiles. - Revised libpng-config creating script in 16 makefiles. - -Version 1.2.3 [May 22, 2002] - Revised libpng-config target in makefile.cygwin. - Removed description of png_set_mem_fn() from documentation. - Revised makefile.freebsd. - Minor cosmetic changes to 15 makefiles, e.g., $(DI) = $(DESTDIR)/$(INCDIR). - Revised projects/msvc/README.txt - Changed -lpng to -lpngNN in LDFLAGS in several makefiles. - -Version 1.2.4beta1 [May 24, 2002] - Added libpng.pc and libpng-config to "all:" target in 16 makefiles. - Fixed bug in 16 makefiles: $(DESTDIR)/$(LIBPATH) to $(DESTDIR)$(LIBPATH) - Added missing "\" before closing double quote in makefile.gcmmx. - Plugged various memory leaks; added png_malloc_warn() and png_set_text_2() - functions. - -Version 1.2.4beta2 [June 25, 2002] - Plugged memory leak of png_ptr->current_text (Matt Holgate). - Check for buffer overflow before reading CRC in pngpread.c (Warwick Allison) - Added -soname to the loader flags in makefile.dec, makefile.sgi, and - makefile.sggcc. - Added "test-installed" target to makefile.linux, makefile.gcmmx, - makefile.sgi, and makefile.sggcc. - -Version 1.2.4beta3 [June 28, 2002] - Plugged memory leak of row_buf in pngtest.c when there is a png_error(). - Detect buffer overflow in pngpread.c when IDAT is corrupted with extra data. - Added "test-installed" target to makefile.32sunu, makefile.64sunu, - makefile.beos, makefile.darwin, makefile.dec, makefile.macosx, - makefile.solaris, makefile.hpux, makefile.hpgcc, and makefile.so9. - -Version 1.2.4rc1 and 1.0.14rc1 [July 2, 2002] - Added "test-installed" target to makefile.cygwin and makefile.sco. - Revised pnggccrd.c to be able to back out version 1.0.x via PNG_1_0_X macro. - -Version 1.2.4 and 1.0.14 [July 8, 2002] - Changed png_warning() to png_error() when width is too large to process. - -Version 1.2.4patch01 [July 20, 2002] - Revised makefile.cygwin to use DLL number 12 instead of 13. - -Version 1.2.5beta1 [August 6, 2002] - Added code to contrib/gregbook/readpng2.c to ignore unused chunks. - Replaced toucan.png in contrib/gregbook (it has been corrupt since 1.0.11) - Removed some stray *.o files from contrib/gregbook. - Changed png_error() to png_warning() about "Too much data" in pngpread.c - and about "Extra compressed data" in pngrutil.c. - Prevent png_ptr->pass from exceeding 7 in png_push_finish_row(). - Updated makefile.hpgcc - Updated png.c and pnggccrd.c handling of return from png_mmx_support() - -Version 1.2.5beta2 [August 15, 2002] - Only issue png_warning() about "Too much data" in pngpread.c when avail_in - is nonzero. - Updated makefiles to install a separate libpng.so.3 with its own rpath. - -Version 1.2.5rc1 and 1.0.15rc1 [August 24, 2002] - Revised makefiles to not remove previous minor versions of shared libraries. - -Version 1.2.5rc2 and 1.0.15rc2 [September 16, 2002] - Revised 13 makefiles to remove "-lz" and "-L$(ZLIBLIB)", etc., from shared - library loader directive. - Added missing "$OBJSDLL" line to makefile.gcmmx. - Added missing "; fi" to makefile.32sunu. - -Version 1.2.5rc3 and 1.0.15rc3 [September 18, 2002] - Revised libpng-config script. - -Version 1.2.5 and 1.0.15 [October 3, 2002] - Revised makefile.macosx, makefile.darwin, makefile.hpgcc, and makefile.hpux, - and makefile.aix. - Relocated two misplaced PNGAPI lines in pngtest.c - -Version 1.2.6beta1 [October 22, 2002] - Commented out warning about uninitialized mmx_support in pnggccrd.c. - Changed "IBMCPP__" flag to "__IBMCPP__" in pngconf.h. - Relocated two more misplaced PNGAPI lines in pngtest.c - Fixed memory overrun bug in png_do_read_filler() with 16-bit datastreams, - introduced in version 1.0.2. - Revised makefile.macosx, makefile.dec, makefile.aix, and makefile.32sunu. - -Version 1.2.6beta2 [November 1, 2002] - Added libpng-config "--ldopts" output. - Added "AR=ar" and "ARFLAGS=rc" and changed "ar rc" to "$(AR) $(ARFLAGS)" - in makefiles. - -Version 1.2.6beta3 [July 18, 2004] - Reverted makefile changes from version 1.2.6beta2 and some of the changes - from version 1.2.6beta1; these will be postponed until version 1.2.7. - Version 1.2.6 is going to be a simple bugfix release. - Changed the one instance of "ln -sf" to "ln -f -s" in each Sun makefile. - Fixed potential overrun in pngerror.c by using strncpy instead of memcpy. - Added "#!/bin/sh" at the top of configure, for recognition of the - 'x' flag under Cygwin (Cosmin). - Optimized vacuous tests that silence compiler warnings, in png.c (Cosmin). - Added support for PNG_USER_CONFIG, in pngconf.h (Cosmin). - Fixed the special memory handler for Borland C under DOS, in pngmem.c - (Cosmin). - Removed some spurious assignments in pngrutil.c (Cosmin). - Replaced 65536 with 65536L, and 0xffff with 0xffffL, to silence warnings - on 16-bit platforms (Cosmin). - Enclosed shift op expressions in parentheses, to silence warnings (Cosmin). - Used proper type png_fixed_point, to avoid problems on 16-bit platforms, - in png_handle_sRGB() (Cosmin). - Added compression_type to png_struct, and optimized the window size - inside the deflate stream (Cosmin). - Fixed definition of isnonalpha(), in pngerror.c and pngrutil.c (Cosmin). - Fixed handling of unknown chunks that come after IDAT (Cosmin). - Allowed png_error() and png_warning() to work even if png_ptr == NULL - (Cosmin). - Replaced row_info->rowbytes with row_bytes in png_write_find_filter() - (Cosmin). - Fixed definition of PNG_LIBPNG_VER_DLLNUM (Simon-Pierre). - Used PNG_LIBPNG_VER and PNG_LIBPNG_VER_STRING instead of the hardcoded - values in png.c (Simon-Pierre, Cosmin). - Initialized png_libpng_ver[] with PNG_LIBPNG_VER_STRING (Simon-Pierre). - Replaced PNG_LIBPNG_VER_MAJOR with PNG_LIBPNG_VER_DLLNUM in png.rc - (Simon-Pierre). - Moved the definition of PNG_HEADER_VERSION_STRING near the definitions - of the other PNG_LIBPNG_VER_... symbols in png.h (Cosmin). - Relocated #ifndef PNGAPI guards in pngconf.h (Simon-Pierre, Cosmin). - Updated scripts/makefile.vc(a)win32 (Cosmin). - Updated the MSVC project (Simon-Pierre, Cosmin). - Updated the Borland C++ Builder project (Cosmin). - Avoided access to asm_flags in pngvcrd.c, if PNG_1_0_X is defined (Cosmin). - Commented out warning about uninitialized mmx_support in pngvcrd.c (Cosmin). - Removed scripts/makefile.bd32 and scripts/pngdef.pas (Cosmin). - Added extra guard around inclusion of Turbo C memory headers, in pngconf.h - (Cosmin). - Renamed projects/msvc/ to projects/visualc6/, and projects/borland/ to - projects/cbuilder5/ (Cosmin). - Moved projects/visualc6/png32ms.def to scripts/pngw32.def, - and projects/visualc6/png.rc to scripts/pngw32.rc (Cosmin). - Added projects/visualc6/pngtest.dsp; removed contrib/msvctest/ (Cosmin). - Changed line endings to DOS style in cbuilder5 and visualc6 files, even - in the tar.* distributions (Cosmin). - Updated contrib/visupng/VisualPng.dsp (Cosmin). - Updated contrib/visupng/cexcept.h to version 2.0.0 (Cosmin). - Added a separate distribution with "configure" and supporting files (Junichi). - -Version 1.2.6beta4 [July 28, 2004] - Added user ability to change png_size_t via a PNG_SIZE_T macro. - Added png_sizeof() and png_convert_size() functions. - Added PNG_SIZE_MAX (maximum value of a png_size_t variable. - Added check in png_malloc_default() for (size_t)size != (png_uint_32)size - which would indicate an overflow. - Changed sPLT failure action from png_error to png_warning and abandon chunk. - Changed sCAL and iCCP failures from png_error to png_warning and abandon. - Added png_get_uint_31(png_ptr, buf) function. - Added PNG_UINT_32_MAX macro. - Renamed PNG_MAX_UINT to PNG_UINT_31_MAX. - Made png_zalloc() issue a png_warning and return NULL on potential - overflow. - Turn on PNG_NO_ZALLOC_ZERO by default in version 1.2.x - Revised "clobber list" in pnggccrd.c so it will compile under gcc-3.4. - Revised Borland portion of png_malloc() to return NULL or issue - png_error() according to setting of PNG_FLAG_MALLOC_NULL_MEM_OK. - Added PNG_NO_SEQUENTIAL_READ_SUPPORTED macro to conditionally remove - sequential read support. - Added some "#if PNG_WRITE_SUPPORTED" blocks. - Added #ifdef to remove some redundancy in png_malloc_default(). - Use png_malloc instead of png_zalloc to allocate the pallete. - -Version 1.0.16rc1 and 1.2.6rc1 [August 4, 2004] - Fixed buffer overflow vulnerability in png_handle_tRNS() - Fixed integer arithmetic overflow vulnerability in png_read_png(). - Fixed some harmless bugs in png_handle_sBIT, etc, that would cause - duplicate chunk types to go undetected. - Fixed some timestamps in the -config version - Rearranged order of processing of color types in png_handle_tRNS(). - Added ROWBYTES macro to calculate rowbytes without integer overflow. - Updated makefile.darwin and removed makefile.macosx from scripts directory. - Imposed default one million column, one-million row limits on the image - dimensions, and added png_set_user_limits() function to override them. - Revised use of PNG_SET_USER_LIMITS_SUPPORTED macro. - Fixed wrong cast of returns from png_get_user_width|height_max(). - Changed some "keep the compiler happy" from empty statements to returns, - Revised libpng.txt to remove 1.2.x stuff from the 1.0.x distribution - -Version 1.0.16rc2 and 1.2.6rc2 [August 7, 2004] - Revised makefile.darwin and makefile.solaris. Removed makefile.macosx. - Revised pngtest's png_debug_malloc() to use png_malloc() instead of - png_malloc_default() which is not supposed to be exported. - Fixed off-by-one error in one of the conversions to PNG_ROWBYTES() in - pngpread.c. Bug was introduced in 1.2.6rc1. - Fixed bug in RGB to RGBX transformation introduced in 1.2.6rc1. - Fixed old bug in RGB to Gray transformation. - Fixed problem with 64-bit compilers by casting arguments to abs() - to png_int_32. - Changed "ln -sf" to "ln -f -s" in three makefiles (solaris, sco, so9). - Changed "HANDLE_CHUNK_*" to "PNG_HANDLE_CHUNK_*" (Cosmin) - Added "-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)" to 15 *NIX makefiles. - Added code to update the row_info->colortype in png_do_read_filler() (MSB). - -Version 1.0.16rc3 and 1.2.6rc3 [August 9, 2004] - Eliminated use of "abs()" in testing cHRM and gAMA values, to avoid - trouble with some 64-bit compilers. Created PNG_OUT_OF_RANGE() macro. - Revised documentation of png_set_keep_unknown_chunks(). - Check handle_as_unknown status in pngpread.c, as in pngread.c previously. - Moved "PNG_HANDLE_CHUNK_*" macros out of PNG_INTERNAL section of png.h - Added "rim" definitions for CONST4 and CONST6 in pnggccrd.c - -Version 1.0.16rc4 and 1.2.6rc4 [August 10, 2004] - Fixed mistake in pngtest.c introduced in 1.2.6rc2 (declaration of - "pinfo" was out of place). - -Version 1.0.16rc5 and 1.2.6rc5 [August 10, 2004] - Moved "PNG_HANDLE_CHUNK_*" macros out of PNG_ASSEMBLER_CODE_SUPPORTED - section of png.h where they were inadvertently placed in version rc3. - -Version 1.2.6 and 1.0.16 [August 15, 2004] - Revised pngtest so memory allocation testing is only done when PNG_DEBUG==1. - -Version 1.2.7beta1 [August 26, 2004] - Removed unused pngasmrd.h file. - Removed references to uu.net for archived files. Added references to - PNG Spec (second edition) and the PNG ISO/IEC Standard. - Added "test-dd" target in 15 makefiles, to run pngtest in DESTDIR. - Fixed bug with "optimized window size" in the IDAT datastream, that - causes libpng to write PNG files with incorrect zlib header bytes. - -Version 1.2.7beta2 [August 28, 2004] - Fixed bug with sCAL chunk and big-endian machines (David Munro). - Undid new code added in 1.2.6rc2 to update the color_type in - png_set_filler(). - Added png_set_add_alpha() that updates color type. - -Version 1.0.17rc1 and 1.2.7rc1 [September 4, 2004] - Revised png_set_strip_filler() to not remove alpha if color_type has alpha. - -Version 1.2.7 and 1.0.17 [September 12, 2004] - Added makefile.hp64 - Changed projects/msvc/png32ms.def to scripts/png32ms.def in makefile.cygwin - -Version 1.2.8beta1 [November 1, 2004] - Fixed bug in png_text_compress() that would fail to complete a large block. - Fixed bug, introduced in libpng-1.2.7, that overruns a buffer during - strip alpha operation in png_do_strip_filler(). - Added PNG_1_2_X definition in pngconf.h - Use #ifdef to comment out png_info_init in png.c and png_read_init in - pngread.c (as of 1.3.0) - -Version 1.2.8beta2 [November 2, 2004] - Reduce color_type to a nonalpha type after strip alpha operation in - png_do_strip_filler(). - -Version 1.2.8beta3 [November 3, 2004] - Revised definitions of PNG_MAX_UINT_32, PNG_MAX_SIZE, and PNG_MAXSUM - -Version 1.2.8beta4 [November 12, 2004] - Fixed (again) definition of PNG_LIBPNG_VER_DLLNUM in png.h (Cosmin). - Added PNG_LIBPNG_BUILD_PRIVATE in png.h (Cosmin). - Set png_ptr->zstream.data_type to Z_BINARY, to avoid unnecessary detection - of data type in deflate (Cosmin). - Deprecated but continue to support SPECIALBUILD and PRIVATEBUILD in favor of - PNG_LIBPNG_BUILD_SPECIAL_STRING and PNG_LIBPNG_BUILD_PRIVATE_STRING. - -Version 1.2.8beta5 [November 20, 2004] - Use png_ptr->flags instead of png_ptr->transformations to pass - PNG_STRIP_ALPHA info to png_do_strip_filler(), to preserve ABI - compatibility. - Revised handling of SPECIALBUILD, PRIVATEBUILD, - PNG_LIBPNG_BUILD_SPECIAL_STRING and PNG_LIBPNG_BUILD_PRIVATE_STRING. - -Version 1.2.8rc1 [November 24, 2004] - Moved handling of BUILD macros from pngconf.h to png.h - Added definition of PNG_LIBPNG_BASE_TYPE in png.h, inadvertently - omitted from beta5. - Revised scripts/pngw32.rc - Despammed mailing addresses by masking "@" with "at". - Inadvertently installed a supposedly faster test version of pngrutil.c - -Version 1.2.8rc2 [November 26, 2004] - Added two missing "\" in png.h - Change tests in pngread.c and pngpread.c to - if (png_ptr->transformations || (png_ptr->flags&PNG_FLAG_STRIP_ALPHA)) - png_do_read_transformations(png_ptr); - -Version 1.2.8rc3 [November 28, 2004] - Reverted pngrutil.c to version libpng-1.2.8beta5. - Added scripts/makefile.elf with supporting code in pngconf.h for symbol - versioning (John Bowler). - -Version 1.2.8rc4 [November 29, 2004] - Added projects/visualc7 (Simon-pierre). - -Version 1.2.8rc5 [November 29, 2004] - Fixed new typo in scripts/pngw32.rc - -Version 1.2.8 [December 3, 2004] - Removed projects/visualc7, added projects/visualc71. - -Version 1.2.9beta1 [February 21, 2006] - Initialized some structure members in pngwutil.c to avoid gcc-4.0.0 complaints - Revised man page and libpng.txt to make it clear that one should not call - png_read_end or png_write_end after png_read_png or png_write_png. - Updated references to png-mng-implement mailing list. - Fixed an incorrect typecast in pngrutil.c - Added PNG_NO_READ_SUPPORTED conditional for making a write-only library. - Added PNG_NO_WRITE_INTERLACING_SUPPORTED conditional. - Optimized alpha-inversion loops in pngwtran.c - Moved test for nonzero gamma outside of png_build_gamma_table() in pngrtran.c - Make sure num_trans is <= 256 before copying data in png_set_tRNS(). - Make sure num_palette is <= 256 before copying data in png_set_PLTE(). - Interchanged order of write_swap_alpha and write_invert_alpha transforms. - Added parentheses in the definition of PNG_LIBPNG_BUILD_TYPE (Cosmin). - Optimized zlib window flag (CINFO) in contrib/pngsuite/*.png (Cosmin). - Updated scripts/makefile.bc32 for Borland C++ 5.6 (Cosmin). - Exported png_get_uint_32, png_save_uint_32, png_get_uint_16, png_save_uint_16, - png_get_int_32, png_save_int_32, png_get_uint_31 (Cosmin). - Added type cast (png_byte) in png_write_sCAL() (Cosmin). - Fixed scripts/makefile.cygwin (Christian Biesinger, Cosmin). - Default iTXt support was inadvertently enabled. - -Version 1.2.9beta2 [February 21, 2006] - Check for png_rgb_to_gray and png_gray_to_rgb read transformations before - checking for png_read_dither in pngrtran.c - Revised checking of chromaticity limits to accommodate extended RGB - colorspace (John Denker). - Changed line endings in some of the project files to CRLF, even in the - "Unix" tar distributions (Cosmin). - Made png_get_int_32 and png_save_int_32 always available (Cosmin). - Updated scripts/pngos2.def, scripts/pngw32.def and projects/wince/png32ce.def - with the newly exported functions. - Eliminated distributions without the "configure" script. - Updated INSTALL instructions. - -Version 1.2.9beta3 [February 24, 2006] - Fixed CRCRLF line endings in contrib/visupng/VisualPng.dsp - Made libpng.pc respect EXEC_PREFIX (D. P. Kreil, J. Bowler) - Removed reference to pngasmrd.h from Makefile.am - Renamed CHANGES to ChangeLog. - Renamed LICENSE to COPYING. - Renamed ANNOUNCE to NEWS. - Created AUTHORS file. - -Version 1.2.9beta4 [March 3, 2006] - Changed definition of PKGCONFIG from $prefix/lib to $libdir in configure.ac - Reverted to filenames LICENSE and ANNOUNCE; removed AUTHORS and COPYING. - Removed newline from the end of some error and warning messages. - Removed test for sqrt() from configure.ac and configure. - Made swap tables in pngtrans.c PNG_CONST (Carlo Bramix). - Disabled default iTXt support that was inadvertently enabled in - libpng-1.2.9beta1. - Added "OS2" to list of systems that don't need underscores, in pnggccrd.c - Removed libpng version and date from *.c files. - -Version 1.2.9beta5 [March 4, 2006] - Removed trailing blanks from source files. - Put version and date of latest change in each source file, and changed - copyright year accordingly. - More cleanup of configure.ac, Makefile.am, and associated scripts. - Restored scripts/makefile.elf which was inadvertently deleted. - -Version 1.2.9beta6 [March 6, 2006] - Fixed typo (RELEASE) in configuration files. - -Version 1.2.9beta7 [March 7, 2006] - Removed libpng.vers and libpng.sym from libpng12_la_SOURCES in Makefile.am - Fixed inconsistent #ifdef's around png_sig_bytes() and png_set_sCAL_s() - in png.h. - Updated makefile.elf as suggested by debian. - Made cosmetic changes to some makefiles, adding LN_SF and other macros. - Made some makefiles accept "exec_prefix". - -Version 1.2.9beta8 [March 9, 2006] - Fixed some "#if defined (..." which should be "#if defined(..." - Bug introduced in libpng-1.2.8. - Fixed inconsistency in definition of png_default_read_data() - Restored blank that was lost from makefile.sggcc "clean" target in beta7. - Revised calculation of "current" and "major" for irix in ltmain.sh - Changed "mkdir" to "MKDIR_P" in some makefiles. - Separated PNG_EXPAND and PNG_EXPAND_tRNS. - Added png_set_expand_gray_1_2_4_to_8() and deprecated - png_set_gray_1_2_4_to_8() which also expands tRNS to alpha. - -Version 1.2.9beta9 [March 10, 2006] - Include "config.h" in pngconf.h when available. - Added some checks for NULL png_ptr or NULL info_ptr (timeless) - -Version 1.2.9beta10 [March 20, 2006] - Removed extra CR from contrib/visualpng/VisualPng.dsw (Cosmin) - Made pnggccrd.c PIC-compliant (Christian Aichinger). - Added makefile.mingw (Wolfgang Glas). - Revised pngconf.h MMX checking. - -Version 1.2.9beta11 [March 22, 2006] - Fixed out-of-order declaration in pngwrite.c that was introduced in beta9 - Simplified some makefiles by using LIBSO, LIBSOMAJ, and LIBSOVER macros. - -Version 1.2.9rc1 [March 31, 2006] - Defined PNG_USER_PRIVATEBUILD when including "pngusr.h" (Cosmin). - Removed nonsensical assertion check from pngtest.c (Cosmin). - -Version 1.2.9 [April 14, 2006] - Revised makefile.beos and added "none" selector in ltmain.sh - -Version 1.2.10beta1 [April 15, 2006] - Renamed "config.h" to "png_conf.h" and revised Makefile.am to add - -DPNG_BUILDING_LIBPNG to compile directive, and modified pngconf.h - to include png_conf.h only when PNG_BUILDING_LIBPNG is defined. - -Version 1.2.10beta2 [April 15, 2006] - Manually updated Makefile.in and configure. Changed png_conf.h.in - back to config.h. - -Version 1.2.10beta3 [April 15, 2006] - Change png_conf.h back to config.h in pngconf.h. - -Version 1.2.10beta4 [April 16, 2006] - Change PNG_BUILDING_LIBPNG to PNG_CONFIGURE_LIBPNG in config/Makefile*. - -Version 1.2.10beta5 [April 16, 2006] - Added a configure check for compiling assembler code in pnggccrd.c - -Version 1.2.10beta6 [April 17, 2006] - Revised the configure check for pnggccrd.c - Moved -DPNG_CONFIGURE_LIBPNG into @LIBPNG_DEFINES@ - Added @LIBPNG_DEFINES@ to arguments when building libpng.sym - -Version 1.2.10beta7 [April 18, 2006] - Change "exec_prefix=$prefix" to "exec_prefix=$(prefix)" in makefiles. - -Version 1.2.10rc1 [April 19, 2006] - Ensure pngconf.h doesn't define both PNG_USE_PNGGCCRD and PNG_USE_PNGVCRD - Fixed "LN_FS" typo in makefile.sco and makefile.solaris. - -Version 1.2.10rc2 [April 20, 2006] - Added a backslash between -DPNG_CONFIGURE_LIBPNG and -DPNG_NO_ASSEMBLER_CODE - in configure.ac and configure - Made the configure warning about versioned symbols less arrogant. - -Version 1.2.10rc3 [April 21, 2006] - Added a note in libpng.txt that png_set_sig_bytes(8) can be used when - writing an embedded PNG without the 8-byte signature. - Revised makefiles and configure to avoid making links to libpng.so.* - -Version 1.2.10 [April 23, 2006] - Reverted configure to "rc2" state. - -Version 1.2.11beta1 [May 31, 2006] - scripts/libpng.pc.in contained "configure" style version info and would - not work with makefiles. - The shared-library makefiles were linking to libpng.so.0 instead of - libpng.so.3 compatibility as the library. - -Version 1.2.11beta2 [June 2, 2006] - Increased sprintf buffer from 50 to 52 chars in pngrutil.c to avoid - buffer overflow. - Fixed bug in example.c (png_set_palette_rgb -> png_set_palette_to_rgb) - -Version 1.2.11beta3 [June 5, 2006] - Prepended "#! /bin/sh" to ltmail.sh and contrib/pngminus/*.sh (Cosmin). - Removed the accidental leftover Makefile.in~ (Cosmin). - Avoided potential buffer overflow and optimized buffer in - png_write_sCAL(), png_write_sCAL_s() (Cosmin). - Removed the include directories and libraries from CFLAGS and LDFLAGS - in scripts/makefile.gcc (Nelson A. de Oliveira, Cosmin). - -Version 1.2.11beta4 [June 6, 2006] - Allow zero-length IDAT chunks after the entire zlib datastream, but not - after another intervening chunk type. - -Version 1.0.19rc1, 1.2.11rc1 [June 13, 2006] - Deleted extraneous square brackets from [config.h] in configure.ac - -Version 1.0.19rc2, 1.2.11rc2 [June 14, 2006] - Added prototypes for PNG_INCH_CONVERSIONS functions to png.h - Revised INSTALL and autogen.sh - Fixed typo in several makefiles (-W1 should be -Wl) - Added typedef for png_int_32 and png_uint_32 on 64-bit systems. - -Version 1.0.19rc3, 1.2.11rc3 [June 15, 2006] - Removed the new typedefs for 64-bit systems (delay until version 1.4.0) - Added one zero element to png_gamma_shift[] array in pngrtran.c to avoid - reading out of bounds. - -Version 1.0.19rc4, 1.2.11rc4 [June 15, 2006] - Really removed the new typedefs for 64-bit systems. - -Version 1.0.19rc5, 1.2.11rc5 [June 22, 2006] - Removed png_sig_bytes entry from scripts/pngw32.def - -Version 1.0.19, 1.2.11 [June 26, 2006] - None. - -Version 1.0.20, 1.2.12 [June 27, 2006] - Really increased sprintf buffer from 50 to 52 chars in pngrutil.c to avoid - buffer overflow. - -Version 1.2.13beta1 [October 2, 2006] - Removed AC_FUNC_MALLOC from configure.ac - Work around Intel-Mac compiler bug by setting PNG_NO_MMX_CODE in pngconf.h - Change "logical" to "bitwise" throughout documentation. - Detect and fix attempt to write wrong iCCP profile length (CVE-2006-7244) - -Version 1.0.21, 1.2.13 [November 14, 2006] - Fix potential buffer overflow in sPLT chunk handler. - Fix Makefile.am to not try to link to noexistent files. - Check all exported functions for NULL png_ptr. - -Version 1.2.14beta1 [November 17, 2006] - Relocated three misplaced tests for NULL png_ptr. - Built Makefile.in with automake-1.9.6 instead of 1.9.2. - Build configure with autoconf-2.60 instead of 2.59 - -Version 1.2.14beta2 [November 17, 2006] - Added some typecasts in png_zalloc(). - -Version 1.2.14rc1 [November 20, 2006] - Changed "strtod" to "png_strtod" in pngrutil.c - -Version 1.0.22, 1.2.14 [November 27, 2006] - Added missing "$(srcdir)" in Makefile.am and Makefile.in - -Version 1.2.15beta1 [December 3, 2006] - Generated configure with autoconf-2.61 instead of 2.60 - Revised configure.ac to update libpng.pc and libpng-config. - -Version 1.2.15beta2 [December 3, 2006] - Always export MMX asm functions, just stubs if not building pnggccrd.c - -Version 1.2.15beta3 [December 4, 2006] - Add "png_bytep" typecast to profile while calculating length in pngwutil.c - -Version 1.2.15beta4 [December 7, 2006] - Added scripts/CMakeLists.txt - Changed PNG_NO_ASSEMBLER_CODE to PNG_NO_MMX_CODE in scripts, like 1.4.0beta - -Version 1.2.15beta5 [December 7, 2006] - Changed some instances of PNG_ASSEMBLER_* to PNG_MMX_* in pnggccrd.c - Revised scripts/CMakeLists.txt - -Version 1.2.15beta6 [December 13, 2006] - Revised scripts/CMakeLists.txt and configure.ac - -Version 1.2.15rc1 [December 18, 2006] - Revised scripts/CMakeLists.txt - -Version 1.2.15rc2 [December 21, 2006] - Added conditional #undef jmpbuf in pngtest.c to undo #define in AIX headers. - Added scripts/makefile.nommx - -Version 1.2.15rc3 [December 25, 2006] - Fixed shared library numbering error that was introduced in 1.2.15beta6. - -Version 1.2.15rc4 [December 27, 2006] - Fixed handling of rgb_to_gray when png_ptr->color.gray isn't set. - -Version 1.2.15rc5 [December 31, 2006] - Revised handling of rgb_to_gray. - -Version 1.2.15 [January 5, 2007] - Added some (unsigned long) typecasts in pngtest.c to avoid printing errors. - -Version 1.2.16beta1 [January 6, 2007] - Fix bugs in makefile.nommx - -Version 1.2.16beta2 [January 16, 2007] - Revised scripts/CMakeLists.txt - -Version 1.2.16 [January 31, 2007] - No changes. - -Version 1.2.17beta1 [March 6, 2007] - Revised scripts/CMakeLists.txt to install both shared and static libraries. - Deleted a redundant line from pngset.c. - -Version 1.2.17beta2 [April 26, 2007] - Relocated misplaced test for png_ptr == NULL in pngpread.c - Change "==" to "&" for testing PNG_RGB_TO_GRAY_ERR & PNG_RGB_TO_GRAY_WARN - flags. - Changed remaining instances of PNG_ASSEMBLER_* to PNG_MMX_* - Added pngerror() when write_IHDR fails in deflateInit2(). - Added "const" to some array declarations. - Mention examples of libpng usage in the libpng*.txt and libpng.3 documents. - -Version 1.2.17rc1 [May 4, 2007] - No changes. - -Version 1.2.17rc2 [May 8, 2007] - Moved several PNG_HAVE_* macros out of PNG_INTERNAL because applications - calling set_unknown_chunk_location() need them. - Changed transformation flag from PNG_EXPAND_tRNS to PNG_EXPAND in - png_set_expand_gray_1_2_4_to_8(). - Added png_ptr->unknown_chunk to hold working unknown chunk data, so it - can be free'ed in case of error. Revised unknown chunk handling in - pngrutil.c and pngpread.c to use this structure. - -Version 1.2.17rc3 [May 8, 2007] - Revised symbol-handling in configure script. - -Version 1.2.17rc4 [May 10, 2007] - Revised unknown chunk handling to avoid storing unknown critical chunks. - -Version 1.0.25 [May 15, 2007] -Version 1.2.17 [May 15, 2007] - Added "png_ptr->num_trans=0" before error return in png_handle_tRNS, - to eliminate a vulnerability (CVE-2007-2445, CERT VU#684664) - -Version 1.0.26 [May 15, 2007] -Version 1.2.18 [May 15, 2007] - Reverted the libpng-1.2.17rc3 change to symbol-handling in configure script - -Version 1.2.19beta1 [May 18, 2007] - Changed "const static" to "static PNG_CONST" everywhere, mostly undoing - change of libpng-1.2.17beta2. Changed other "const" to "PNG_CONST" - Changed some handling of unused parameters, to avoid compiler warnings. - "if (unused == NULL) return;" becomes "unused = unused". - -Version 1.2.19beta2 [May 18, 2007] - Only use the valid bits of tRNS value in png_do_expand() (Brian Cartier) - -Version 1.2.19beta3 [May 19, 2007] - Add some "png_byte" typecasts in png_check_keyword() and write new_key - instead of key in zTXt chunk (Kevin Ryde). - -Version 1.2.19beta4 [May 21, 2007] - Add png_snprintf() function and use it in place of sprint() for improved - defense against buffer overflows. - -Version 1.2.19beta5 [May 21, 2007] - Fixed png_handle_tRNS() to only use the valid bits of tRNS value. - Changed handling of more unused parameters, to avoid compiler warnings. - Removed some PNG_CONST in pngwutil.c to avoid compiler warnings. - -Version 1.2.19beta6 [May 22, 2007] - Added some #ifdef PNG_MMX_CODE_SUPPORTED where needed in pngvcrd.c - Added a special "_MSC_VER" case that defines png_snprintf to _snprintf - -Version 1.2.19beta7 [May 22, 2007] - Squelched png_squelch_warnings() in pnggccrd.c and added - an #ifdef PNG_MMX_CODE_SUPPORTED block around the declarations that caused - the warnings that png_squelch_warnings was squelching. - -Version 1.2.19beta8 [May 22, 2007] - Removed __MMX__ from test in pngconf.h. - -Version 1.2.19beta9 [May 23, 2007] - Made png_squelch_warnings() available via PNG_SQUELCH_WARNINGS macro. - Revised png_squelch_warnings() so it might work. - Updated makefile.sgcc and makefile.solaris; added makefile.solaris-x86. - -Version 1.2.19beta10 [May 24, 2007] - Resquelched png_squelch_warnings(), use "__attribute__((used))" instead. - -Version 1.4.0beta1 [April 20, 2006] - Enabled iTXt support (changes png_struct, thus requires so-number change). - Cleaned up PNG_ASSEMBLER_CODE_SUPPORTED vs PNG_MMX_CODE_SUPPORTED - Eliminated PNG_1_0_X and PNG_1_2_X macros. - Removed deprecated functions png_read_init, png_write_init, png_info_init, - png_permit_empty_plte, png_set_gray_1_2_4_to_8, png_check_sig, and - removed the deprecated macro PNG_MAX_UINT. - Moved "PNG_INTERNAL" parts of png.h and pngconf.h into pngintrn.h - Removed many WIN32_WCE #ifdefs (Cosmin). - Reduced dependency on C-runtime library when on Windows (Simon-Pierre) - Replaced sprintf() with png_sprintf() (Simon-Pierre) - -Version 1.4.0beta2 [April 20, 2006] - Revised makefiles and configure to avoid making links to libpng.so.* - Moved some leftover MMX-related defines from pngconf.h to pngintrn.h - Updated scripts/pngos2.def, pngw32.def, and projects/wince/png32ce.def - -Version 1.4.0beta3 [May 10, 2006] - Updated scripts/pngw32.def to comment out MMX functions. - Added PNG_NO_GET_INT_32 and PNG_NO_SAVE_INT_32 macros. - Scripts/libpng.pc.in contained "configure" style version info and would - not work with makefiles. - Revised pngconf.h and added pngconf.h.in, so makefiles and configure can - pass defines to libpng and applications. - -Version 1.4.0beta4 [May 11, 2006] - Revised configure.ac, Makefile.am, and many of the makefiles to write - their defines in pngconf.h. - -Version 1.4.0beta5 [May 15, 2006] - Added a missing semicolon in Makefile.am and Makefile.in - Deleted extraneous square brackets from configure.ac - -Version 1.4.0beta6 [June 2, 2006] - Increased sprintf buffer from 50 to 52 chars in pngrutil.c to avoid - buffer overflow. - Changed sonum from 0 to 1. - Removed unused prototype for png_check_sig() from png.h - -Version 1.4.0beta7 [June 16, 2006] - Exported png_write_sig (Cosmin). - Optimized buffer in png_handle_cHRM() (Cosmin). - Set pHYs = 2835 x 2835 pixels per meter, and added - sCAL = 0.352778e-3 x 0.352778e-3 meters, in pngtest.png (Cosmin). - Added png_set_benign_errors(), png_benign_error(), png_chunk_benign_error(). - Added typedef for png_int_32 and png_uint_32 on 64-bit systems. - Added "(unsigned long)" typecast on png_uint_32 variables in printf lists. - -Version 1.4.0beta8 [June 22, 2006] - Added demonstration of user chunk support in pngtest.c, to support the - public sTER chunk and a private vpAg chunk. - -Version 1.4.0beta9 [July 3, 2006] - Removed ordinals from scripts/pngw32.def and removed png_info_int and - png_set_gray_1_2_4_to_8 entries. - Inline call of png_get_uint_32() in png_get_uint_31(). - Use png_get_uint_31() to get vpAg width and height in pngtest.c - Removed WINCE and Netware projects. - Removed standalone Y2KINFO file. - -Version 1.4.0beta10 [July 12, 2006] - Eliminated automatic copy of pngconf.h to pngconf.h.in from configure and - some makefiles, because it was not working reliably. Instead, distribute - pngconf.h.in along with pngconf.h and cause configure and some of the - makefiles to update pngconf.h from pngconf.h.in. - Added pngconf.h to DEPENDENCIES in Makefile.am - -Version 1.4.0beta11 [August 19, 2006] - Removed AC_FUNC_MALLOC from configure.ac. - Added a warning when writing iCCP profile with mismatched profile length. - Patched pnggccrd.c to assemble on x86_64 platforms. - Moved chunk header reading into a separate function png_read_chunk_header() - in pngrutil.c. The chunk header (len+sig) is now serialized in a single - operation (Cosmin). - Implemented support for I/O states. Added png_ptr member io_state, and - functions png_get_io_chunk_name() and png_get_io_state() in pngget.c - (Cosmin). - Added png_get_io_chunk_name and png_get_io_state to scripts/*.def (Cosmin). - Renamed scripts/pngw32.* to scripts/pngwin.* (Cosmin). - Removed the include directories and libraries from CFLAGS and LDFLAGS - in scripts/makefile.gcc (Cosmin). - Used png_save_uint_32() to set vpAg width and height in pngtest.c (Cosmin). - Cast to proper type when getting/setting vpAg units in pngtest.c (Cosmin). - Added pngintrn.h to the Visual C++ projects (Cosmin). - Removed scripts/list (Cosmin). - Updated copyright year in scripts/pngwin.def (Cosmin). - Removed PNG_TYPECAST_NULL and used standard NULL consistently (Cosmin). - Disallowed the user to redefine png_size_t, and enforced a consistent use - of png_size_t across libpng (Cosmin). - Changed the type of png_ptr->rowbytes, PNG_ROWBYTES() and friends - to png_size_t (Cosmin). - Removed png_convert_size() and replaced png_sizeof with sizeof (Cosmin). - Removed some unnecessary type casts (Cosmin). - Changed prototype of png_get_compression_buffer_size() and - png_set_compression_buffer_size() to work with png_size_t instead of - png_uint_32 (Cosmin). - Removed png_memcpy_check() and png_memset_check() (Cosmin). - Fixed a typo (png_byte --> png_bytep) in libpng.3 and libpng.txt (Cosmin). - Clarified that png_zalloc() does not clear the allocated memory, - and png_zalloc() and png_zfree() cannot be PNGAPI (Cosmin). - Renamed png_mem_size_t to png_alloc_size_t, fixed its definition in - pngconf.h, and used it in all memory allocation functions (Cosmin). - Renamed pngintrn.h to pngpriv.h, added a comment at the top of the file - mentioning that the symbols declared in that file are private, and - updated the scripts and the Visual C++ projects accordingly (Cosmin). - Removed circular references between pngconf.h and pngconf.h.in in - scripts/makefile.vc*win32 (Cosmin). - Removing trailing '.' from the warning and error messages (Cosmin). - Added pngdefs.h that is built by makefile or configure, instead of - pngconf.h.in (Glenn). - Detect and fix attempt to write wrong iCCP profile length. - -Version 1.4.0beta12 [October 19, 2006] - Changed "logical" to "bitwise" in the documentation. - Work around Intel-Mac compiler bug by setting PNG_NO_MMX_CODE in pngconf.h - Add a typecast to stifle compiler warning in pngrutil.c - -Version 1.4.0beta13 [November 10, 2006] - Fix potential buffer overflow in sPLT chunk handler. - Fix Makefile.am to not try to link to noexistent files. - -Version 1.4.0beta14 [November 15, 2006] - Check all exported functions for NULL png_ptr. - -Version 1.4.0beta15 [November 17, 2006] - Relocated two misplaced tests for NULL png_ptr. - Built Makefile.in with automake-1.9.6 instead of 1.9.2. - Build configure with autoconf-2.60 instead of 2.59 - Add "install: all" in Makefile.am so "configure; make install" will work. - -Version 1.4.0beta16 [November 17, 2006] - Added a typecast in png_zalloc(). - -Version 1.4.0beta17 [December 4, 2006] - Changed "new_key[79] = '\0';" to "(*new_key)[79] = '\0';" in pngwutil.c - Add "png_bytep" typecast to profile while calculating length in pngwutil.c - -Version 1.4.0beta18 [December 7, 2006] - Added scripts/CMakeLists.txt - -Version 1.4.0beta19 [May 16, 2007] - Revised scripts/CMakeLists.txt - Rebuilt configure and Makefile.in with newer tools. - Added conditional #undef jmpbuf in pngtest.c to undo #define in AIX headers. - Added scripts/makefile.nommx - -Version 1.4.0beta20 [July 9, 2008] - Moved several PNG_HAVE_* macros from pngpriv.h to png.h because applications - calling set_unknown_chunk_location() need them. - Moved several macro definitions from pngpriv.h to pngconf.h - Merge with changes to the 1.2.X branch, as of 1.2.30beta04. - Deleted all use of the MMX assembler code and Intel-licensed optimizations. - Revised makefile.mingw - -Version 1.4.0beta21 [July 21, 2008] - Moved local array "chunkdata" from pngrutil.c to the png_struct, so - it will be freed by png_read_destroy() in case of a read error (Kurt - Christensen). - -Version 1.4.0beta22 [July 21, 2008] - Change "purpose" and "buffer" to png_ptr->chunkdata to avoid memory leaking. - -Version 1.4.0beta23 [July 22, 2008] - Change "chunkdata = NULL" to "png_ptr->chunkdata = NULL" several places in - png_decompress_chunk(). - -Version 1.4.0beta24 [July 25, 2008] - Change all remaining "chunkdata" to "png_ptr->chunkdata" in - png_decompress_chunk(), and remove "chunkdata" from parameter list. - Put a call to png_check_chunk_name() in png_read_chunk_header(). - Revised png_check_chunk_name() to reject a name with a lowercase 3rd byte. - Removed two calls to png_check_chunk_name() occuring later in the process. - Define PNG_NO_ERROR_NUMBERS by default in pngconf.h - -Version 1.4.0beta25 [July 30, 2008] - Added a call to png_check_chunk_name() in pngpread.c - Reverted png_check_chunk_name() to accept a name with a lowercase 3rd byte. - Added png_push_have_buffer() function to pngpread.c - Eliminated PNG_BIG_ENDIAN_SUPPORTED and associated png_get_* macros. - Made inline expansion of png_get_*() optional with PNG_USE_READ_MACROS. - Eliminated all PNG_USELESS_TESTS and PNG_CORRECT_PALETTE_SUPPORTED code. - Synced contrib directory and configure files with libpng-1.2.30beta06. - Eliminated no-longer-used pngdefs.h (but it's still built in the makefiles) - Relocated a misplaced "#endif /* PNG_NO_WRITE_FILTER */" in pngwutil.c - -Version 1.4.0beta26 [August 4, 2008] - Removed png_push_have_buffer() function in pngpread.c. It increased the - compiled library size slightly. - Changed "-Wall" to "-W -Wall" in the CFLAGS in all makefiles (Cosmin Truta) - Declared png_ptr "volatile" in pngread.c and pngwrite.c to avoid warnings. - Updated contrib/visupng/cexcept.h to version 2.0.1 - Added PNG_LITERAL_CHARACTER macros for #, [, and ]. - -Version 1.4.0beta27 [August 5, 2008] - Revised usage of PNG_LITERAL_SHARP in pngerror.c. - Moved newline character from individual png_debug messages into the - png_debug macros. - Allow user to #define their own png_debug, png_debug1, and png_debug2. - -Version 1.4.0beta28 [August 5, 2008] - Revised usage of PNG_LITERAL_SHARP in pngerror.c. - Added PNG_STRING_NEWLINE macro - -Version 1.4.0beta29 [August 9, 2008] - Revised usage of PNG_STRING_NEWLINE to work on non-ISO compilers. - Added PNG_STRING_COPYRIGHT macro. - Added non-ISO versions of png_debug macros. - -Version 1.4.0beta30 [August 14, 2008] - Added premultiplied alpha feature (Volker Wiendl). - -Version 1.4.0beta31 [August 18, 2008] - Moved png_set_premultiply_alpha from pngtrans.c to pngrtran.c - Removed extra crc check at the end of png_handle_cHRM(). Bug introduced - in libpng-1.4.0beta20. - -Version 1.4.0beta32 [August 19, 2008] - Added PNG_WRITE_FLUSH_SUPPORTED block around new png_flush() call. - Revised PNG_NO_STDIO version of png_write_flush() - -Version 1.4.0beta33 [August 20, 2008] - Added png_get|set_chunk_cache_max() to limit the total number of sPLT, - text, and unknown chunks that can be stored. - -Version 1.4.0beta34 [September 6, 2008] - Shortened tIME_string to 29 bytes in pngtest.c - Fixed off-by-one error introduced in png_push_read_zTXt() function in - libpng-1.2.30beta04/pngpread.c (Harald van Dijk) - -Version 1.4.0beta35 [October 6, 2008] - Changed "trans_values" to "trans_color". - Changed so-number from 0 to 14. Some OS do not like 0. - Revised makefile.darwin to fix shared library numbering. - Change png_set_gray_1_2_4_to_8() to png_set_expand_gray_1_2_4_to_8() - in example.c (debian bug report) - -Version 1.4.0beta36 [October 25, 2008] - Sync with tEXt vulnerability fix in libpng-1.2.33rc02. - -Version 1.4.0beta37 [November 13, 2008] - Added png_check_cHRM in png.c and moved checking from pngget.c, pngrutil.c, - and pngwrite.c - -Version 1.4.0beta38 [November 22, 2008] - Added check for zero-area RGB cHRM triangle in png_check_cHRM() and - png_check_cHRM_fixed(). - -Version 1.4.0beta39 [November 23, 2008] - Revised png_warning() to write its message on standard output by default - when warning_fn is NULL. - -Version 1.4.0beta40 [November 24, 2008] - Eliminated png_check_cHRM(). Instead, always use png_check_cHRM_fixed(). - In png_check_cHRM_fixed(), ensure white_y is > 0, and removed redundant - check for all-zero coordinates that is detected by the triangle check. - -Version 1.4.0beta41 [November 26, 2008] - Fixed string vs pointer-to-string error in png_check_keyword(). - Rearranged test expressions in png_check_cHRM_fixed() to avoid internal - overflows. - Added PNG_NO_CHECK_cHRM conditional. - -Version 1.4.0beta42, 43 [December 1, 2008] - Merge png_debug with version 1.2.34beta04. - -Version 1.4.0beta44 [December 6, 2008] - Removed redundant check for key==NULL before calling png_check_keyword() - to ensure that new_key gets initialized and removed extra warning - (Merge with version 1.2.34beta05 -- Arvan Pritchard). - -Version 1.4.0beta45 [December 9, 2008] - In png_write_png(), respect the placement of the filler bytes in an earlier - call to png_set_filler() (Jim Barry). - -Version 1.4.0beta46 [December 10, 2008] - Undid previous change and added PNG_TRANSFORM_STRIP_FILLER_BEFORE and - PNG_TRANSFORM_STRIP_FILLER_AFTER conditionals and deprecated - PNG_TRANSFORM_STRIP_FILLER (Jim Barry). - -Version 1.4.0beta47 [December 15, 2008] - Support for dithering was disabled by default, because it has never - been well tested and doesn't work very well. The code has not - been removed, however, and can be enabled by building libpng with - PNG_READ_DITHER_SUPPORTED defined. - -Version 1.4.0beta48 [February 14, 2009] - Added new exported function png_calloc(). - Combined several instances of png_malloc(); png_memset() into png_calloc(). - Removed prototype for png_freeptr() that was added in libpng-1.4.0beta24 - but was never defined. - -Version 1.4.0beta49 [February 28, 2009] - Added png_fileno() macro to pngconf.h, used in pngwio.c - Corrected order of #ifdef's in png_debug definition in png.h - Fixed bug introduced in libpng-1.4.0beta48 with the memset arguments - for pcal_params. - Fixed order of #ifdef directives in the png_debug defines in png.h - (bug introduced in libpng-1.2.34/1.4.0beta29). - Revised comments in png_set_read_fn() and png_set_write_fn(). - -Version 1.4.0beta50 [March 18, 2009] - Use png_calloc() instead of png_malloc() to allocate big_row_buf when - reading an interlaced file, to avoid a possible UMR. - Undid revision of PNG_NO_STDIO version of png_write_flush(). Users - having trouble with fflush() can build with PNG_NO_WRITE_FLUSH defined - or supply their own flush_fn() replacement. - Revised libpng*.txt and png.h documentation about use of png_write_flush() - and png_set_write_fn(). - Removed fflush() from pngtest.c. - Added "#define PNG_NO_WRITE_FLUSH" to contrib/pngminim/encoder/pngusr.h - -Version 1.4.0beta51 [March 21, 2009] - Removed new png_fileno() macro from pngconf.h . - -Version 1.4.0beta52 [March 27, 2009] - Relocated png_do_chop() ahead of building gamma tables in pngrtran.c - This avoids building 16-bit gamma tables unnecessarily. - Removed fflush() from pngtest.c. - Added "#define PNG_NO_WRITE_FLUSH" to contrib/pngminim/encoder/pngusr.h - Added a section on differences between 1.0.x and 1.2.x to libpng.3/libpng.txt - -Version 1.4.0beta53 [April 1, 2009] - Removed some remaining MMX macros from pngpriv.h - Fixed potential memory leak of "new_name" in png_write_iCCP() (Ralph Giles) - -Version 1.4.0beta54 [April 13, 2009] - Added "ifndef PNG_SKIP_SETJMP_CHECK" block in pngconf.h to allow - application code writers to bypass the check for multiple inclusion - of setjmp.h when they know that it is safe to ignore the situation. - Eliminated internal use of setjmp() in pngread.c and pngwrite.c - Reordered ancillary chunks in pngtest.png to be the same as what - pngtest now produces, and made some cosmetic changes to pngtest output. - Eliminated deprecated png_read_init_3() and png_write_init_3() functions. - -Version 1.4.0beta55 [April 15, 2009] - Simplified error handling in pngread.c and pngwrite.c by putting - the new png_read_cleanup() and png_write_cleanup() functions inline. - -Version 1.4.0beta56 [April 25, 2009] - Renamed "user_chunk_data" to "my_user_chunk_data" in pngtest.c to suppress - "shadowed declaration" warning from gcc-4.3.3. - Renamed "gamma" to "png_gamma" in pngset.c to avoid "shadowed declaration" - warning about a global "gamma" variable in math.h on some platforms. - -Version 1.4.0beta57 [May 2, 2009] - Removed prototype for png_freeptr() that was added in libpng-1.4.0beta24 - but was never defined (again). - Rebuilt configure scripts with autoconf-2.63 instead of 2.62 - Removed pngprefs.h and MMX from makefiles - -Version 1.4.0beta58 [May 14, 2009] - Changed pngw32.def to pngwin.def in makefile.mingw (typo was introduced - in beta57). - Clarified usage of sig_bit versus sig_bit_p in example.c (Vincent Torri) - -Version 1.4.0beta59 [May 15, 2009] - Reformated sources in libpng style (3-space intentation, comment format) - Fixed typo in libpng docs (PNG_FILTER_AVE should be PNG_FILTER_AVG) - Added sections about the git repository and our coding style to the - documentation - Relocated misplaced #endif in pngwrite.c, sCAL chunk handler. - -Version 1.4.0beta60 [May 19, 2009] - Conditionally compile png_read_finish_row() which is not used by - progressive readers. - Added contrib/pngminim/preader to demonstrate building minimal progressive - decoder, based on contrib/gregbook with embedded libpng and zlib. - -Version 1.4.0beta61 [May 20, 2009] - In contrib/pngminim/*, renamed "makefile.std" to "makefile", since there - is only one makefile in those directories, and revised the README files - accordingly. - More reformatting of comments, mostly to capitalize sentences. - -Version 1.4.0beta62 [June 2, 2009] - Added "#define PNG_NO_WRITE_SWAP" to contrib/pngminim/encoder/pngusr.h - and "define PNG_NO_READ_SWAP" to decoder/pngusr.h and preader/pngusr.h - Reformatted several remaining "else statement" into two lines. - Added a section to the libpng documentation about using png_get_io_ptr() - in configure scripts to detect the presence of libpng. - -Version 1.4.0beta63 [June 15, 2009] - Revised libpng*.txt and libpng.3 to mention calling png_set_IHDR() - multiple times and to specify the sample order in the tRNS chunk, - because the ISO PNG specification has a typo in the tRNS table. - Changed several PNG_UNKNOWN_CHUNK_SUPPORTED to - PNG_HANDLE_AS_UNKNOWN_SUPPORTED, to make the png_set_keep mechanism - available for ignoring known chunks even when not saving unknown chunks. - Adopted preference for consistent use of "#ifdef" and "#ifndef" versus - "#if defined()" and "if !defined()" where possible. - -Version 1.4.0beta64 [June 24, 2009] - Eliminated PNG_LEGACY_SUPPORTED code. - Moved the various unknown chunk macro definitions outside of the - PNG_READ|WRITE_ANCILLARY_CHUNK_SUPPORTED blocks. - -Version 1.4.0beta65 [June 26, 2009] - Added a reference to the libpng license in each file. - -Version 1.4.0beta66 [June 27, 2009] - Refer to the libpng license instead of the libpng license in each file. - -Version 1.4.0beta67 [July 6, 2009] - Relocated INVERT_ALPHA within png_read_png() and png_write_png(). - Added high-level API transform PNG_TRANSFORM_GRAY_TO_RGB. - Added an "xcode" project to the projects directory (Alam Arias). - -Version 1.4.0beta68 [July 19, 2009] - Avoid some tests in filter selection in pngwutil.c - -Version 1.4.0beta69 [July 25, 2009] - Simplified the new filter-selection test. This runs faster in the - common "PNG_ALL_FILTERS" and PNG_FILTER_NONE cases. - Removed extraneous declaration from the new call to png_read_gray_to_rgb() - (bug introduced in libpng-1.4.0beta67). - Fixed up xcode project (Alam Arias) - Added a prototype for png_64bit_product() in png.c - -Version 1.4.0beta70 [July 27, 2009] - Avoid a possible NULL dereference in debug build, in png_set_text_2(). - (bug introduced in libpng-0.95, discovered by Evan Rouault) - -Version 1.4.0beta71 [July 29, 2009] - Rebuilt configure scripts with autoconf-2.64. - -Version 1.4.0beta72 [August 1, 2009] - Replaced *.tar.lzma with *.tar.xz in distribution. Get the xz codec - from . - -Version 1.4.0beta73 [August 1, 2009] - Reject attempt to write iCCP chunk with negative embedded profile length - (JD Chen) (CVE-2009-5063). - -Version 1.4.0beta74 [August 8, 2009] - Changed png_ptr and info_ptr member "trans" to "trans_alpha". - -Version 1.4.0beta75 [August 21, 2009] - Removed an extra png_debug() recently added to png_write_find_filter(). - Fixed incorrect #ifdef in pngset.c regarding unknown chunk support. - -Version 1.4.0beta76 [August 22, 2009] - Moved an incorrectly located test in png_read_row() in pngread.c - -Version 1.4.0beta77 [August 27, 2009] - Removed lpXYZ.tar.bz2 (with CRLF), KNOWNBUG, libpng-x.y.z-KNOWNBUG.txt, - and the "noconfig" files from the distribution. - Moved CMakeLists.txt from scripts into the main libpng directory. - Various bugfixes and improvements to CMakeLists.txt (Philip Lowman) - -Version 1.4.0beta78 [August 31, 2009] - Converted all PNG_NO_* tests to PNG_*_SUPPORTED everywhere except pngconf.h - Eliminated PNG_NO_FREE_ME and PNG_FREE_ME_SUPPORTED macros. - Use png_malloc plus a loop instead of png_calloc() to initialize - row_pointers in png_read_png(). - -Version 1.4.0beta79 [September 1, 2009] - Eliminated PNG_GLOBAL_ARRAYS and PNG_LOCAL_ARRAYS; always use local arrays. - Eliminated PNG_CALLOC_SUPPORTED macro and always provide png_calloc(). - -Version 1.4.0beta80 [September 17, 2009] - Removed scripts/libpng.icc - Changed typecast of filler from png_byte to png_uint_16 in png_set_filler(). - (Dennis Gustafsson) - Fixed typo introduced in beta78 in pngtest.c ("#if def " should be "#ifdef ") - -Version 1.4.0beta81 [September 23, 2009] - Eliminated unused PNG_FLAG_FREE_* defines from pngpriv.h - Expanded TAB characters in pngrtran.c - Removed PNG_CONST from all "PNG_CONST PNG_CHNK" declarations to avoid - compiler complaints about doubly declaring things "const". - Changed all "#if [!]defined(X)" to "if[n]def X" where possible. - Eliminated unused png_ptr->row_buf_size - -Version 1.4.0beta82 [September 25, 2009] - Moved redundant IHDR checking into new png_check_IHDR() in png.c - and report all errors found in the IHDR data. - Eliminated useless call to png_check_cHRM() from pngset.c - -Version 1.4.0beta83 [September 25, 2009] - Revised png_check_IHDR() to eliminate bogus complaint about filter_type. - -Version 1.4.0beta84 [September 30, 2009] - Fixed some inconsistent indentation in pngconf.h - Revised png_check_IHDR() to add a test for width variable less than 32-bit. - -Version 1.4.0beta85 [October 1, 2009] - Revised png_check_IHDR() again, to check info_ptr members instead of - the contents of the returned parameters. - -Version 1.4.0beta86 [October 9, 2009] - Updated the "xcode" project (Alam Arias). - Eliminated a shadowed declaration of "pp" in png_handle_sPLT(). - -Version 1.4.0rc01 [October 19, 2009] - Trivial cosmetic changes. - -Version 1.4.0beta87 [October 30, 2009] - Moved version 1.4.0 back into beta. - -Version 1.4.0beta88 [October 30, 2009] - Revised libpng*.txt section about differences between 1.2.x and 1.4.0 - because most of the new features have now been ported back to 1.2.41 - -Version 1.4.0beta89 [November 1, 2009] - More bugfixes and improvements to CMakeLists.txt (Philip Lowman) - Removed a harmless extra png_set_invert_alpha() from pngwrite.c - Apply png_user_chunk_cache_max within png_decompress_chunk(). - Merged libpng-1.2.41.txt with libpng-1.4.0.txt where appropriate. - -Version 1.4.0beta90 [November 2, 2009] - Removed all remaining WIN32_WCE #ifdefs except those involving the - time.h "tm" structure - -Version 1.4.0beta91 [November 3, 2009] - Updated scripts/pngw32.def and projects/wince/png32ce.def - Copied projects/wince/png32ce.def to the scripts directory. - Added scripts/makefile.wce - Patched ltmain.sh for wince support. - Added PNG_CONVERT_tIME_SUPPORTED macro. - -Version 1.4.0beta92 [November 4, 2009] - Make inclusion of time.h in pngconf.h depend on PNG_CONVERT_tIME_SUPPORTED - Make #define PNG_CONVERT_tIME_SUPPORTED depend on PNG_WRITE_tIME_SUPPORTED - Revised libpng*.txt to describe differences from 1.2.40 to 1.4.0 (instead - of differences from 1.2.41 to 1.4.0) - -Version 1.4.0beta93 [November 7, 2009] - Added PNG_DEPSTRUCT, PNG_DEPRECATED, PNG_USE_RESULT, PNG_NORETURN, and - PNG_ALLOCATED macros to detect deprecated direct access to the - png_struct or info_struct members and other deprecated usage in - applications (John Bowler). - Updated scripts/makefile* to add "-DPNG_CONFIGURE_LIBPNG" to CFLAGS, - to prevent warnings about direct access to png structs by libpng - functions while building libpng. They need to be tested, especially - those using compilers other than gcc. - Updated projects/visualc6 and visualc71 with "/d PNG_CONFIGURE_LIBPNG". - They should work but still need to be updated to remove - references to pnggccrd.c or pngvcrd.c and ASM building. - Added README.txt to the beos, cbuilder5, netware, and xcode projects warning - that they need to be updated, to remove references to pnggccrd.c and - pngvcrd.c and to depend on pngpriv.h - Removed three direct references to read_info_ptr members in pngtest.c - that were detected by the new PNG_DEPSTRUCT macro. - Moved the png_debug macro definitions and the png_read_destroy(), - png_write_destroy() and png_far_to_near() prototypes from png.h - to pngpriv.h (John Bowler) - Moved the synopsis lines for png_read_destroy(), png_write_destroy() - png_debug(), png_debug1(), and png_debug2() from libpng.3 to libpngpf.3. - -Version 1.4.0beta94 [November 9, 2009] - Removed the obsolete, unused pnggccrd.c and pngvcrd.c files. - Updated CMakeLists.txt to add "-DPNG_CONFIGURE_LIBPNG" to the definitions. - Removed dependency of pngtest.o on pngpriv.h in the makefiles. - Only #define PNG_DEPSTRUCT, etc. in pngconf.h if not already defined. - -Version 1.4.0beta95 [November 10, 2009] - Changed png_check_sig() to !png_sig_cmp() in contrib programs. - Added -DPNG_CONFIGURE_LIBPNG to contrib/pngminm/*/makefile - Changed png_check_sig() to !png_sig_cmp() in contrib programs. - Corrected the png_get_IHDR() call in contrib/gregbook/readpng2.c - Changed pngminim/*/gather.sh to stop trying to remove pnggccrd.c and pngvcrd.c - Added dependency on pngpriv.h in contrib/pngminim/*/makefile - -Version 1.4.0beta96 [November 12, 2009] - Renamed scripts/makefile.wce to scripts/makefile.cegcc - Revised Makefile.am to use libpng.sys while building libpng.so - so that only PNG_EXPORT functions are exported. - Removed the deprecated png_check_sig() function/macro. - Removed recently removed function names from scripts/*.def - Revised pngtest.png to put chunks in the same order written by pngtest - (evidently the same change made in libpng-1.0beta54 was lost). - Added PNG_PRIVATE macro definition in pngconf.h for possible future use. - -Version 1.4.0beta97 [November 13, 2009] - Restored pngtest.png to the libpng-1.4.0beta7 version. - Removed projects/beos and netware.txt; no one seems to be supporting them. - Revised Makefile.in - -Version 1.4.0beta98 [November 13, 2009] - Added the "xcode" project to zip distributions, - Fixed a typo in scripts/pngwin.def introduced in beta97. - -Version 1.4.0beta99 [November 14, 2009] - Moved libpng-config.in and libpng.pc-configure.in out of the scripts - directory, to libpng-config.in and libpng-pc.in, respectively, and - modified Makefile.am and configure.ac accordingly. Now "configure" - needs nothing from the "scripts" directory. - Avoid redefining PNG_CONST in pngconf.h - -Version 1.4.0beta100 [November 14, 2009] - Removed ASM builds from projects/visualc6 and projects/visualc71 - Removed scripts/makefile.nommx and makefile.vcawin32 - Revised CMakeLists.txt to account for new location of libpng-config.in - and libpng-pc.in - Updated INSTALL to reflect removal and relocation of files. - -Version 1.4.0beta101 [November 14, 2009] - Restored the binary files (*.jpg, *.png, some project files) that were - accidentally deleted from the zip and 7z distributions when the xcode - project was added. - -Version 1.4.0beta102 [November 18, 2009] - Added libpng-config.in and libpng-pc.in to the zip and 7z distributions. - Fixed a typo in projects/visualc6/pngtest.dsp, introduced in beta100. - Moved descriptions of makefiles and other scripts out of INSTALL into - scripts/README.txt - Updated the copyright year in scripts/pngwin.rc from 2006 to 2009. - -Version 1.4.0beta103 [November 21, 2009] - Removed obsolete comments about ASM from projects/visualc71/README_zlib.txt - Align row_buf on 16-byte boundary in memory. - Restored the PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED guard around the call - to png_flush() after png_write_IEND(). See 1.4.0beta32, 1.4.0beta50 - changes above and 1.2.30, 1.2.30rc01 and rc03 in 1.2.41 CHANGES. Someone - needs this feature. - Make the 'png_jmpbuf' macro expand to a call that records the correct - longjmp function as well as returning a pointer to the setjmp - jmp_buf buffer, and marked direct access to jmpbuf 'deprecated'. - (John Bowler) - -Version 1.4.0beta104 [November 22, 2009] - Removed png_longjmp_ptr from scripts/*.def and libpng.3 - Rebuilt configure scripts with autoconf-2.65 - -Version 1.4.0beta105 [November 25, 2009] - Use fast integer PNG_DIVIDE_BY_255() or PNG_DIVIDE_BY_65535() - to accomplish alpha premultiplication when - PNG_READ_COMPOSITE_NODIV_SUPPORTED is defined. - Changed "/255" to "/255.0" in background calculations to make it clear - that the 255 is used as a double. - -Version 1.4.0beta106 [November 27, 2009] - Removed premultiplied alpha feature. - -Version 1.4.0beta107 [December 4, 2009] - Updated README - Added "#define PNG_NO_PEDANTIC_WARNINGS" in the libpng source files. - Removed "-DPNG_CONFIGURE_LIBPNG" from the makefiles and projects. - Revised scripts/makefile.netbsd, makefile.openbsd, and makefile.sco - to put png.h and pngconf.h in $prefix/include, like the other scripts, - instead of in $prefix/include/libpng. Also revised makefile.sco - to put them in $prefix/include/libpng15 instead of in - $prefix/include/libpng/libpng15. - -Version 1.4.0beta108 [December 11, 2009] - Removed leftover "-DPNG_CONFIGURE_LIBPNG" from contrib/pngminim/*/makefile - Relocated png_do_chop() to its original position in pngrtran.c; the - change in version 1.2.41beta08 caused transparency to be handled wrong - in some 16-bit datastreams (Yusaku Sugai). - -Version 1.4.0beta109 [December 13, 2009] - Added "bit_depth" parameter to the private png_build_gamma_table() function. - Pass bit_depth=8 to png_build_gamma_table() when bit_depth is 16 but the - PNG_16_TO_8 transform has been set, to avoid unnecessary build of 16-bit - tables. - -Version 1.4.0rc02 [December 20, 2009] - Declared png_cleanup_needed "volatile" in pngread.c and pngwrite.c - -Version 1.4.0rc03 [December 22, 2009] - Renamed libpng-pc.in back to libpng.pc.in and revised CMakeLists.txt - (revising the change in 1.4.0beta99) - -Version 1.4.0rc04 [December 25, 2009] - Swapped PNG_UNKNOWN_CHUNKS_SUPPORTED and PNG_HANDLE_AS_UNKNOWN_SUPPORTED - in pngset.c to be consistent with other changes in version 1.2.38. - -Version 1.4.0rc05 [December 25, 2009] - Changed "libpng-pc.in" to "libpng.pc.in" in configure.ac, configure, and - Makefile.in to be consistent with changes in libpng-1.4.0rc03 - -Version 1.4.0rc06 [December 29, 2009] - Reverted the gamma_table changes from libpng-1.4.0beta109. - Fixed some indentation errors. - -Version 1.4.0rc07 [January 1, 2010] - Revised libpng*.txt and libpng.3 about 1.2.x->1.4.x differences. - Use png_calloc() instead of png_malloc(); png_memset() in pngrutil.c - Update copyright year to 2010. - -Version 1.4.0rc08 [January 2, 2010] - Avoid deprecated references to png_ptr-io_ptr and png_ptr->error_ptr - in pngtest.c - -Version 1.4.0 [January 3, 2010] - No changes. - -Version 1.4.1beta01 [January 8, 2010] - Updated CMakeLists.txt for consistent indentation and to avoid an - unclosed if-statement warning (Philip Lowman). - Revised Makefile.am and Makefile.in to remove references to Y2KINFO, - KNOWNBUG, and libpng.la (Robert Schwebel). - Revised the makefiles to install the same files and symbolic - links as configure, except for libpng.la and libpng14.la. - Make png_set|get_compression_buffer_size() available even when - PNG_WRITE_SUPPORTED is not enabled. - Revised Makefile.am and Makefile.in to simplify their maintenance. - Revised scripts/makefile.linux to install a link to libpng14.so.14.1 - -Version 1.4.1beta02 [January 9, 2010] - Revised the rest of the makefiles to install a link to libpng14.so.14.1 - -Version 1.4.1beta03 [January 10, 2010] - Removed png_set_premultiply_alpha() from scripts/*.def - -Version 1.4.1rc01 [January 16, 2010] - No changes. - -Version 1.4.1beta04 [January 23, 2010] - Revised png_decompress_chunk() to improve speed and memory usage when - decoding large chunks. - Added png_set|get_chunk_malloc_max() functions. - -Version 1.4.1beta05 [January 26, 2010] - Relocated "int k" declaration in pngtest.c to minimize its scope. - -Version 1.4.1beta06 [January 28, 2010] - Revised png_decompress_chunk() to use a two-pass method suggested by - John Bowler. - -Version 1.4.1beta07 [February 6, 2010] - Folded some long lines in the source files. - Added defineable PNG_USER_CHUNK_CACHE_MAX, PNG_USER_CHUNK_MALLOC_MAX, - and a PNG_USER_LIMITS_SUPPORTED flag. - Eliminated use of png_ptr->irowbytes and reused the slot in png_ptr as - png_ptr->png_user_chunk_malloc_max. - Revised png_push_save_buffer() to do fewer but larger png_malloc() calls. - -Version 1.4.1beta08 [February 6, 2010] - Minor cleanup and updating of dates and copyright year. - -Version 1.5.0beta01 [February 7, 2010] - Moved declaration of png_struct into private pngstruct.h and png_info - into pnginfo.h - -Version 1.4.1beta09 and 1.5.0beta02 [February 7, 2010] - Reverted to original png_push_save_buffer() code. - -Version 1.4.1beta10 and 1.5.0beta03 [February 8, 2010] - Return allocated "old_buffer" in png_push_save_buffer() before - calling png_error(), to avoid a potential memory leak. - Updated configure script to use SO number 15. - -Version 1.5.0beta04 [February 9, 2010] - Removed malformed "incomplete struct declaration" of png_info from png.h - -Version 1.5.0beta05 [February 12, 2010] - Removed PNG_DEPSTRUCT markup in pngstruct.h and pnginfo.h, and undid the - linewrapping that it entailed. - Revised comments in pngstruct.h and pnginfo.h and added pointers to - the libpng license. - Changed PNG_INTERNAL to PNG_EXPOSE_INTERNAL_STRUCTURES - Removed the cbuilder5 project, which has not been updated to 1.4.0. - -Version 1.4.1beta12 and 1.5.0beta06 [February 14, 2010] - Fixed type declaration of png_get_chunk_malloc_max() in pngget.c (Daisuke - Nishikawa) - -Version 1.5.0beta07 [omitted] - -Version 1.5.0beta08 [February 19, 2010] - Changed #ifdef PNG_NO_STDIO_SUPPORTED to #ifdef PNG_NO_CONSOLE_IO_SUPPORTED - wherever png_snprintf() is used to construct error and warning messages. - Noted in scripts/makefile.mingw that it expects to be run under MSYS. - Removed obsolete unused MMX-querying support from contrib/gregbook - Added exported png_longjmp() function. - Removed the AIX redefinition of jmpbuf in png.h - Added -D_ALLSOURCE in configure.ac, makefile.aix, and CMakeLists.txt - when building on AIX. - -Version 1.5.0beta09 [February 19, 2010] - Removed -D_ALLSOURCE from configure.ac, makefile.aix, and CMakeLists.txt. - Changed the name of png_ptr->jmpbuf to png_ptr->png_jmpbuf in pngstruct.h - -Version 1.5.0beta10 [February 25, 2010] - Removed unused gzio.c from contrib/pngminim gather and makefile scripts - Removed replacement error handlers from contrib/gregbook. Because of - the new png_longjmp() function they are no longer needed. - -Version 1.5.0beta11 [March 6, 2010] - Removed checking for already-included setjmp.h from pngconf.h - Fixed inconsistent indentations and made numerous cosmetic changes. - Revised the "SEE ALSO" style of libpng.3, libpngpf.3, and png.5 - -Version 1.5.0beta12 [March 9, 2010] - Moved "#include png.h" inside pngpriv.h and removed "#include png.h" from - the source files, along with "#define PNG_EXPOSE_INTERNAL_STRUCTURES" - and "#define PNG_NO_PEDANTIC_WARNINGS" (John Bowler). - Created new pngdebug.h and moved debug definitions there. - -Version 1.5.0beta13 [March 10, 2010] - Protect pngstruct.h, pnginfo.h, and pngdebug.h from being included twice. - Revise the "#ifdef" blocks in png_inflate() so it will compile when neither - PNG_USER_CHUNK_MALLOC_MAX nor PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED - is defined. - Removed unused png_measure_compressed_chunk() from pngpriv.h and libpngpf.3 - Moved the 'config.h' support from pngconf.h to pngpriv.h - Removed PNGAPI from the png_longjmp_ptr typedef. - Eliminated dependence of pngtest.c on the private pngdebug.h file. - Make all png_debug macros into *unterminated* statements or - expressions (i.e. a trailing ';' must always be added) and correct - the format statements in various png_debug messages. - -Version 1.5.0beta14 [March 14, 2010] - Removed direct access to png_ptr->io_ptr from the Windows code in pngtest.c - Revised Makefile.am to account for recent additions and replacements. - Corrected CE and OS/2 DEF files (scripts/png*def) for symbols removed and - added ordinal numbers to the Windows DEF file and corrected the duplicated - ordinal numbers on CE symbols that are commented out. - Added back in export symbols that can be present in the Windows build but - are disabled by default. - PNG_EXPORT changed to include an 'ordinal' field for DEF file generation. - PNG_CALLBACK added to make callback definitions uniform. PNGAPI split - into PNGCAPI (base C form), PNGAPI (exports) and PNGCBAPI (callbacks), - and appropriate changes made to all files. Cygwin builds re-hinged to - allow procedure call standard changes and to remove the need for the DEF - file (fixes build on Cygwin). - Enabled 'attribute' warnings that are relevant to library APIs and callbacks. - Changed rules for generation of the various symbol files and added a new - rule for a DEF file (which is also added to the distribution). - Updated the symbol file generation to stop it adding spurious spaces - to EOL (coming from preprocessor macro expansion). Added a facility - to join tokens in the output and rewrite *.dfn to use this. - Eliminated scripts/*.def in favor of libpng.def; updated projects/visualc71 - and removed scripts/makefile.cygwin. - Made PNG_BUILD_DLL safe: it can be set whenever a DLL is being built. - Removed the include of sys/types.h - apparently unnecessary now on the - platforms on which it happened (all but Mac OS and RISC OS). - Moved the Mac OS test into pngpriv.h (the only place it is used.) - -Version 1.5.0beta15 [March 17, 2010] - Added symbols.chk target to Makefile.am to validate the symbols in png.h - against the new DEF file scripts/symbols.def. - Changed the default DEF file back to pngwin.def. - Removed makefile.mingw. - Eliminated PNG_NO_EXTERN and PNG_ALL_EXTERN - -Version 1.5.0beta16 [April 1, 2010] - Make png_text_struct independent of PNG_iTXt_SUPPORTED, so that - fields are initialized in all configurations. The READ/WRITE - macros (PNG_(READ|WRITE)_iTXt_SUPPORTED) still function as - before to disable code to actually read or write iTXt chunks - and iTXt_SUPPORTED can be used to detect presence of either - read or write support (but it is probably better to check for - the one actually required - read or write.) - Combined multiple png_warning() calls for a single error. - Restored the macro definition of png_check_sig(). - -Version 1.5.0beta17 [April 17, 2010] - Added some "(long)" typecasts to printf calls in png_handle_cHRM(). - Documented the fact that png_set_dither() was disabled since libpng-1.4.0. - Reenabled png_set_dither() but renamed it to png_set_quantize() to reflect - more accurately what it actually does. At the same time, renamed - the PNG_DITHER_[RED,GREEN_BLUE]_BITS macros to - PNG_QUANTIZE_[RED,GREEN,BLUE]_BITS. - Added some "(long)" typecasts to printf calls in png_handle_cHRM(). - Freeze build-time only configuration in the build. - In all prior versions of libpng most configuration options - controlled by compiler #defines had to be repeated by the - application code that used libpng. This patch changes this - so that compilation options that can only be changed at build - time are frozen in the build. Options that are compiler - dependent (and those that are system dependent) are evaluated - each time - pngconf.h holds these. Options that can be changed - per-file in the application are in png.h. Frozen options are - in the new installed header file pnglibconf.h (John Bowler) - Removed the xcode project because it has not been updated to work - with libpng-1.5.0. - Removed the ability to include optional pngusr.h - -Version 1.5.0beta18 [April 17, 2010] - Restored the ability to include optional pngusr.h - Moved replacements for png_error() and png_warning() from the - contrib/pngminim project to pngerror.c, for use when warnings or - errors are disabled via PNG_NO_WARN or PNG_NO_ERROR_TEXT, to avoid - storing unneeded error/warning text. - Updated contrib/pngminim project to work with the new pnglibconf.h - Added some PNG_NO_* defines to contrib/pngminim/*/pngusr.h to save space. - -Version 1.5.0beta19 [April 24, 2010] - Added PNG_{READ,WRITE}_INT_FUNCTIONS_SUPPORTED. This allows the functions - to read and write ints to be disabled independently of PNG_USE_READ_MACROS, - which allows libpng to be built with the functions even though the default - is to use the macros - this allows applications to choose at app build - time whether or not to use macros (previously impossible because the - functions weren't in the default build.) - Changed Windows calling convention back to __cdecl for API functions. - For Windows/x86 platforms only: - __stdcall is no longer needed for Visual Basic, so libpng-1.5.0 uses - __cdecl throughout (both API functions and callbacks) on Windows/x86 - platforms. - Replaced visualc6 and visualc71 projects with new vstudio project - Relaxed the overly-restrictive permissions of some files. - -Version 1.5.0beta20 [April 24, 2010] - Relaxed more overly-restrictive permissions of some files. - -Version 1.5.0beta21 [April 27, 2010] - Removed some unwanted binary bytes and changed CRLF to NEWLINE in the new - vstudio project files, and some trivial editing of some files in the - scripts directory. - Set PNG_NO_READ_BGR, PNG_NO_IO_STATE, and PNG_NO_TIME_RFC1123 in - contrib/pngminim/decoder/pngusr.h to make a smaller decoder application. - -Version 1.5.0beta22 [April 28, 2010] - Fixed dependencies of GET_INT_32 - it does not require READ_INT_FUNCTIONS - because it has a macro equivalent. - Improved the options.awk script; added an "everything off" option. - Revised contrib/pngminim to use the "everything off" option in pngusr.dfa. - -Version 1.5.0beta23 [April 29, 2010] - Corrected PNG_REMOVED macro to take five arguments. - The macro was documented with two arguments (name,ordinal), however - the symbol checking .dfn files assumed five arguments. The five - argument form seems more useful so it is changed to that. - Corrected PNG_UNKNOWN_CHUNKS_SUPPORTED to PNG_HANDLE_AS_UNKNOWN_SUPPORTED - in gregbook/readpng2.c - Corrected protection of png_get_user_transform_ptr. The API declaration in - png.h is removed if both READ and WRITE USER_TRANSFORM are turned off - but was left defined in pngtrans.c - Added logunsupported=1 to cause pnglibconf.h to document disabled options. - This makes the installed pnglibconf.h more readable but causes no - other change. The intention is that users of libpng will find it - easier to understand if an API they need is missing. - Include png_reset_zstream() in png.c only when PNG_READ_SUPPORTED is defined. - Removed dummy_inflate.c from contrib/pngminim/encoder - Removed contrib/pngminim/*/gather.sh; gathering is now done in the makefile. - -Version 1.5.0beta24 [May 7, 2010] - Use bitwise "&" instead of arithmetic mod in pngrutil.c calculation of the - offset of the png_ptr->rowbuf pointer into png_ptr->big_row_buf. - Added more blank lines for readability. - -Version 1.5.0beta25 [June 18, 2010] - In pngpread.c: png_push_have_row() add check for new_row > height - Removed the now-redundant check for out-of-bounds new_row from example.c - -Version 1.5.0beta26 [June 18, 2010] - In pngpread.c: png_push_process_row() add check for too many rows. - -Version 1.5.0beta27 [June 18, 2010] - Removed the check added in beta25 as it is now redundant. - -Version 1.5.0beta28 [June 20, 2010] - Rewrote png_process_IDAT_data to consistently treat extra data as warnings - and handle end conditions more cleanly. - Removed the new (beta26) check in png_push_process_row(). - -Version 1.5.0beta29 [June 21, 2010] - Revised scripts/options.awk to work on Sunos (but still doesn't work) - Added comment to options.awk and contrib/pngminim/*/makefile to try nawk. - -Version 1.5.0beta30 [June 22, 2010] - Stop memory leak when reading a malformed sCAL chunk. - -Version 1.5.0beta31 [June 26, 2010] - Revised pngpread.c patch of beta28 to avoid an endless loop. - Removed some trailing blanks. - -Version 1.5.0beta32 [June 26, 2010] - Removed leftover scripts/options.patch and scripts/options.rej - -Version 1.5.0beta33 [July 6, 3010] - Made FIXED and FLOATING options consistent in the APIs they enable and - disable. Corrected scripts/options.awk to handle both command line - options and options specified in the .dfa files. - Changed char *msg to PNG_CONST char *msg in pngrutil.c - Make png_set_sRGB_gAMA_and_cHRM set values using either the fixed or - floating point APIs, but not both. - Reversed patch to remove error handler when the jmp_buf is stored in the - main program structure, not the png_struct. - The error handler is needed because the default handler in libpng will - always use the jmp_buf in the library control structure; this is never - set. The gregbook code is a useful example because, even though it - uses setjmp/longjmp, it shows how error handling can be implemented - using control mechanisms not directly supported by libpng. The - technique will work correctly with mechanisms such as Microsoft - Structure Exceptions or C++ exceptions (compiler willing - note that gcc - does not by default support interworking of C and C++ error handling.) - Reverted changes to call png_longjmp in contrib/gregbook where it is not - appropriate. If mainprog->jmpbuf is used by setjmp, then png_longjmp - cannot be used. - Changed "extern PNG_EXPORT" to "PNG_EXPORT" in png.h (Jan Nijtmans) - Changed "extern" to "PNG_EXTERN" in pngpriv.h (except for the 'extern "C" {') - -Version 1.5.0beta34 [July 12, 2010] - Put #ifndef PNG_EXTERN, #endif around the define PNG_EXTERN in pngpriv.h - -Version 1.5.0beta35 [July 24, 2010] - Removed some newly-added TAB characters. - Added -DNO_PNG_SNPRINTF to CFLAGS in scripts/makefile.dj2 - Moved the definition of png_snprintf() outside of the enclosing - #ifdef blocks in pngconf.h - -Version 1.5.0beta36 [July 29, 2010] - Patches by John Bowler: - Fixed point APIs are now supported throughout (no missing APIs). - Internal fixed point arithmetic support exists for all internal floating - point operations. - sCAL validates the floating point strings it is passed. - Safe, albeit rudimentary, Watcom support is provided by PNG_API_RULE==2 - Two new APIs exist to get the number of passes without turning on the - PNG_INTERLACE transform and to get the number of rows in the current - pass. - A new test program, pngvalid.c, validates the gamma code. - Errors in the 16-bit gamma correction (overflows) have been corrected. - cHRM chunk testing is done consistently (previously the floating point - API bypassed it, because the test really didn't work on FP, now the test - is performed on the actual values to be stored in the PNG file so it - works in the FP case too.) - Most floating point APIs now simply call the fixed point APIs after - converting the values to the fixed point form used in the PNG file. - The standard headers no longer include zlib.h, which is currently only - required for pngstruct.h and can therefore be internal. - Revised png_get_int_32 to undo the PNG two's complement representation of - negative numbers. - -Version 1.5.0beta37 [July 30, 2010] - Added a typecast in png_get_int_32() in png.h and pngrutil.h to avoid - a compiler warning. - Replaced oFFs 0,0 with oFFs -10,20 in pngtest.png - -Version 1.5.0beta38 [July 31, 2010] - Implemented remaining "_fixed" functions. - Corrected a number of recently introduced warnings mostly resulting from - safe but uncast assignments to shorter integers. Also added a zlib - VStudio release library project because the latest zlib Official Windows - build does not include such a thing. - Revised png_get_int_16() to be similar to png_get_int_32(). - Restored projects/visualc71. - -Version 1.5.0beta39 [August 2, 2010] - VisualC/GCC warning fixes, VisualC build fixes - The changes include support for function attributes in VC in addition to - those already present in GCC - necessary because without these some - warnings are unavoidable. Fixes include signed/unsigned fixes in - pngvalid and checks with gcc -Wall -Wextra -Wunused. - VC requires function attributes on function definitions as well as - declarations, PNG_FUNCTION has been added to enable this and the - relevant function definitions changed. - -Version 1.5.0beta40 [August 6, 2010] - Correct use of _WINDOWS_ in pngconf.h - Removed png_mem_ #defines; they are no longer used. - Added the sRGB chunk to pngtest.png - -Version 1.5.0beta41 [August 11, 2010] - Added the cHRM chunk to pngtest.png - Don't try to use version-script with cygwin/mingw. - Revised contrib/gregbook to work under cygwin/mingw. - -Version 1.5.0beta42 [August 18, 2010] - Add .dll.a to the list of extensions to be symlinked by Makefile.am (Yaakov) - Made all API functions that have const arguments and constant string - literal pointers declare them (John Bowler). - -Version 1.5.0beta43 [August 20, 2010] - Removed spurious tabs, shorten long lines (no source change) - Also added scripts/chkfmt to validate the format of all the files that can - reasonably be validated (it is suggested to run "make distclean" before - checking, because some machine generated files have long lines.) - Reformatted the CHANGES file to be more consistent throughout. - Made changes to address various issues identified by GCC, mostly - signed/unsigned and shortening problems on assignment but also a few - difficult to optimize (for GCC) loops. - Fixed non-GCC fixed point builds. In png.c a declaration was misplaced - in an earlier update. Fixed to declare the auto variables at the head. - Use cexcept.h in pngvalid.c. - -Version 1.5.0beta44 [August 24, 2010] - Updated CMakeLists.txt to use CMAKE_INSTALL_LIBDIR variable; useful for - installing libpng in /usr/lib64 (Funda Wang). - Revised CMakeLists.txt to put the man pages in share/man/man* not man/man* - Revised CMakeLists.txt to make symlinks instead of copies when installing. - Changed PNG_LIB_NAME from pngNN to libpngNN in CMakeLists.txt (Philip Lowman) - Implemented memory checks within pngvalid - Reformatted/rearranged pngvalid.c to assist use of progressive reader. - Check interlaced images in pngvalid - Clarified pngusr.h comments in pnglibconf.dfa - Simplified the pngvalid error-handling code now that cexcept.h is in place. - Implemented progressive reader in pngvalid.c for standard tests - Implemented progressive read in pngvalid.c gamma tests - Turn on progressive reader in pngvalid.c by default and tidy code. - -Version 1.5.0beta45 [August 26, 2010] - Added an explicit make step to projects/vstudio for pnglibconf.h - Also corrected zlib.vcxproj into which Visual Studio had introduced - what it calls an "authoring error". The change to make pnglibconf.h - simply copies the file; in the future it may actually generate the - file from scripts/pnglibconf.dfa as the other build systems do. - Changed pngvalid to work when floating point APIs are disabled - Renamed the prebuilt scripts/pnglibconf.h to scripts/pnglibconf.h.prebuilt - Supply default values for PNG_USER_PRIVATEBUILD and PNG_USER_DLLFNAME_POSTFIX - in pngpriv.h in case the user neglected to define them in their pngusr.h - -Version 1.5.0beta46 [August 28, 2010] - Added new private header files to libpng_sources in CMakeLists.txt - Added PNG_READ_16BIT, PNG_WRITE_16BIT, and PNG_16BIT options. - Added reference to scripts/pnglibconf.h.prebuilt in the visualc71 project. - -Version 1.5.0beta47 [September 11, 2010] - Fixed a number of problems with 64-bit compilation reported by Visual - Studio 2010 (John Bowler). - -Version 1.5.0beta48 [October 4, 2010] - Updated CMakeLists.txt (Philip Lowman). - Revised autogen.sh to recognize and use $AUTOCONF, $AUTOMAKE, $AUTOHEADER, - $AUTOPOINT, $ACLOCAL and $LIBTOOLIZE - Fixed problem with symbols creation in Makefile.am which was assuming that - all versions of ccp write to standard output by default (Martin Banky). The - bug was introduced in libpng-1.2.9beta5. - Removed unused mkinstalldirs. - -Version 1.5.0beta49 [October 8, 2010] - Undid Makefile.am revision of 1.5.0beta48. - -Version 1.5.0beta50 [October 14, 2010] - Revised Makefile.in to account for mkinstalldirs being removed. - Added some "(unsigned long)" typecasts in printf statements in pngvalid.c. - Suppressed a compiler warning in png_handle_sPLT(). - Check for out-of-range text compression mode in png_set_text(). - -Version 1.5.0beta51 [October 15, 2010] - Changed embedded dates to "(PENDING RELEASE) in beta releases (and future - rc releases) to minimize the difference between releases. - -Version 1.5.0beta52 [October 16, 2010] - Restored some of the embedded dates (in png.h, png.c, documentation, etc.) - -Version 1.5.0beta53 [October 18, 2010] - Updated INSTALL to mention using "make maintainer-clean" and to remove - obsolete statement about a custom ltmain.sh - Disabled "color-tests" by default in Makefile.am so it will work with - automake versions earlier than 1.11.1 - Use document name "libpng-manual.txt" instead of "libpng-.txt" - to simplify version differences. - Removed obsolete remarks about setjmp handling from INSTALL. - Revised and renamed the typedef in png.h and png.c that was designed - to catch library and header mismatch. - -Version 1.5.0beta54 [November 10, 2010] - Require 48 bytes, not 64 bytes, for big_row_buf in overflow checks. - Used a consistent structure for the pngget.c functions. - -Version 1.5.0beta55 [November 21, 2010] - Revised png_get_uint_32, png_get_int_32, png_get_uint_16 (Cosmin) - Moved reading of file signature into png_read_sig (Cosmin) - Fixed atomicity of chunk header serialization (Cosmin) - Added test for io_state in pngtest.c (Cosmin) - Added "#!/bin/sh" at the top of contrib/pngminim/*/gather.sh scripts. - Changes to remove gcc warnings (John Bowler) - Certain optional gcc warning flags resulted in warnings in libpng code. - With these changes only -Wconversion and -Wcast-qual cannot be turned on. - Changes are trivial rearrangements of code. -Wconversion is not possible - for pngrutil.c (because of the widespread use of += et al on variables - smaller than (int) or (unsigned int)) and -Wcast-qual is not possible - with pngwio.c and pngwutil.c because the 'write' callback and zlib - compression both fail to declare their input buffers with 'const'. - -Version 1.5.0beta56 [December 7, 2010] - Added the private PNG_UNUSED() macro definition in pngpriv.h. - Added some commentary about PNG_EXPORT in png.h and pngconf.h - Revised PNG_EXPORT() macro and added PNG_EXPORTA() macro, with the - objective of simplifying and improving the cosmetic appearance of png.h. - Fixed some incorrect "=" macro names in pnglibconf.dfa - Included documentation of changes in 1.5.0 from 1.4.x in libpng-manual.txt - -Version 1.5.0beta57 [December 9, 2010] - Documented the pngvalid gamma error summary with additional comments and - print statements. - Improved missing symbol handling in checksym.awk; symbols missing in both - the old and new files can now be optionally ignored, treated as errors - or warnings. - Removed references to pngvcrd.c and pnggccrd.c from the vstudio project. - Updated "libpng14" to "libpng15" in the visualc71 project. - Enabled the strip16 tests in pngvalid.` - Don't display test results (except PASS/FAIL) when running "make test". - Instead put them in pngtest-log.txt - Added "--with-zprefix=" to configure.ac - Updated the prebuilt configuration files to autoconf version 2.68 - -Version 1.5.0beta58 [December 19, 2010] - Fixed interlace image handling and add test cases (John Bowler) - Fixed the clean rule in Makefile.am to remove pngtest-log.txt - Made minor changes to work around warnings in gcc 3.4 - -Version 1.5.0rc01 [December 27, 2010] - No changes. - -Version 1.5.0rc02 [December 27, 2010] - Eliminated references to the scripts/*.def files in project/visualc71. - -Version 1.5.0rc03 [December 28, 2010] - Eliminated scripts/*.def and revised Makefile.am accordingly - -Version 1.5.0rc04 [December 29, 2010] - Fixed bug in background transformation handling in pngrtran.c (it was - looking for the flag in png_ptr->transformations instead of in - png_ptr->flags) (David Raymond). - -Version 1.5.0rc05 [December 31, 2010] - Fixed typo in a comment in CMakeLists.txt (libpng14 => libpng15) (Cosmin) - -Version 1.5.0rc06 [January 4, 2011] - Changed the new configure option "zprefix=string" to "zlib-prefix=string" - -Version 1.5.0rc07 [January 4, 2011] - Updated copyright year. - -Version 1.5.0 [January 6, 2011] - No changes. - -version 1.5.1beta01 [January 8, 2011] - Added description of png_set_crc_action() to the manual. - Added a note in the manual that the type of the iCCP profile was changed - from png_charpp to png_bytepp in png_get_iCCP(). This change happened - in version 1.5.0beta36 but is not noted in the CHANGES. Similarly, - it was changed from png_charpp to png_const_bytepp in png_set_iCCP(). - Ensure that png_rgb_to_gray ignores palette mapped images, if libpng - internally happens to call it with one, and fixed a failure to handle - palette mapped images correctly. This fixes CVE-2690. - -Version 1.5.1beta02 [January 14, 2011] - Fixed a bug in handling of interlaced images (bero at arklinux.org). - Updated CMakeLists.txt (Clifford Yapp) - -Version 1.5.1beta03 [January 14, 2011] - Fixed typecasting of some png_debug() statements (Cosmin) - -Version 1.5.1beta04 [January 16, 2011] - Updated documentation of png_set|get_tRNS() (Thomas Klausner). - Mentioned in the documentation that applications must #include "zlib.h" - if they need access to anything in zlib.h, and that a number of - macros such as png_memset() are no longer accessible by applications. - Corrected pngvalid gamma test "sample" function to access all of the color - samples of each pixel, instead of sampling the red channel three times. - Prefixed variable names index, div, exp, gamma with "png_" to avoid "shadow" - warnings, and (mistakenly) changed png_exp() to exp(). - -Version 1.5.1beta05 [January 16, 2011] - Changed variable names png_index, png_div, png_exp, and png_gamma to - char_index, divisor, exp_b10, and gamma_val, respectively, and - changed exp() back to png_exp(). - -Version 1.5.1beta06 [January 20, 2011] - Prevent png_push_crc_skip() from hanging while reading an unknown chunk - or an over-large compressed zTXt chunk with the progressive reader. - Eliminated more GCC "shadow" warnings. - Revised png_fixed() in png.c to avoid compiler warning about reaching the - end without returning anything. - -Version 1.5.1beta07 [January 22, 2011] - In the manual, describe the png_get_IHDR() arguments in the correct order. - Added const_png_structp and const_png_infop types, and used them in - prototypes for most png_get_*() functions. - -Version 1.5.1beta08 [January 23, 2011] - Added png_get_io_chunk_type() and deprecated png_get_io_chunk_name() - Added synopses for the IO_STATE functions and other missing synopses - to the manual. Removed the synopses from libpngpf.3 because they - were out of date and no longer useful. Better information can be - obtained by reading the prototypes and comments in pngpriv.h - Attempted to fix cpp on Solaris with S. Studio 12 cc, fix build - Added a make macro DFNCPP that is a CPP that will accept the tokens in - a .dfn file and adds configure stuff to test for such a CPP. ./configure - should fail if one is not available. - Corrected const_png_ in png.h to png_const_ to avoid polluting the namespace. - Added png_get_current_row_number and png_get_current_pass_number for the - benefit of the user transform callback. - Added png_process_data_pause and png_process_data_skip for the benefit of - progressive readers that need to stop data processing or want to optimize - skipping of unread data (e.g., if the reader marks a chunk to be skipped.) - -Version 1.5.1beta09 [January 24, 2011] - Enhanced pngvalid, corrected an error in gray_to_rgb, corrected doc error. - pngvalid contains tests of transforms, which tests are currently disabled - because they are incompletely tested. gray_to_rgb was failing to expand - the bit depth for smaller bit depth images; this seems to be a long - standing error and resulted, apparently, in invalid output - (CVE-2011-0408, CERT VU#643140). The documentation did not accurately - describe what libpng really does when converting RGB to gray. - -Version 1.5.1beta10 [January 27, 2010] - Fixed incorrect examples of callback prototypes in the manual, that were - introduced in libpng-1.0.0. - In addition the order of the png_get_uint macros with respect to the - relevant function definitions has been reversed. This helps the - preprocessing of the symbol files be more robust. Furthermore, the - symbol file preprocessing now uses -DPNG_NO_USE_READ_MACROS even when - the library may actually be built with PNG_USE_READ_MACROS; this stops - the read macros interfering with the symbol file format. - Made the manual, synopses, and function prototypes use the function - argument names file_gamma, int_file_gamma, and srgb_intent consistently. - -Version 1.5.1beta11 [January 28, 2011] - Changed PNG_UNUSED from "param=param;" to "{if(param){}}". - Corrected local variable type in new API png_process_data_skip() - The type was self-evidently incorrect but only causes problems on 64-bit - architectures. - Added transform tests to pngvalid and simplified the arguments. - -Version 1.5.1rc01 [January 29, 2011] - No changes. - -Version 1.5.1rc02 [January 31, 2011] - Added a request in the manual that applications do not use "png_" or - "PNG_" to begin any of their own symbols. - Changed PNG_UNUSED to "(void)param;" and updated the commentary in pngpriv.h - -Version 1.5.1 [February 3, 2011] - No changes. - -Version 1.5.2beta01 [February 13, 2011] - More -Wshadow fixes for older gcc compilers. Older gcc versions apparently - check formal parameters names in function declarations (as well as - definitions) to see if they match a name in the global namespace. - Revised PNG_EXPORTA macro to not use an empty parameter, to accommodate the - old VisualC++ preprocessor. - Turned on interlace handling in png_read_png(). - Fixed gcc pendantic warnings. - Handle longjmp in Cygwin. - Fixed png_get_current_row_number() in the interlaced case. - Cleaned up ALPHA flags and transformations. - Implemented expansion to 16 bits. - -Version 1.5.2beta02 [February 19, 2011] - Fixed mistake in the descriptions of user read_transform and write_transform - function prototypes in the manual. The row_info struct is png_row_infop. - Reverted png_get_current_row_number() to previous (1.5.2beta01) behavior. - Corrected png_get_current_row_number documentation - Fixed the read/write row callback documentation. - This documents the current behavior, where the callback is called after - every row with information pertaining to the next row. - -Version 1.5.2beta03 [March 3, 2011] - Fixed scripts/makefile.vcwin32 - Updated contrib/pngsuite/README to add the word "modify". - Define PNG_ALLOCATED to blank when _MSC_VER<1300. - -Version 1.5.2rc01 [March 19, 2011] - Define remaining attributes to blank when MSC_VER<1300. - ifdef out mask arrays in pngread.c when interlacing is not supported. - -Version 1.5.2rc02 [March 22, 2011] - Added a hint to try CPP=/bin/cpp if "cpp -E" fails in scripts/pnglibconf.mak - and in contrib/pngminim/*/makefile, eg., on SunOS 5.10, and removed "strip" - from the makefiles. - Fixed a bug (present since libpng-1.0.7) that makes png_handle_sPLT() fail - to compile when PNG_NO_POINTER_INDEXING is defined (Chubanov Kirill) - -Version 1.5.2rc03 [March 24, 2011] - Don't include standard header files in png.h while building the symbol table, - to avoid cpp failure on SunOS (introduced PNG_BUILDING_SYMBOL_TABLE macro). - -Version 1.5.2 [March 31, 2011] - No changes. - -Version 1.5.3beta01 [April 1, 2011] - Re-initialize the zlib compressor before compressing non-IDAT chunks. - Added API functions (png_set_text_compression_level() and four others) to - set parameters for zlib compression of non-IDAT chunks. - -Version 1.5.3beta02 [April 3, 2011] - Updated scripts/symbols.def with new API functions. - Only compile the new zlib re-initializing code when text or iCCP is - supported, using PNG_WRITE_COMPRESSED_TEXT_SUPPORTED macro. - Improved the optimization of the zlib CMF byte (see libpng-1.2.6beta03). - Optimize the zlib CMF byte in non-IDAT compressed chunks - -Version 1.5.3beta03 [April 16, 2011] - Fixed gcc -ansi -pedantic compile. A strict ANSI system does not have - snprintf, and the "__STRICT_ANSI__" detects that condition more reliably - than __STDC__ (John Bowler). - Removed the PNG_PTR_NORETURN attribute because it too dangerous. It tells - the compiler that a user supplied callback (the error handler) does not - return, yet there is no guarantee in practice that the application code - will correctly implement the error handler because the compiler only - issues a warning if there is a mistake (John Bowler). - Removed the no-longer-used PNG_DEPSTRUCT macro. - Updated the zlib version to 1.2.5 in the VStudio project. - Fixed 64-bit builds where png_uint_32 is smaller than png_size_t in - pngwutil.c (John Bowler). - Fixed bug with stripping the filler or alpha channel when writing, that - was introduced in libpng-1.5.2beta01 (bug report by Andrew Church). - -Version 1.5.3beta04 [April 27, 2011] - Updated pngtest.png with the new zlib CMF optimization. - Cleaned up conditional compilation code and of background/gamma handling - Internal changes only except a new option to avoid compiling the - png_build_grayscale_palette API (which is not used at all internally.) - The main change is to move the transform tests (READ_TRANSFORMS, - WRITE_TRANSFORMS) up one level to the caller of the APIs. This avoids - calls to spurious functions if all transforms are disabled and slightly - simplifies those functions. Pngvalid modified to handle this. - A minor change is to stop the strip_16 and expand_16 interfaces from - disabling each other; this allows the future alpha premultiplication - code to use 16-bit intermediate values while still producing 8-bit output. - png_do_background and png_do_gamma have been simplified to take a single - pointer to the png_struct rather than pointers to every item required - from the png_struct. This makes no practical difference to the internal - code. - A serious bug in the pngvalid internal routine 'standard_display_init' has - been fixed - this failed to initialize the red channel and accidentally - initialized the alpha channel twice. - Changed png_struct jmp_buf member name from png_jmpbuf to tmp_jmpbuf to - avoid a possible clash with the png_jmpbuf macro on some platforms. - -Version 1.5.3beta05 [May 6, 2011] - Added the "_POSIX_SOURCE" feature test macro to ensure libpng sees the - correct API. _POSIX_SOURCE is defined in pngpriv.h, pngtest.c and - pngvalid.c to ensure that POSIX conformant systems disable non-POSIX APIs. - Removed png_snprintf and added formatted warning messages. This change adds - internal APIs to allow png_warning messages to have parameters without - requiring the host OS to implement snprintf. As a side effect the - dependency of the tIME-supporting RFC1132 code on stdio is removed and - PNG_NO_WARNINGS does actually work now. - Pass "" instead of '\0' to png_default_error() in png_err(). This mistake - was introduced in libpng-1.2.20beta01. This fixes CVE-2011-2691. - Added PNG_WRITE_OPTIMIZE_CMF_SUPPORTED macro to make the zlib "CMF" byte - optimization configureable. - IDAT compression failed if preceded by a compressed text chunk (bug - introduced in libpng-1.5.3beta01-02). This was because the attempt to - reset the zlib stream in png_write_IDAT happened after the first IDAT - chunk had been deflated - much too late. In this change internal - functions were added to claim/release the z_stream and, hopefully, make - the code more robust. Also deflateEnd checking is added - previously - libpng would ignore an error at the end of the stream. - -Version 1.5.3beta06 [May 8, 2011] - Removed the -D_ALL_SOURCE from definitions for AIX in CMakeLists.txt - Implemented premultiplied alpha support: png_set_alpha_mode API - -Version 1.5.3beta07 [May 11, 2011] - Added expand_16 support to the high level interface. - Added named value and 'flag' gamma support to png_set_gamma. Made a minor - change from the previous (unreleased) ABI/API to hide the exact value used - for Macs - it's not a good idea to embed this in the ABI! - Moved macro definitions for PNG_HAVE_IHDR, PNG_HAVE_PLTE, and PNG_AFTER_IDAT - from pngpriv.h to png.h because they must be visible to applications - that call png_set_unknown_chunks(). - Check for up->location !PNG_AFTER_IDAT when writing unknown chunks - before IDAT. - -Version 1.5.3beta08 [May 16, 2011] - Improved "pngvalid --speed" to exclude more of pngvalid from the time. - Documented png_set_alpha_mode(), other changes in libpng.3/libpng-manual.txt - The cHRM chunk now sets the defaults for png_set_rgb_to_gray() (when negative - parameters are supplied by the caller), while in the absence of cHRM - sRGB/Rec 709 values are still used. This introduced a divide-by-zero - bug in png_handle_cHRM(). - The bKGD chunk no longer overwrites the background value set by - png_set_background(), allowing the latter to be used before the file - header is read. It never performed any useful function to override - the default anyway. - Added memory overwrite and palette image checks to pngvalid.c - Previously palette image code was poorly checked. Since the transformation - code has a special palette path in most cases this was a severe weakness. - Minor cleanup and some extra checking in pngrutil.c and pngrtran.c. When - expanding an indexed image, always expand to RGBA if transparency is - present. - -Version 1.5.3beta09 [May 17, 2011] - Reversed earlier 1.5.3 change of transformation order; move png_expand_16 - back where it was. The change doesn't work because it requires 16-bit - gamma tables when the code only generates 8-bit ones. This fails - silently; the libpng code just doesn't do any gamma correction. Moving - the tests back leaves the old, inaccurate, 8-bit gamma calculations, but - these are clearly better than none! - -Version 1.5.3beta10 [May 20, 2011] - - png_set_background() and png_expand_16() did not work together correctly. - This problem is present in 1.5.2; if png_set_background is called with - need_expand false and the matching 16 bit color libpng erroneously just - treats it as an 8-bit color because of where png_do_expand_16 is in the - transform list. This simple fix reduces the supplied colour to 8-bits, - so it gets smashed, but this is better than the current behavior. - Added tests for expand16, more fixes for palette image tests to pngvalid. - Corrects the code for palette image tests and disables attempts to - validate palette colors. - -Version 1.5.3rc01 [June 3, 2011] - No changes. - -Version 1.5.3rc02 [June 8, 2011] - Fixed uninitialized memory read in png_format_buffer() (Bug report by - Frank Busse, CVE-2011-2501, related to CVE-2004-0421). - -Version 1.5.3beta11 [June 11, 2011] - Fixed png_handle_sCAL which is broken in 1.5. This fixes CVE 2011-2692. - Added sCAL to pngtest.png - Revised documentation about png_set_user_limits() to say that it also affects - png writing. - Revised handling of png_set_user_limits() so that it can increase the - limit beyond the PNG_USER_WIDTH|HEIGHT_MAX; previously it could only - reduce it. - Make the 16-to-8 scaling accurate. Dividing by 256 with no rounding is - wrong (high by one) 25% of the time. Dividing by 257 with rounding is - wrong in 128 out of 65536 cases. Getting the right answer all the time - without division is easy. - Added "_SUPPORTED" to the PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION macro. - Added projects/owatcom, an IDE project for OpenWatcom to replace - scripts/makefile.watcom. This project works with OpenWatcom 1.9. The - IDE autogenerates appropriate makefiles (libpng.mk) for batch processing. - The project is configurable, unlike the Visual Studio project, so long - as the developer has an awk. - Changed png_set_gAMA to limit the gamma value range so that the inverse - of the stored value cannot overflow the fixed point representation, - and changed other things OpenWatcom warns about. - Revised pngvalid.c to test PNG_ALPHA_MODE_SUPPORTED correctly. This allows - pngvalid to build when ALPHA_MODE is not supported, which is required if - it is to build on libpng 1.4. - Removed string/memory macros that are no longer used and are not - necessarily fully supportable, particularly png_strncpy and png_snprintf. - Added log option to pngvalid.c and attempted to improve gamma messages. - -Version 1.5.3 [omitted] - People found the presence of a beta release following an rc release - to be confusing; therefore we bump the version to libpng-1.5.4beta01 - and there will be no libpng-1.5.3 release. - -Version 1.5.4beta01 [June 14, 2011] - Made it possible to undefine PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED - to get the same (inaccurate) output as libpng-1.5.2 and earlier. - Moved definitions of PNG_HAVE_IHDR, PNG_AFTER_IDAT, and PNG_HAVE_PLTE - outside of an unknown-chunk block in png.h because they are also - needed for other uses. - -Version 1.5.4beta02 [June 14, 2011] - Fixed and clarified LEGACY 16-to-8 scaling code. - Added png_set_chop_16() API, to match inaccurate results from previous - libpng versions. - Removed the ACCURATE and LEGACY options (they are no longer useable) - Use the old scaling method for background if png_set_chop_16() was - called. - Made png_set_chop_16() API removeable by disabling PNG_CHOP_16_TO_8_SUPPORTED - -Version 1.5.4beta03 [June 15, 2011] - Fixed a problem in png_do_expand_palette() exposed by optimization in - 1.5.3beta06 - Also removed a spurious and confusing "trans" member ("trans") from png_info. - The palette expand optimization prevented expansion to an intermediate RGBA - form if tRNS was present but alpha was marked to be stripped; this exposed - a check for tRNS in png_do_expand_palette() which is inconsistent with the - code elsewhere in libpng. - Correction to the expand_16 code; removed extra instance of - png_set_scale_16_to_8 from pngpriv.h - -Version 1.5.4beta04 [June 16, 2011] - Added a missing "#ifdef PNG_READ_BACKGROUND_SUPPORTED/#endif" in pngrtran.c - Added PNG_TRANSFORM_CHOP_16 to the high-level read transforms. - Made PNG_READ_16_TO_8_ACCURATE_SCALE configurable again. If this is - not enabled, png_set_strip_16() and png_do_scale_16_to_8() aren't built. - Revised contrib/visupng, gregbook, and pngminim to demonstrate chop_16_to_8 - -Version 1.5.4beta05 [June 16, 2011] - Renamed png_set_strip_16() to png_set_scale_16() and renamed - png_set_chop_16() to png_set_strip(16) in an attempt to minimize the - behavior changes between libpng14 and libpng15. - -Version 1.5.4beta06 [June 18, 2011] - Fixed new bug that was causing both strip_16 and scale_16 to be applied. - -Version 1.5.4beta07 [June 19, 2011] - Fixed pngvalid, simplified macros, added checking for 0 in sCAL. - The ACCURATE scale macro is no longer defined in 1.5 - call the - png_scale_16_to_8 API. Made sure that PNG_READ_16_TO_8 is still defined - if the png_strip_16_to_8 API is present. png_check_fp_number now - maintains some state so that positive, negative and zero values are - identified. sCAL uses these to be strictly spec conformant. - -Version 1.5.4beta08 [June 23, 2011] - Fixed pngvalid if ACCURATE_SCALE is defined. - Updated scripts/pnglibconf.h.prebuilt. - -Version 1.5.4rc01 [June 30, 2011] - Define PNG_ALLOCATED to "restrict" only if MSC_VER >= 1400. - -Version 1.5.4 [July 7, 2011] - No changes. - -Version 1.5.5beta01 [July 13, 2011] - Fixed some typos and made other minor changes in the manual. - Updated contrib/pngminus/makefile.std (Samuli Souminen) - -Version 1.5.5beta02 [July 14, 2011] - Revised Makefile.am and Makefile.in to look in the right directory for - pnglibconf.h.prebuilt - -Version 1.5.5beta03 [July 27, 2011] - Enabled compilation with g++ compiler. This compiler does not recognize - the file extension, so it always compiles with C++ rules. Made minor - changes to pngrutil.c to cast results where C++ expects it but C does not. - Minor editing of libpng.3 and libpng-manual.txt. - -Version 1.5.5beta04 [July 29, 2011] - Revised CMakeLists.txt (Clifford Yapp) - Updated commentary about the png_rgb_to_gray() default coefficients - in the manual and in pngrtran.c - -Version 1.5.5beta05 [August 17, 2011] - Prevent unexpected API exports from non-libpng DLLs on Windows. The "_DLL" - is removed from the test of whether a DLL is being built (this erroneously - caused the libpng APIs to be marked as DLL exports in static builds under - Microsoft Visual Studio). Almost all of the libpng building configuration - is moved from pngconf.h to pngpriv.h, but PNG_DLL_EXPORT remains in - pngconf.h, though, so that it is colocated with the import definition (it - is no longer used anywhere in the installed headers). The VStudio project - definitions have been cleaned up: "_USRDLL" has been removed from the - static library builds (this was incorrect), and PNG_USE_DLL has been added - to pngvalid to test the functionality (pngtest does not supply it, - deliberately). The spurious "_EXPORTS" has been removed from the - libpng build (all these errors were a result of copy/paste between project - configurations.) - Added new types and internal functions for CIE RGB end point handling to - pngpriv.h (functions yet to be implemented). - -Version 1.5.5beta06 [August 26, 2011] - Ensure the CMAKE_LIBRARY_OUTPUT_DIRECTORY is set in CMakeLists.txt - (Clifford Yap) - Fixes to rgb_to_gray and cHRM XYZ APIs (John Bowler): - The rgb_to_gray code had errors when combined with gamma correction. - Some pixels were treated as true grey when they weren't and such pixels - and true grey ones were not gamma corrected (the original value of the - red component was used instead). APIs to get and set cHRM using color - space end points have been added and the rgb_to_gray code that defaults - based on cHRM, and the divide-by-zero bug in png_handle_cHRM (CERT - VU#477046, CVE-2011-3328, introduced in 1.5.4) have been corrected. - A considerable number of tests has been added to pngvalid for the - rgb_to_gray transform. - Arithmetic errors in rgb_to_gray whereby the calculated gray value was - truncated to the bit depth rather than rounded have been fixed except in - the 8-bit non-gamma-corrected case (where consistency seems more important - than correctness.) The code still has considerable inaccuracies in the - 8-bit case because 8-bit linear arithmetic is used. - -Version 1.5.5beta07 [September 7, 2011] - Added "$(ARCH)" option to makefile.darwin - Added SunOS support to configure.ac and Makefile.am - Changed png_chunk_benign_error() to png_warning() in png.c, in - png_XYZ_from_xy_checked(). - -Version 1.5.5beta08 [September 10, 2011] - Fixed 64-bit compilation errors (gcc). The errors fixed relate - to conditions where types that are 32 bits in the GCC 32-bit - world (uLong and png_size_t) become 64 bits in the 64-bit - world. This produces potential truncation errors which the - compiler correctly flags. - Relocated new HAVE_SOLARIS_LD definition in configure.ac - Constant changes for 64-bit compatibility (removal of L suffixes). The - 16-bit cases still use "L" as we don't have a 16-bit test system. - -Version 1.5.5rc01 [September 15, 2011] - Removed "L" suffixes in pngpriv.h - -Version 1.5.5 [September 22, 2011] - No changes. - -Version 1.5.6beta01 [September 22, 2011] - Fixed some 64-bit type conversion warnings in pngrtran.c - Moved row_info from png_struct to a local variable. - The various interlace mask arrays have been made into arrays of - bytes and made PNG_CONST and static (previously some arrays were - marked PNG_CONST and some weren't). - Additional checks have been added to the transform code to validate the - pixel depths after the transforms on both read and write. - Removed some redundant code from pngwrite.c, in png_destroy_write_struct(). - Changed chunk reading/writing code to use png_uint_32 instead of png_byte[4]. - This removes the need to allocate temporary strings for chunk names on - the stack in the read/write code. Unknown chunk handling still uses the - string form because this is exposed in the API. - -Version 1.5.6beta02 [September 26, 2011] - Added a note in the manual the png_read_update_info() must be called only - once with a particular info_ptr. - Fixed a typo in the definition of the new PNG_STRING_FROM_CHUNK(s,c) macro. - -Version 1.5.6beta03 [September 28, 2011] - Revised test-pngtest.sh to report FAIL when pngtest fails. - Added "--strict" option to pngtest, to report FAIL when the failure is - only because the resulting valid files are different. - Revised CMakeLists.txt to work with mingw and removed some material from - CMakeLists.txt that is no longer useful in libpng-1.5. - -Version 1.5.6beta04 [October 5, 2011] - Fixed typo in Makefile.in and Makefile.am ("-M Wl" should be "-M -Wl")." - -Version 1.5.6beta05 [October 12, 2011] - Speed up png_combine_row() for interlaced images. This reduces the generality - of the code, allowing it to be optimized for Adam7 interlace. The masks - passed to png_combine_row() are now generated internally, avoiding - some code duplication and localizing the interlace handling somewhat. - Align png_struct::row_buf - previously it was always unaligned, caused by - a bug in the code that attempted to align it; the code needs to subtract - one from the pointer to take account of the filter byte prepended to - each row. - Optimized png_combine_row() when rows are aligned. This gains a small - percentage for 16-bit and 32-bit pixels in the typical case where the - output row buffers are appropriately aligned. The optimization was not - previously possible because the png_struct buffer was always misaligned. - Fixed bug in png_write_chunk_header() debug print, introduced in 1.5.6beta01. - -Version 1.5.6beta06 [October 17, 2011] - Removed two redundant tests for unitialized row. - Fixed a relatively harmless memory overwrite in compressed text writing - with a 1 byte zlib buffer. - Add ability to call png_read_update_info multiple times to pngvalid.c. - Fixes for multiple calls to png_read_update_info. These fixes attend to - most of the errors revealed in pngvalid, however doing the gamma work - twice results in inaccuracies that can't be easily fixed. There is now - a warning in the code if this is going to happen. - Turned on multiple png_read_update_info in pngvalid transform tests. - Prevent libpng from overwriting unused bits at the end of the image when - it is not byte aligned, while reading. Prior to libpng-1.5.6 libpng would - overwrite the partial byte at the end of each row if the row width was not - an exact multiple of 8 bits and the image is not interlaced. - -Version 1.5.6beta07 [October 21, 2011] - Made png_ptr->prev_row an aligned pointer into png_ptr->big_prev_row - (Mans Rullgard). - -Version 1.5.6rc01 [October 26, 2011] - Changed misleading "Missing PLTE before cHRM" warning to "Out of place cHRM" - -Version 1.5.6rc02 [October 27, 2011] - Added LSR() macro to defend against buggy compilers that evaluate non-taken - code branches and complain about out-of-range shifts. - -Version 1.5.6rc03 [October 28, 2011] - Renamed the LSR() macro to PNG_LSR() and added PNG_LSL() macro. - Fixed compiler warnings with Intel and MSYS compilers. The logical shift - fix for Microsoft Visual C is required by other compilers, so this - enables that fix for all compilers when using compile-time constants. - Under MSYS 'byte' is a name declared in a system header file, so we - changed the name of a local variable to avoid the warnings that result. - Added #define PNG_ALIGN_TYPE PNG_ALIGN_NONE to contrib/pngminim/*/pngusr.h - -Version 1.5.6 [November 3, 2011] - No changes. - -Version 1.5.7beta01 [November 4, 2011] - Added support for ARM processor, when decoding all PNG up-filtered rows - and any other-filtered rows with 3 or 4 bytes per pixel (Mans Rullgard). - Fixed bug in pngvalid on early allocation failure; fixed type cast in - pngmem.c; pngvalid would attempt to call png_error() if the allocation - of a png_struct or png_info failed. This would probably have led to a - crash. The pngmem.c implementation of png_malloc() included a cast - to png_size_t which would fail on large allocations on 16-bit systems. - Fix for the preprocessor of the Intel C compiler. The preprocessor - splits adjacent @ signs with a space; this changes the concatentation - token from @-@-@ to PNG_JOIN; that should work with all compiler - preprocessors. - Paeth filter speed improvements from work by Siarhei Siamashka. This - changes the 'Paeth' reconstruction function to improve the GCC code - generation on x86. The changes are only part of the suggested ones; - just the changes that definitely improve speed and remain simple. - The changes also slightly increase the clarity of the code. - -Version 1.5.7beta02 [November 11, 2011] - Check compression_type parameter in png_get_iCCP and remove spurious - casts. The compression_type parameter is always assigned to, so must - be non-NULL. The cast of the profile length potentially truncated the - value unnecessarily on a 16-bit int system, so the cast of the (byte) - compression type to (int) is specified by ANSI-C anyway. - Fixed FP division by zero in pngvalid.c; the 'test_pixel' code left - the sBIT fields in the test pixel as 0, which resulted in a floating - point division by zero which was irrelevant but causes systems where - FP exceptions cause a crash. Added code to pngvalid to turn on FP - exceptions if the appropriate glibc support is there to ensure this is - tested in the future. - Updated scripts/pnglibconf.mak and scripts/makefile.std to handle the - new PNG_JOIN macro. - Added versioning to pnglibconf.h comments. - Simplified read/write API initial version; basic read/write tested on - a variety of images, limited documentation (in the header file.) - Installed more accurate linear to sRGB conversion tables. The slightly - modified tables reduce the number of 16-bit values that - convert to an off-by-one 8-bit value. The "makesRGB.c" code that was used - to generate the tables is now in a contrib/sRGBtables sub-directory. - -Version 1.5.7beta03 [November 17, 2011] - Removed PNG_CONST from the sRGB table declarations in pngpriv.h and png.c - Added run-time detection of NEON support. - Added contrib/libtests; includes simplified API test and timing test and - a color conversion utility for rapid checking of failed 'pngstest' results. - Multiple transform bug fixes plus a work-round for double gamma correction. - libpng does not support more than one transform that requires linear data - at once - if this is tried typically the results is double gamma - correction. Since the simplified APIs can need rgb to gray combined with - a compose operation it is necessary to do one of these outside the main - libpng transform code. This check-in also contains fixes to various bugs - in the simplified APIs themselves and to some bugs in compose and rgb to - gray (on palette) itself. - Fixes for C++ compilation using g++ When libpng source is compiled - using g++. The compiler imposes C++ rules on the C source; thus it - is desireable to make the source work with either C or C++ rules - without throwing away useful error information. This change adds - png_voidcast to allow C semantic (void*) cases or the corresponding - C++ static_cast operation, as appropriate. - Added --noexecstack to assembler file compilation. GCC does not set - this on assembler compilation, even though it does on C compilation. - This creates security issues if assembler code is enabled; the - work-around is to set it by default in the flags for $(CCAS) - Work around compilers that don't support declaration of const data. Some - compilers fault 'extern const' data declarations (because the data is - not initialized); this turns on const-ness only for compilers where - this is known to work. - -Version 1.5.7beta04 [November 17, 2011] - Since the gcc driver does not recognize the --noexecstack flag, we must - use the -Wa prefix to have it passed through to the assembler. - Also removed a duplicate setting of this flag. - Added files that were omitted from the libpng-1.5.7beta03 zip distribution. - -Version 1.5.7beta05 [November 25, 2011] - Removed "zTXt" from warning in generic chunk decompression function. - Validate time settings passed to pngset() and png_convert_to_rfc1123() - (Frank Busse). - Added MINGW support to CMakeLists.txt - Reject invalid compression flag or method when reading the iTXt chunk. - Backed out 'simplified' API changes. The API seems too complex and there - is a lack of consensus or enthusiasm for the proposals. The API also - reveals significant bugs inside libpng (double gamma correction and the - known bug of being unable to retrieve a corrected palette). It seems - better to wait until the bugs, at least, are corrected. - Moved pngvalid.c into contrib/libtests - Rebuilt Makefile.in, configure, etc., with autoconf-2.68 - -Version 1.5.7rc01 [December 1, 2011] - Replaced an "#if" with "#ifdef" in pngrtran.c - Revised #if PNG_DO_BC block in png.c (use #ifdef and add #else) - -Version 1.5.7rc02 [December 5, 2011] - Revised project files and contrib/pngvalid/pngvalid.c to account for - the relocation of pngvalid into contrib/libtests. - Revised pngconf.h to use " __declspec(restrict)" only when MSC_VER >= 1400, - as in libpng-1.5.4. - Put CRLF line endings in the owatcom project files. - -Version 1.5.7rc03 [December 7, 2011] - Updated CMakeLists.txt to account for the relocation of pngvalid.c - -Version 1.5.7 [December 15, 2011] - Minor fixes to pngvalid.c for gcc 4.6.2 compatibility to remove warnings - reported by earlier versions. - Fixed minor memset/sizeof errors in pngvalid.c. - -Version 1.6.0beta01 [December 15, 2011] - Removed machine-generated configure files from the GIT repository (they will - continue to appear in the tarball distributions and in the libpng15 and - earlier GIT branches). - Restored the new 'simplified' API, which was started in libpng-1.5.7beta02 - but later deleted from libpng-1.5.7beta05. - Added example programs for the new 'simplified' API. - Added ANSI-C (C90) headers and require them, and take advantage of the - change. Also fixed some of the projects/* and contrib/* files that needed - updates for libpng16 and the move of pngvalid.c. - With this change the required ANSI-C header files are assumed to exist: the - implementation must provide float.h, limits.h, stdarg.h and stddef.h and - libpng relies on limits.h and stddef.h existing and behaving as defined - (the other two required headers aren't used). Non-ANSI systems that don't - have stddef.h or limits.h will have to provide an appropriate fake - containing the relevant types and #defines. - The use of FAR/far has been eliminated and the definition of png_alloc_size_t - is now controlled by a flag so that 'small size_t' systems can select it - if necessary. Libpng 1.6 may not currently work on such systems -- it - seems likely that it will ask 'malloc' for more than 65535 bytes with any - image that has a sufficiently large row size (rather than simply failing - to read such images). - New tools directory containing tools used to generate libpng code. - Fixed race conditions in parallel make builds. With higher degrees of - parallelism during 'make' the use of the same temporary file names such - as 'dfn*' can result in a race where a temporary file from one arm of the - build is deleted or overwritten in another arm. This changes the - temporary files for suffix rules to always use $* and ensures that the - non-suffix rules use unique file names. - -Version 1.6.0beta02 [December 21, 2011] - Correct configure builds where build and source directories are separate. - The include path of 'config.h' was erroneously made relative in pngvalid.c - in libpng 1.5.7. - -Version 1.6.0beta03 [December 22, 2011] - Start-up code size improvements, error handler flexibility. These changes - alter how the tricky allocation of the initial png_struct and png_info - structures are handled. png_info is now handled in pretty much the same - way as everything else, except that the allocations handle NULL return - silently. png_struct is changed in a similar way on allocation and on - deallocation a 'safety' error handler is put in place (which should never - be required). The error handler itself is changed to permit mismatches - in the application and libpng error buffer size; however, this means a - silent change to the API to return the jmp_buf if the size doesn't match - the size from the libpng compilation; libpng now allocates the memory and - this may fail. Overall these changes result in slight code size - reductions; however, this is a reduction in code that is always executed - so is particularly valuable. Overall on a 64-bit system the libpng DLL - decreases in code size by 1733 bytes. pngerror.o increases in size by - about 465 bytes because of the new functionality. - Added png_convert_to_rfc1123_buffer() and deprecated png_convert_to_rfc1123() - to avoid including a spurious buffer in the png_struct. - -Version 1.6.0beta04 [December 30, 2011] - Regenerated configure scripts with automake-1.11.2 - Eliminated png_info_destroy(). It is now used only in png.c and only calls - one other internal function and memset(). - Enabled png_get_sCAL_fixed() if floating point APIs are enabled. Previously - it was disabled whenever internal fixed point arithmetic was selected, - which meant it didn't exist even on systems where FP was available but not - preferred. - Added pngvalid.c compile time checks for const APIs. - Implemented 'restrict' for png_info and png_struct. Because of the way - libpng works both png_info and png_struct are always accessed via a - single pointer. This means adding C99 'restrict' to the pointer gives - the compiler some opportunity to optimize the code. This change allows - that. - Moved AC_MSG_CHECKING([if libraries can be versioned]) later to the proper - location in configure.ac (Gilles Espinasse). - Changed png_memcpy to C assignment where appropriate. Changed all those - uses of png_memcpy that were doing a simple assignment to assignments - (all those cases where the thing being copied is a non-array C L-value). - Added some error checking to png_set_*() routines. - Removed the reference to the non-exported function png_memcpy() from - example.c. - Fixed the Visual C 64-bit build - it requires jmp_buf to be aligned, but - it had become misaligned. - Revised contrib/pngminus/pnm2png.c to avoid warnings when png_uint_32 - and unsigned long are of different sizes. - -Version 1.6.0beta05 [January 15, 2012] - Updated manual with description of the simplified API (copied from png.h) - Fix bug in pngerror.c: some long warnings were being improperly truncated - (CVE-2011-3464, bug introduced in libpng-1.5.3beta05). - -Version 1.6.0beta06 [January 24, 2012] - Added palette support to the simplified APIs. This commit - changes some of the macro definitions in png.h, app code - may need corresponding changes. - Increased the formatted warning buffer to 192 bytes. - Added color-map support to simplified API. This is an initial version for - review; the documentation has not yet been updated. - Fixed Min/GW uninstall to remove libpng.dll.a - -Version 1.6.0beta07 [January 28, 2012] - Eliminated Intel icc/icl compiler warnings. The Intel (GCC derived) - compiler issues slightly different warnings from those issued by the - current vesions of GCC. This eliminates those warnings by - adding/removing casts and small code rewrites. - Updated configure.ac from autoupdate: added --enable-werror option. - Also some layout regularization and removal of introduced tab characters - (replaced with 3-character indentation). Obsolete macros identified by - autoupdate have been removed; the replacements are all in 2.59 so - the pre-req hasn't been changed. --enable-werror checks for support - for -Werror (or the given argument) in the compiler. This mimics the - gcc configure option by allowing -Werror to be turned on safely; without - the option the tests written in configure itself fail compilation because - they cause compiler warnings. - Rewrote autogen.sh to run autoreconf instead of running tools one-by-one. - Conditionalize the install rules for MINGW and CYGWIN in CMakeLists.txt and - set CMAKE_LIBRARY_OUTPUT_DIRECTORY to "lib" on all platforms (C. Yapp). - Freeze libtool files in the 'scripts' directory. This version of autogen.sh - attempts to dissuade people from running it when it is not, or should not, - be necessary. In fact, autogen.sh does not work when run in a libpng - directory extracted from a tar distribution anymore. You must run it in - a GIT clone instead. - Added two images to contrib/pngsuite (1-bit and 2-bit transparent grayscale), - and renamed three whose names were inconsistent with those in - pngsuite/README.txt. - -Version 1.6.0beta08 [February 1, 2012] - Fixed Image::colormap misalignment in pngstest.c - Check libtool/libtoolize version number (2.4.2) in configure.ac - Divide test-pngstest.sh into separate pngstest runs for basic and - transparent images. - Moved automake options to AM_INIT_AUTOMAKE in configure.ac - Added color-tests, silent-rules (Not yet implemented in Makefile.am) and - version checking to configure.ac - Improved pngstest speed by not doing redundant tests and add const to - the background parameter of png_image_finish_read. The --background - option is now done automagically only when required, so that commandline - option no longer exists. - Cleaned up pngpriv.h to consistently declare all functions and data. - Also eliminated PNG_CONST_DATA, which is apparently not needed but we - can't be sure until it is gone. - Added symbol prefixing that allows all the libpng external symbols - to be prefixed (suggested by Reuben Hawkins). - Updated "ftbb*.png" list in the owatcom and vstudio projects. - Fixed 'prefix' builds on clean systems. The generation of pngprefix.h - should not require itself. - Updated INSTALL to explain that autogen.sh must be run in a GIT clone, - not in a libpng directory extracted from a tar distribution. - -Version 1.6.0beta09 [February 1, 2012] - Reverted the prebuilt configure files to libpng-1.6.0beta05 condition. - -Version 1.6.0beta10 [February 3, 2012] - Added Z_SOLO for zlib-1.2.6+ and correct pngstest tests - Updated list of test images in CMakeLists.txt - Updated the prebuilt configure files to current condition. - Revised INSTALL information about autogen.sh; it works in tar distributions. - -Version 1.6.0beta11 [February 16, 2012] - Fix character count in pngstest command in projects/owatcom/pngstest.tgt - Revised test-pngstest.sh to report PASS/FAIL for each image. - Updated documentation about the simplified API. - Corrected estimate of error in libpng png_set_rgb_to_gray API. The API is - extremely inaccurate for sRGB conversions because it uses an 8-bit - intermediate linear value and it does not use the sRGB transform, so it - suffers from the known instability in gamma transforms for values close - to 0 (see Poynton). The net result is that the calculation has a maximum - error of 14.99/255; 0.5/255^(1/2.2). pngstest now uses 15 for the - permitted 8-bit error. This may still not be enough because of arithmetic - error. - Removed some unused arrays (with #ifdef) from png_read_push_finish_row(). - Fixed a memory overwrite bug in simplified read of RGB PNG with - non-linear gamma Also bugs in the error checking in pngread.c and changed - quite a lot of the checks in pngstest.c to be correct; either correctly - written or not over-optimistic. The pngstest changes are insufficient to - allow all possible RGB transforms to be passed; pngstest cmppixel needs - to be rewritten to make it clearer which errors it allows and then changed - to permit known inaccuracies. - Removed tests for no-longer-used *_EMPTY_PLTE_SUPPORTED from pngstruct.h - Fixed fixed/float API export conditionals. 1) If FIXED_POINT or - FLOATING_POINT options were switched off, png.h ended up with lone ';' - characters. This is not valid ANSI-C outside a function. The ';' - characters have been moved inside the definition of PNG_FP_EXPORT and - PNG_FIXED_EXPORT. 2) If either option was switched off, the declaration - of the corresponding functions were completely omitted, even though some - of them are still used internally. The result is still valid, but - produces warnings from gcc with some warning options (including -Wall). The - fix is to cause png.h to declare the functions with PNG_INTERNAL_FUNCTION - when png.h is included from pngpriv.h. - Check for invalid palette index while reading paletted PNG. When one is - found, issue a warning and increase png_ptr->num_palette accordingly. - Apps are responsible for checking to see if that happened. - -Version 1.6.0beta12 [February 18, 2012] - Do not increase num_palette on invalid_index. - Relocated check for invalid palette index to pngrtran.c, after unpacking - the sub-8-bit pixels. - Fixed CVE-2011-3026 buffer overrun bug. This bug was introduced when - iCCP chunk support was added at libpng-1.0.6. Deal more correctly with the - test on iCCP chunk length. Also removed spurious casts that may hide - problems on 16-bit systems. - -Version 1.6.0beta13 [February 24, 2012] - Eliminated redundant png_push_read_tEXt|zTXt|iTXt|unknown code from - pngpread.c and use the sequential png_handle_tEXt, etc., in pngrutil.c; - now that png_ptr->buffer is inaccessible to applications, the special - handling is no longer useful. - Added PNG_SAFE_LIMITS feature to pnglibconf.dfa, pngpriv.h, and new - pngusr.dfa to reset the user limits to safe ones if PNG_SAFE_LIMITS is - defined. To enable, use "CPPFLAGS=-DPNG_SAFE_LIMITS_SUPPORTED=1" on the - configure command or put #define PNG_SAFE_LIMITS_SUPPORTED in - pnglibconf.h.prebuilt and pnglibconf.h. - -Version 1.6.0beta14 [February 27, 2012] - Added information about the new limits in the manual. - Updated Makefile.in - -Version 1.6.0beta15 [March 2, 2012] - Removed unused "current_text" members of png_struct and the png_free() - of png_ptr->current_text from pngread.c - Rewrote pngstest.c for substantial speed improvement. - Fixed transparent pixel and 16-bit rgb tests in pngstest and removed a - spurious check in pngwrite.c - Added PNG_IMAGE_FLAG_FAST for the benefit of applications that store - intermediate files, or intermediate in-memory data, while processing - image data with the simplified API. The option makes the files larger - but faster to write and read. pngstest now uses this by default; this - can be disabled with the --slow option. - Improved pngstest fine tuning of error numbers, new test file generator. - The generator generates images that test the full range of sample values, - allow the error numbers in pngstest to be tuned and checked. makepng - also allows generation of images with extra chunks, although this is - still work-in-progress. - Added check for invalid palette index while reading. - Fixed some bugs in ICC profile writing. The code should now accept - all potentially valid ICC profiles and reject obviously invalid ones. - It now uses png_error() to do so rather than casually writing a PNG - without the necessary color data. - Removed whitespace from the end of lines in all source files and scripts. - -Version 1.6.0beta16 [March 6, 2012] - Relocated palette-index checking function from pngrutil.c to pngtrans.c - Added palette-index checking while writing. - Changed png_inflate() and calling routines to avoid overflow problems. - This is an intermediate check-in that solves the immediate problems and - introduces one performance improvement (avoiding a copy via png_ptr->zbuf.) - Further changes will be made to make ICC profile handling more secure. - Fixed build warnings (MSVC, GCC, GCC v3). Cygwin GCC with default options - declares 'index' as a global, causing a warning if it is used as a local - variable. GCC 64-bit warns about assigning a (size_t) (unsigned 64-bit) - to an (int) (signed 32-bit). MSVC, however, warns about using the - unary '-' operator on an unsigned value (even though it is well defined - by ANSI-C to be ~x+1). The padding calculation was changed to use a - different method. Removed the tests on png_ptr->pass. - Added contrib/libtests/tarith.c to test internal arithmetic functions from - png.c. This is a libpng maintainer program used to validate changes to the - internal arithmetic functions. - Made read 'inflate' handling like write 'deflate' handling. The read - code now claims and releases png_ptr->zstream, like the write code. - The bug whereby the progressive reader failed to release the zstream - is now fixed, all initialization is delayed, and the code checks for - changed parameters on deflate rather than always calling - deflatedEnd/deflateInit. - Validate the zTXt strings in pngvalid. - Added code to validate the windowBits value passed to deflateInit2(). - If the call to deflateInit2() is wrong a png_warning will be issued - (in fact this is harmless, but the PNG data produced may be sub-optimal). - -Version 1.6.0beta17 [March 10, 2012] - Fixed PNG_LIBPNG_BUILD_BASE_TYPE definition. - Reject all iCCP chunks after the first, even if the first one is invalid. - Deflate/inflate was reworked to move common zlib calls into single - functions [rw]util.c. A new shared keyword check routine was also added - and the 'zbuf' is no longer allocated on progressive read. It is now - possible to call png_inflate() incrementally. A warning is no longer - issued if the language tag or translated keyword in the iTXt chunk - has zero length. - If benign errors are disabled use maximum window on ancilliary inflate. - This works round a bug introduced in 1.5.4 where compressed ancillary - chunks could end up with a too-small windowBits value in the deflate - header. - -Version 1.6.0beta18 [March 16, 2012] - Issue a png_benign_error() instead of png_warning() about bad palette index. - In pngtest, treat benign errors as errors if "-strict" is present. - Fixed an off-by-one error in the palette index checking function. - Fixed a compiler warning under Cygwin (Windows-7, 32-bit system) - Revised example.c to put text strings in a temporary character array - instead of directly assigning string constants to png_textp members. - This avoids compiler warnings when -Wwrite-strings is enabled. - Added output flushing to aid debugging under Visual Studio. Unfortunately - this is necessary because the VS2010 output window otherwise simply loses - the error messages on error (they weren't flushed to the window before - the process exited, apparently!) - Added configuration support for benign errors and changed the read - default. Also changed some warnings in the iCCP and sRGB handling - from to benign errors. Configuration now makes read benign - errors warnings and write benign errors to errors by default (thus - changing the behavior on read). The simplified API always forces - read benign errors to warnings (regardless of the system default, unless - this is disabled in which case the simplified API can't be built.) - -Version 1.6.0beta19 [March 18, 2012] - Work around for duplicate row start calls; added warning messages. - This turns on PNG_FLAG_DETECT_UNINITIALIZED to detect app code that - fails to call one of the 'start' routines (not enabled in libpng-1.5 - because it is technically an API change, since it did normally work - before.) It also makes duplicate calls to png_read_start_row (an - internal function called at the start of the image read) benign, as - they were before changes to use png_inflate_claim. Somehow webkit is - causing this to happen; this is probably a mis-feature in the zlib - changes so this commit is only a work-round. - Removed erroneous setting of DETECT_UNINITIALIZED and added more - checks. The code now does a png_error if an attempt is made to do the - row initialization twice; this is an application error and it has - serious consequences because the transform data in png_struct is - changed by each call. - Added application error reporting and added chunk names to read - benign errors; also added --strict to pngstest - not enabled - yet because a warning is produced. - Avoid the double gamma correction warning in the simplified API. - This allows the --strict option to pass in the pngstest checks - -Version 1.6.0beta20 [March 29, 2012] - Changed chunk handler warnings into benign errors, incrementally load iCCP - Added checksum-icc.c to contrib/tools - Prevent PNG_EXPAND+PNG_SHIFT doing the shift twice. - Recognize known sRGB ICC profiles while reading; prefer writing the - iCCP profile over writing the sRGB chunk, controlled by the - PNG_sRGB_PROFILE_CHECKS option. - Revised png_set_text_2() to avoid potential memory corruption (fixes - CVE-2011-3048, also known as CVE-2012-3425). - -Version 1.6.0beta21 [April 27, 2012] - Revised scripts/makefile.darwin: use system zlib; remove quotes around - architecture list; add missing ppc architecture; add architecture options - to shared library link; don't try to create a shared lib based on missing - RELEASE variable. - Enable png_set_check_for_invalid_index() for both read and write. - Removed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpriv.h around - declaration of png_handle_unknown(). - Added -lssp_nonshared in a comment in scripts/makefile.freebsd - and changed deprecated NOOBJ and NOPROFILE to NO_OBJ and NO_PROFILE. - -Version 1.6.0beta22 [May 23, 2012] - Removed need for -Wno-cast-align with clang. clang correctly warns on - alignment increasing pointer casts when -Wcast-align is passed. This - fixes the cases that clang warns about either by eliminating the - casts from png_bytep to png_uint_16p (pngread.c), or, for pngrutil.c - where the cast is previously verified or pngstest.c where it is OK, by - introducing new png_aligncast macros to do the cast in a way that clang - accepts. - -Version 1.6.0beta23 [June 6, 2012] - Revised CMakeLists.txt to not attempt to make a symlink under mingw. - Made fixes for new optimization warnings from gcc 4.7.0. The compiler - performs an optimization which is safe; however it then warns about it. - Changing the type of 'palette_number' in pngvalid.c removes the warning. - Do not depend upon a GCC feature macro being available for use in generating - the linker mapfile symbol prefix. - Improved performance of new do_check_palette_indexes() function (only - update the value when it actually increases, move test for whether - the check is wanted out of the function. - -Version 1.6.0beta24 [June 7, 2012] - Don't check palette indexes if num_palette is 0 (as it can be in MNG files). - -Version 1.6.0beta25 [June 16, 2012] - Revised png_set_keep_unknown_chunks() so num_chunks < 0 means ignore all - unknown chunks and all known chunks except for IHDR, PLTE, tRNS, IDAT, - and IEND. Previously it only meant ignore all unknown chunks, the - same as num_chunks == 0. Revised png_image_skip_unused_chunks() to - provide a list of chunks to be processed instead of a list of chunks to - ignore. Revised contrib/gregbook/readpng2.c accordingly. - -Version 1.6.0beta26 [July 10, 2012] - Removed scripts/makefile.cegcc from the *.zip and *.7z distributions; it - depends on configure, which is not included in those archives. - Moved scripts/chkfmt to contrib/tools. - Changed "a+w" to "u+w" in Makefile.in to fix CVE-2012-3386. - -Version 1.6.0beta27 [August 11, 2012] - Do not compile PNG_DEPRECATED, PNG_ALLOC and PNG_PRIVATE when __GNUC__ < 3. - Do not use __restrict when GNUC is <= 3.1 - Removed references to png_zalloc() and png_zfree() from the manual. - Fixed configurations where floating point is completely disabled. Because - of the changes to support symbol prefixing PNG_INTERNAL_FUNCTION declares - floating point APIs during libpng builds even if they are completely - disabled. This requires the png floating point types (png_double*) to be - declared even though the functions are never actually defined. This - change provides a dummy definition so that the declarations work, yet any - implementation will fail to compile because of an incomplete type. - Re-eliminated the use of strcpy() in pngtest.c. An unncessary use of - strcpy() was accidentally re-introduced in libpng16; this change replaces - it with strncpy(). - Eliminated use of png_sizeof(); use sizeof() instead. - Use a consistent style for (sizeof type) and (sizeof (array)) - Cleanup of png_set_filler(). This function does very different things on - read and write. In libpng 1.6 the two cases can be distinguished and - considerable code cleanup, and extra error checking, is possible. This - makes calls on the write side that have no effect be ignored with a - png_app_error(), which can be disabled in the app using - png_set_benign_errors(), and removes the spurious use of usr_channels - on the read side. - Insist on autotools 1.12.1 for git builds because there are security issues - with 1.12 and insisting on anything less would allow 1.12 to be used. - Removed info_ptr->signature[8] from WRITE-only builds. - Add some conditions for compiling png_fixed(). This is a small function - but it requires "-lm" on some platforms. - Cause pngtest --strict to fail on any warning from libpng (not just errors) - and cause it not to fail at the comparison step if libpng lacks support - for writing chunks that it reads from the input (currently only implemented - for compressed text chunks). - Make all three "make check" test programs work without READ or WRITE support. - Now "make check" will succeed even if libpng is compiled with -DPNG_NO_READ - or -DPNG_NO_WRITE. The tests performed are reduced, but the basic reading - and writing of a PNG file is always tested by one or more of the tests. - Consistently use strlen(), memset(), memcpy(), and memcmp() instead of the - png_strlen(), png_memset(), png_memcpy(), and png_memcmp() macros. - Removed the png_sizeof(), png_strlen(), png_memset(), png_memcpy(), and - png_memcmp() macros. - Work around gcc 3.x and Microsoft Visual Studio 2010 complaints. Both object - to the split initialization of num_chunks. - -Version 1.6.0beta28 [August 29, 2012] - Unknown handling fixes and clean up. This adds more correct option - control of the unknown handling, corrects the pre-existing bug where - the per-chunk 'keep' setting is ignored and makes it possible to skip - IDAT chunks in the sequential reader (broken in earlier 1.6 versions). - There is a new test program, test-unknown.c, which is a work in progress - (not currently part of the test suite). Comments in the header files now - explain how the unknown handling works. - Allow fine grain control of unknown chunk APIs. This change allows - png_set_keep_unknown_chunks() to be turned off if not required and causes - both read and write to behave appropriately (on read this is only possible - if the user callback is used to handle unknown chunks). The change - also removes the support for storing unknown chunks in the info_struct - if the only unknown handling enabled is via the callback, allowing libpng - to be configured with callback reading and none of the unnecessary code. - Corrected fix for unknown handling in pngtest. This reinstates the - libpng handling of unknown chunks other than vpAg and sTER (including - unsafe-to-copy chunks which were dropped before) and eliminates the - repositioning of vpAg and sTER in pngtest.png by changing pngtest.png - (so the chunks are where libpng would put them). - Added "tunknown" test and corrected a logic error in png_handle_unknown() - when SAVE support is absent. Moved the shell test scripts for - contrib/libtests from the libpng top directory to contrib/libtests. - png_handle_unknown() must always read or skip the chunk, if - SAVE_UNKNOWN_CHUNKS is turned off *and* the application does not set - a user callback an unknown chunk will not be read, leading to a read - error, which was revealed by the "tunknown" test. - Cleaned up and corrected ICC profile handling. - contrib/libtests/makepng: corrected 'rgb' and 'gray' cases. profile_error - messages could be truncated; made a correct buffer size calculation and - adjusted pngerror.c appropriately. png_icc_check_* checking improved; - changed the functions to receive the correct color type of the PNG on read - or write and check that it matches the color space of the profile (despite - what the comments said before, there is danger in assuming the app will - cope correctly with an RGB profile on a grayscale image and, since it - violates the PNG spec, allowing it is certain to produce inconsistent - app behavior and might even cause app crashes.) Check that profiles - contain the tags needed to process the PNG (tags all required by the ICC - spec). Removed unused PNG_STATIC from pngpriv.h. - -Version 1.6.0beta29 [September 4, 2012] - Fixed the simplified API example programs to add the *colormap parameter - to several of he API and improved the error message if the version field - is not set. - Added contrib/examples/* to the *.zip and *.7z distributions. - Updated simplified API synopses and description of the png_image structure - in the manual. - Made makepng and pngtest produce identical PNGs, add "--relaxed" option - to pngtest. The "--relaxed" option turns off the benign errors that are - enabled by default in pre-RC builds. makepng can now write ICC profiles - where the length has not been extended to a multiple of 4, and pngtest - now intercepts all libpng errors, allowing the previously-introduced - "--strict test" on no warnings to actually work. - Improved ICC profile handling including cHRM chunk generation and fixed - Cygwin+MSVC build errors. The ICC profile handling now includes more - checking. Several errors that caused rejection of the profile are now - handled with a warning in such a way that the invalid profiles will be - read by default in release (but not pre-RC) builds but will not be - written by default. The easy part of handling the cHRM chunk is written, - where the ICC profile contains the required data. The more difficult - part plus guessing a gAMA value requires code to pass selected RGB values - through the profile. - -Version 1.6.0beta30 [October 24, 2012] - Changed ICC profile matrix/vector types to not depend on array type rules. - By the ANSI-C standard the new types should be identical to the previous - versions, and all known versions of gcc tested with the previous versions - except for GCC-4.2.1 work with this version. The change makes the ANSI-C - rule that const applied to an array of elements applies instead to the - elements in the array moot by explicitly applying const to the base - elements of the png_icc_matrix and png_icc_vector types. The accidental - (harmless) 'const' previously applied to the parameters of two of the - functions have also been removed. - Added a work around for GCC 4.2 optimization bug. - Marked the broken (bad white point) original HP sRGB profiles correctly and - correct comments. - Added -DZ_SOLO to contrib/pngminim/*/makefile to work with zlib-1.2.7 - Use /MDd for vstudio debug builds. Also added pngunkown to the vstudio - builds, fixed build errors and corrected a minor exit code error in - pngvalid if the 'touch' file name is invalid. - Add updated WARNING file to projects/vstudio from libpng 1.5/vstudio - Fixed build when using #define PNG_NO_READ_GAMMA in png_do_compose() in - pngrtran.c (Domani Hannes). - -Version 1.6.0beta31 [November 1, 2012] - Undid the erroneous change to vstudio/pngvalid build in libpng-1.6.0beta30. - Made pngvalid so that it will build outside the libpng source tree. - Made builds -DPNG_NO_READ_GAMMA compile (the unit tests still fail). - Made PNG_NO_READ_GAMMA switch off interfaces that depend on READ_GAMMA. - Prior to 1.6.0 switching off READ_GAMMA did unpredictable things to the - interfaces that use it (specifically, png_do_background in 1.4 would - simply display composite for grayscale images but do composition - with the incorrect arithmetic for color ones). In 1.6 the semantic - of -DPNG_NO_READ_GAMMA is changed to simply disable any interface that - depends on it; this obliges people who set it to consider whether they - really want it off if they happen to use any of the interfaces in - question (typically most users who disable it won't). - Fixed GUIDs in projects/vstudio. Some were duplicated or missing, - resulting in VS2010 having to update the files. - Removed non-working ICC profile support code that was mostly added to - libpng-1.6.0beta29 and beta30. There was too much code for too little - gain; implementing full ICC color correction may be desireable but is left - up to applications. - -Version 1.6.0beta32 [November 25, 2012] - Fixed an intermittent SEGV in pngstest due to an uninitialized array element. - Added the ability for contrib/libtests/makepng.c to make a PNG with just one - color. This is useful for debugging pngstest color inaccuracy reports. - Fixed error checking in the simplified write API (Olaf van der Spek) - Made png_user_version_check() ok to use with libpng version 1.10.x and later. - -Version 1.6.0beta33 [December 15, 2012] - Fixed typo in png.c (PNG_SET_CHUNK_MALLOC_MAX should be PNG_CHUNK_MALLOC_MAX) - that causes the MALLOC_MAX limit not to work (John Bowler) - Change png_warning() to png_app_error() in pngwrite.c and comment the - fall-through condition. - Change png_warning() to png_app_warning() in png_write_tRNS(). - Rearranged the ARM-NEON optimizations: Isolated the machine specific code - to the hardware subdirectory and added comments to pngrutil.c so that - implementors of other optimizations know what to do. - Fixed cases of unquoted DESTDIR in Makefile.am - Rebuilt Makefile.in, etc., with autoconf-2.69 and automake-1.12.5. - -Version 1.6.0beta34 [December 19, 2012] - Cleaned up whitespace in the synopsis portion of the manpage "libpng.3" - Disassembled the version number in scripts/options.awk (necessary for - building on SunOs). - -Version 1.6.0beta35 [December 23, 2012] - Made default Zlib compression settings be configurable. This adds #defines to - pnglibconf.h to control the defaults. - Fixed Windows build issues, enabled ARM compilation. Various warnings issued - by earlier versions of GCC fixed for Cygwin and Min/GW (which both use old - GCCs.) ARM support is enabled by default in zlib.props (unsupported by - Microsoft) and ARM compilation is made possible by deleting the check for - x86. The test programs cannot be run because they are not signed. - -Version 1.6.0beta36 [January 2, 2013] - Discontinued distributing libpng-1.x.x.tar.bz2. - Discontinued distributing libpng-1.7.0-1.6.0-diff.txt and similar. - Rebuilt configure with autoconf-2.69 (inadvertently not done in beta33) - Fixed 'make distcheck' on SUN OS - libpng.so was not being removed - -Version 1.6.0beta37 [January 10, 2013] - Fixed conceivable but difficult to repro overflow. Also added two test - programs to generate and test a PNG which should have the problem. - -Version 1.6.0beta39 [January 19, 2013] - Again corrected attempt at overflow detection in png_set_unknown_chunks(). - Added overflow detection in png_set_sPLT() and png_set_text_2(). - -Version 1.6.0beta40 [January 20, 2013] - Use consistent handling of overflows in text, sPLT and unknown png_set_* APIs - -Version 1.6.0rc01 [January 26, 2013] - No changes. - -Version 1.6.0rc02 [February 4, 2013] - Added png_get_palette_max() function. - -Version 1.6.0rc03 [February 5, 2013] - Fixed the png_get_palette_max API. - -Version 1.6.0rc04 [February 7, 2013] - Turn serial tests back on (recently turned off by autotools upgrade). - -Version 1.6.0rc05 [February 8, 2013] - Update manual about png_get_palette_max(). - -Version 1.6.0rc06 [February 9, 2013] - Fixed missing dependency in --prefix builds The intermediate - internal 'prefix.h' file can only be generated correctly after - pnglibconf.h, however the dependency was not in Makefile.am. The - symptoms are unpredictable depending on the order make chooses to - build pngprefix.h and pnglibconf.h, often the error goes unnoticed - because there is a system pnglibconf.h to use instead. - -Version 1.6.0rc07 [February 10, 2013] - Enclosed the new png_get_palette_max in #ifdef PNG_GET_PALETTE_MAX_SUPPORTED - block, and revised pnglibconf.h and pnglibconf.h.prebuilt accordingly. - -Version 1.6.0rc08 [February 10, 2013] - Fix typo in png.h #ifdef - -Version 1.6.0 [February 14, 2013] - No changes. - -Version 1.6.1beta01 [February 16, 2013] - Made symbol prefixing work with the ARM neon optimizations. Also allow - pngpriv.h to be included for preprocessor definitions only, so it can - be used in non-C/C++ files. Back ported from libpng 1.7. - Made sRGB check numbers consistent. - Ported libpng 1.5 options.awk/dfn file handling to 1.6, fixed one bug. - Removed cc -E workround, corrected png_get_palette_max API Tested on - SUN OS cc 5.9, which demonstrates the tokenization problem previously - avoided by using /lib/cpp. Since all .dfn output is now protected in - double quotes unless it is to be macro substituted the fix should - work everywhere. - Enabled parallel tests - back ported from libpng-1.7. - scripts/pnglibconf.dfa formatting improvements back ported from libpng17. - Fixed a race condition in the creation of the build 'scripts' directory - while building with a parallel make. - Use approved/supported Android method to check for NEON, use Linux/POSIX - 1003.1 API to check /proc/self/auxv avoiding buffer allocation and other - library calls (ported from libpng15). - -Version 1.6.1beta02 [February 19, 2013] - Use parentheses more consistently in "#if defined(MACRO)" tests. - Folded long lines. - Reenabled code to allow zero length PLTE chunks for MNG. - -Version 1.6.1beta03 [February 22, 2013] - Fixed ALIGNED_MEMORY support. - Allow run-time ARM NEON checking to be disabled. A new configure option: - --enable-arm-neon=always will stop the run-time checks. New checks - within arm/arm_init.c will cause the code not to be compiled unless - __ARM_NEON__ is set. This should make it fail safe (if someone asks - for it on then the build will fail if it can't be done.) - Updated the INSTALL document. - -Version 1.6.1beta04 [February 27, 2013] - Revised INSTALL to recommend using CPPFLAGS instead of INCLUDES. - Revised scripts/makefile.freebsd to respect ZLIBLIB and ZLIBINC. - Revised scripts/dfn.awk to work with the buggy MSYS awk that has trouble - with CRLF line endings. - -Version 1.6.1beta05 [March 1, 2013] - Avoid a possible memory leak in contrib/gregbook/readpng.c - -Version 1.6.1beta06 [March 4, 2013] - Better documentation of unknown handling API interactions. - Corrected Android builds and corrected libpng.vers with symbol - prefixing This adds an API to set optimization options externally, - providing an alternative and general solution for the non-portable - run-time tests used by the ARM Neon code. It also makes those tests - compile and link on Android. - The order of settings vs options in pnglibconf.h is reversed to allow - settings to depend on options and options can now set (or override) the - defaults for settings. - -Version 1.6.1beta07 [March 7, 2013] - Corrected simplified API default gamma for color-mapped output, added - a flag to change default. In 1.6.0 when the simplified API was used - to produce color-mapped output from an input image with no gamma - information the gamma assumed for the input could be different from - that assumed for non-color-mapped output. In particular 16-bit depth - input files were assumed to be sRGB encoded, whereas in the 'direct' - case they were assumed to have linear data. This was an error. The - fix makes the simplified API treat all input files the same way and - adds a new flag to the png_image::flags member to allow the - application/user to specify that 16-bit files contain sRGB data - rather than the default linear. - Fixed bugs in the pngpixel and makepng test programs. - -Version 1.6.1beta08 [March 7, 2013] - Fixed CMakelists.txt to allow building a single variant of the library - (Claudio Bley): - Introduced a PNG_LIB_TARGETS variable that lists all activated library - targets. It is an error if this variable ends up empty, ie. you have - to build at least one library variant. - Made the *_COPY targets only depend on library targets actually being build. - Use PNG_LIB_TARGETS to unify a code path. - Changed the CREATE_SYMLINK macro to expect the full path to a file as the - first argument. When symlinking the filename component of that path is - determined and used as the link target. - Use copy_if_different in the CREATE_SYMLINK macro. - -Version 1.6.1beta09 [March 13, 2013] - Eliminated two warnings from the Intel C compiler. The warnings are - technically valid, although a reasonable treatment of division would - show it to be incorrect. - -Version 1.6.1rc01 [March 21, 2013] - No changes. - -Version 1.6.1 [March 28, 2013] - No changes. - -Version 1.6.2beta01 [April 14, 2013] - Updated documentation of 1.5.x to 1.6.x changes in iCCP chunk handling. - Fixed incorrect warning of excess deflate data. End condition - the - warning would be produced if the end of the deflate stream wasn't read - in the last row. The warning is harmless. - Corrected the test on user transform changes on read. It was in the - png_set of the transform function, but that doesn't matter unless the - transform function changes the rowbuf size, and that is only valid if - transform_info is called. - Corrected a misplaced closing bracket in contrib/libtests/pngvalid.c - (Flavio Medeiros). - Corrected length written to uncompressed iTXt chunks (Samuli Suominen). - Bug was introduced in libpng-1.6.0. - -Version 1.6.2rc01 [April 18, 2013] - Added contrib/tools/fixitxt.c, to repair the erroneous iTXt chunk length - written by libpng-1.6.0 and 1.6.1. - Disallow storing sRGB information when the sRGB is not supported. - -Version 1.6.2rc02 [April 18, 2013] - Merge pngtest.c with libpng-1.7.0 - -Version 1.6.2rc03 [April 22, 2013] - Trivial spelling cleanup. - -Version 1.6.2rc04 and 1.6.2rc05 [omitted] - -Version 1.6.2rc06 [April 24, 2013] - Reverted to version 1.6.2rc03. Recent changes to arm/neon support - have been ported to libpng-1.7.0beta09 and will reappear in version - 1.6.3beta01. - -Version 1.6.2 [April 25, 2013] - No changes. - -Version 1.6.3beta01 [April 25, 2013] - Revised stack marking in arm/filter_neon.S and configure.ac. - Ensure that NEON filter stuff is completely disabled when switched 'off'. - Previously the ARM NEON specific files were still built if the option - was switched 'off' as opposed to being explicitly disabled. - -Version 1.6.3beta02 [April 26, 2013] - Test for 'arm*' not just 'arm' in the host_cpu configure variable. - Rebuilt the configure scripts. - -Version 1.6.3beta03 [April 30, 2013] - Expanded manual paragraph about writing private chunks, particularly - the need to call png_set_keep_unknown_chunks() when writing them. - Avoid dereferencing NULL pointer possibly returned from - png_create_write_struct() (Andrew Church). - -Version 1.6.3beta05 [May 9, 2013] - Calculate our own zlib windowBits when decoding rather than trusting the - CMF bytes in the PNG datastream. - Added an option to force maximum window size for inflating, which was - the behavior of libpng15 and earlier. - Added png-fix-itxt and png-fix-too-far-back to the built programs and - removed warnings from the source code and timepng that are revealed as - a result. - Detect wrong libpng versions linked to png-fix-too-far-back, which currently - only works with libpng versions that can be made to reliably fail when - the deflate data contains an out-of-window reference. This means only - 1.6 and later. - Fixed gnu issues: g++ needs a static_cast, gcc 4.4.7 has a broken warning - message which it is easier to work round than ignore. - Updated contrib/pngminus/pnm2png.c (Paul Stewart): - Check for EOF - Ignore "#" delimited comments in input file to pnm2png.c. - Fixed whitespace handling - Added a call to png_set_packing() - Initialize dimension values so if sscanf fails at least we have known - invalid values. - Attempt to detect configuration issues with png-fix-too-far-back, which - requires both the correct libpng and the correct zlib to function - correctly. - Check ZLIB_VERNUM for mismatches, enclose #error in quotes - Added information in the documentation about problems with and fixes for - the bad CRC and bad iTXt chunk situations. - -Version 1.6.3beta06 [May 12, 2013] - Allow contrib/pngminus/pnm2png.c to compile without WRITE_INVERT and - WRITE_PACK supported (writes error message that it can't read P1 or - P4 PBM files). - Improved png-fix-too-far-back usage message, added --suffix option. - Revised contrib/pngminim/*/makefile to generate pnglibconf.h with the - right zlib header files. - Separated CPPFLAGS and CFLAGS in contrib/pngminim/*/makefile - -Version 1.6.3beta07 [June 8, 2013] - Removed a redundant test in png_set_IHDR(). - Added set(CMAKE_CONFIGURATION_TYPES ...) to CMakeLists.txt (Andrew Hundt) - Deleted set(CMAKE_BUILD_TYPE) block from CMakeLists.txt - Enclose the prototypes for the simplified write API in - #ifdef PNG_STDIO_SUPPORTED/#endif - Make ARM NEON support work at compile time (not just configure time). - This moves the test on __ARM_NEON__ into pngconf.h to avoid issues when - using a compiler that compiles for multiple architectures at one time. - Removed PNG_FILTER_OPTIMIZATIONS and PNG_ARM_NEON_SUPPORTED from - pnglibconf.h, allowing more of the decisions to be made internally - (pngpriv.h) during the compile. Without this, symbol prefixing is broken - under certain circumstances on ARM platforms. Now only the API parts of - the optimizations ('check' vs 'api') are exposed in the public header files - except that the new setting PNG_ARM_NEON_OPT documents how libpng makes the - decision about whether or not to use the optimizations. - Protect symbol prefixing against CC/CPPFLAGS/CFLAGS useage. - Previous iOS/Xcode fixes for the ARM NEON optimizations moved the test - on __ARM_NEON__ from configure time to compile time. This breaks symbol - prefixing because the definition of the special png_init_filter_functions - call was hidden at configure time if the relevant compiler arguments are - passed in CFLAGS as opposed to CC. This change attempts to avoid all - the confusion that would result by declaring the init function even when - it is not used, so that it will always get prefixed. - -Version 1.6.3beta08 [June 18, 2013] - Revised libpng.3 so that "doclifter" can process it. - -Version 1.6.3beta09 [June 27, 2013] - Revised example.c to illustrate use of PNG_DEFAULT_sRGB and PNG_GAMMA_MAC_18 - as parameters for png_set_gamma(). These have been available since - libpng-1.5.4. - Renamed contrib/tools/png-fix-too-far-back.c to pngfix.c and revised it - to check all compressed chunks known to libpng. - -Version 1.6.3beta10 [July 5, 2013] - Updated documentation to show default behavior of benign errors correctly. - Only compile ARM code when PNG_READ_SUPPORTED is defined. - Fixed undefined behavior in contrib/tools/pngfix.c and added new strip - option. pngfix relied on undefined behavior and even a simple change from - gcc to g++ caused it to fail. The new strip option 'unsafe' has been - implemented and is the default if --max is given. Option names have - been clarified, with --strip=transform now stripping the bKGD chunk, - which was stripped previously with --strip=unused. - Added all documented chunk types to pngpriv.h - Unified pngfix.c source with libpng17. - -Version 1.6.3rc01 [July 11, 2013] - No changes. - -Version 1.6.3 [July 18, 2013] - Revised manual about changes in iTXt chunk handling made in libpng-1.6.0. - Added "/* SAFE */" comments in pngrutil.c and pngrtran.c where warnings - may be erroneously issued by code-checking applications. - -Version 1.6.4beta01 [August 21, 2013] - Added information about png_set_options() to the manual. - Delay calling png_init_filter_functions() until a row with nonzero filter - is found. - -Version 1.6.4beta02 [August 30, 2013] - Fixed inconsistent conditional compilation of png_chunk_unknown_handling() - prototype, definition, and usage. Made it depend on - PNG_HANDLE_AS_UNKNOWN_SUPPORTED everywhere. - -Version 1.6.4rc01 [September 5, 2013] - No changes. - -Version 1.6.4 [September 12, 2013] - No changes. - -Version 1.6.5 [September 14, 2013] - Removed two stray lines of code from arm/arm_init.c. - -Version 1.6.6 [September 16, 2013] - Removed two stray lines of code from arm/arm_init.c, again. - -Version 1.6.7beta01 [September 30, 2013] - Revised unknown chunk code to correct several bugs in the NO_SAVE_/NO_WRITE - combination - Allow HANDLE_AS_UNKNOWN to work when other options are configured off. Also - fixed the pngminim makefiles to work when $(MAKEFLAGS) contains stuff - which terminates the make options (as by default in recent versions of - Gentoo). - Avoid up-cast warnings in pngvalid.c. On ARM the alignment requirements of - png_modifier are greater than that of png_store and as a consequence - compilation of pngvalid.c results in a warning about increased alignment - requirements because of the bare cast to (png_modifier*). The code is safe, - because the pointer is known to point to a stack allocated png_modifier, - but this change avoids the warning. - Fixed default behavior of ARM_NEON_API. If the ARM NEON API option was - compiled without the CHECK option it defaulted to on, not off. - Check user callback behavior in pngunknown.c. Previous versions compiled - if SAVE_UNKNOWN was not available but did nothing since the callback - was never implemented. - Merged pngunknown.c with 1.7 version and back ported 1.7 improvements/fixes - -Version 1.6.7beta02 [October 12, 2013] - Made changes for compatibility with automake 1.14: - 1) Added the 'compile' program to the list of programs that must be cleaned - in autogen.sh - 2) Added 'subdir-objects' which causes .c files in sub-directories to be - compiled such that the corresponding .o files are also in the - sub-directory. This is because automake 1.14 warns that the - current behavior of compiling to the top level directory may be removed - in the future. - 3) Updated dependencies on pnglibconf.h to match the new .o locations and - added all the files in contrib/libtests and contrib/tools that depend - on pnglibconf.h - 4) Added 'BUILD_SOURCES = pnglibconf.h'; this is the automake recommended - way of handling the dependencies of sources that are machine generated; - unfortunately it only works if the user does 'make all' or 'make check', - so the dependencies (3) are still required. - Cleaned up (char*) casts of zlib messages. The latest version of the Intel C - compiler complains about casting a string literal as (char*), so copied the - treatment of z_const from the library code into pngfix.c - Simplified error message code in pngunknown. The simplification has the - useful side effect of avoiding a bogus warning generated by the latest - version of the Intel C compiler (it objects to - condition ? string-literal : string-literal). - Make autogen.sh work with automake 1.13 as well as 1.14. Do this by always - removing the 1.14 'compile' script but never checking for it. - -Version 1.6.7beta03 [October 19, 2013] - Added ARMv8 support (James Yu ). Added file - arm/filter_neon_intrinsics.c; enable with -mfpu=neon. - Revised pngvalid to generate size images with as many filters as it can - manage, limited by the number of rows. - Cleaned up ARM NEON compilation handling. The tests are now in pngpriv.h - and detect the broken GCC compilers. - -Version 1.6.7beta04 [October 26, 2013] - Allow clang derived from older GCC versions to use ARM intrinsics. This - causes all clang builds that use -mfpu=neon to use the intrinsics code, - not the assembler code. This has only been tested on iOS 7. It may be - necessary to exclude some earlier clang versions but this seems unlikely. - Changed NEON implementation selection mechanism. This allows assembler - or intrinsics to be turned on at compile time during the build by defining - PNG_ARM_NEON_IMPLEMENTATION to the correct value (2 or 1). This macro - is undefined by default and the build type is selected in pngpriv.h. - -Version 1.6.7rc01 [November 2, 2013] - No changes. - -Version 1.6.7rc02 [November 7, 2013] - Fixed #include in filter_neon_intrinsics.c and ctype macros. The ctype char - checking macros take an unsigned char argument, not a signed char. - -Version 1.6.7 [November 14, 2013] - No changes. - -Version 1.6.8beta01 [November 24, 2013] - Moved prototype for png_handle_unknown() in pngpriv.h outside of - the #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED/#endif block. - Added "-Wall" to CFLAGS in contrib/pngminim/*/makefile - Conditionally compile some unused functions reported by -Wall in - pngminim. - Fixed 'minimal' builds. Various obviously useful minimal configurations - don't build because of missing contrib/libtests test programs and - overly complex dependencies in scripts/pnglibconf.dfa. This change - adds contrib/conftest/*.dfa files that can be used in automatic build - scripts to ensure that these configurations continue to build. - Enabled WRITE_INVERT and WRITE_PACK in contrib/pngminim/encoder. - Fixed pngvalid 'fail' function declaration on the Intel C Compiler. - This reverts to the previous 'static' implementation and works round - the 'unused static function' warning by using PNG_UNUSED(). - -Version 1.6.8beta02 [November 30, 2013] - Removed or marked PNG_UNUSED some harmless "dead assignments" reported - by clang scan-build. - Changed tabs to 3 spaces in png_debug macros and changed '"%s"m' - to '"%s" m' to improve portability among compilers. - Changed png_free_default() to free() in pngtest.c - -Version 1.6.8beta03 [December 1, 2013] - Tidied up pngfix inits and fixed pngtest no-write builds. - -Send comments/corrections/commendations to png-mng-implement at lists.sf.net -(subscription required; visit -https://lists.sourceforge.net/lists/listinfo/png-mng-implement -to subscribe) -or to glennrp at users.sourceforge.net - -Glenn R-P -#endif diff --git a/libpng16/CMakeLists.txt b/libpng16/CMakeLists.txt deleted file mode 100644 index 9b7f444..0000000 --- a/libpng16/CMakeLists.txt +++ /dev/null @@ -1,364 +0,0 @@ -# CMakeLists.txt - -# Copyright (C) 2007-2013 Glenn Randers-Pehrson - -# This code is released under the libpng license. -# For conditions of distribution and use, see the disclaimer -# and license in png.h - -cmake_minimum_required(VERSION 2.4.4) -set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) - -set(CMAKE_CONFIGURATION_TYPES "Release;Debug;MinSizeRel;RelWithDebInfo") - -project(libpng C) -enable_testing() - -set(PNGLIB_MAJOR 1) -set(PNGLIB_MINOR 6) -set(PNGLIB_RELEASE 8) -set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) -set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) - -# needed packages -find_package(ZLIB REQUIRED) -include_directories(${ZLIB_INCLUDE_DIR}) - -if(NOT WIN32) - find_library(M_LIBRARY - NAMES m - PATHS /usr/lib /usr/local/lib - ) - if(NOT M_LIBRARY) - message(STATUS - "math library 'libm' not found - floating point support disabled") - endif() -else() - # not needed on windows - set(M_LIBRARY "") -endif() - -# COMMAND LINE OPTIONS -if(DEFINED PNG_SHARED) - option(PNG_SHARED "Build shared lib" ${PNG_SHARED}) -else() - option(PNG_SHARED "Build shared lib" ON) -endif() -if(DEFINED PNG_STATIC) - option(PNG_STATIC "Build static lib" ${PNG_STATIC}) -else() - option(PNG_STATIC "Build static lib" ON) -endif() - -option(PNG_TESTS "Build libpng tests" YES) - -# Many more configuration options could be added here -option(PNG_DEBUG "Build with debug output" NO) -option(PNGARG "Disable ANSI-C prototypes" NO) - -# SET LIBNAME -set(PNG_LIB_NAME png${PNGLIB_MAJOR}${PNGLIB_MINOR}) - -# to distinguish between debug and release lib -set(CMAKE_DEBUG_POSTFIX "d") - -# Use the prebuilt pnglibconf.h file from the scripts folder -# TODO: fix this by building with awk; without this no cmake build can be -# configured directly (to do so indirectly use your local awk to build a -# pnglibconf.h in the build directory.) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.h.prebuilt - ${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) - -# OUR SOURCES -set(libpng_public_hdrs - png.h - pngconf.h - ${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h -) -set(libpng_sources - ${libpng_public_hdrs} - pngdebug.h - pnginfo.h - pngpriv.h - pngstruct.h - png.c - pngerror.c - pngget.c - pngmem.c - pngpread.c - pngread.c - pngrio.c - pngrtran.c - pngrutil.c - pngset.c - pngtrans.c - pngwio.c - pngwrite.c - pngwtran.c - pngwutil.c -) -set(pngtest_sources - pngtest.c -) -set(pngvalid_sources - contrib/libtests/pngvalid.c -) -set(pngstest_sources - contrib/libtests/pngstest.c -) -# SOME NEEDED DEFINITIONS - -if(MSVC) - add_definitions(-D_CRT_SECURE_NO_DEPRECATE) -endif(MSVC) - -if(PNG_DEBUG) - add_definitions(-DPNG_DEBUG) -endif() - -# NOW BUILD OUR TARGET -include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${ZLIB_INCLUDE_DIR}) - -unset(PNG_LIB_TARGETS) - -if(PNG_SHARED) - add_library(${PNG_LIB_NAME} SHARED ${libpng_sources}) - set(PNG_LIB_TARGETS ${PNG_LIB_NAME}) - if(MSVC) - # msvc does not append 'lib' - do it here to have consistent name - set_target_properties(${PNG_LIB_NAME} PROPERTIES PREFIX "lib") - set_target_properties(${PNG_LIB_NAME} PROPERTIES IMPORT_PREFIX "lib") - endif() - target_link_libraries(${PNG_LIB_NAME} ${ZLIB_LIBRARY} ${M_LIBRARY}) -endif() - -if(PNG_STATIC) -# does not work without changing name - set(PNG_LIB_NAME_STATIC ${PNG_LIB_NAME}_static) - add_library(${PNG_LIB_NAME_STATIC} STATIC ${libpng_sources}) - list(APPEND PNG_LIB_TARGETS ${PNG_LIB_NAME_STATIC}) - if(MSVC) - # msvc does not append 'lib' - do it here to have consistent name - set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES PREFIX "lib") - endif() - target_link_libraries(${PNG_LIB_NAME_STATIC} ${ZLIB_LIBRARY} ${M_LIBRARY}) -endif() - -if(NOT PNG_LIB_TARGETS) - message(SEND_ERROR - "No library variant selected to build. " - "Please enable at least one of the following options: PNG_STATIC, PNG_SHARED") -endif() - -if(PNG_SHARED AND WIN32) - set_target_properties(${PNG_LIB_NAME} PROPERTIES DEFINE_SYMBOL PNG_BUILD_DLL) -endif() - -if(PNG_TESTS AND PNG_SHARED) - # does not work with msvc due to png_lib_ver issue - add_executable(pngtest ${pngtest_sources}) - target_link_libraries(pngtest ${PNG_LIB_NAME}) - add_test(pngtest ./pngtest ${CMAKE_CURRENT_SOURCE_DIR}/pngtest.png) - # - add_executable(pngvalid ${pngvalid_sources}) - target_link_libraries(pngvalid ${PNG_LIB_NAME}) - add_test(pngvalid ./pngvalid) - add_executable(pngstest ${pngstest_sources}) - target_link_libraries(pngstest ${PNG_LIB_NAME}) - add_test(pngstest ./pngstest - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn0g01.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn0g02.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn0g04.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn0g08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn0g16.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn2c08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn2c16.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn3p01.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn3p02.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn3p04.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn3p08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn4a08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn4a16.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn6a08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn6a16.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbbn0g01.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbbn0g02.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbbn0g04.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbbn2c16.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbbn3p08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbgn2c16.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbgn3p08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbrn2c08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbwn0g16.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbwn3p08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbyn3p08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftp0n0g08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftp0n2c08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftp0n3p08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftp1n3p08.png - ) -endif() - -# Ensure the CMAKE_LIBRARY_OUTPUT_DIRECTORY is set -IF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY) - SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "lib") -ENDIF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY) - -# Set a variable with CMake code which: -# Creates a symlink from src to dest (if possible) or alternatively -# copies if different. -macro(CREATE_SYMLINK SRC_FILE DEST_FILE) - FILE(REMOVE ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE}) - if(WIN32 AND NOT CYGWIN AND NOT MSYS) - ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${DEST_FILE} - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${SRC_FILE}" ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE} - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${SRC_FILE}" ${CMAKE_CURRENT_BINARY_DIR}/${DEST_FILE} - DEPENDS ${PNG_LIB_TARGETS} - ) - ADD_CUSTOM_TARGET(${DEST_FILE}_COPY ALL DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE}) - else(WIN32 AND NOT CYGWIN AND NOT MSYS) - get_filename_component(LINK_TARGET "${SRC_FILE}" NAME) - execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${LINK_TARGET}" ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) - execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${LINK_TARGET}" ${DEST_FILE} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) - endif(WIN32 AND NOT CYGWIN AND NOT MSYS) -endmacro() - -# libpng is a library so default to 'lib' -if(NOT DEFINED CMAKE_INSTALL_LIBDIR) - set(CMAKE_INSTALL_LIBDIR lib) -endif(NOT DEFINED CMAKE_INSTALL_LIBDIR) - -# CREATE PKGCONFIG FILES -# we use the same files like ./configure, so we have to set its vars -# Only do this on Windows for Cygwin - the files don't make much sense outside -# a UNIX look alike -if(NOT WIN32 OR CYGWIN OR MINGW) - set(prefix ${CMAKE_INSTALL_PREFIX}) - set(exec_prefix ${CMAKE_INSTALL_PREFIX}) - set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) - set(includedir ${CMAKE_INSTALL_PREFIX}/include) - set(LIBS "-lz -lm") - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY) - CREATE_SYMLINK(${PNGLIB_NAME}.pc libpng.pc) - - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in - ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config @ONLY) - CREATE_SYMLINK(${PNGLIB_NAME}-config libpng-config) -endif(NOT WIN32 OR CYGWIN OR MINGW) - -# SET UP LINKS -if(PNG_SHARED) - set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 16.${PNGLIB_RELEASE}.1.6.8beta03 - VERSION 16.${PNGLIB_RELEASE}.0 - SOVERSION 16 - CLEAN_DIRECT_OUTPUT 1) -endif() -if(PNG_STATIC) - # MSVC doesn't use a different file extension for shared vs. static - # libs. We are able to change OUTPUT_NAME to remove the _static - # for all other platforms. - if(NOT MSVC) - set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES - OUTPUT_NAME ${PNG_LIB_NAME} - CLEAN_DIRECT_OUTPUT 1) - endif() -endif() - -# If CMake > 2.4.x, we set a variable used below to export -# targets to an export file. -# TODO: Use VERSION_GREATER after our cmake_minimum_required >= 2.6.2 -if(CMAKE_MAJOR_VERSION GREATER 1 AND CMAKE_MINOR_VERSION GREATER 4) - set(PNG_EXPORT_RULE EXPORT libpng) -elseif(CMAKE_MAJOR_VERSION GREATER 2) # future proof - set(PNG_EXPORT_RULE EXPORT libpng) -endif() - -# INSTALL -if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) - install(TARGETS ${PNG_LIB_TARGETS} - ${PNG_EXPORT_RULE} - RUNTIME DESTINATION bin - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - if(PNG_SHARED) - # Create a symlink for libpng.dll.a => libpng16.dll.a on Cygwin - if(CYGWIN OR MINGW) - get_target_property(BUILD_TARGET_LOCATION ${PNG_LIB_NAME} LOCATION_${CMAKE_BUILD_TYPE}) - CREATE_SYMLINK(${BUILD_TARGET_LOCATION} libpng${CMAKE_IMPORT_LIBRARY_SUFFIX}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_IMPORT_LIBRARY_SUFFIX} - DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif(CYGWIN OR MINGW) - - if(NOT WIN32) - get_target_property(BUILD_TARGET_LOCATION ${PNG_LIB_NAME} LOCATION_${CMAKE_BUILD_TYPE}) - CREATE_SYMLINK(${BUILD_TARGET_LOCATION} libpng${CMAKE_SHARED_LIBRARY_SUFFIX}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_SHARED_LIBRARY_SUFFIX} - DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif(NOT WIN32) - endif(PNG_SHARED) - - if(PNG_STATIC) - if(NOT WIN32 OR CYGWIN OR MINGW) - get_target_property(BUILD_TARGET_LOCATION ${PNG_LIB_NAME_STATIC} LOCATION_${CMAKE_BUILD_TYPE}) - CREATE_SYMLINK(${BUILD_TARGET_LOCATION} libpng${CMAKE_STATIC_LIBRARY_SUFFIX}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_STATIC_LIBRARY_SUFFIX} - DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif(NOT WIN32 OR CYGWIN OR MINGW) - endif() -endif() - -if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL ) - install(FILES ${libpng_public_hdrs} DESTINATION include) - install(FILES ${libpng_public_hdrs} DESTINATION include/${PNGLIB_NAME}) -endif() -if(NOT SKIP_INSTALL_EXECUTABLES AND NOT SKIP_INSTALL_ALL ) - if(NOT WIN32 OR CYGWIN OR MINGW) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config DESTINATION bin) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config - DESTINATION bin) - endif(NOT WIN32 OR CYGWIN OR MINGW) -endif() - -if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL ) - # Install man pages - if(NOT PNG_MAN_DIR) - set(PNG_MAN_DIR "share/man") - endif() - install(FILES libpng.3 libpngpf.3 DESTINATION ${PNG_MAN_DIR}/man3) - install(FILES png.5 DESTINATION ${PNG_MAN_DIR}/man5) - # Install pkg-config files - if(NOT WIN32 OR CYGWIN OR MINGW) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config - DESTINATION bin) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config - DESTINATION bin) - endif(NOT WIN32 OR CYGWIN OR MINGW) -endif() - -# On versions of CMake that support it, create an export file CMake -# users can include() to import our targets -if(PNG_EXPORT_RULE AND NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL ) - install(EXPORT libpng DESTINATION lib/libpng FILE lib${PNG_LIB_NAME}.cmake) -endif() - -# what's with libpng-$VER%.txt and all the extra files? - -# UNINSTALL -# do we need this? - -# DIST -# do we need this? - -# to create msvc import lib for mingw compiled shared lib -# pexports libpng.dll > libpng.def -# lib /def:libpng.def /machine:x86 - diff --git a/libpng16/INSTALL b/libpng16/INSTALL deleted file mode 100644 index f987378..0000000 --- a/libpng16/INSTALL +++ /dev/null @@ -1,170 +0,0 @@ - -Installing libpng - -On Unix/Linux and similar systems, you can simply type - - ./configure [--prefix=/path] - make check - make install - -and ignore the rest of this document. - -If configure does not work on your system, or if you have a need to -change configure.ac or Makefile.am, and you have a reasonably -up-to-date set of tools, running ./autogen.sh in a git clone before -running ./configure may fix the problem. To be really sure that you -aren't using any of the included pre-built scripts, you can do this: - - ./configure --enable-maintainer-mode - make maintainer-clean - ./autogen.sh --maintainer --clean - ./autogen.sh --maintainer - ./configure [--prefix=/path] [other options] - make - make install - make check - -Instead, you can use one of the custom-built makefiles in the -"scripts" directory - - cp scripts/makefile.system makefile - make test - make install - -The files that are presently available in the scripts directory -are listed and described in scripts/README.txt. - -Or you can use one of the "projects" in the "projects" directory. - -Before installing libpng, you must first install zlib, if it -is not already on your system. zlib can usually be found -wherever you got libpng. zlib can be placed in another directory, -at the same level as libpng. - -If your system already has a preinstalled zlib you will still need -to have access to the zlib.h and zconf.h include files that -correspond to the version of zlib that's installed. - -If you wish to test with a particular zlib that is not first in the -standard library search path, put ZLIBLIB, ZLIBINC, CPPFLAGS, LDFLAGS, -and LD_LIBRARY_PATH in your environment before running "make test" -or "make distcheck": - -ZLIBLIB=/path/to/lib export ZLIBLIB -ZLIBINC=/path/to/include export ZLIBINC -CPPFLAGS="-I$ZLIBINC" export CPPFLAGS -LDFLAGS="-L$ZLIBLIB" export LDFLAGS -LD_LIBRARY_PATH="$ZLIBLIB:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH - -If you are using one of the makefile scripts, put ZLIBLIB and ZLIBINC -in your environment and type "make ZLIBLIB=$ZLIBLIB ZLIBINC=$ZLIBINC test". - -If you want to use "cmake" (see www.cmake.org), type - - cmake . -DCMAKE_INSTALL_PREFIX=/path - make - make install - -You can rename the directories that you downloaded (they -might be called "libpng-x.y.z" or "libpngNN" and "zlib-1.2.7" -or "zlib127") so that you have directories called "zlib" and "libpng". - -Your directory structure should look like this: - - .. (the parent directory) - libpng (this directory) - INSTALL (this file) - README - *.h - *.c - CMakeLists.txt => "cmake" script - configuration files: - configure.ac, configure, Makefile.am, Makefile.in, - autogen.sh, config.guess, ltmain.sh, missing, libpng.pc.in, - libpng-config.in, aclocal.m4, config.h.in, config.sub, - depcomp, install-sh, mkinstalldirs, test-pngtest.sh - contrib - gregbook - libtests - pngminim - pngminus - pngsuite - visupng - projects - visualc71 - vstudio - scripts - makefile.* - *.def (module definition files) - etc. - pngtest.png - etc. - zlib - README - *.h - *.c - contrib - etc. - -If the line endings in the files look funny, you may wish to get the other -distribution of libpng. It is available in both tar.gz (UNIX style line -endings) and zip (DOS style line endings) formats. - -If you are building libpng with MSVC, you can enter the -libpng projects\visualc6 or visualc71 directory and follow the instructions -in README.txt. - -Otherwise enter the zlib directory and follow the instructions in zlib/README, -then come back here and run "configure" or choose the appropriate -makefile.sys in the scripts directory. - -Copy the file (or files) that you need from the -scripts directory into this directory, for example - - MSDOS example: copy scripts\makefile.msc makefile - UNIX example: cp scripts/makefile.std makefile - -Read the makefile to see if you need to change any source or -target directories to match your preferences. - -Then read pnglibconf.dfa to see if you want to make any configuration -changes. - -Then just run "make" which will create the libpng library in -this directory and "make test" which will run a quick test that reads -the "pngtest.png" file and writes a "pngout.png" file that should be -identical to it. Look for "9782 zero samples" in the output of the -test. For more confidence, you can run another test by typing -"pngtest pngnow.png" and looking for "289 zero samples" in the output. -Also, you can run "pngtest -m contrib/pngsuite/*.png" and compare -your output with the result shown in contrib/pngsuite/README. - -Most of the makefiles will allow you to run "make install" to -put the library in its final resting place (if you want to -do that, run "make install" in the zlib directory first if necessary). -Some also allow you to run "make test-installed" after you have -run "make install". - -Further information can be found in the README and libpng-manual.txt -files, in the individual makefiles, in png.h, and the manual pages -libpng.3 and png.5. - -Using the ./configure script -- 16 December 2002. -================================================= - -The ./configure script should work compatibly with what scripts/makefile.* -did, however there are some options you might need to add to configure -explicitly, which previously was done semi-automatically (if you didn't edit -scripts/makefile.* yourself, that is) - -CFLAGS="-Wall -O -funroll-loops \ --malign-loops=2 -malign-functions=2" ./configure --prefix=/usr/include \ ---with-pkgconfigdir=/usr/lib/pkgconfig --includedir=/usr/include - -You can alternatively specify --includedir=/usr/include, /usr/local/include, -/usr/include/libpng%NN%, or whatever. - -If you find that the configure script is out-of-date or is not supporting -your platform properly, try running autogen.sh to regenerate "configure", -"Makefile.in", and the other configuration files. Then try configure again. - diff --git a/libpng16/LICENSE b/libpng16/LICENSE deleted file mode 100644 index 20098d8..0000000 --- a/libpng16/LICENSE +++ /dev/null @@ -1,111 +0,0 @@ - -This copy of the libpng notices is provided for your convenience. In case of -any discrepancy between this copy and the notices in the file png.h that is -included in the libpng distribution, the latter shall prevail. - -COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: - -If you modify libpng you may insert additional notices immediately following -this sentence. - -This code is released under the libpng license. - -libpng versions 1.2.6, August 15, 2004, through 1.6.8beta03, November 30, 2013, are -Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson, and are -distributed according to the same disclaimer and license as libpng-1.2.5 -with the following individual added to the list of Contributing Authors - - Cosmin Truta - -libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are -Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are -distributed according to the same disclaimer and license as libpng-1.0.6 -with the following individuals added to the list of Contributing Authors - - Simon-Pierre Cadieux - Eric S. Raymond - Gilles Vollant - -and with the following additions to the disclaimer: - - There is no warranty against interference with your enjoyment of the - library or against infringement. There is no warranty that our - efforts or the library will fulfill any of your particular purposes - or needs. This library is provided with all faults, and the entire - risk of satisfactory quality, performance, accuracy, and effort is with - the user. - -libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are -Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are -distributed according to the same disclaimer and license as libpng-0.96, -with the following individuals added to the list of Contributing Authors: - - Tom Lane - Glenn Randers-Pehrson - Willem van Schaik - -libpng versions 0.89, June 1996, through 0.96, May 1997, are -Copyright (c) 1996, 1997 Andreas Dilger -Distributed according to the same disclaimer and license as libpng-0.88, -with the following individuals added to the list of Contributing Authors: - - John Bowler - Kevin Bracey - Sam Bushell - Magnus Holmgren - Greg Roelofs - Tom Tanner - -libpng versions 0.5, May 1995, through 0.88, January 1996, are -Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. - -For the purposes of this copyright and license, "Contributing Authors" -is defined as the following set of individuals: - - Andreas Dilger - Dave Martindale - Guy Eric Schalnat - Paul Schmidt - Tim Wegner - -The PNG Reference Library is supplied "AS IS". The Contributing Authors -and Group 42, Inc. disclaim all warranties, expressed or implied, -including, without limitation, the warranties of merchantability and of -fitness for any purpose. The Contributing Authors and Group 42, Inc. -assume no liability for direct, indirect, incidental, special, exemplary, -or consequential damages, which may result from the use of the PNG -Reference Library, even if advised of the possibility of such damage. - -Permission is hereby granted to use, copy, modify, and distribute this -source code, or portions hereof, for any purpose, without fee, subject -to the following restrictions: - -1. The origin of this source code must not be misrepresented. - -2. Altered versions must be plainly marked as such and must not - be misrepresented as being the original source. - -3. This Copyright notice may not be removed or altered from any - source or altered source distribution. - -The Contributing Authors and Group 42, Inc. specifically permit, without -fee, and encourage the use of this source code as a component to -supporting the PNG file format in commercial products. If you use this -source code in a product, acknowledgment is not required but would be -appreciated. - - -A "png_get_copyright" function is available, for convenient use in "about" -boxes and the like: - - printf("%s",png_get_copyright(NULL)); - -Also, the PNG logo (in PNG format, of course) is supplied in the -files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). - -Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a -certification mark of the Open Source Initiative. - -Glenn Randers-Pehrson -glennrp at users.sourceforge.net -November 30, 2013 diff --git a/libpng16/Makefile.am b/libpng16/Makefile.am deleted file mode 100644 index 5ac0423..0000000 --- a/libpng16/Makefile.am +++ /dev/null @@ -1,331 +0,0 @@ -# Makefile.am: -# Source file for Makefile.in (and hence Makefile) -# - -PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ - -ACLOCAL_AMFLAGS = -I scripts - -# test programs - run on make check, make distcheck -check_PROGRAMS= pngtest pngunknown pngstest pngvalid - -# Utilities - installed -bin_PROGRAMS= pngfix png-fix-itxt - -# This ensures that pnglibconf.h gets built at the start of 'make all' or -# 'make check', but it does not add dependencies to the individual programs, -# this is done below. -# -# IMPORTANT: always add the object modules of new programs to the list below -# because otherwise the sequence 'configure; make new-program' will *sometimes* -# result in the installed (system) pnglibconf.h being used and the result is -# always wrong and always very confusing. -BUILT_SOURCES = pnglibconf.h - -pngtest_SOURCES = pngtest.c -pngtest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la - -pngvalid_SOURCES = contrib/libtests/pngvalid.c -pngvalid_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la - -pngstest_SOURCES = contrib/libtests/pngstest.c -pngstest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la - -pngunknown_SOURCES = contrib/libtests/pngunknown.c -pngunknown_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la - -pngfix_SOURCES = contrib/tools/pngfix.c -pngfix_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la - -png_fix_itxt_SOURCES = contrib/tools/png-fix-itxt.c - -# Generally these are single line shell scripts to run a test with a particular -# set of parameters: -TESTS =\ - tests/pngtest\ - tests/pngvalid-gamma-16-to-8 tests/pngvalid-gamma-alpha-mode\ - tests/pngvalid-gamma-background tests/pngvalid-gamma-expand16-alpha-mode\ - tests/pngvalid-gamma-expand16-background\ - tests/pngvalid-gamma-expand16-transform tests/pngvalid-gamma-sbit\ - tests/pngvalid-gamma-threshold tests/pngvalid-gamma-transform\ - tests/pngvalid-progressive-interlace-size\ - tests/pngvalid-progressive-interlace-standard\ - tests/pngvalid-progressive-interlace-transform\ - tests/pngvalid-progressive-standard tests/pngvalid-standard\ - tests/pngstest-0g01 tests/pngstest-0g02 tests/pngstest-0g04\ - tests/pngstest-0g08 tests/pngstest-0g16 tests/pngstest-2c08\ - tests/pngstest-2c16 tests/pngstest-3p01 tests/pngstest-3p02\ - tests/pngstest-3p04 tests/pngstest-3p08 tests/pngstest-4a08\ - tests/pngstest-4a16 tests/pngstest-6a08 tests/pngstest-6a16\ - tests/pngstest-error tests/pngunknown-IDAT\ - tests/pngunknown-discard tests/pngunknown-if-safe tests/pngunknown-sAPI\ - tests/pngunknown-sTER tests/pngunknown-save tests/pngunknown-vpAg - -# These tests are expected, and required, to fail: -XFAIL_TESTS = tests/pngstest-error - -# man pages -dist_man_MANS= libpng.3 libpngpf.3 png.5 - -# generate the -config scripts if required -binconfigs= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config -EXTRA_SCRIPTS= libpng-config libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config -bin_SCRIPTS= @binconfigs@ - -# rules to build libpng, only build the old library on request -lib_LTLIBRARIES=libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la -# EXTRA_LTLIBRARIES= libpng.la -libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = png.c pngerror.c\ - pngget.c pngmem.c pngpread.c pngread.c pngrio.c pngrtran.c pngrutil.c\ - pngset.c pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c\ - png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h pngusr.dfa - -if PNG_ARM_NEON - libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += arm/arm_init.c\ - arm/filter_neon.S arm/filter_neon_intrinsics.c -endif - -nodist_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = pnglibconf.h - -libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS = -no-undefined -export-dynamic \ - -version-number @PNGLIB_MAJOR@@PNGLIB_MINOR@:@PNGLIB_RELEASE@:0 - -if HAVE_LD_VERSION_SCRIPT -# Versioned symbols and restricted exports -if HAVE_SOLARIS_LD - libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS += -Wl,-M -Wl,libpng.vers -else - libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS += -Wl,--version-script=libpng.vers -endif - - libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng.vers -else -# Only restricted exports when possible - libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS += -export-symbols libpng.sym - libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng.sym -endif - -#distribute headers in /usr/include/libpng/* -pkgincludedir= $(includedir)/$(PNGLIB_BASENAME) -pkginclude_HEADERS= png.h pngconf.h -nodist_pkginclude_HEADERS= pnglibconf.h - -# pkg-config stuff, note that libpng.pc is always required in order -# to get the correct library -pkgconfigdir = @pkgconfigdir@ -pkgconfig_DATA = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc - -# Extra source distribution files, '${srcdir}' is used below to stop build files -# from those directories being included. This only works if the configure is -# not done in the source directory! -EXTRA_DIST= \ - ANNOUNCE CHANGES INSTALL LICENSE README TODO \ - pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \ - ${srcdir}/contrib ${srcdir}/projects ${srcdir}/scripts \ - $(TESTS) $(XFAIL_TESTS) tests/pngstest \ - CMakeLists.txt example.c libpng-manual.txt - -SCRIPT_CLEANFILES=scripts/*.out scripts/*.chk scripts/pnglibconf.dfn - -CLEANFILES= *.tf? pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc \ - libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers libpng.sym \ - check.new pnglibconf.* pngprefix.h symbols.new pngtest-log.txt \ - $(SCRIPT_CLEANFILES) - -MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \ -config.sub configure depcomp install-sh ltmain.sh missing - -# PNG_COPTS give extra options for the C compiler to be used on all compilation -# steps (unless targe_CFLAGS is specified; that will take precedence over -# AM_CFLAGS) -PNG_COPTS = @PNG_COPTS@ -AM_CFLAGS = ${PNG_COPTS} - -# DFNCPP is normally just CPP - the C preprocessor - but on Solaris and maybe -# other operating systems (NeXT?) the C preprocessor selected by configure -# checks input tokens for validity - effectively it performs part of the ANSI-C -# parsing - and therefore fails with the .df files. configure.ac has special -# checks for this and sets DFNCPP appropriately. -DFNCPP = @DFNCPP@ - -SUFFIXES = .chk .dfn .out - -$(PNGLIB_BASENAME).pc: libpng.pc - cp libpng.pc $@ - -$(PNGLIB_BASENAME)-config: libpng-config - cp libpng-config $@ - -scripts/sym.out scripts/vers.out: png.h pngconf.h pnglibconf.h -scripts/prefix.out: png.h pngconf.h pnglibconf.out -scripts/symbols.out: png.h pngconf.h $(srcdir)/scripts/pnglibconf.h.prebuilt -scripts/intprefix.out: pnglibconf.h - -libpng.sym: scripts/sym.out - rm -f $@ - cp $? $@ -libpng.vers: scripts/vers.out - rm -f $@ - cp $? $@ - -if DO_PNG_PREFIX -# Rename functions in scripts/prefix.out with a PNG_PREFIX prefix. -# Rename macros in scripts/macro.lst from PNG_PREFIXpng_ to PNG_ (the actual -# implementation of the macro). -pnglibconf.h: pnglibconf.out scripts/prefix.out scripts/macro.lst - rm -f $@ - $(AWK) 's==0 && NR>1{print prev}\ - s==0{prev=$$0}\ - s==1{print "#define", $$1, "@PNG_PREFIX@" $$1}\ - s==2{print "#define @PNG_PREFIX@png_" $$1, "PNG_" $$1}\ - END{print prev}' s=0 pnglibconf.out s=1 scripts/prefix.out\ - s=2 ${srcdir}/scripts/macro.lst >pnglibconf.tf8 - mv pnglibconf.tf8 $@ - -pngprefix.h: scripts/intprefix.out - rm -f pngprefix.tf1 - $(AWK) '{print "#define", $$1, "@PNG_PREFIX@" $$1}' $? >pngprefix.tf1 - mv pngprefix.tf1 $@ -else -pnglibconf.h: pnglibconf.out - rm -f $@ - cp $? $@ - -pngprefix.h: # is empty - :>$@ -endif - -$(srcdir)/scripts/pnglibconf.h.prebuilt: - @echo "Attempting to build $@" >&2 - @echo "This is a machine generated file, but if you want to make" >&2 - @echo "a new one simply make 'scripts/pnglibconf.out', copy that" >&2 - @echo "AND set PNG_ZLIB_VERNUM to 0 (you MUST do this)" >&2 - @exit 1 - -# The following is necessary to ensure that the local pnglibconf.h is used, not -# an installed one (this can happen immediately after on a clean system if -# 'make test' is the first thing the user does.) Only files which include -# one of the png source files (typically png.h or pngpriv.h) need to be listed -# here: -pngtest.o: pnglibconf.h - -contrib/libtests/makepng.o: pnglibconf.h -contrib/libtests/pngstest.o: pnglibconf.h -contrib/libtests/pngunknown.o: pnglibconf.h -contrib/libtests/pngvalid.o: pnglibconf.h -contrib/libtests/readpng.o: pnglibconf.h -contrib/libtests/tarith.o: pnglibconf.h -contrib/libtests/timepng.o: pnglibconf.h - -contrib/tools/makesRGB.o: pnglibconf.h -contrib/tools/pngfix.o: pnglibconf.h - -# We must use -DPNG_NO_USE_READ_MACROS here even when the library may actually -# be built with PNG_USE_READ_MACROS; this prevents the read macros from -# interfering with the symbol file format. -SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0'\ - -DPNGLIB_VERSION='@PNGLIB_VERSION@'\ - -DSYMBOL_PREFIX='$(SYMBOL_PREFIX)'\ - -DPNG_NO_USE_READ_MACROS -DPNG_BUILDING_SYMBOL_TABLE - -if DO_PNG_PREFIX -SYMBOL_CFLAGS += -DPNG_PREFIX='@PNG_PREFIX@' -endif - -.dfn.out: - rm -f $@ $*.c $*.tf[12] - test -d scripts || mkdir scripts || test -d scripts - echo '#include "$<"' >$*.c - $(DFNCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)\ - $(CPPFLAGS) $(SYMBOL_CFLAGS) $*.c > $*.tf1 - $(AWK) -f "${srcdir}/scripts/dfn.awk" out="$*.tf2" $*.tf1 1>&2 - rm -f $*.c $*.tf1 - mv $*.tf2 $@ - -# The .dfn file for pnglibconf.h is machine generated -pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h pngusr.dfa $(DFA_XTRA) - rm -f $@ $*.tf[45] - $(AWK) -f ${srcdir}/scripts/options.awk out=$*.tf4 version=search\ - ${srcdir}/pngconf.h ${srcdir}/scripts/pnglibconf.dfa\ - ${srcdir}/pngusr.dfa $(DFA_XTRA) 1>&2 - $(AWK) -f ${srcdir}/scripts/options.awk out=$*.tf5 $*.tf4 1>&2 - rm $*.tf4 - mv $*.tf5 $@ - -# Symbol checks (.def and .out files should match) -scripts/symbols.chk: scripts/checksym.awk scripts/symbols.def scripts/symbols.out - -.out.chk: - rm -f $@ $*.new - $(AWK) -f ${srcdir}/scripts/checksym.awk ${srcdir}/scripts/${*F}.def\ - of="$*.new" $< >&2 - mv $*.new $@ - -# used on demand to regenerate the standard header, CPPFLAGS should -# be empty - no non-standard defines -scripts/pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h - rm -f $@ pnglibconf.tf[67] - test -z "$(CPPFLAGS)" - echo "com @PNGLIB_VERSION@ STANDARD API DEFINITION" |\ - $(AWK) -f ${srcdir}/scripts/options.awk out=pnglibconf.tf6\ - logunsupported=1 version=search ${srcdir}/pngconf.h -\ - ${srcdir}/scripts/pnglibconf.dfa 1>&2 - $(AWK) -f ${srcdir}/scripts/options.awk out=pnglibconf.tf7\ - pnglibconf.tf6 1>&2 - rm pnglibconf.tf6 - mv pnglibconf.tf7 $@ - -$(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS): png.h pngconf.h \ - pnglibconf.h pngpriv.h pngdebug.h pnginfo.h pngstruct.h pngprefix.h - -test: check-am - -# Extra checks -check: scripts/symbols.chk - -# Don't distribute the generated script files -dist-hook: - cd '$(top_distdir)'; rm -f $(SCRIPT_CLEANFILES) - -# install the .../include headers as links to the new ones -install-data-hook: - cd '$(DESTDIR)$(includedir)'; rm -f png.h pngconf.h pnglibconf.h - cd '$(DESTDIR)$(includedir)'; $(LN_S) $(PNGLIB_BASENAME)/png.h png.h - cd '$(DESTDIR)$(includedir)'; $(LN_S) $(PNGLIB_BASENAME)/pngconf.h \ - pngconf.h - cd '$(DESTDIR)$(includedir)'; $(LN_S) $(PNGLIB_BASENAME)/pnglibconf.h \ - pnglibconf.h - cd '$(DESTDIR)$(pkgconfigdir)'; rm -f libpng.pc - cd '$(DESTDIR)$(pkgconfigdir)'; $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc - -# do evil things to libpng to cause libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ to be used -install-exec-hook: - cd '$(DESTDIR)$(bindir)'; rm -f libpng-config - cd '$(DESTDIR)$(bindir)';\ - $(LN_S) $(PNGLIB_BASENAME)-config libpng-config - @set -x;\ - cd '$(DESTDIR)$(libdir)';\ - for ext in a la so so.@PNGLIB_MAJOR@@PNGLIB_MINOR@.@PNGLIB_RELEASE@\ - sl dylib dll.a; do\ - rm -f libpng.$$ext;\ - if test -f $(PNGLIB_BASENAME).$$ext; then\ - $(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\ - fi;\ - done - -uninstall-hook: - cd '$(DESTDIR)$(includedir)'; rm -f png.h pngconf.h pnglibconf.h - rm -f '$(DESTDIR)$(pkgconfigdir)/libpng.pc' - rm -f '$(DESTDIR)$(bindir)/libpng-config' - rm -f '$(DESTDIR)$(libdir)/libpng.a' - rm -f '$(DESTDIR)$(libdir)/libpng.la' - rm -f '$(DESTDIR)$(libdir)/libpng.so' - rm -f '$(DESTDIR)$(libdir)/libpng.so.@PNGLIB_MAJOR@@PNGLIB_MINOR@.@PNGLIB_RELEASE@' - rm -f '$(DESTDIR)$(libdir)/libpng.sl' - rm -f '$(DESTDIR)$(libdir)/libpng.dylib' - rm -f '$(DESTDIR)$(libdir)/libpng.dll.a' - -# The following addition ensures that 'make all' always builds the test programs -# too. It used to, but some change either in libpng or configure stopped this -# working. -all-am: $(check_PROGRAMS) diff --git a/libpng16/README b/libpng16/README deleted file mode 100644 index bd73611..0000000 --- a/libpng16/README +++ /dev/null @@ -1,202 +0,0 @@ -README for libpng version 1.6.8beta03 - November 30, 2013 (shared library 16.0) -See the note about version numbers near the top of png.h - -See INSTALL for instructions on how to install libpng. - -Libpng comes in several distribution formats. Get libpng-*.tar.gz or -libpng-*.tar.xz or if you want UNIX-style line endings in the text files, -or lpng*.7z or lpng*.zip if you want DOS-style line endings. - -Version 0.89 was the first official release of libpng. Don't let the -fact that it's the first release fool you. The libpng library has been in -extensive use and testing since mid-1995. By late 1997 it had -finally gotten to the stage where there hadn't been significant -changes to the API in some time, and people have a bad feeling about -libraries with versions < 1.0. Version 1.0.0 was released in -March 1998. - -**** -Note that some of the changes to the png_info structure render this -version of the library binary incompatible with libpng-0.89 or -earlier versions if you are using a shared library. The type of the -"filler" parameter for png_set_filler() has changed from png_byte to -png_uint_32, which will affect shared-library applications that use -this function. - -To avoid problems with changes to the internals of png_info_struct, -new APIs have been made available in 0.95 to avoid direct application -access to info_ptr. These functions are the png_set_ and -png_get_ functions. These functions should be used when -accessing/storing the info_struct data, rather than manipulating it -directly, to avoid such problems in the future. - -It is important to note that the APIs do not make current programs -that access the info struct directly incompatible with the new -library. However, it is strongly suggested that new programs use -the new APIs (as shown in example.c and pngtest.c), and older programs -be converted to the new format, to facilitate upgrades in the future. -**** - -Additions since 0.90 include the ability to compile libpng as a -Windows DLL, and new APIs for accessing data in the info struct. -Experimental functions include the ability to set weighting and cost -factors for row filter selection, direct reads of integers from buffers -on big-endian processors that support misaligned data access, faster -methods of doing alpha composition, and more accurate 16->8 bit color -conversion. - -The additions since 0.89 include the ability to read from a PNG stream -which has had some (or all) of the signature bytes read by the calling -application. This also allows the reading of embedded PNG streams that -do not have the PNG file signature. As well, it is now possible to set -the library action on the detection of chunk CRC errors. It is possible -to set different actions based on whether the CRC error occurred in a -critical or an ancillary chunk. - -The changes made to the library, and bugs fixed are based on discussions -on the PNG-implement mailing list and not on material submitted -privately to Guy, Andreas, or Glenn. They will forward any good -suggestions to the list. - -For a detailed description on using libpng, read libpng-manual.txt. For -examples of libpng in a program, see example.c and pngtest.c. For usage -information and restrictions (what little they are) on libpng, see -png.h. For a description on using zlib (the compression library used by -libpng) and zlib's restrictions, see zlib.h - -I have included a general makefile, as well as several machine and -compiler specific ones, but you may have to modify one for your own needs. - -You should use zlib 1.0.4 or later to run this, but it MAY work with -versions as old as zlib 0.95. Even so, there are bugs in older zlib -versions which can cause the output of invalid compression streams for -some images. You will definitely need zlib 1.0.4 or later if you are -taking advantage of the MS-DOS "far" structure allocation for the small -and medium memory models. You should also note that zlib is a -compression library that is useful for more things than just PNG files. -You can use zlib as a drop-in replacement for fread() and fwrite() if -you are so inclined. - -zlib should be available at the same place that libpng is, or at zlib.net. - -You may also want a copy of the PNG specification. It is available -as an RFC, a W3C Recommendation, and an ISO/IEC Standard. You can find -these at http://www.libpng.org/pub/png/documents/ - -This code is currently being archived at libpng.sf.net in the -[DOWNLOAD] area, and at ftp://ftp.simplesystems.org. If you can't find it -in any of those places, e-mail me, and I'll help you find it. - -If you have any code changes, requests, problems, etc., please e-mail -them to me. Also, I'd appreciate any make files or project files, -and any modifications you needed to make to get libpng to compile, -along with a #define variable to tell what compiler/system you are on. -If you needed to add transformations to libpng, or wish libpng would -provide the image in a different way, drop me a note (and code, if -possible), so I can consider supporting the transformation. -Finally, if you get any warning messages when compiling libpng -(note: not zlib), and they are easy to fix, I'd appreciate the -fix. Please mention "libpng" somewhere in the subject line. Thanks. - -This release was created and will be supported by myself (of course -based in a large way on Guy's and Andreas' earlier work), and the PNG -development group. - -Send comments/corrections/commendations to png-mng-implement at -lists.sourceforge.net (subscription required; visit -https://lists.sourceforge.net/lists/listinfo/png-mng-implement -to subscribe) or to glennrp at users.sourceforge.net - -You can't reach Guy, the original libpng author, at the addresses -given in previous versions of this document. He and Andreas will -read mail addressed to the png-implement list, however. - -Please do not send general questions about PNG. Send them to -png-mng-misc at lists.sf.net (subscription required; visit -https://lists.sourceforge.net/lists/listinfo/png-mng-misc to -subscribe). If you have a question about something -in the PNG specification that is related to using libpng, send it -to me. Send me any questions that start with "I was using libpng, -and ...". If in doubt, send questions to me. I'll bounce them -to others, if necessary. - -Please do not send suggestions on how to change PNG. We have -been discussing PNG for eighteen years now, and it is official and -finished. If you have suggestions for libpng, however, I'll -gladly listen. Even if your suggestion is not used immediately, -it may be used later. - -Files in this distribution: - - ANNOUNCE => Announcement of this version, with recent changes - CHANGES => Description of changes between libpng versions - KNOWNBUG => List of known bugs and deficiencies - LICENSE => License to use and redistribute libpng - README => This file - TODO => Things not implemented in the current library - Y2KINFO => Statement of Y2K compliance - example.c => Example code for using libpng functions - libpng.3 => manual page for libpng (includes libpng-manual.txt) - libpng-manual.txt => Description of libpng and its functions - libpngpf.3 => manual page for libpng's private functions - png.5 => manual page for the PNG format - png.c => Basic interface functions common to library - png.h => Library function and interface declarations (public) - pngpriv.h => Library function and interface declarations (private) - pngconf.h => System specific library configuration (public) - pngstruct.h => png_struct declaration (private) - pnginfo.h => png_info struct declaration (private) - pngdebug.h => debugging macros (private) - pngerror.c => Error/warning message I/O functions - pngget.c => Functions for retrieving info from struct - pngmem.c => Memory handling functions - pngbar.png => PNG logo, 88x31 - pngnow.png => PNG logo, 98x31 - pngpread.c => Progressive reading functions - pngread.c => Read data/helper high-level functions - pngrio.c => Lowest-level data read I/O functions - pngrtran.c => Read data transformation functions - pngrutil.c => Read data utility functions - pngset.c => Functions for storing data into the info_struct - pngtest.c => Library test program - pngtest.png => Library test sample image - pngtrans.c => Common data transformation functions - pngwio.c => Lowest-level write I/O functions - pngwrite.c => High-level write functions - pngwtran.c => Write data transformations - pngwutil.c => Write utility functions - arm => Contains optimized code for the ARM platform - contrib => Contributions - examples => Example programs - gregbook => source code for PNG reading and writing, from - Greg Roelofs' "PNG: The Definitive Guide", - O'Reilly, 1999 - libtests => Test programs - pngminim => Minimal decoder, encoder, and progressive decoder - programs demonstrating use of pngusr.dfa - pngminus => Simple pnm2png and png2pnm programs - pngsuite => Test images - tools => Various tools - visupng => Contains a MSVC workspace for VisualPng - projects => Contains project files and workspaces for - building a DLL - owatcom => Contains a WATCOM project for building libpng - visualc71 => Contains a Microsoft Visual C++ (MSVC) - workspace for building libpng and zlib - vstudio => Contains a Microsoft Visual C++ (MSVC) - workspace for building libpng and zlib - scripts => Directory containing scripts for building libpng: - (see scripts/README.txt for the list of scripts) - -Good luck, and happy coding. - --Glenn Randers-Pehrson (current maintainer, since 1998) - Internet: glennrp at users.sourceforge.net - --Andreas Eric Dilger (former maintainer, 1996-1997) - Internet: adilger at enel.ucalgary.ca - Web: http://www-mddsp.enel.ucalgary.ca/People/adilger/ - --Guy Eric Schalnat (original author and former maintainer, 1995-1996) - (formerly of Group 42, Inc) - Internet: gschal at infinet.com diff --git a/libpng16/TODO b/libpng16/TODO deleted file mode 100644 index 6e1f028..0000000 --- a/libpng16/TODO +++ /dev/null @@ -1,27 +0,0 @@ -/* -TODO - list of things to do for libpng: - -Final bug fixes. -Better C++ wrapper/full C++ implementation? -Fix problem with C++ and EXTERN "C". -cHRM transformation. -Remove setjmp/longjmp usage in favor of returning error codes. -Add "grayscale->palette" transformation and "palette->grayscale" detection. -Improved dithering. -Multi-lingual error and warning message support. -Complete sRGB transformation (presently it simply uses gamma=0.45455). -Man pages for function calls. -Better documentation. -Better filter selection - (counting huffman bits/precompression? filter inertia? filter costs?). -Histogram creation. -Text conversion between different code pages (Latin-1 -> Mac and DOS). -Avoid building gamma tables whenever possible. -Use greater precision when changing to linear gamma for compositing against - background and doing rgb-to-gray transformation. -Investigate pre-incremented loop counters and other loop constructions. -Add interpolated method of handling interlacing. -Switch to the simpler zlib (zlib/libpng) license if legally possible. -Extend pngvalid.c to validate more of the libpng transformations. - -*/ diff --git a/libpng16/arm/arm_init.c b/libpng16/arm/arm_init.c deleted file mode 100644 index 0987717..0000000 --- a/libpng16/arm/arm_init.c +++ /dev/null @@ -1,232 +0,0 @@ - -/* arm_init.c - NEON optimised filter functions - * - * Copyright (c) 2013 Glenn Randers-Pehrson - * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.6.6 [September 16, 2013] - * - * This code is released under the libpng license. - * For conditions of distribution and use, see the disclaimer - * and license in png.h - */ -/* Below, after checking __linux__, various non-C90 POSIX 1003.1 functions are - * called. - */ -#define _POSIX_SOURCE 1 - -#include "../pngpriv.h" - -#ifdef PNG_READ_SUPPORTED -#if PNG_ARM_NEON_OPT > 0 -#ifdef PNG_ARM_NEON_CHECK_SUPPORTED /* Do run-time checks */ -#include /* for sig_atomic_t */ - -#ifdef __ANDROID__ -/* Linux provides access to information about CPU capabilites via - * /proc/self/auxv, however Android blocks this while still claiming to be - * Linux. The Andoid NDK, however, provides appropriate support. - * - * Documentation: http://www.kandroid.org/ndk/docs/CPU-ARM-NEON.html - */ -#include - -static int -png_have_neon(png_structp png_ptr) -{ - /* This is a whole lot easier than the mess below, however it is probably - * implemented as below, therefore it is better to cache the result (these - * function calls may be slow!) - */ - PNG_UNUSED(png_ptr) - return android_getCpuFamily() == ANDROID_CPU_FAMILY_ARM && - (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0; -} -#elif defined(__linux__) -/* The generic __linux__ implementation requires reading /proc/self/auxv and - * looking at each element for one that records NEON capabilities. - */ -#include /* for POSIX 1003.1 */ -#include /* for EINTR */ - -#include -#include -#include -#include -#include - -/* A read call may be interrupted, in which case it returns -1 and sets errno to - * EINTR if nothing was done, otherwise (if something was done) a partial read - * may result. - */ -static size_t -safe_read(png_structp png_ptr, int fd, void *buffer_in, size_t nbytes) -{ - size_t ntotal = 0; - char *buffer = png_voidcast(char*, buffer_in); - - while (nbytes > 0) - { - unsigned int nread; - int iread; - - /* Passing nread > INT_MAX to read is implementation defined in POSIX - * 1003.1, therefore despite the unsigned argument portable code must - * limit the value to INT_MAX! - */ - if (nbytes > INT_MAX) - nread = INT_MAX; - - else - nread = (unsigned int)/*SAFE*/nbytes; - - iread = read(fd, buffer, nread); - - if (iread == -1) - { - /* This is the devil in the details, a read can terminate early with 0 - * bytes read because of EINTR, yet it still returns -1 otherwise end - * of file cannot be distinguished. - */ - if (errno != EINTR) - { - png_warning(png_ptr, "/proc read failed"); - return 0; /* I.e. a permanent failure */ - } - } - - else if (iread < 0) - { - /* Not a valid 'read' result: */ - png_warning(png_ptr, "OS /proc read bug"); - return 0; - } - - else if (iread > 0) - { - /* Continue reading until a permanent failure, or EOF */ - buffer += iread; - nbytes -= (unsigned int)/*SAFE*/iread; - ntotal += (unsigned int)/*SAFE*/iread; - } - - else - return ntotal; - } - - return ntotal; /* nbytes == 0 */ -} - -static int -png_have_neon(png_structp png_ptr) -{ - int fd = open("/proc/self/auxv", O_RDONLY); - Elf32_auxv_t aux; - - /* Failsafe: failure to open means no NEON */ - if (fd == -1) - { - png_warning(png_ptr, "/proc/self/auxv open failed"); - return 0; - } - - while (safe_read(png_ptr, fd, &aux, sizeof aux) == sizeof aux) - { - if (aux.a_type == AT_HWCAP && (aux.a_un.a_val & HWCAP_NEON) != 0) - { - close(fd); - return 1; - } - } - - close(fd); - return 0; -} -#else - /* We don't know how to do a run-time check on this system */ -# error "no support for run-time ARM NEON checks" -#endif /* OS checks */ -#endif /* PNG_ARM_NEON_CHECK_SUPPORTED */ - -#ifndef PNG_ALIGNED_MEMORY_SUPPORTED -# error "ALIGNED_MEMORY is required; set: -DPNG_ALIGNED_MEMORY_SUPPORTED" -#endif - -void -png_init_filter_functions_neon(png_structp pp, unsigned int bpp) -{ - /* The switch statement is compiled in for ARM_NEON_API, the call to - * png_have_neon is compiled in for ARM_NEON_CHECK. If both are defined - * the check is only performed if the API has not set the NEON option on - * or off explicitly. In this case the check controls what happens. - * - * If the CHECK is not compiled in and the option is UNSET the behavior prior - * to 1.6.7 was to use the NEON code - this was a bug caused by having the - * wrong order of the 'ON' and 'default' cases. UNSET now defaults to OFF, - * as documented in png.h - */ -#ifdef PNG_ARM_NEON_API_SUPPORTED - switch ((pp->options >> PNG_ARM_NEON) & 3) - { - case PNG_OPTION_UNSET: - /* Allow the run-time check to execute if it has been enabled - - * thus both API and CHECK can be turned on. If it isn't supported - * this case will fall through to the 'default' below, which just - * returns. - */ -#endif /* PNG_ARM_NEON_API_SUPPORTED */ -#ifdef PNG_ARM_NEON_CHECK_SUPPORTED - { - static volatile sig_atomic_t no_neon = -1; /* not checked */ - - if (no_neon < 0) - no_neon = !png_have_neon(pp); - - if (no_neon) - return; - } -#ifdef PNG_ARM_NEON_API_SUPPORTED - break; -#endif -#endif /* PNG_ARM_NEON_CHECK_SUPPORTED */ - -#ifdef PNG_ARM_NEON_API_SUPPORTED - default: /* OFF or INVALID */ - return; - - case PNG_OPTION_ON: - /* Option turned on */ - break; - } -#endif - - /* IMPORTANT: any new external functions used here must be declared using - * PNG_INTERNAL_FUNCTION in ../pngpriv.h. This is required so that the - * 'prefix' option to configure works: - * - * ./configure --with-libpng-prefix=foobar_ - * - * Verify you have got this right by running the above command, doing a build - * and examining pngprefix.h; it must contain a #define for every external - * function you add. (Notice that this happens automatically for the - * initialization function.) - */ - pp->read_filter[PNG_FILTER_VALUE_UP-1] = png_read_filter_row_up_neon; - - if (bpp == 3) - { - pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub3_neon; - pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg3_neon; - pp->read_filter[PNG_FILTER_VALUE_PAETH-1] = - png_read_filter_row_paeth3_neon; - } - - else if (bpp == 4) - { - pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub4_neon; - pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg4_neon; - pp->read_filter[PNG_FILTER_VALUE_PAETH-1] = - png_read_filter_row_paeth4_neon; - } -} -#endif /* PNG_ARM_NEON_OPT > 0 */ -#endif /* PNG_READ_SUPPORTED */ diff --git a/libpng16/arm/filter_neon.S b/libpng16/arm/filter_neon.S deleted file mode 100644 index 0d7b710..0000000 --- a/libpng16/arm/filter_neon.S +++ /dev/null @@ -1,246 +0,0 @@ - -/* filter_neon.S - NEON optimised filter functions - * - * Copyright (c) 2013 Glenn Randers-Pehrson - * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.6.8 [(PENDING RELEASE)] - * - * This code is released under the libpng license. - * For conditions of distribution and use, see the disclaimer - * and license in png.h - */ - -/* This is required to get the symbol renames, which are #defines, and also - * includes the definition (or not) of PNG_ARM_NEON_OPT and - * PNG_ARM_NEON_IMPLEMENTATION. - */ -#define PNG_VERSION_INFO_ONLY -#include "../pngpriv.h" - -#if defined(__linux__) && defined(__ELF__) -.section .note.GNU-stack,"",%progbits /* mark stack as non-executable */ -#endif - -/* Assembler NEON support - only works for 32-bit ARM (i.e. it does not work for - * ARM64). The code in arm/filter_neon_intrinsics.c supports ARM64, however it - * only works if -mfpu=neon is specified on the GCC command line. See pngpriv.h - * for the logic which sets PNG_USE_ARM_NEON_ASM: - */ -#if PNG_ARM_NEON_IMPLEMENTATION == 2 /* hand-coded assembler */ - -#ifdef PNG_READ_SUPPORTED -#if PNG_ARM_NEON_OPT > 0 - -#ifdef __ELF__ -# define ELF -#else -# define ELF @ -#endif - - .arch armv7-a - .fpu neon - -.macro func name, export=0 - .macro endfunc -ELF .size \name, . - \name - .endfunc - .purgem endfunc - .endm - .text - .if \export - .global \name - .endif -ELF .type \name, STT_FUNC - .func \name -\name: -.endm - -func png_read_filter_row_sub4_neon, export=1 - ldr r3, [r0, #4] @ rowbytes - vmov.i8 d3, #0 -1: - vld4.32 {d4[],d5[],d6[],d7[]}, [r1,:128] - vadd.u8 d0, d3, d4 - vadd.u8 d1, d0, d5 - vadd.u8 d2, d1, d6 - vadd.u8 d3, d2, d7 - vst4.32 {d0[0],d1[0],d2[0],d3[0]},[r1,:128]! - subs r3, r3, #16 - bgt 1b - - bx lr -endfunc - -func png_read_filter_row_sub3_neon, export=1 - ldr r3, [r0, #4] @ rowbytes - vmov.i8 d3, #0 - mov r0, r1 - mov r2, #3 - mov r12, #12 - vld1.8 {q11}, [r0], r12 -1: - vext.8 d5, d22, d23, #3 - vadd.u8 d0, d3, d22 - vext.8 d6, d22, d23, #6 - vadd.u8 d1, d0, d5 - vext.8 d7, d23, d23, #1 - vld1.8 {q11}, [r0], r12 - vst1.32 {d0[0]}, [r1,:32], r2 - vadd.u8 d2, d1, d6 - vst1.32 {d1[0]}, [r1], r2 - vadd.u8 d3, d2, d7 - vst1.32 {d2[0]}, [r1], r2 - vst1.32 {d3[0]}, [r1], r2 - subs r3, r3, #12 - bgt 1b - - bx lr -endfunc - -func png_read_filter_row_up_neon, export=1 - ldr r3, [r0, #4] @ rowbytes -1: - vld1.8 {q0}, [r1,:128] - vld1.8 {q1}, [r2,:128]! - vadd.u8 q0, q0, q1 - vst1.8 {q0}, [r1,:128]! - subs r3, r3, #16 - bgt 1b - - bx lr -endfunc - -func png_read_filter_row_avg4_neon, export=1 - ldr r12, [r0, #4] @ rowbytes - vmov.i8 d3, #0 -1: - vld4.32 {d4[],d5[],d6[],d7[]}, [r1,:128] - vld4.32 {d16[],d17[],d18[],d19[]},[r2,:128]! - vhadd.u8 d0, d3, d16 - vadd.u8 d0, d0, d4 - vhadd.u8 d1, d0, d17 - vadd.u8 d1, d1, d5 - vhadd.u8 d2, d1, d18 - vadd.u8 d2, d2, d6 - vhadd.u8 d3, d2, d19 - vadd.u8 d3, d3, d7 - vst4.32 {d0[0],d1[0],d2[0],d3[0]},[r1,:128]! - subs r12, r12, #16 - bgt 1b - - bx lr -endfunc - -func png_read_filter_row_avg3_neon, export=1 - push {r4,lr} - ldr r12, [r0, #4] @ rowbytes - vmov.i8 d3, #0 - mov r0, r1 - mov r4, #3 - mov lr, #12 - vld1.8 {q11}, [r0], lr -1: - vld1.8 {q10}, [r2], lr - vext.8 d5, d22, d23, #3 - vhadd.u8 d0, d3, d20 - vext.8 d17, d20, d21, #3 - vadd.u8 d0, d0, d22 - vext.8 d6, d22, d23, #6 - vhadd.u8 d1, d0, d17 - vext.8 d18, d20, d21, #6 - vadd.u8 d1, d1, d5 - vext.8 d7, d23, d23, #1 - vld1.8 {q11}, [r0], lr - vst1.32 {d0[0]}, [r1,:32], r4 - vhadd.u8 d2, d1, d18 - vst1.32 {d1[0]}, [r1], r4 - vext.8 d19, d21, d21, #1 - vadd.u8 d2, d2, d6 - vhadd.u8 d3, d2, d19 - vst1.32 {d2[0]}, [r1], r4 - vadd.u8 d3, d3, d7 - vst1.32 {d3[0]}, [r1], r4 - subs r12, r12, #12 - bgt 1b - - pop {r4,pc} -endfunc - -.macro paeth rx, ra, rb, rc - vaddl.u8 q12, \ra, \rb @ a + b - vaddl.u8 q15, \rc, \rc @ 2*c - vabdl.u8 q13, \rb, \rc @ pa - vabdl.u8 q14, \ra, \rc @ pb - vabd.u16 q15, q12, q15 @ pc - vcle.u16 q12, q13, q14 @ pa <= pb - vcle.u16 q13, q13, q15 @ pa <= pc - vcle.u16 q14, q14, q15 @ pb <= pc - vand q12, q12, q13 @ pa <= pb && pa <= pc - vmovn.u16 d28, q14 - vmovn.u16 \rx, q12 - vbsl d28, \rb, \rc - vbsl \rx, \ra, d28 -.endm - -func png_read_filter_row_paeth4_neon, export=1 - ldr r12, [r0, #4] @ rowbytes - vmov.i8 d3, #0 - vmov.i8 d20, #0 -1: - vld4.32 {d4[],d5[],d6[],d7[]}, [r1,:128] - vld4.32 {d16[],d17[],d18[],d19[]},[r2,:128]! - paeth d0, d3, d16, d20 - vadd.u8 d0, d0, d4 - paeth d1, d0, d17, d16 - vadd.u8 d1, d1, d5 - paeth d2, d1, d18, d17 - vadd.u8 d2, d2, d6 - paeth d3, d2, d19, d18 - vmov d20, d19 - vadd.u8 d3, d3, d7 - vst4.32 {d0[0],d1[0],d2[0],d3[0]},[r1,:128]! - subs r12, r12, #16 - bgt 1b - - bx lr -endfunc - -func png_read_filter_row_paeth3_neon, export=1 - push {r4,lr} - ldr r12, [r0, #4] @ rowbytes - vmov.i8 d3, #0 - vmov.i8 d4, #0 - mov r0, r1 - mov r4, #3 - mov lr, #12 - vld1.8 {q11}, [r0], lr -1: - vld1.8 {q10}, [r2], lr - paeth d0, d3, d20, d4 - vext.8 d5, d22, d23, #3 - vadd.u8 d0, d0, d22 - vext.8 d17, d20, d21, #3 - paeth d1, d0, d17, d20 - vst1.32 {d0[0]}, [r1,:32], r4 - vext.8 d6, d22, d23, #6 - vadd.u8 d1, d1, d5 - vext.8 d18, d20, d21, #6 - paeth d2, d1, d18, d17 - vext.8 d7, d23, d23, #1 - vld1.8 {q11}, [r0], lr - vst1.32 {d1[0]}, [r1], r4 - vadd.u8 d2, d2, d6 - vext.8 d19, d21, d21, #1 - paeth d3, d2, d19, d18 - vst1.32 {d2[0]}, [r1], r4 - vmov d4, d19 - vadd.u8 d3, d3, d7 - vst1.32 {d3[0]}, [r1], r4 - subs r12, r12, #12 - bgt 1b - - pop {r4,pc} -endfunc -#endif /* PNG_ARM_NEON_OPT > 0 */ -#endif /* PNG_READ_SUPPORTED */ -#endif /* PNG_ARM_NEON_IMPLEMENTATION == 2 (assembler) */ diff --git a/libpng16/arm/filter_neon_intrinsics.c b/libpng16/arm/filter_neon_intrinsics.c deleted file mode 100644 index 64f12fc..0000000 --- a/libpng16/arm/filter_neon_intrinsics.c +++ /dev/null @@ -1,372 +0,0 @@ - -/* filter_neon_intrinsics.c - NEON optimised filter functions - * - * Copyright (c) 2013 Glenn Randers-Pehrson - * Written by James Yu , October 2013. - * Based on filter_neon.S, written by Mans Rullgard, 2011. - * - * Last changed in libpng 1.6.8 [(PENDING RELEASE)] - * - * This code is released under the libpng license. - * For conditions of distribution and use, see the disclaimer - * and license in png.h - */ - -#include "../pngpriv.h" - -/* This code requires -mfpu=neon on the command line: */ -#if PNG_ARM_NEON_IMPLEMENTATION == 1 /* intrinsics code from pngpriv.h */ - -#include - -/* libpng row pointers are not necessarily aligned to any particular boundary, - * however this code will only work with appropriate alignment. arm/arm_init.c - * checks for this (and will not compile unless it is done), this code uses - * variants of png_aligncast to avoid compiler warnings. - */ -#define png_ptr(type,pointer) png_aligncast(type *,pointer) -#define png_ptrc(type,pointer) png_aligncastconst(const type *,pointer) - -/* The following relies on a variable 'temp_pointer' being declared with type - * 'type'. This is written this way just to hide the GCC strict aliasing - * warning; note that the code is safe because there never is an alias between - * the input and output pointers. - */ -#define png_ldr(type,pointer)\ - (temp_pointer = png_ptr(type,pointer), *temp_pointer) - -#ifdef PNG_READ_SUPPORTED -#if PNG_ARM_NEON_OPT > 0 - -void -png_read_filter_row_up_neon(png_row_infop row_info, png_bytep row, - png_const_bytep prev_row) -{ - png_bytep rp = row; - png_bytep rp_stop = row + row_info->rowbytes; - png_const_bytep pp = prev_row; - - for (; rp < rp_stop; rp += 16, pp += 16) - { - uint8x16_t qrp, qpp; - - qrp = vld1q_u8(rp); - qpp = vld1q_u8(pp); - qrp = vaddq_u8(qrp, qpp); - vst1q_u8(rp, qrp); - } -} - -void -png_read_filter_row_sub3_neon(png_row_infop row_info, png_bytep row, - png_const_bytep prev_row) -{ - png_bytep rp = row; - png_bytep rp_stop = row + row_info->rowbytes; - - uint8x16_t vtmp = vld1q_u8(rp); - uint8x8x2_t *vrpt = png_ptr(uint8x8x2_t, &vtmp); - uint8x8x2_t vrp = *vrpt; - - uint8x8x4_t vdest; - vdest.val[3] = vdup_n_u8(0); - - for (; rp < rp_stop;) - { - uint8x8_t vtmp1, vtmp2; - uint32x2_t *temp_pointer; - - vtmp1 = vext_u8(vrp.val[0], vrp.val[1], 3); - vdest.val[0] = vadd_u8(vdest.val[3], vrp.val[0]); - vtmp2 = vext_u8(vrp.val[0], vrp.val[1], 6); - vdest.val[1] = vadd_u8(vdest.val[0], vtmp1); - - vtmp1 = vext_u8(vrp.val[1], vrp.val[1], 1); - vdest.val[2] = vadd_u8(vdest.val[1], vtmp2); - vdest.val[3] = vadd_u8(vdest.val[2], vtmp1); - - vtmp = vld1q_u8(rp + 12); - vrpt = png_ptr(uint8x8x2_t, &vtmp); - vrp = *vrpt; - - vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[0]), 0); - rp += 3; - vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[1]), 0); - rp += 3; - vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[2]), 0); - rp += 3; - vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[3]), 0); - rp += 3; - } - - PNG_UNUSED(prev_row) -} - -void -png_read_filter_row_sub4_neon(png_row_infop row_info, png_bytep row, - png_const_bytep prev_row) -{ - png_bytep rp = row; - png_bytep rp_stop = row + row_info->rowbytes; - - uint8x8x4_t vdest; - vdest.val[3] = vdup_n_u8(0); - - for (; rp < rp_stop; rp += 16) - { - uint32x2x4_t vtmp = vld4_u32(png_ptr(uint32_t,rp)); - uint8x8x4_t *vrpt = png_ptr(uint8x8x4_t,&vtmp); - uint8x8x4_t vrp = *vrpt; - uint32x2x4_t *temp_pointer; - - vdest.val[0] = vadd_u8(vdest.val[3], vrp.val[0]); - vdest.val[1] = vadd_u8(vdest.val[0], vrp.val[1]); - vdest.val[2] = vadd_u8(vdest.val[1], vrp.val[2]); - vdest.val[3] = vadd_u8(vdest.val[2], vrp.val[3]); - vst4_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2x4_t,&vdest), 0); - } - - PNG_UNUSED(prev_row) -} - -void -png_read_filter_row_avg3_neon(png_row_infop row_info, png_bytep row, - png_const_bytep prev_row) -{ - png_bytep rp = row; - png_const_bytep pp = prev_row; - png_bytep rp_stop = row + row_info->rowbytes; - - uint8x16_t vtmp; - uint8x8x2_t *vrpt; - uint8x8x2_t vrp; - uint8x8x4_t vdest; - vdest.val[3] = vdup_n_u8(0); - - vtmp = vld1q_u8(rp); - vrpt = png_ptr(uint8x8x2_t,&vtmp); - vrp = *vrpt; - - for (; rp < rp_stop; pp += 12) - { - uint8x8_t vtmp1, vtmp2, vtmp3; - - uint8x8x2_t *vppt; - uint8x8x2_t vpp; - - uint32x2_t *temp_pointer; - - vtmp = vld1q_u8(pp); - vppt = png_ptr(uint8x8x2_t,&vtmp); - vpp = *vppt; - - vtmp1 = vext_u8(vrp.val[0], vrp.val[1], 3); - vdest.val[0] = vhadd_u8(vdest.val[3], vpp.val[0]); - vdest.val[0] = vadd_u8(vdest.val[0], vrp.val[0]); - - vtmp2 = vext_u8(vpp.val[0], vpp.val[1], 3); - vtmp3 = vext_u8(vrp.val[0], vrp.val[1], 6); - vdest.val[1] = vhadd_u8(vdest.val[0], vtmp2); - vdest.val[1] = vadd_u8(vdest.val[1], vtmp1); - - vtmp2 = vext_u8(vpp.val[0], vpp.val[1], 6); - vtmp1 = vext_u8(vrp.val[1], vrp.val[1], 1); - - vtmp = vld1q_u8(rp + 12); - vrpt = png_ptr(uint8x8x2_t,&vtmp); - vrp = *vrpt; - - vdest.val[2] = vhadd_u8(vdest.val[1], vtmp2); - vdest.val[2] = vadd_u8(vdest.val[2], vtmp3); - - vtmp2 = vext_u8(vpp.val[1], vpp.val[1], 1); - - vdest.val[3] = vhadd_u8(vdest.val[2], vtmp2); - vdest.val[3] = vadd_u8(vdest.val[3], vtmp1); - - vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[0]), 0); - rp += 3; - vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[1]), 0); - rp += 3; - vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[2]), 0); - rp += 3; - vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[3]), 0); - rp += 3; - } -} - -void -png_read_filter_row_avg4_neon(png_row_infop row_info, png_bytep row, - png_const_bytep prev_row) -{ - png_bytep rp = row; - png_bytep rp_stop = row + row_info->rowbytes; - png_const_bytep pp = prev_row; - - uint8x8x4_t vdest; - vdest.val[3] = vdup_n_u8(0); - - for (; rp < rp_stop; rp += 16, pp += 16) - { - uint32x2x4_t vtmp; - uint8x8x4_t *vrpt, *vppt; - uint8x8x4_t vrp, vpp; - uint32x2x4_t *temp_pointer; - - vtmp = vld4_u32(png_ptr(uint32_t,rp)); - vrpt = png_ptr(uint8x8x4_t,&vtmp); - vrp = *vrpt; - vtmp = vld4_u32(png_ptrc(uint32_t,pp)); - vppt = png_ptr(uint8x8x4_t,&vtmp); - vpp = *vppt; - - vdest.val[0] = vhadd_u8(vdest.val[3], vpp.val[0]); - vdest.val[0] = vadd_u8(vdest.val[0], vrp.val[0]); - vdest.val[1] = vhadd_u8(vdest.val[0], vpp.val[1]); - vdest.val[1] = vadd_u8(vdest.val[1], vrp.val[1]); - vdest.val[2] = vhadd_u8(vdest.val[1], vpp.val[2]); - vdest.val[2] = vadd_u8(vdest.val[2], vrp.val[2]); - vdest.val[3] = vhadd_u8(vdest.val[2], vpp.val[3]); - vdest.val[3] = vadd_u8(vdest.val[3], vrp.val[3]); - - vst4_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2x4_t,&vdest), 0); - } -} - -static uint8x8_t -paeth(uint8x8_t a, uint8x8_t b, uint8x8_t c) -{ - uint8x8_t d, e; - uint16x8_t p1, pa, pb, pc; - - p1 = vaddl_u8(a, b); /* a + b */ - pc = vaddl_u8(c, c); /* c * 2 */ - pa = vabdl_u8(b, c); /* pa */ - pb = vabdl_u8(a, c); /* pb */ - pc = vabdq_u16(p1, pc); /* pc */ - - p1 = vcleq_u16(pa, pb); /* pa <= pb */ - pa = vcleq_u16(pa, pc); /* pa <= pc */ - pb = vcleq_u16(pb, pc); /* pb <= pc */ - - p1 = vandq_u16(p1, pa); /* pa <= pb && pa <= pc */ - - d = vmovn_u16(pb); - e = vmovn_u16(p1); - - d = vbsl_u8(d, b, c); - e = vbsl_u8(e, a, d); - - return e; -} - -void -png_read_filter_row_paeth3_neon(png_row_infop row_info, png_bytep row, - png_const_bytep prev_row) -{ - png_bytep rp = row; - png_const_bytep pp = prev_row; - png_bytep rp_stop = row + row_info->rowbytes; - - uint8x16_t vtmp; - uint8x8x2_t *vrpt; - uint8x8x2_t vrp; - uint8x8_t vlast = vdup_n_u8(0); - uint8x8x4_t vdest; - vdest.val[3] = vdup_n_u8(0); - - vtmp = vld1q_u8(rp); - vrpt = png_ptr(uint8x8x2_t,&vtmp); - vrp = *vrpt; - - for (; rp < rp_stop; pp += 12) - { - uint8x8x2_t *vppt; - uint8x8x2_t vpp; - uint8x8_t vtmp1, vtmp2, vtmp3; - uint32x2_t *temp_pointer; - - vtmp = vld1q_u8(pp); - vppt = png_ptr(uint8x8x2_t,&vtmp); - vpp = *vppt; - - vdest.val[0] = paeth(vdest.val[3], vpp.val[0], vlast); - vdest.val[0] = vadd_u8(vdest.val[0], vrp.val[0]); - - vtmp1 = vext_u8(vrp.val[0], vrp.val[1], 3); - vtmp2 = vext_u8(vpp.val[0], vpp.val[1], 3); - vdest.val[1] = paeth(vdest.val[0], vtmp2, vpp.val[0]); - vdest.val[1] = vadd_u8(vdest.val[1], vtmp1); - - vtmp1 = vext_u8(vrp.val[0], vrp.val[1], 6); - vtmp3 = vext_u8(vpp.val[0], vpp.val[1], 6); - vdest.val[2] = paeth(vdest.val[1], vtmp3, vtmp2); - vdest.val[2] = vadd_u8(vdest.val[2], vtmp1); - - vtmp1 = vext_u8(vrp.val[1], vrp.val[1], 1); - vtmp2 = vext_u8(vpp.val[1], vpp.val[1], 1); - - vtmp = vld1q_u8(rp + 12); - vrpt = png_ptr(uint8x8x2_t,&vtmp); - vrp = *vrpt; - - vdest.val[3] = paeth(vdest.val[2], vtmp2, vtmp3); - vdest.val[3] = vadd_u8(vdest.val[3], vtmp1); - - vlast = vtmp2; - - vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[0]), 0); - rp += 3; - vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[1]), 0); - rp += 3; - vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[2]), 0); - rp += 3; - vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[3]), 0); - rp += 3; - } -} - -void -png_read_filter_row_paeth4_neon(png_row_infop row_info, png_bytep row, - png_const_bytep prev_row) -{ - png_bytep rp = row; - png_bytep rp_stop = row + row_info->rowbytes; - png_const_bytep pp = prev_row; - - uint8x8_t vlast = vdup_n_u8(0); - uint8x8x4_t vdest; - vdest.val[3] = vdup_n_u8(0); - - for (; rp < rp_stop; rp += 16, pp += 16) - { - uint32x2x4_t vtmp; - uint8x8x4_t *vrpt, *vppt; - uint8x8x4_t vrp, vpp; - uint32x2x4_t *temp_pointer; - - vtmp = vld4_u32(png_ptr(uint32_t,rp)); - vrpt = png_ptr(uint8x8x4_t,&vtmp); - vrp = *vrpt; - vtmp = vld4_u32(png_ptrc(uint32_t,pp)); - vppt = png_ptr(uint8x8x4_t,&vtmp); - vpp = *vppt; - - vdest.val[0] = paeth(vdest.val[3], vpp.val[0], vlast); - vdest.val[0] = vadd_u8(vdest.val[0], vrp.val[0]); - vdest.val[1] = paeth(vdest.val[0], vpp.val[1], vpp.val[0]); - vdest.val[1] = vadd_u8(vdest.val[1], vrp.val[1]); - vdest.val[2] = paeth(vdest.val[1], vpp.val[2], vpp.val[1]); - vdest.val[2] = vadd_u8(vdest.val[2], vrp.val[2]); - vdest.val[3] = paeth(vdest.val[2], vpp.val[3], vpp.val[2]); - vdest.val[3] = vadd_u8(vdest.val[3], vrp.val[3]); - - vlast = vpp.val[3]; - - vst4_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2x4_t,&vdest), 0); - } -} - -#endif /* PNG_ARM_NEON_OPT > 0 */ -#endif /* PNG_READ_SUPPORTED */ -#endif /* PNG_ARM_NEON_IMPLEMENTATION == 1 (intrinsics) */ diff --git a/libpng16/autogen.sh b/libpng16/autogen.sh deleted file mode 100644 index 9af34bd..0000000 --- a/libpng16/autogen.sh +++ /dev/null @@ -1,224 +0,0 @@ -#! /bin/sh -# -# Run 'autoreconf' to build 'configure', 'Makefile.in' and other configure -# control files. -# -# The first time this is run on a GIT checkout the only files that exist are -# configure.ac and Makefile.am; all of the autotools support scripts are -# missing. They are instantiated with autoreconf --force --install. -# -# For regular ("tarball") distributions all the files should exist. We do not -# want them to be updated *under any circumstances*. It should never be -# necessary to run autogen.sh because ./configure --enable-maintainer-mode says -# what to do if Makefile.am or configure.ac are changed. -# -# It is *probably* OK to update the files on a GIT checkout, because they have -# come from the local tools, but leave that to the user who is assumed to know -# whether it is ok or required. -# -# This script is intended to work without arguments, there are, however, hidden -# arguments (a) for use while testing the script and (b) to fix up systems that -# have been broken. If (b) is required the script prompts for the correct -# options. For this reason the options are *NOT* documented in the help; this -# is deliberate; UTSL. -# -clean= -maintainer= -while test $# -gt 0 -do - case "$1" in - --maintainer) - maintainer=1;; - - --clean) - clean=1;; - - *) - exec >&2 - echo "$0: usage: ./autogen.sh" - if test -d .git - then - echo " ./autogen.sh generates the configure script and" - echo " Makefile.in, or refreshes them after changes to Makefile.am" - echo " or configure.ac. You may prefer to just run autoreconf." - elif test -z "$maintainer" - then - echo " DO NOT RUN THIS SCRIPT." - echo " If you need to change Makefile.am or configure.ac then you" - echo " also need to run ./configure --enable-maintainer-mode and" - echo " use the appropriate autotools, *NOT* this script, to update" - echo " everything, please check the documentation of autoreconf." - echo " WARNING: libpng is intentionally generated with a known," - echo " fixed, set of autotools. It is known *NOT* to work with" - echo " the collection of autotools distributed on highly reputable" - echo " operating systems." - echo " Remember: autotools is GNU software, you are expected to" - echo " pay for support." - else - echo " You have run autogen.sh with --maintainer enabled and you" - echo " are not using a GIT distribution, then you have given an" - echo " unrecognized argument. This is not good. --maintainer" - echo " switches off any assumptions that you might not know what" - echo " you are doing." - fi - exit 1;; - esac - - shift -done -# -# First check for a set of the autotools files; if absent then this is assumed -# to be a GIT version and the local autotools must be used. If present this -# is a tarball distribution and the script should not be used. If partially -# present bad things are happening. -# -# The autotools generated files: -libpng_autotools_files="Makefile.in aclocal.m4 config.guess config.h.in\ - config.sub configure depcomp install-sh ltmain.sh missing test-driver" -# -# Files generated by versions of configue >2.68 or automake >1.13 (i.e. later -# versions than those required by configure.ac): -libpng_autotools_extra="compile" -# -# These are separate because 'maintainer-clean' does not remove them. -libpng_libtool_files="scripts/libtool.m4 scripts/ltoptions.m4\ - scripts/ltsugar.m4 scripts/ltversion.m4 scripts/lt~obsolete.m4" - -libpng_autotools_dirs="autom4te.cache" # not required -# -# The configure generated files: -libpng_configure_files="Makefile config.h config.log config.status\ - libpng-config libpng.pc libtool stamp-h1" - -libpng_configure_dirs=".deps" -# -# We must remove the configure generated files as well as the autotools -# generated files if autotools are regenerated because otherwise if configure -# has been run without "--enable-maintainer-mode" make can do a partial update -# of Makefile. These functions do the two bits of cleaning. -clean_autotools(){ - rm -rf $libpng_autotools_files $libpng_libtool_files $libpng_autotools_dirs - rm -rf $libpng_autotools_extra -} - -clean_configure(){ - rm -rf $libpng_configure_files $libpng_configure_dirs -} -# -# Clean: remove everything (this is to help with testing) -if test -n "$clean" -then - clean_configure - if test -n "$maintainer" - then - clean_autotools - fi - - exit 0 -fi -# -# Validate the distribution. -libpng_autotools_file_found= -libpng_autotools_file_missing= -for file in $libpng_autotools_files -do - if test -f "$file" - then - libpng_autotools_file_found=1 - else - libpng_autotools_file_missing=1 - fi -done -# -# Presence of one of these does not *invalidate* missing, but absence -# invalidates found. -for file in $libpng_libtool_files -do - if test ! -f "$file" - then - libpng_autotools_file_missing=1 - fi -done -# -# The cache directory doesn't matter - it will be regenerated and does not exist -# anyway in a tarball. -# -# Either everything is missing or everything is there, the --maintainer option -# just changes this so that the mode is set to generate all the files. -mode= -if test -z "$libpng_autotools_file_found" -o -n "$maintainer" -then - mode="autoreconf" -else - if test -n "$libpng_autotools_file_missing" - then - mode="broken" - else - mode="configure" - fi -fi -# -# So: -case "$mode" in - autoreconf) - # Clean in case configure files exist - clean_configure - clean_autotools - # Everything must be initialized, so use --force - if autoreconf --warnings=all --force --install - then - missing= - for file in $libpng_autotools_files - do - test -f "$file" || missing=1 - done - # ignore the cache directory - test -z "$missing" || { - exec >&2 - echo "autoreconf was run, but did not produce all the expected" - echo "files. It is likely that your autotools installation is" - echo "not compatible with that expected by libpng." - exit 1 - } - else - exec >&2 - echo "autoreconf failed: your version of autotools is incompatible" - echo "with this libpng version. Please use a distributed archive" - echo "(which includes the autotools generated files) and run configure" - echo "instead." - exit 1 - fi;; - - configure) - if test -d .git - then - exec >&2 - echo "ERROR: running autoreconf on an initialized sytem" - echo " This is not necessary; it is only necessary to remake the" - echo " autotools generated files if Makefile.am or configure.ac" - echo " change and make does the right thing with:" - echo - echo " ./configure --enable-maintainer-mode." - echo - echo " You can run autoreconf yourself if you don't like maintainer" - echo " mode and you can also just run autoreconf -f -i to initialize" - echo " everything in the first place; this script is only for" - echo " compatibility with prior releases." - exit 1 - else - exec >&2 - echo "autogen.sh is intended only to generate 'configure' on systems" - echo "that do not have it. You have a complete 'configure', if you" - echo "need to change Makefile.am or configure.ac you also need to" - echo "run configure with the --enable-maintainer-mode option." - exit 1 - fi;; - - broken) - exec >&2 - echo "Your system has a partial set of autotools generated files." - echo "autogen.sh is unable to proceed. The full set of files is" - echo "contained in the libpng 'tar' distribution archive and you do" - echo "not need to run autogen.sh if you use it." - exit 1;; -esac diff --git a/libpng16/configure.ac b/libpng16/configure.ac deleted file mode 100644 index 3ef41e9..0000000 --- a/libpng16/configure.ac +++ /dev/null @@ -1,285 +0,0 @@ -# configure.ac - -dnl Process this file with autoconf to produce a configure script. -dnl -dnl Minor upgrades (compatible ABI): increment the package version -dnl (third field in two places below) and set the PNGLIB_RELEASE -dnl variable. -dnl -dnl Major upgrades (incompatible ABI): increment the package major -dnl version (second field, or first if desired), set the minor -dnl to 0, set PNGLIB_MAJOR below *and* follow the instructions in -dnl Makefile.am to upgrade the package name. - -dnl This is here to prevent earlier autoconf from being used, it -dnl should not be necessary to regenerate configure if the time -dnl stamps are correct -AC_PREREQ([2.68]) - -dnl Version number stuff here: - -AC_INIT([libpng],[1.6.8beta03],[png-mng-implement@lists.sourceforge.net]) -AC_CONFIG_MACRO_DIR([scripts]) - -# libpng does not follow GNU file name conventions (hence 'foreign') -# color-tests requires automake 1.11 or later -# silent-rules requires automake 1.11 or later -# dist-xz requires automake 1.11 or later -# 1.12.2 fixes a security issue in 1.11.2 and 1.12.1 -# 1.13 is required for parallel tests -AM_INIT_AUTOMAKE([1.13 foreign dist-xz color-tests silent-rules subdir-objects]) -# The following line causes --disable-maintainer-mode to be the default to -# configure, this is necessary because libpng distributions cannot rely on the -# time stamps of the autotools generated files being correct -AM_MAINTAINER_MODE - -dnl configure.ac and Makefile.am expect automake 1.11.2 or a compatible later -dnl version; aclocal.m4 will generate a failure if you use a prior version of -dnl automake, so the following is not necessary (and is not defined anyway): -dnl AM_PREREQ([1.11.2]) -dnl stop configure from automagically running automake - -PNGLIB_VERSION=1.6.8beta03 -PNGLIB_MAJOR=1 -PNGLIB_MINOR=6 -PNGLIB_RELEASE=8 - -dnl End of version number stuff - -AC_CONFIG_SRCDIR([pngget.c]) -AC_CONFIG_HEADERS([config.h]) - -# Checks for programs. -AC_LANG([C]) -AC_PROG_CC -AM_PROG_AS -LT_PATH_LD -AC_PROG_CPP -AC_PROG_AWK -AC_PROG_INSTALL -AC_PROG_LN_S -AC_PROG_MAKE_SET - -dnl libtool/libtoolize; version 2.4.2 is the tested version, this or any -dnl compatible later version may be used -LT_INIT([win32-dll]) -LT_PREREQ([2.4.2]) - -# Some awks crash when confronted with pnglibconf.dfa, do a test run now -# to make sure this doesn't happen -AC_MSG_CHECKING([that AWK works]) -if ${AWK} -f ${srcdir}/scripts/options.awk out="/dev/null" version=search\ - ${srcdir}/pngconf.h ${srcdir}/scripts/pnglibconf.dfa\ - ${srcdir}/pngusr.dfa 1>&2 -then - AC_MSG_RESULT([ok]) -else - AC_MSG_FAILURE([failed], 1) -fi - -# This is a remnant of the old cc -E validation, where it may have been -# necessary to use a different preprocessor for .dfn files -DFNCPP="$CPP" -AC_SUBST(DFNCPP) - -# -Werror cannot be passed to GCC in CFLAGS because configure will fail (it -# checks the compiler with a program that generates a warning), add the -# following option to deal with this -AC_ARG_VAR(PNG_COPTS, - [additional flags for the C compiler, use this for options that would] - [cause configure itself to fail]) -AC_ARG_ENABLE(werror, - AS_HELP_STRING([[[--enable-werror[=OPT]]]], - [Pass -Werror or the given argument to the compiler if it is supported]), - [test "$enable_werror" = "yes" && enable_werror="-Werror" - if test "$enable_werror" != "no"; then - sav_CFLAGS="$CFLAGS" - CFLAGS="$enable_werror $CFLAGS" - AC_MSG_CHECKING([if the compiler allows $enable_werror]) - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE([ - [int main(int argc, char **argv){] - [return argv[argc-1][0];] - [}]])], - AC_MSG_RESULT(yes) - PNG_COPTS="$PNG_COPTS $enable_werror", - AC_MSG_RESULT(no)) - CFLAGS="$sav_CFLAGS" - fi],) - -# Checks for header files. -AC_HEADER_STDC - -# Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_TYPE_SIZE_T -AC_STRUCT_TM -AC_C_RESTRICT - -# Checks for library functions. -AC_FUNC_STRTOD -AC_CHECK_FUNCS([memset], , AC_MSG_ERROR(memset not found in libc)) -AC_CHECK_FUNCS([pow], , AC_CHECK_LIB(m, pow, , AC_MSG_ERROR(cannot find pow)) ) -AC_ARG_WITH(zlib-prefix, - AS_HELP_STRING([[[--with-zlib-prefix]]], - [prefix that may have been used in installed zlib]), - [ZPREFIX=${withval}], - [ZPREFIX='z_']) -AC_CHECK_LIB(z, zlibVersion, , - AC_CHECK_LIB(z, ${ZPREFIX}zlibVersion, , AC_MSG_ERROR(zlib not installed))) - -# The following is for pngvalid, to ensure it catches FP errors even on -# platforms that don't enable FP exceptions, the function appears in the math -# library (typically), it's not an error if it is not found. -AC_CHECK_LIB([m], [feenableexcept]) -AC_CHECK_FUNCS([feenableexcept]) - -AC_MSG_CHECKING([if using Solaris linker]) -SLD=`$LD --version 2>&1 | grep Solaris` -if test "$SLD"; then - have_solaris_ld=yes - AC_MSG_RESULT(yes) -else - have_solaris_ld=no - AC_MSG_RESULT(no) -fi -AM_CONDITIONAL(HAVE_SOLARIS_LD, test "$have_solaris_ld" = "yes") - -AC_MSG_CHECKING([if libraries can be versioned]) -# Special case for PE/COFF platforms: ld reports -# support for version-script, but doesn't actually -# DO anything with it. -case $host in -*cygwin* | *mingw32* | *interix* ) - have_ld_version_script=no - AC_MSG_RESULT(no) -;; -* ) - -if test "$have_solaris_ld" = "yes"; then - GLD=`$LD --help < /dev/null 2>&1 | grep 'M mapfile'` -else - GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script` -fi - -if test "$GLD"; then - have_ld_version_script=yes - AC_MSG_RESULT(yes) -else - have_ld_version_script=no - AC_MSG_RESULT(no) - AC_MSG_WARN(*** You have not enabled versioned symbols.) -fi -;; -esac - -AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes") - -if test "$have_ld_version_script" = "yes"; then - AC_MSG_CHECKING([for symbol prefix]) - SYMBOL_PREFIX=`echo "PREFIX=__USER_LABEL_PREFIX__" \ - | ${CPP-${CC-gcc} -E} - 2>&1 \ - | ${EGREP-grep} "^PREFIX=" \ - | ${SED-sed} -e "s:^PREFIX=::" -e "s:__USER_LABEL_PREFIX__::"` - AC_SUBST(SYMBOL_PREFIX) - AC_MSG_RESULT($SYMBOL_PREFIX) -fi - -# Substitutions for .in files -AC_SUBST(PNGLIB_VERSION) -AC_SUBST(PNGLIB_MAJOR) -AC_SUBST(PNGLIB_MINOR) -AC_SUBST(PNGLIB_RELEASE) - -# Additional arguments (and substitutions) -# Allow the pkg-config directory to be set -AC_ARG_WITH(pkgconfigdir, - AS_HELP_STRING([[[--with-pkgconfigdir]]], - [Use the specified pkgconfig dir (default is libdir/pkgconfig)]), - [pkgconfigdir=${withval}], - [pkgconfigdir='${libdir}/pkgconfig']) - -AC_SUBST([pkgconfigdir]) -AC_MSG_NOTICE([[pkgconfig directory is ${pkgconfigdir}]]) - -# Make the *-config binary config scripts optional -AC_ARG_WITH(binconfigs, - AS_HELP_STRING([[[--with-binconfigs]]], - [Generate shell libpng-config scripts as well as pkg-config data] - [@<:@default=yes@:>@]), - [if test "${withval}" = no; then - binconfigs= - AC_MSG_NOTICE([[libpng-config scripts will not be built]]) - else - binconfigs='${binconfigs}' - fi], - [binconfigs='${binconfigs}']) -AC_SUBST([binconfigs]) - -# Support for prefixes to the API function names; this will generate defines -# at the start of the build to rename exported library functions -AC_ARG_WITH(libpng-prefix, - AS_HELP_STRING([[[--with-libpng-prefix]]], - [prefix libpng exported function (API) names with the given value]), - [if test "${withval:-no}" != "no"; then - AC_SUBST([PNG_PREFIX], [${withval}]) - fi]) -AM_CONDITIONAL([DO_PNG_PREFIX], [test "${with_libpng_prefix:-no}" != "no"]) - -# HOST SPECIFIC OPTIONS -# ===================== -# -# ARM -# === -# -# ARM NEON (SIMD) support. - -AC_ARG_ENABLE([arm-neon], - AS_HELP_STRING([[[--enable-arm-neon]]], - [Enable ARM NEON optimizations: =no/off, check, api, yes/on:] - [no/off: disable the optimizations; check: use internal checking code] - [(deprecated and poorly supported); api: disable by default, enable by] - [a call to png_set_option; yes/on: turn on unconditionally.] - [If not specified: determined by the compiler.]), - [case "$enableval" in - no|off) - # disable the default enabling on __ARM_NEON__ systems: - AC_DEFINE([PNG_ARM_NEON_OPT], [0], - [Disable ARM Neon optimizations]) - # Prevent inclusion of the assembler files below: - enable_arm_neon=no;; - check) - AC_DEFINE([PNG_ARM_NEON_CHECK_SUPPORTED], [], - [Check for ARM Neon support at run-time]);; - api) - AC_DEFINE([PNG_ARM_NEON_API_SUPPORTED], [], - [Turn on ARM Neon optimizations at run-time]);; - yes|on) - AC_DEFINE([PNG_ARM_NEON_OPT], [2], - [Enable ARM Neon optimizations]) - AC_MSG_WARN([--enable-arm-neon: please specify 'check' or 'api', if] - [you want the optimizations unconditionally pass -mfpu=neon] - [to the compiler.]);; - *) - AC_MSG_ERROR([--enable-arm-neon=${enable_arm_neon}: invalid value]) - esac]) - -# Add ARM specific files to all builds where the host_cpu is arm ('arm*') or -# where ARM optimizations were explicitly requested (this allows a fallback if a -# future host CPU does not match 'arm*') - -AM_CONDITIONAL([PNG_ARM_NEON], - [test "$enable_arm_neon" != 'no' && - case "$host_cpu" in - arm*) :;; - *) test "$enable_arm_neon" != '';; - esac]) - -AC_MSG_NOTICE([[Extra options for compiler: $PNG_COPTS]]) - -# Config files, substituting as above -AC_CONFIG_FILES([Makefile libpng.pc:libpng.pc.in]) -AC_CONFIG_FILES([libpng-config:libpng-config.in], - [chmod +x libpng-config]) - -AC_OUTPUT diff --git a/libpng16/contrib/README.txt b/libpng16/contrib/README.txt deleted file mode 100644 index bcd433d..0000000 --- a/libpng16/contrib/README.txt +++ /dev/null @@ -1,4 +0,0 @@ - -This "contrib" directory contains contributions which are not necessarily under -the libpng license, although all are open source. They are not part of -libpng proper and are not used for building the library. diff --git a/libpng16/contrib/conftest/README b/libpng16/contrib/conftest/README deleted file mode 100644 index 0f47279..0000000 --- a/libpng16/contrib/conftest/README +++ /dev/null @@ -1,49 +0,0 @@ -This directory contains test configuration files, currently always '.dfa' files -intended to be used in the build by setting the make macro DFA_XTRA to the name -of the file. - -These files are used in release validation of the 'configure' builds of libpng -by building 'make check', or 'make all-am' for cross-builds, with each .dfa -file. - -The files in this directory may change between minor releases, however -contributions describing specific builds of libpng are welcomed. There is no -guarantee that libpng will continue to build with such configurations; support -for given configurations can be, and has been, dropped between successive minor -releases. However if a .dfa file describing a configuration is not in this -directory it is very unlikely that it will be tested before a minor release! - -You can use these .dfa files as the basis of new configurations. Files in this -directory should not have any use restrictions or restrictive licenses. - -This directory is not included in the .zip and .7z distributions, which do -not contain 'configure' scripts. - -DOCUMENTATION -============= - -Examples: - ${srcdir}/pngusr.dfa - ${srcdir}/contrib/pngminim/*/pngusr.dfa - -Documentation of the options: - ${srcdir}/scripts/pnglibconf.dfa - -Documentation of the file format: - ${srcdir}/scripts/options.awk - -FILE NAMING -=========== - -File names in this directory may NOT contain any of the five characters: - - - , + * ? - -Neither may they contain any space character. - -While other characters may be used it is strongly suggested that file names be -limited to lower case Latiin alphabetic characters (a-z), digits (0-9) and, if -necessary the underscore (_) character. File names should be about 8 characters -long (excluding the .dfa extension). Submitted .dfa files should have names -between 7 and 16 characters long, shorter names (6 characters or less) are -reserved for standard tests. diff --git a/libpng16/contrib/conftest/read.dfa b/libpng16/contrib/conftest/read.dfa deleted file mode 100644 index 21e88d0..0000000 --- a/libpng16/contrib/conftest/read.dfa +++ /dev/null @@ -1,58 +0,0 @@ -# read.dfa -# Build time configuration of libpng -# -# Author: John Bowler -# Copyright: (c) John Bowler, 2013 -# Usage rights: -# To the extent possible under law, the author has waived all copyright and -# related or neighboring rights to this work. This work is published from: -# United States. -# -# Build libpng with basic read support. This enables the lowest level libpng -# read API - the one where the calling code has to use a loop to read each row. -# At present this is the API used by most programs. -# -# Support is enabled only for those chunks and transformations that are -# typically required - others can be added easily. -# - -everything = off - -# The sequential read code is enabled here; the progressive code can be used -# instead but there is no point enabling both. - -option SEQUENTIAL_READ on - -# Likewise it is pointless enabling both fixed and floating point APIs. Choose -# one or the other for both the API and the internal math. - -#Fixed point: -#option FIXED_POINT on -#option FLOATING_ARITHMETIC off - -#Floating point: -option FLOATING_POINT on -option FLOATING_ARITHMETIC on - -# Basic error handling, IO and user memory support. The latter allows the -# application program to provide its own implementations of 'malloc' and 'free'. -option SETJMP on -option STDIO on -option USER_MEM on - -# To read the full set of PNG images correctly interlace, transparency and -# 16-bit support is required. The application can implement interlace itself, -# but very few do and it's no longer possible to disable it when READ is -# enabled. -option READ_tRNS on -option READ_16BIT on - -# Everything else is application dependent. This file assumes the app handles -# all the native PNG bit layouts, so it doesn't need any of layout change -# transforms, but needs libpng to perform gamma correction. It doesn't do any -# colorspace stuff and ignores the 'significant bit' information. -# -# If your app always expands the image to a limited set of bit layouts you -# probably want to consider using the simplified API instead of the low level -# one - see png.h and s_read.dfa. -option READ_GAMMA on diff --git a/libpng16/contrib/conftest/s_read.dfa b/libpng16/contrib/conftest/s_read.dfa deleted file mode 100644 index cb1ce0b..0000000 --- a/libpng16/contrib/conftest/s_read.dfa +++ /dev/null @@ -1,35 +0,0 @@ -# s_read.dfa -# Build time configuration of libpng -# -# Author: John Bowler -# Copyright: (c) John Bowler, 2013 -# Usage rights: -# To the extent possible under law, the author has waived all copyright and -# related or neighboring rights to this work. This work is published from: -# United States. -# -# Build libpng with simplified read support (only). This builds a minimal -# libpng able to read all PNG formats and convert them into a small number of -# well understood memory formats. -# - -everything = off - -option SIMPLIFIED_READ on - -# It isn't necessary to chose fixed or floating point for the APIs because the -# simplified API doesn't need fixed or floating point numbers. It is necessary -# to chose an internal math implementation. The default (because of 'everything -# = off') is fixed point - turn the floating point implementation on if you have -# hardware floating point or prefer your software floating point implementation. -option FLOATING_ARITHMETIC on - -# This is not strictly necessary, but without it the message strings in the API -# will not be filled in -option ERROR_TEXT on - -# Switching these options on enables the 'AFIRST' and 'BGR' formats - you don't -# need this if you don't use them, they just allow the in-memory layout to be -# changed to match common hardware formats. -option SIMPLIFIED_READ_AFIRST on -option SIMPLIFIED_READ_BGR on diff --git a/libpng16/contrib/conftest/s_write.dfa b/libpng16/contrib/conftest/s_write.dfa deleted file mode 100644 index e540a46..0000000 --- a/libpng16/contrib/conftest/s_write.dfa +++ /dev/null @@ -1,33 +0,0 @@ -# s_write.dfa -# Build time configuration of libpng -# -# Author: John Bowler -# Copyright: (c) John Bowler, 2013 -# Usage rights: -# To the extent possible under law, the author has waived all copyright and -# related or neighboring rights to this work. This work is published from: -# United States. -# -# Build libpng with (just) simplified write support -# - -everything = off - -option SIMPLIFIED_WRITE on - -# It isn't necessary to chose fixed or floating point for the APIs because the -# simplified API doesn't need fixed or floating point numbers. It is necessary -# to chose an internal math implementation. The default (because of 'everything -# = off') is fixed point - turn the floating point implementation on if you have -# hardware floating point or prefer your software floating point implementation. -option FLOATING_ARITHMETIC on - -# This is not strictly necessary, but without it the message strings in the API -# will not be filled in -option ERROR_TEXT on - -# Switching these options on enables the 'AFIRST' and 'BGR' formats - you don't -# need this if you don't use them, they just allow the in-memory layout to be -# changed to match common hardware formats. -option SIMPLIFIED_WRITE_AFIRST on -option SIMPLIFIED_WRITE_BGR on diff --git a/libpng16/contrib/conftest/simple.dfa b/libpng16/contrib/conftest/simple.dfa deleted file mode 100644 index 0419333..0000000 --- a/libpng16/contrib/conftest/simple.dfa +++ /dev/null @@ -1,36 +0,0 @@ -# simple.dfa -# Build time configuration of libpng -# -# Author: John Bowler -# Copyright: (c) John Bowler, 2013 -# Usage rights: -# To the extent possible under law, the author has waived all copyright and -# related or neighboring rights to this work. This work is published from: -# United States. -# -# Build libpng with just the simplified APIs (read and write). -# - -everything = off - -option SIMPLIFIED_WRITE on -option SIMPLIFIED_READ on - -# It isn't necessary to chose fixed or floating point for the APIs because the -# simplified API doesn't need fixed or floating point numbers. It is necessary -# to chose an internal math implementation. The default (because of 'everything -# = off') is fixed point - turn the floating point implementation on if you have -# hardware floating point or prefer your software floating point implementation. -option FLOATING_ARITHMETIC on - -# This is not strictly necessary, but without it the message strings in the API -# will not be filled in -option ERROR_TEXT on - -# Switching these options on enables the 'AFIRST' and 'BGR' formats - you don't -# need this if you don't use them, they just allow the in-memory layout to be -# changed to match common hardware formats. -option SIMPLIFIED_READ_AFIRST on -option SIMPLIFIED_READ_BGR on -option SIMPLIFIED_WRITE_AFIRST on -option SIMPLIFIED_WRITE_BGR on diff --git a/libpng16/contrib/conftest/write.dfa b/libpng16/contrib/conftest/write.dfa deleted file mode 100644 index 3319aab..0000000 --- a/libpng16/contrib/conftest/write.dfa +++ /dev/null @@ -1,45 +0,0 @@ -# write.dfa -# Build time configuration of libpng -# -# Author: John Bowler -# Copyright: (c) John Bowler, 2013 -# Usage rights: -# To the extent possible under law, the author has waived all copyright and -# related or neighboring rights to this work. This work is published from: -# United States. -# -# Build libpng with no read support and minimal write support. -# - -everything = off - -# Switch on the write code - this makes a minimalist encoder - -option WRITE on - -# Choose fixed or floating point APIs and arithmetic. The choices are -# independent but normally they will match. It is typically better to use the -# floating point if you have floating point hardware. If you don't know, or -# (perhaps) to make libpng smaller used fixed point throughout. - -#Fixed point: -#option FIXED_POINT on -#option FLOATING_ARITHMETIC off - -#Floating point: -option FLOATING_POINT on -option FLOATING_ARITHMETIC on - -# Basic error handling, IO and user memory support. The latter allows the -# application program to provide its own implementations of 'malloc' and 'free'. -option SETJMP on -option STDIO on -option USER_MEM on - -# Everything else is optional. Unlike the read code in libpng the write code -# does not need to deal with arbitrary formats, so only add support for things -# you really do write! For example you might only write sRGB images, sometimes -# with transparency and never write 16 bit images, so: -option WRITE_sRGB on -option WRITE_tRNS on -#option WRITE_16BIT off (this is the default with 'everything = off') diff --git a/libpng16/contrib/examples/README.txt b/libpng16/contrib/examples/README.txt deleted file mode 100644 index 0525c9d..0000000 --- a/libpng16/contrib/examples/README.txt +++ /dev/null @@ -1,24 +0,0 @@ - -This directory (contrib/examples) contains examples of libpng usage. - -NO COPYRIGHT RIGHTS ARE CLAIMED TO ANY OF THE FILES IN THIS DIRECTORY. - -To the extent possible under law, the authors have waived all copyright and -related or neighboring rights to this work. This work is published from: -United States. - -The files may be used freely in any way. The intention is that appropriate -parts of the files be used in other libpng-using programs without any need for -the authors of the using code to seek copyright or license from the original -authors. - -The source code and comments in this directory are the original work of the -people named below. No other person or organization has made contributions to -the work in this directory. - -ORIGINAL AUTHORS - The following people have contributed to the code in this directory. None - of the people below claim any rights with regard to the contents of this - directory. - - John Bowler diff --git a/libpng16/contrib/examples/iccfrompng.c b/libpng16/contrib/examples/iccfrompng.c deleted file mode 100644 index 6767621..0000000 --- a/libpng16/contrib/examples/iccfrompng.c +++ /dev/null @@ -1,180 +0,0 @@ -/*- iccfrompng - * - * COPYRIGHT: Written by John Cunningham Bowler, 2011. - * To the extent possible under law, the author has waived all copyright and - * related or neighboring rights to this work. This work is published from: - * United States. - * - * Extract any icc profiles found in the given PNG files. This is a simple - * example of a program which extracts information from the header of a PNG file - * without processing the image. Notice that some header information may occur - * after the image data, textual data and comments are an example; the approach - * in this file won't work reliably for such data because it only looks for the - * information in the section of the file that preceeds the image data. - * - * Compile and link against libpng and zlib, plus anything else required on the - * system you use. - * - * To use supply a list of PNG files containing iCCP chunks, the chunks will be - * extracted to a similarly named file with the extension replaced by 'icc', - * which will be overwritten without warning. - */ -#include -#include -#include -#include - -#include - -static int verbose = 1; -static png_byte no_profile[] = "no profile"; - -static png_bytep -extract(FILE *fp, png_uint_32 *proflen) -{ - png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,0,0,0); - png_infop info_ptr = NULL; - png_bytep result = NULL; - - /* Initialize for error or no profile: */ - *proflen = 0; - - if (png_ptr == NULL) - { - fprintf(stderr, "iccfrompng: version library mismatch?\n"); - return 0; - } - - if (setjmp(png_jmpbuf(png_ptr))) - { - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - return 0; - } - - png_init_io(png_ptr, fp); - - info_ptr = png_create_info_struct(png_ptr); - if (info_ptr == NULL) - png_error(png_ptr, "OOM allocating info structure"); - - png_read_info(png_ptr, info_ptr); - - { - png_charp name; - int compression_type; - png_bytep profile; - - if (png_get_iCCP(png_ptr, info_ptr, &name, &compression_type, &profile, - proflen) & PNG_INFO_iCCP) - { - result = malloc(*proflen); - if (result != NULL) - memcpy(result, profile, *proflen); - - else - png_error(png_ptr, "OOM allocating profile buffer"); - } - - else - result = no_profile; - } - - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - return result; -} - -static int -extract_one_file(const char *filename) -{ - int result = 0; - FILE *fp = fopen(filename, "rb"); - - if (fp != NULL) - { - png_uint_32 proflen = 0; - png_bytep profile = extract(fp, &proflen); - - if (profile != NULL && profile != no_profile) - { - size_t len; - char *output; - - { - const char *ep = strrchr(filename, '.'); - - if (ep != NULL) - len = ep-filename; - - else - len = strlen(filename); - } - - output = malloc(len + 5); - if (output != NULL) - { - FILE *of; - - memcpy(output, filename, len); - strcpy(output+len, ".icc"); - - of = fopen(output, "wb"); - if (of != NULL) - { - if (fwrite(profile, proflen, 1, of) == 1 && - fflush(of) == 0 && - fclose(of) == 0) - { - if (verbose) - printf("%s -> %s\n", filename, output); - /* Success return */ - result = 1; - } - - else - { - fprintf(stderr, "%s: error writing profile\n", output); - if (remove(output)) - fprintf(stderr, "%s: could not remove file\n", output); - } - } - - else - fprintf(stderr, "%s: failed to open output file\n", output); - - free(output); - } - - else - fprintf(stderr, "%s: OOM allocating string!\n", filename); - - free(profile); - } - - else if (verbose && profile == no_profile) - printf("%s has no profile\n", filename); - } - - else - fprintf(stderr, "%s: could not open file\n", filename); - - return result; -} - -int -main(int argc, char **argv) -{ - int i; - int extracted = 0; - - for (i=1; i -#include -#include /* required for error handling */ - -/* Normally use here to get the installed libpng, but this is done to - * ensure the code picks up the local libpng implementation: - */ -#include "../../png.h" - -/* Return component 'c' of pixel 'x' from the given row. */ -static unsigned int -component(png_const_bytep row, png_uint_32 x, unsigned int c, - unsigned int bit_depth, unsigned int channels) -{ - /* PNG images can be up to 2^31 pixels wide, but this means they can be up to - * 2^37 bits wide (for a 64-bit pixel - the largest possible) and hence 2^34 - * bytes wide. Since the row fitted into memory, however, the following must - * work: - */ - png_uint_32 bit_offset_hi = bit_depth * ((x >> 6) * channels); - png_uint_32 bit_offset_lo = bit_depth * ((x & 0x3f) * channels + c); - - row = (png_const_bytep)(((PNG_CONST png_byte (*)[8])row) + bit_offset_hi); - row += bit_offset_lo >> 3; - bit_offset_lo &= 0x07; - - /* PNG pixels are packed into bytes to put the first pixel in the highest - * bits of the byte and into two bytes for 16-bit values with the high 8 bits - * first, so: - */ - switch (bit_depth) - { - case 1: return (row[0] >> (7-bit_offset_lo)) & 0x01; - case 2: return (row[0] >> (6-bit_offset_lo)) & 0x03; - case 4: return (row[0] >> (4-bit_offset_lo)) & 0x0f; - case 8: return row[0]; - case 16: return (row[0] << 8) + row[1]; - default: - /* This should never happen, it indicates a bug in this program or in - * libpng itself: - */ - fprintf(stderr, "pngpixel: invalid bit depth %u\n", bit_depth); - exit(1); - } -} - -/* Print a pixel from a row returned by libpng; determine the row format, find - * the pixel, and print the relevant information to stdout. - */ -static void -print_pixel(png_structp png_ptr, png_infop info_ptr, png_const_bytep row, - png_uint_32 x) -{ - PNG_CONST unsigned int bit_depth = png_get_bit_depth(png_ptr, info_ptr); - - switch (png_get_color_type(png_ptr, info_ptr)) - { - case PNG_COLOR_TYPE_GRAY: - printf("GRAY %u\n", component(row, x, 0, bit_depth, 1)); - return; - - /* The palette case is slightly more difficult - the palette and, if - * present, the tRNS ('transparency', though the values are really - * opacity) data must be read to give the full picture: - */ - case PNG_COLOR_TYPE_PALETTE: - { - PNG_CONST unsigned int index = component(row, x, 0, bit_depth, 1); - png_colorp palette = NULL; - int num_palette = 0; - - if ((png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette) & - PNG_INFO_PLTE) && num_palette > 0 && palette != NULL) - { - png_bytep trans_alpha = NULL; - int num_trans = 0; - if ((png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, - NULL) & PNG_INFO_tRNS) && num_trans > 0 && - trans_alpha != NULL) - printf("INDEXED %u = %d %d %d %d\n", index, - palette[index].red, palette[index].green, - palette[index].blue, - index < num_trans ? trans_alpha[index] : 255); - - else /* no transparency */ - printf("INDEXED %u = %d %d %d\n", index, - palette[index].red, palette[index].green, - palette[index].blue); - } - - else - printf("INDEXED %u = invalid index\n", index); - } - return; - - case PNG_COLOR_TYPE_RGB: - printf("RGB %u %u %u\n", component(row, x, 0, bit_depth, 3), - component(row, x, 1, bit_depth, 3), - component(row, x, 2, bit_depth, 3)); - return; - - case PNG_COLOR_TYPE_GRAY_ALPHA: - printf("GRAY+ALPHA %u %u\n", component(row, x, 0, bit_depth, 2), - component(row, x, 1, bit_depth, 2)); - return; - - case PNG_COLOR_TYPE_RGB_ALPHA: - printf("RGBA %u %u %u %u\n", component(row, x, 0, bit_depth, 4), - component(row, x, 1, bit_depth, 4), - component(row, x, 2, bit_depth, 4), - component(row, x, 3, bit_depth, 4)); - return; - - default: - png_error(png_ptr, "invalid color type"); - } -} - -int main(int argc, const char **argv) -{ - /* This program uses the default, based, libpng error handling - * mechanism, therefore any local variable that exists before the call to - * setjmp and is changed after the call to setjmp returns successfully must - * be declared with 'volatile' to ensure that their values don't get - * destroyed by longjmp: - */ - volatile int result = 1/*fail*/; - - if (argc == 4) - { - long x = atol(argv[1]); - long y = atol(argv[2]); - FILE *f = fopen(argv[3], "rb"); - volatile png_bytep row = NULL; - - if (f != NULL) - { - /* libpng requires a callback function for handling errors; this - * callback must not return. The default callback function uses a - * stored style jmp_buf which is held in a png_struct and - * writes error messages to stderr. Creating the png_struct is a - * little tricky; just copy the following code. - */ - png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, - NULL, NULL, NULL); - - if (png_ptr != NULL) - { - png_infop info_ptr = png_create_info_struct(png_ptr); - - if (info_ptr != NULL) - { - /* Declare stack variables to hold pointers to locally allocated - * data. - */ - - /* Initialize the error control buffer: */ - if (setjmp(png_jmpbuf(png_ptr)) == 0) - { - png_uint_32 width, height; - int bit_depth, color_type, interlace_method, - compression_method, filter_method; - png_bytep row_tmp; - - /* Now associate the recently opened (FILE*) with the default - * libpng initialization functions. Sometimes libpng is - * compiled without stdio support (it can be difficult to do - * in some environments); in that case you will have to write - * your own read callback to read data from the (FILE*). - */ - png_init_io(png_ptr, f); - - /* And read the first part of the PNG file - the header and - * all the information up to the first pixel. - */ - png_read_info(png_ptr, info_ptr); - - /* This fills in enough information to tell us the width of - * each row in bytes, allocate the appropriate amount of - * space. In this case png_malloc is used - it will not - * return if memory isn't available. - */ - row = png_malloc(png_ptr, png_get_rowbytes(png_ptr, - info_ptr)); - - /* To avoid the overhead of using a volatile auto copy row_tmp - * to a local here - just use row for the png_free below. - */ - row_tmp = row; - - /* All the information we need is in the header is returned by - * png_get_IHDR, if this fails we can now use 'png_error' to - * signal the error and return control to the setjmp above. - */ - if (png_get_IHDR(png_ptr, info_ptr, &width, &height, - &bit_depth, &color_type, &interlace_method, - &compression_method, &filter_method)) - { - int passes, pass; - - /* png_set_interlace_handling returns the number of - * passes required as well as turning on libpng's - * handling, but since we do it ourselves this is - * necessary: - */ - switch (interlace_method) - { - case PNG_INTERLACE_NONE: - passes = 1; - break; - - case PNG_INTERLACE_ADAM7: - passes = PNG_INTERLACE_ADAM7_PASSES; - break; - - default: - png_error(png_ptr, "pngpixel: unknown interlace"); - } - - /* Now read the pixels, pass-by-pass, row-by-row: */ - png_start_read_image(png_ptr); - - for (pass=0; pass -#include -#include -#include - -/* Normally use here to get the installed libpng, but this is done to - * ensure the code picks up the local libpng implementation: - */ -#include "../../png.h" - -int main(int argc, const char **argv) -{ - int result = 1; - - if (argc == 3) - { - png_image image; - - /* Only the image structure version number needs to be set. */ - memset(&image, 0, sizeof image); - image.version = PNG_IMAGE_VERSION; - - if (png_image_begin_read_from_file(&image, argv[1])) - { - png_bytep buffer; - - /* Change this to try different formats! If you set a colormap format - * then you must also supply a colormap below. - */ - image.format = PNG_FORMAT_RGBA; - - buffer = malloc(PNG_IMAGE_SIZE(image)); - - if (buffer != NULL) - { - if (png_image_finish_read(&image, NULL/*background*/, buffer, - 0/*row_stride*/, NULL/*colormap for PNG_FORMAT_FLAG_COLORMAP */)) - { - if (png_image_write_to_file(&image, argv[2], - 0/*convert_to_8bit*/, buffer, 0/*row_stride*/, - NULL/*colormap*/)) - result = 0; - - else - fprintf(stderr, "pngtopng: write %s: %s\n", argv[2], - image.message); - - free(buffer); - } - - else - { - fprintf(stderr, "pngtopng: read %s: %s\n", argv[1], - image.message); - - /* This is the only place where a 'free' is required; libpng does - * the cleanup on error and success, but in this case we couldn't - * complete the read because of running out of memory. - */ - png_image_free(&image); - } - } - - else - fprintf(stderr, "pngtopng: out of memory: %lu bytes\n", - (unsigned long)PNG_IMAGE_SIZE(image)); - } - - else - /* Failed to read the first argument: */ - fprintf(stderr, "pngtopng: %s: %s\n", argv[1], image.message); - } - - else - /* Wrong number of arguments */ - fprintf(stderr, "pngtopng: usage: pngtopng input-file output-file\n"); - - return result; -} diff --git a/libpng16/contrib/gregbook/COPYING b/libpng16/contrib/gregbook/COPYING deleted file mode 100644 index a3e9774..0000000 --- a/libpng16/contrib/gregbook/COPYING +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/libpng16/contrib/gregbook/LICENSE b/libpng16/contrib/gregbook/LICENSE deleted file mode 100644 index d956717..0000000 --- a/libpng16/contrib/gregbook/LICENSE +++ /dev/null @@ -1,50 +0,0 @@ - --------------------------------------------------------------------------- - - Copyright (c) 1998-2008 Greg Roelofs. All rights reserved. - - This software is provided "as is," without warranty of any kind, - express or implied. In no event shall the author or contributors - be held liable for any damages arising in any way from the use of - this software. - - The contents of this file are DUAL-LICENSED. You may modify and/or - redistribute this software according to the terms of one of the - following two licenses (at your option): - - - LICENSE 1 ("BSD-like with advertising clause"): - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute - it freely, subject to the following restrictions: - - 1. Redistributions of source code must retain the above copyright - notice, disclaimer, and this list of conditions. - 2. Redistributions in binary form must reproduce the above copyright - notice, disclaimer, and this list of conditions in the documenta- - tion and/or other materials provided with the distribution. - 3. All advertising materials mentioning features or use of this - software must display the following acknowledgment: - - This product includes software developed by Greg Roelofs - and contributors for the book, "PNG: The Definitive Guide," - published by O'Reilly and Associates. - - - LICENSE 2 (GNU GPL v2 or later): - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - --------------------------------------------------------------------------- diff --git a/libpng16/contrib/gregbook/Makefile.mingw32 b/libpng16/contrib/gregbook/Makefile.mingw32 deleted file mode 100644 index e70a59a..0000000 --- a/libpng16/contrib/gregbook/Makefile.mingw32 +++ /dev/null @@ -1,130 +0,0 @@ -# Sample makefile for rpng-win / rpng2-win / wpng using mingw32-gcc and make. -# Greg Roelofs -# Last modified: 2 June 2007 -# -# The programs built by this makefile are described in the book, -# "PNG: The Definitive Guide," by Greg Roelofs (O'Reilly and -# Associates, 1999). Go buy a copy, eh? Well, OK, it's not -# generally for sale anymore, but it's the thought that counts, -# right? (Hint: http://www.libpng.org/pub/png/book/ ) -# -# Invoke this makefile from a DOS-prompt window via: -# -# make -f Makefile.mingw32 -# -# This makefile assumes libpng and zlib have already been built or downloaded -# and are in subdirectories at the same level as the current subdirectory -# (as indicated by the PNGDIR and ZDIR macros below). It makes no assumptions -# at all about the mingw32 installation tree (W32DIR). Edit as appropriate. -# -# Note that the names of the dynamic and static libpng and zlib libraries -# used below may change in later releases of the libraries. This makefile -# builds both statically and dynamically linked executables by default. -# (You need only one set, but for testing it can be handy to have both.) - - -# macros -------------------------------------------------------------------- - -#PNGDIR = ../..# for libpng-x.y.z/contrib/gregbook builds -PNGDIR = ../libpng-win32 -PNGINC = -I$(PNGDIR) -PNGLIBd = $(PNGDIR)/libpng.dll.a # dynamically linked -PNGLIBs = $(PNGDIR)/libpng.a # statically linked, local libpng - -#ZDIR = ../../../zlib-win32# for libpng-x.y.z/contrib/gregbook builds -ZDIR = ../zlib-win32 -ZINC = -I$(ZDIR) -ZLIBd = $(ZDIR)/libzdll.a -ZLIBs = $(ZDIR)/libz.a - -# change this to be the path where mingw32 installs its stuff: -W32DIR = -#W32DIR = /usr/local/cross-tools/i386-mingw32msvc -W32INC = -I$(W32DIR)/include -W32LIB = $(W32DIR)/lib/libuser32.a $(W32DIR)/lib/libgdi32.a - -CC = gcc -#CC = i386-mingw32msvc-gcc # e.g., Linux -> Win32 cross-compilation -LD = $(CC) -RM = rm -f -CFLAGS = -O -Wall $(INCS) $(MINGW_CCFLAGS) -# [note that -Wall is a gcc-specific compilation flag ("most warnings on")] -# [-ansi, -pedantic and -W can also be used] -LDFLAGS = $(MINGW_LDFLAGS) -O = .o -E = .exe - -INCS = $(PNGINC) $(ZINC) $(W32INC) -RLIBSd = $(PNGLIBd) $(ZLIBd) $(W32LIB) -lm -RLIBSs = $(PNGLIBs) $(ZLIBs) $(W32LIB) -lm -WLIBSd = $(PNGLIBd) $(ZLIBd) -WLIBSs = $(PNGLIBs) $(ZLIBs) - -RPNG = rpng-win -RPNG2 = rpng2-win -WPNG = wpng - -ROBJSd = $(RPNG)$(O) readpng.pic$(O) -ROBJS2d = $(RPNG2)$(O) readpng2.pic$(O) -WOBJSd = $(WPNG)$(O) writepng.pic$(O) - -RPNGs = $(RPNG)-static -RPNG2s = $(RPNG2)-static -WPNGs = $(WPNG)-static - -ROBJSs = $(RPNG)$(O) readpng$(O) -ROBJS2s = $(RPNG2)$(O) readpng2$(O) -WOBJSs = $(WPNG)$(O) writepng$(O) - -STATIC_EXES = $(RPNGs)$(E) $(RPNG2s)$(E) $(WPNGs)$(E) -DYNAMIC_EXES = $(RPNG)$(E) $(RPNG2)$(E) $(WPNG)$(E) - -EXES = $(STATIC_EXES) $(DYNAMIC_EXES) - - -# implicit make rules ------------------------------------------------------- - -.c$(O): - $(CC) -c $(CFLAGS) $< - -%.pic$(O): %.c - $(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $< - - -# dependencies -------------------------------------------------------------- - -all: $(EXES) - -$(RPNGs)$(E): $(ROBJSs) - $(LD) $(LDFLAGS) -o $@ $(ROBJSs) $(RLIBSs) - -$(RPNG)$(E): $(ROBJSd) - $(LD) $(LDFLAGS) -o $@ $(ROBJSd) $(RLIBSd) - -$(RPNG2s)$(E): $(ROBJS2s) - $(LD) $(LDFLAGS) -o $@ $(ROBJS2s) $(RLIBSs) - -$(RPNG2)$(E): $(ROBJS2d) - $(LD) $(LDFLAGS) -o $@ $(ROBJS2d) $(RLIBSd) - -$(WPNGs)$(E): $(WOBJSs) - $(LD) $(LDFLAGS) -o $@ $(WOBJSs) $(WLIBSs) - -$(WPNG)$(E): $(WOBJSd) - $(LD) $(LDFLAGS) -o $@ $(WOBJSd) $(WLIBSd) - -$(RPNG)$(O): $(RPNG).c readpng.h -$(RPNG2)$(O): $(RPNG2).c readpng2.h -$(WPNG)$(O): $(WPNG).c writepng.h - -readpng$(O) readpng.pic$(O): readpng.c readpng.h -readpng2$(O) readpng2.pic$(O): readpng2.c readpng2.h -writepng$(O) writepng.pic$(O): writepng.c writepng.h - - -# maintenance --------------------------------------------------------------- - -clean: - $(RM) $(EXES) - $(RM) $(ROBJSs) $(ROBJS2s) $(WOBJSs) - $(RM) $(ROBJSd) $(ROBJS2d) $(WOBJSd) diff --git a/libpng16/contrib/gregbook/Makefile.sgi b/libpng16/contrib/gregbook/Makefile.sgi deleted file mode 100644 index 6c3bdf1..0000000 --- a/libpng16/contrib/gregbook/Makefile.sgi +++ /dev/null @@ -1,104 +0,0 @@ -# Sample makefile for rpng-x / rpng2-x / wpng for SGI using cc and make. -# Greg Roelofs -# Last modified: 7 March 2002 -# -# The programs built by this makefile are described in the book, -# "PNG: The Definitive Guide," by Greg Roelofs (O'Reilly and -# Associates, 1999). Go buy a copy, eh? Buy some for friends -# and family, too. (Not that this is a blatant plug or anything.) -# -# Invoke this makefile from a shell prompt in the usual way; for example: -# -# make -f Makefile.sgi -# -# This makefile assumes libpng and zlib have already been built or downloaded -# and are both installed in /usr/local/{include,lib} (as indicated by the -# PNG* and Z* macros below). Edit as appropriate--choose only ONE each of -# the PNGINC, PNGLIB, ZINC and ZLIB lines. -# -# This makefile builds dynamically linked executables (against libpng and zlib, -# that is), but that can be changed by uncommenting the appropriate PNGLIB and -# ZLIB lines. - - -# macros -------------------------------------------------------------------- - -PNGINC = -I/usr/local/include/libpng16 -PNGLIB = -L/usr/local/lib -lpng16 # dynamically linked against libpng -#PNGLIB = /usr/local/lib/libpng16.a # statically linked against libpng -# or: -#PNGINC = -I../.. -#PNGLIB = -L../.. -lpng -#PNGLIB = ../../libpng.a - -ZINC = -I/usr/local/include -ZLIB = -L/usr/local/lib -lz # dynamically linked against zlib -#ZLIB = /usr/local/lib/libz.a # statically linked against zlib -#ZINC = -I../zlib -#ZLIB = -L../zlib -lz -#ZLIB = ../../../zlib/libz.a - -XINC = -I/usr/include/X11 # old-style, stock X distributions -XLIB = -L/usr/lib/X11 -lX11 -#XINC = -I/usr/openwin/include # Sun workstations (OpenWindows) -#XLIB = -L/usr/openwin/lib -lX11 -#XINC = -I/usr/X11R6/include # new X distributions (XFree86, etc.) -#XLIB = -L/usr/X11R6/lib -lX11 - -INCS = $(PNGINC) $(ZINC) $(XINC) -RLIBS = $(PNGLIB) $(ZLIB) $(XLIB) -lm -WLIBS = $(PNGLIB) $(ZLIB) - -CC = cc -LD = cc -RM = rm -f -# ABI must be the same as that used to build libpng. -ABI= -CFLAGS = $(ABI) -O -fullwarn $(INCS) -LDFLAGS = $(ABI) -O = .o -E = - -RPNG = rpng-x -RPNG2 = rpng2-x -WPNG = wpng - -ROBJS = $(RPNG)$(O) readpng$(O) -ROBJS2 = $(RPNG2)$(O) readpng2$(O) -WOBJS = $(WPNG)$(O) writepng$(O) - -EXES = $(RPNG)$(E) $(RPNG2)$(E) $(WPNG)$(E) - - -# implicit make rules ------------------------------------------------------- - -.c$(O): - $(CC) -c $(CFLAGS) $< - - -# dependencies -------------------------------------------------------------- - -all: $(EXES) - -$(RPNG)$(E): $(ROBJS) - $(LD) $(LDFLAGS) -o $@ $(ROBJS) $(RLIBS) - -$(RPNG2)$(E): $(ROBJS2) - $(LD) $(LDFLAGS) -o $@ $(ROBJS2) $(RLIBS) - -$(WPNG)$(E): $(WOBJS) - $(LD) $(LDFLAGS) -o $@ $(WOBJS) $(WLIBS) - -$(RPNG)$(O): $(RPNG).c readpng.h -$(RPNG2)$(O): $(RPNG2).c readpng2.h -$(WPNG)$(O): $(WPNG).c writepng.h - -readpng$(O): readpng.c readpng.h -readpng2$(O): readpng2.c readpng2.h -writepng$(O): writepng.c writepng.h - - -# maintenance --------------------------------------------------------------- - -clean: - $(RM) $(EXES) $(ROBJS) $(ROBJS2) $(WOBJS) diff --git a/libpng16/contrib/gregbook/Makefile.unx b/libpng16/contrib/gregbook/Makefile.unx deleted file mode 100644 index d5e4f35..0000000 --- a/libpng16/contrib/gregbook/Makefile.unx +++ /dev/null @@ -1,132 +0,0 @@ -# Sample makefile for rpng-x / rpng2-x / wpng using gcc and make. -# Greg Roelofs -# Last modified: 2 June 2007 -# -# The programs built by this makefile are described in the book, -# "PNG: The Definitive Guide," by Greg Roelofs (O'Reilly and -# Associates, 1999). Go buy a copy, eh? Well, OK, it's not -# generally for sale anymore, but it's the thought that counts, -# right? (Hint: http://www.libpng.org/pub/png/book/ ) -# -# Invoke this makefile from a shell prompt in the usual way; for example: -# -# make -f Makefile.unx -# -# This makefile assumes libpng and zlib have already been built or downloaded -# and are installed in /usr/local/{include,lib} or as otherwise indicated by -# the PNG* and Z* macros below. Edit as appropriate--choose only ONE each of -# the PNGINC, PNGLIBd, PNGLIBs, ZINC, ZLIBd and ZLIBs lines. -# -# This makefile builds both dynamically and statically linked executables -# (against libpng and zlib, that is), but that can be changed by modifying -# the "EXES =" line. (You need only one set, but for testing it can be handy -# to have both.) - - -# macros -------------------------------------------------------------------- - -#PNGDIR = /usr/local/lib -#PNGINC = -I/usr/local/include/libpng16 -#PNGLIBd = -L$(PNGDIR) -lpng16 # dynamically linked, installed libpng -#PNGLIBs = $(PNGDIR)/libpng16.a # statically linked, installed libpng -# or: -PNGDIR = ../..# this one is for libpng-x.y.z/contrib/gregbook builds -#PNGDIR = ../libpng -PNGINC = -I$(PNGDIR) -PNGLIBd = -Wl,-rpath,$(PNGDIR) -L$(PNGDIR) -lpng16 # dynamically linked -PNGLIBs = $(PNGDIR)/libpng.a # statically linked, local libpng - -ZDIR = /usr/local/lib -#ZDIR = /usr/lib64 -ZINC = -I/usr/local/include -ZLIBd = -L$(ZDIR) -lz # dynamically linked against zlib -ZLIBs = $(ZDIR)/libz.a # statically linked against zlib -# or: -#ZDIR = ../zlib -#ZINC = -I$(ZDIR) -#ZLIBd = -Wl,-rpath,$(ZDIR) -L$(ZDIR) -lz # -rpath allows in-place testing -#ZLIBs = $(ZDIR)/libz.a - -#XINC = -I/usr/include # old-style, stock X distributions -#XLIB = -L/usr/lib/X11 -lX11 # (including SGI IRIX) -#XINC = -I/usr/openwin/include # Sun workstations (OpenWindows) -#XLIB = -L/usr/openwin/lib -lX11 -XINC = -I/usr/X11R6/include # new X distributions (X.org, etc.) -XLIB = -L/usr/X11R6/lib -lX11 -#XLIB = -L/usr/X11R6/lib64 -lX11 # e.g., Red Hat on AMD64 - -INCS = $(PNGINC) $(ZINC) $(XINC) -RLIBSd = $(PNGLIBd) $(ZLIBd) $(XLIB) -lm -RLIBSs = $(PNGLIBs) $(ZLIBs) $(XLIB) -lm -WLIBSd = $(PNGLIBd) $(ZLIBd) -lm -WLIBSs = $(PNGLIBs) $(ZLIBs) - -CC = gcc -LD = gcc -RM = rm -f -CFLAGS = -O -Wall $(INCS) -DFEATURE_LOOP -# [note that -Wall is a gcc-specific compilation flag ("most warnings on")] -# [-ansi, -pedantic and -W can also be used] -LDFLAGS = -O = .o -E = - -RPNG = rpng-x -RPNG2 = rpng2-x -WPNG = wpng - -RPNGs = $(RPNG)-static -RPNG2s = $(RPNG2)-static -WPNGs = $(WPNG)-static - -ROBJS = $(RPNG)$(O) readpng$(O) -ROBJS2 = $(RPNG2)$(O) readpng2$(O) -WOBJS = $(WPNG)$(O) writepng$(O) - -STATIC_EXES = $(RPNGs)$(E) $(RPNG2s)$(E) $(WPNGs)$(E) -DYNAMIC_EXES = $(RPNG)$(E) $(RPNG2)$(E) $(WPNG)$(E) - -EXES = $(STATIC_EXES) $(DYNAMIC_EXES) - - -# implicit make rules ------------------------------------------------------- - -.c$(O): - $(CC) -c $(CFLAGS) $< - - -# dependencies -------------------------------------------------------------- - -all: $(EXES) - -$(RPNGs)$(E): $(ROBJS) - $(LD) $(LDFLAGS) -o $@ $(ROBJS) $(RLIBSs) - -$(RPNG)$(E): $(ROBJS) - $(LD) $(LDFLAGS) -o $@ $(ROBJS) $(RLIBSd) - -$(RPNG2s)$(E): $(ROBJS2) - $(LD) $(LDFLAGS) -o $@ $(ROBJS2) $(RLIBSs) - -$(RPNG2)$(E): $(ROBJS2) - $(LD) $(LDFLAGS) -o $@ $(ROBJS2) $(RLIBSd) - -$(WPNGs)$(E): $(WOBJS) - $(LD) $(LDFLAGS) -o $@ $(WOBJS) $(WLIBSs) - -$(WPNG)$(E): $(WOBJS) - $(LD) $(LDFLAGS) -o $@ $(WOBJS) $(WLIBSd) - -$(RPNG)$(O): $(RPNG).c readpng.h -$(RPNG2)$(O): $(RPNG2).c readpng2.h -$(WPNG)$(O): $(WPNG).c writepng.h - -readpng$(O): readpng.c readpng.h -readpng2$(O): readpng2.c readpng2.h -writepng$(O): writepng.c writepng.h - - -# maintenance --------------------------------------------------------------- - -clean: - $(RM) $(EXES) $(ROBJS) $(ROBJS2) $(WOBJS) diff --git a/libpng16/contrib/gregbook/Makefile.w32 b/libpng16/contrib/gregbook/Makefile.w32 deleted file mode 100644 index 41cfb23..0000000 --- a/libpng16/contrib/gregbook/Makefile.w32 +++ /dev/null @@ -1,113 +0,0 @@ -# Sample makefile for rpng-win / rpng2-win / wpng using MSVC and NMAKE. -# Greg Roelofs -# Last modified: 2 June 2007 -# -# The programs built by this makefile are described in the book, -# "PNG: The Definitive Guide," by Greg Roelofs (O'Reilly and -# Associates, 1999). Go buy a copy, eh? Well, OK, it's not -# generally for sale anymore, but it's the thought that counts, -# right? (Hint: http://www.libpng.org/pub/png/book/ ) -# -# Invoke this makefile from a DOS prompt window via: -# -# %devstudio%\vc\bin\vcvars32.bat -# nmake -nologo -f Makefile.w32 -# -# where %devstudio% is the installation directory for MSVC / DevStudio. If -# you get "environment out of space" errors, create a desktop shortcut with -# "c:\windows\command.com /e:4096" as the program command line and set the -# working directory to this directory. Then double-click to open the new -# DOS-prompt window with a bigger environment and retry the commands above. -# -# This makefile assumes libpng and zlib have already been built or downloaded -# and are in subdirectories at the same level as the current subdirectory -# (as indicated by the PNGPATH and ZPATH macros below). Edit as appropriate. -# -# Note that the names of the dynamic and static libpng and zlib libraries -# used below may change in later releases of the libraries. This makefile -# builds statically linked executables, but that can be changed by uncom- -# menting the appropriate PNGLIB and ZLIB lines. - -!include - - -# macros -------------------------------------------------------------------- - -PNGPATH = ../libpng -PNGINC = -I$(PNGPATH) -#PNGLIB = $(PNGPATH)/pngdll.lib -PNGLIB = $(PNGPATH)/libpng.lib - -ZPATH = ../zlib -ZINC = -I$(ZPATH) -#ZLIB = $(ZPATH)/zlibdll.lib -ZLIB = $(ZPATH)/zlibstat.lib - -WINLIBS = -defaultlib:user32.lib gdi32.lib -# ["real" apps may also need comctl32.lib, comdlg32.lib, winmm.lib, etc.] - -INCS = $(PNGINC) $(ZINC) -RLIBS = $(PNGLIB) $(ZLIB) $(WINLIBS) -WLIBS = $(PNGLIB) $(ZLIB) - -CC = cl -LD = link -RM = del -CFLAGS = -nologo -O -W3 $(INCS) $(cvars) -# [note that -W3 is an MSVC-specific compilation flag ("all warnings on")] -# [see %devstudio%\vc\include\win32.mak for cvars macro definition] -O = .obj -E = .exe - -RLDFLAGS = -nologo -subsystem:windows -WLDFLAGS = -nologo - -RPNG = rpng-win -RPNG2 = rpng2-win -WPNG = wpng - -ROBJS = $(RPNG)$(O) readpng$(O) -ROBJS2 = $(RPNG2)$(O) readpng2$(O) -WOBJS = $(WPNG)$(O) writepng$(O) - -EXES = $(RPNG)$(E) $(RPNG2)$(E) $(WPNG)$(E) - - -# implicit make rules ------------------------------------------------------- - -.c$(O): - $(CC) -c $(CFLAGS) $< - - -# dependencies -------------------------------------------------------------- - -all: $(EXES) - -$(RPNG)$(E): $(ROBJS) - $(LD) $(RLDFLAGS) -out:$@ $(ROBJS) $(RLIBS) - -$(RPNG2)$(E): $(ROBJS2) - $(LD) $(RLDFLAGS) -out:$@ $(ROBJS2) $(RLIBS) - -$(WPNG)$(E): $(WOBJS) - $(LD) $(WLDFLAGS) -out:$@ $(WOBJS) $(WLIBS) - -$(RPNG)$(O): $(RPNG).c readpng.h -$(RPNG2)$(O): $(RPNG2).c readpng2.h -$(WPNG)$(O): $(WPNG).c writepng.h - -readpng$(O): readpng.c readpng.h -readpng2$(O): readpng2.c readpng2.h -writepng$(O): writepng.c writepng.h - - -# maintenance --------------------------------------------------------------- - -clean: -# ideally we could just do this: -# $(RM) $(EXES) $(ROBJS) $(ROBJS2) $(WOBJS) -# ...but the Windows "DEL" command is none too bright, so: - $(RM) r*$(E) - $(RM) w*$(E) - $(RM) r*$(O) - $(RM) w*$(O) diff --git a/libpng16/contrib/gregbook/README b/libpng16/contrib/gregbook/README deleted file mode 100644 index 7b1f6a3..0000000 --- a/libpng16/contrib/gregbook/README +++ /dev/null @@ -1,186 +0,0 @@ - =========================== - PNG: The Definitive Guide - =========================== - - Source Code - -Chapters 13, 14 and 15 of "PNG: The Definitive Guide" discuss three free, -cross-platform demo programs that show how to use the libpng reference -library: rpng, rpng2 and wpng. rpng and rpng2 are viewers; the first is -a very simple example that that shows how a standard file-viewer might use -libpng, while the second is designed to process streaming data and shows -how a web browser might be written. wpng is a simple command-line program -that reads binary PGM and PPM files (the ``raw'' grayscale and RGB subsets -of PBMPLUS/NetPBM) and converts them to PNG. - -The source code for all three demo programs currently compiles under -Unix, OpenVMS, and 32-bit Windows. (Special thanks to Martin Zinser, -zinser@decus.de, for making the necessary changes for OpenVMS and for -providing an appropriate build script.) Build instructions can be found -below. - -Files: - - README this file - LICENSE terms of distribution and reuse (BSD-like or GNU GPL) - COPYING GNU General Public License (GPL) - - Makefile.unx Unix makefile - Makefile.w32 Windows (MSVC) makefile - makevms.com OpenVMS build script - - rpng-win.c Windows front end for the basic viewer - rpng-x.c X Window System (Unix, OpenVMS) front end - readpng.c generic back end for the basic viewer - readpng.h header file for the basic viewer - - rpng2-win.c Windows front end for the progressive viewer - rpng2-x.c X front end for the progressive viewer - readpng2.c generic back end for the progressive viewer - readpng2.h header file for the progressive viewer - - wpng.c generic (text) front end for the converter - writepng.c generic back end for the converter - writepng.h header file for the converter - - toucan.png transparent PNG for testing (by Stefan Schneider) - -Note that, although the programs are designed to be functional, their -primary purpose is to illustrate how to use libpng to add PNG support to -other programs. As such, their user interfaces are crude and definitely -are not intended for everyday use. - -Please see http://www.libpng.org/pub/png/pngbook.html for further infor- -mation and links to the latest version of the source code, and Chapters -13-15 of the book for detailed discussion of the three programs. - -Greg Roelofs -http://pobox.com/~newt/greg_contact.html -16 March 2008 - - -BUILD INSTRUCTIONS - - - Prerequisites (in order of compilation): - - - zlib http://zlib.net/ - - libpng http://www.libpng.org/pub/png/libpng.html - - pngbook http://www.libpng.org/pub/png/book/sources.html - - The pngbook demo programs are explicitly designed to demonstrate proper - coding techniques for using the libpng reference library. As a result, - you need to download and build both zlib (on which libpng depends) and - libpng. A common build setup is to place the zlib, libpng and pngbook - subdirectory trees ("folders") in the same parent directory. Then the - libpng build can refer to files in ../zlib (or ..\zlib or [-.zlib]), - and similarly for the pngbook build. - - Note that all three packages are designed to be built from a command - line by default; those who wish to use a graphical or other integrated - development environments are on their own. - - - - Unix: - - Unpack the latest pngbook sources (which should correspond to this - README file) into a directory and change into that directory. - - Copy Makefile.unx to Makefile and edit the PNG* and Z* variables - appropriately (possibly also the X* variables if necessary). - - make - - There is no "install" target, so copy the three executables somewhere - in your path or run them from the current directory. All three will - print a basic usage screen when run without any command-line arguments; - see the book for more details. - - - - Windows: - - Unpack the latest pngbook sources (which should correspond to this - README file) into a folder, open a "DOS shell" or "command prompt" - or equivalent command-line window, and cd into the folder where you - unpacked the source code. - - For MSVC, set up the necessary environment variables by invoking - - %devstudio%\vc\bin\vcvars32.bat - - where where %devstudio% is the installation directory for MSVC / - DevStudio. If you get "environment out of space" errors under 95/98, - create a desktop shortcut with "c:\windows\command.com /e:4096" as - the program command line and set the working directory to the pngbook - directory. Then double-click to open the new DOS-prompt window with - a bigger environment and retry the commands above. - - Copy Makefile.w32 to Makefile and edit the PNGPATH and ZPATH variables - appropriately (possibly also the "INC" and "LIB" variables if needed). - Note that the names of the dynamic and static libpng and zlib libraries - used in the makefile may change in later releases of the libraries. - Also note that, as of libpng version 1.0.5, MSVC DLL builds do not work. - This makefile therefore builds statically linked executables, but if - the DLL problems ever get fixed, uncommenting the appropriate PNGLIB - and ZLIB lines will build dynamically linked executables instead. - - Do the build by typing - - nmake - - The result should be three executables: rpng-win.exe, rpng2-win.exe, - and wpng.exe. Copy them somewhere in your PATH or run them from the - current folder. Like the Unix versions, the two windowed programs - (rpng and rpng2) now display a usage screen in a console window when - invoked without command-line arguments; this is new behavior as of - the June 2001 release. Note that the programs use the Unix-style "-" - character to specify options, instead of the more common DOS/Windows - "/" character. (For example: "rpng2-win -bgpat 4 foo.png", not - "rpng2-win /bgpat 4 foo.png") - - - - OpenVMS: - - Unpack the pngbook sources into a subdirectory and change into that - subdirectory. - - Edit makevms.com appropriately, specifically the zpath and pngpath - variables. - - @makevms - - To run the programs, they probably first need to be set up as "foreign - symbols," with "disk" and "dir" set appropriately: - - $ rpng == "$disk:[dir]rpng-x.exe" - $ rpng2 == "$disk:[dir]rpng2-x.exe" - $ wpng == "$disk:[dir]wpng.exe" - - All three will print a basic usage screen when run without any command- - line arguments; see the book for more details. Note that the options - style is Unix-like, i.e., preceded by "-" rather than "/". - - -RUNNING THE PROGRAMS: (VERY) BRIEF INTRO - - rpng is a simple PNG viewer that can display transparent PNGs with a - specified background color; for example, - - rpng -bgcolor \#ff0000 toucan.png - - would display the image with a red background. rpng2 is a progressive - viewer that simulates a web browser in some respects; it can display - images against either a background color or a dynamically generated - background image. For example: - - rpng2 -bgpat 16 toucan.png - - wpng is a purely command-line image converter from binary PBMPLUS/NetPBM - format (.pgm or .ppm) to PNG; for example, - - wpng -time < toucan-notrans.ppm > toucan-notrans.png - - would convert the specified PPM file (using redirection) to PNG, auto- - matically setting the PNG modification-time chunk. - - All options can be abbreviated to the shortest unique value; for example, - "-bgc" for -bgcolor (versus "-bgp" for -bgpat), or "-g" for -gamma. diff --git a/libpng16/contrib/gregbook/makevms.com b/libpng16/contrib/gregbook/makevms.com deleted file mode 100644 index f32bcab..0000000 --- a/libpng16/contrib/gregbook/makevms.com +++ /dev/null @@ -1,132 +0,0 @@ -$!------------------------------------------------------------------------------ -$! make "PNG: The Definitive Guide" demo programs (for X) under OpenVMS -$! -$! Script created by Martin Zinser for libpng; modified by Greg Roelofs -$! for standalone pngbook source distribution. -$! -$! -$! Set locations where zlib and libpng sources live. -$! -$ zpath = "" -$ pngpath = "" -$! -$ if f$search("[---.zlib]zlib.h").nes."" then zpath = "[---.zlib]" -$ if f$search("[--]png.h").nes."" then pngpath = "[--]" -$! -$ if f$search("[-.zlib]zlib.h").nes."" then zpath = "[-.zlib]" -$ if f$search("[-.libpng]png.h").nes."" then pngpath = "[-.libpng]" -$! -$ if zpath .eqs. "" -$ then -$ write sys$output "zlib include not found. Exiting..." -$ exit 2 -$ endif -$! -$ if pngpath .eqs. "" -$ then -$ write sys$output "libpng include not found. Exiting..." -$ exit 2 -$ endif -$! -$! Look for the compiler used. -$! -$ ccopt="/include=(''zpath',''pngpath')" -$ if f$getsyi("HW_MODEL").ge.1024 -$ then -$ ccopt = "/prefix=all"+ccopt -$ comp = "__decc__=1" -$ if f$trnlnm("SYS").eqs."" then define sys sys$library: -$ else -$ if f$search("SYS$SYSTEM:DECC$COMPILER.EXE").eqs."" -$ then -$ if f$trnlnm("SYS").eqs."" then define sys sys$library: -$ if f$search("SYS$SYSTEM:VAXC.EXE").eqs."" -$ then -$ comp = "__gcc__=1" -$ CC :== GCC -$ else -$ comp = "__vaxc__=1" -$ endif -$ else -$ if f$trnlnm("SYS").eqs."" then define sys decc$library_include: -$ ccopt = "/decc/prefix=all"+ccopt -$ comp = "__decc__=1" -$ endif -$ endif -$ open/write lopt lib.opt -$ write lopt "''pngpath'libpng.olb/lib" -$ write lopt "''zpath'libz.olb/lib" -$ close lopt -$ open/write xopt x11.opt -$ write xopt "sys$library:decw$xlibshr.exe/share" -$ close xopt -$! -$! Build 'em. -$! -$ write sys$output "Compiling PNG book programs ..." -$ CALL MAKE readpng.OBJ "cc ''CCOPT' readpng" - - readpng.c readpng.h -$ CALL MAKE readpng2.OBJ "cc ''CCOPT' readpng2" - - readpng2.c readpng2.h -$ CALL MAKE writepng.OBJ "cc ''CCOPT' writepng" - - writepng.c writepng.h -$ write sys$output "Building rpng-x..." -$ CALL MAKE rpng-x.OBJ "cc ''CCOPT' rpng-x" - - rpng-x.c readpng.h -$ call make rpng-x.exe - - "LINK rpng-x,readpng,lib.opt/opt,x11.opt/opt" - - rpng-x.obj readpng.obj -$ write sys$output "Building rpng2-x..." -$ CALL MAKE rpng2-x.OBJ "cc ''CCOPT' rpng2-x" - - rpng2-x.c readpng2.h -$ call make rpng2-x.exe - - "LINK rpng2-x,readpng2,lib.opt/opt,x11.opt/opt" - - rpng2-x.obj readpng2.obj -$ write sys$output "Building wpng..." -$ CALL MAKE wpng.OBJ "cc ''CCOPT' wpng" - - wpng.c writepng.h -$ call make wpng.exe - - "LINK wpng,writepng,lib.opt/opt" - - wpng.obj writepng.obj -$ exit -$! -$! -$MAKE: SUBROUTINE !SUBROUTINE TO CHECK DEPENDENCIES -$ V = 'F$Verify(0) -$! P1 = What we are trying to make -$! P2 = Command to make it -$! P3 - P8 What it depends on -$ -$ If F$Search(P1) .Eqs. "" Then Goto Makeit -$ Time = F$CvTime(F$File(P1,"RDT")) -$arg=3 -$Loop: -$ Argument = P'arg -$ If Argument .Eqs. "" Then Goto Exit -$ El=0 -$Loop2: -$ File = F$Element(El," ",Argument) -$ If File .Eqs. " " Then Goto Endl -$ AFile = "" -$Loop3: -$ OFile = AFile -$ AFile = F$Search(File) -$ If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl -$ If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit -$ Goto Loop3 -$NextEL: -$ El = El + 1 -$ Goto Loop2 -$EndL: -$ arg=arg+1 -$ If arg .Le. 8 Then Goto Loop -$ Goto Exit -$ -$Makeit: -$ VV=F$VERIFY(0) -$ write sys$output P2 -$ 'P2 -$ VV='F$Verify(VV) -$Exit: -$ If V Then Set Verify -$ENDSUBROUTINE diff --git a/libpng16/contrib/gregbook/readpng.c b/libpng16/contrib/gregbook/readpng.c deleted file mode 100644 index f5e1fb1..0000000 --- a/libpng16/contrib/gregbook/readpng.c +++ /dev/null @@ -1,316 +0,0 @@ -/*--------------------------------------------------------------------------- - - rpng - simple PNG display program readpng.c - - --------------------------------------------------------------------------- - - Copyright (c) 1998-2007 Greg Roelofs. All rights reserved. - - This software is provided "as is," without warranty of any kind, - express or implied. In no event shall the author or contributors - be held liable for any damages arising in any way from the use of - this software. - - The contents of this file are DUAL-LICENSED. You may modify and/or - redistribute this software according to the terms of one of the - following two licenses (at your option): - - - LICENSE 1 ("BSD-like with advertising clause"): - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute - it freely, subject to the following restrictions: - - 1. Redistributions of source code must retain the above copyright - notice, disclaimer, and this list of conditions. - 2. Redistributions in binary form must reproduce the above copyright - notice, disclaimer, and this list of conditions in the documenta- - tion and/or other materials provided with the distribution. - 3. All advertising materials mentioning features or use of this - software must display the following acknowledgment: - - This product includes software developed by Greg Roelofs - and contributors for the book, "PNG: The Definitive Guide," - published by O'Reilly and Associates. - - - LICENSE 2 (GNU GPL v2 or later): - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - ---------------------------------------------------------------------------*/ - -#include -#include -#include - -#include "png.h" /* libpng header */ -#include "readpng.h" /* typedefs, common macros, public prototypes */ - -/* future versions of libpng will provide this macro: */ -#ifndef png_jmpbuf -# define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf) -#endif - - -static png_structp png_ptr = NULL; -static png_infop info_ptr = NULL; - -png_uint_32 width, height; -int bit_depth, color_type; -uch *image_data = NULL; - - -void readpng_version_info(void) -{ - fprintf(stderr, " Compiled with libpng %s; using libpng %s.\n", - PNG_LIBPNG_VER_STRING, png_libpng_ver); - fprintf(stderr, " Compiled with zlib %s; using zlib %s.\n", - ZLIB_VERSION, zlib_version); -} - - -/* return value = 0 for success, 1 for bad sig, 2 for bad IHDR, 4 for no mem */ - -int readpng_init(FILE *infile, ulg *pWidth, ulg *pHeight) -{ - uch sig[8]; - - - /* first do a quick check that the file really is a PNG image; could - * have used slightly more general png_sig_cmp() function instead */ - - fread(sig, 1, 8, infile); - if (png_sig_cmp(sig, 0, 8)) - return 1; /* bad signature */ - - - /* could pass pointers to user-defined error handlers instead of NULLs: */ - - png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - if (!png_ptr) - return 4; /* out of memory */ - - info_ptr = png_create_info_struct(png_ptr); - if (!info_ptr) { - png_destroy_read_struct(&png_ptr, NULL, NULL); - return 4; /* out of memory */ - } - - - /* we could create a second info struct here (end_info), but it's only - * useful if we want to keep pre- and post-IDAT chunk info separated - * (mainly for PNG-aware image editors and converters) */ - - - /* setjmp() must be called in every function that calls a PNG-reading - * libpng function */ - - if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - return 2; - } - - - png_init_io(png_ptr, infile); - png_set_sig_bytes(png_ptr, 8); /* we already read the 8 signature bytes */ - - png_read_info(png_ptr, info_ptr); /* read all PNG info up to image data */ - - - /* alternatively, could make separate calls to png_get_image_width(), - * etc., but want bit_depth and color_type for later [don't care about - * compression_type and filter_type => NULLs] */ - - png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, - NULL, NULL, NULL); - *pWidth = width; - *pHeight = height; - - - /* OK, that's all we need for now; return happy */ - - return 0; -} - - - - -/* returns 0 if succeeds, 1 if fails due to no bKGD chunk, 2 if libpng error; - * scales values to 8-bit if necessary */ - -int readpng_get_bgcolor(uch *red, uch *green, uch *blue) -{ - png_color_16p pBackground; - - - /* setjmp() must be called in every function that calls a PNG-reading - * libpng function */ - - if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - return 2; - } - - - if (!png_get_valid(png_ptr, info_ptr, PNG_INFO_bKGD)) - return 1; - - /* it is not obvious from the libpng documentation, but this function - * takes a pointer to a pointer, and it always returns valid red, green - * and blue values, regardless of color_type: */ - - png_get_bKGD(png_ptr, info_ptr, &pBackground); - - - /* however, it always returns the raw bKGD data, regardless of any - * bit-depth transformations, so check depth and adjust if necessary */ - - if (bit_depth == 16) { - *red = pBackground->red >> 8; - *green = pBackground->green >> 8; - *blue = pBackground->blue >> 8; - } else if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { - if (bit_depth == 1) - *red = *green = *blue = pBackground->gray? 255 : 0; - else if (bit_depth == 2) - *red = *green = *blue = (255/3) * pBackground->gray; - else /* bit_depth == 4 */ - *red = *green = *blue = (255/15) * pBackground->gray; - } else { - *red = (uch)pBackground->red; - *green = (uch)pBackground->green; - *blue = (uch)pBackground->blue; - } - - return 0; -} - - - - -/* display_exponent == LUT_exponent * CRT_exponent */ - -uch *readpng_get_image(double display_exponent, int *pChannels, ulg *pRowbytes) -{ - double gamma; - png_uint_32 i, rowbytes; - png_bytepp row_pointers = NULL; - - - /* setjmp() must be called in every function that calls a PNG-reading - * libpng function */ - - if (setjmp(png_jmpbuf(png_ptr))) { - free(image_data); - image_data = NULL; - free(row_pointers); - row_pointers = NULL; - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - return NULL; - } - - - /* expand palette images to RGB, low-bit-depth grayscale images to 8 bits, - * transparency chunks to full alpha channel; strip 16-bit-per-sample - * images to 8 bits per sample; and convert grayscale to RGB[A] */ - - if (color_type == PNG_COLOR_TYPE_PALETTE) - png_set_expand(png_ptr); - if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) - png_set_expand(png_ptr); - if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) - png_set_expand(png_ptr); -#ifdef PNG_READ_16_TO_8_SUPPORTED - if (bit_depth == 16) -# ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED - png_set_scale_16(png_ptr); -# else - png_set_strip_16(png_ptr); -# endif -#endif - if (color_type == PNG_COLOR_TYPE_GRAY || - color_type == PNG_COLOR_TYPE_GRAY_ALPHA) - png_set_gray_to_rgb(png_ptr); - - - /* unlike the example in the libpng documentation, we have *no* idea where - * this file may have come from--so if it doesn't have a file gamma, don't - * do any correction ("do no harm") */ - - if (png_get_gAMA(png_ptr, info_ptr, &gamma)) - png_set_gamma(png_ptr, display_exponent, gamma); - - - /* all transformations have been registered; now update info_ptr data, - * get rowbytes and channels, and allocate image memory */ - - png_read_update_info(png_ptr, info_ptr); - - *pRowbytes = rowbytes = png_get_rowbytes(png_ptr, info_ptr); - *pChannels = (int)png_get_channels(png_ptr, info_ptr); - - if ((image_data = (uch *)malloc(rowbytes*height)) == NULL) { - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - return NULL; - } - if ((row_pointers = (png_bytepp)malloc(height*sizeof(png_bytep))) == NULL) { - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - free(image_data); - image_data = NULL; - return NULL; - } - - Trace((stderr, "readpng_get_image: channels = %d, rowbytes = %ld, height = %ld\n", - *pChannels, rowbytes, height)); - - - /* set the individual row_pointers to point at the correct offsets */ - - for (i = 0; i < height; ++i) - row_pointers[i] = image_data + i*rowbytes; - - - /* now we can go ahead and just read the whole image */ - - png_read_image(png_ptr, row_pointers); - - - /* and we're done! (png_read_end() can be omitted if no processing of - * post-IDAT text/time/etc. is desired) */ - - free(row_pointers); - row_pointers = NULL; - - png_read_end(png_ptr, NULL); - - return image_data; -} - - -void readpng_cleanup(int free_image_data) -{ - if (free_image_data && image_data) { - free(image_data); - image_data = NULL; - } - - if (png_ptr && info_ptr) { - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - png_ptr = NULL; - info_ptr = NULL; - } -} diff --git a/libpng16/contrib/gregbook/readpng.h b/libpng16/contrib/gregbook/readpng.h deleted file mode 100644 index fad9fe3..0000000 --- a/libpng16/contrib/gregbook/readpng.h +++ /dev/null @@ -1,88 +0,0 @@ -/*--------------------------------------------------------------------------- - - rpng - simple PNG display program readpng.h - - --------------------------------------------------------------------------- - - Copyright (c) 1998-2007 Greg Roelofs. All rights reserved. - - This software is provided "as is," without warranty of any kind, - express or implied. In no event shall the author or contributors - be held liable for any damages arising in any way from the use of - this software. - - The contents of this file are DUAL-LICENSED. You may modify and/or - redistribute this software according to the terms of one of the - following two licenses (at your option): - - - LICENSE 1 ("BSD-like with advertising clause"): - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute - it freely, subject to the following restrictions: - - 1. Redistributions of source code must retain the above copyright - notice, disclaimer, and this list of conditions. - 2. Redistributions in binary form must reproduce the above copyright - notice, disclaimer, and this list of conditions in the documenta- - tion and/or other materials provided with the distribution. - 3. All advertising materials mentioning features or use of this - software must display the following acknowledgment: - - This product includes software developed by Greg Roelofs - and contributors for the book, "PNG: The Definitive Guide," - published by O'Reilly and Associates. - - - LICENSE 2 (GNU GPL v2 or later): - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - ---------------------------------------------------------------------------*/ - -#ifndef TRUE -# define TRUE 1 -# define FALSE 0 -#endif - -#ifndef MAX -# define MAX(a,b) ((a) > (b)? (a) : (b)) -# define MIN(a,b) ((a) < (b)? (a) : (b)) -#endif - -#ifdef DEBUG -# define Trace(x) {fprintf x ; fflush(stderr); fflush(stdout);} -#else -# define Trace(x) ; -#endif - -typedef unsigned char uch; -typedef unsigned short ush; -typedef unsigned long ulg; - - -/* prototypes for public functions in readpng.c */ - -void readpng_version_info(void); - -int readpng_init(FILE *infile, ulg *pWidth, ulg *pHeight); - -int readpng_get_bgcolor(uch *bg_red, uch *bg_green, uch *bg_blue); - -uch *readpng_get_image(double display_exponent, int *pChannels, - ulg *pRowbytes); - -void readpng_cleanup(int free_image_data); diff --git a/libpng16/contrib/gregbook/readpng2.c b/libpng16/contrib/gregbook/readpng2.c deleted file mode 100644 index e179db7..0000000 --- a/libpng16/contrib/gregbook/readpng2.c +++ /dev/null @@ -1,505 +0,0 @@ -/*--------------------------------------------------------------------------- - - rpng2 - progressive-model PNG display program readpng2.c - - --------------------------------------------------------------------------- - - Copyright (c) 1998-2007 Greg Roelofs. All rights reserved. - - This software is provided "as is," without warranty of any kind, - express or implied. In no event shall the author or contributors - be held liable for any damages arising in any way from the use of - this software. - - The contents of this file are DUAL-LICENSED. You may modify and/or - redistribute this software according to the terms of one of the - following two licenses (at your option): - - - LICENSE 1 ("BSD-like with advertising clause"): - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute - it freely, subject to the following restrictions: - - 1. Redistributions of source code must retain the above copyright - notice, disclaimer, and this list of conditions. - 2. Redistributions in binary form must reproduce the above copyright - notice, disclaimer, and this list of conditions in the documenta- - tion and/or other materials provided with the distribution. - 3. All advertising materials mentioning features or use of this - software must display the following acknowledgment: - - This product includes software developed by Greg Roelofs - and contributors for the book, "PNG: The Definitive Guide," - published by O'Reilly and Associates. - - - LICENSE 2 (GNU GPL v2 or later): - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - ---------------------------------------------------------------------------*/ - - -#include /* for exit() prototype */ -#include - -#include -#include "png.h" /* libpng header from the local directory */ -#include "readpng2.h" /* typedefs, common macros, public prototypes */ - - -/* local prototypes */ - -static void readpng2_info_callback(png_structp png_ptr, png_infop info_ptr); -static void readpng2_row_callback(png_structp png_ptr, png_bytep new_row, - png_uint_32 row_num, int pass); -static void readpng2_end_callback(png_structp png_ptr, png_infop info_ptr); -static void readpng2_error_handler(png_structp png_ptr, png_const_charp msg); - - - - -void readpng2_version_info(void) -{ - fprintf(stderr, " Compiled with libpng %s; using libpng %s\n", - PNG_LIBPNG_VER_STRING, png_libpng_ver); - - fprintf(stderr, " and with zlib %s; using zlib %s.\n", - ZLIB_VERSION, zlib_version); -} - - - - -int readpng2_check_sig(uch *sig, int num) -{ - return !png_sig_cmp(sig, 0, num); -} - - - - -/* returns 0 for success, 2 for libpng problem, 4 for out of memory */ - -int readpng2_init(mainprog_info *mainprog_ptr) -{ - png_structp png_ptr; /* note: temporary variables! */ - png_infop info_ptr; - - - /* could also replace libpng warning-handler (final NULL), but no need: */ - - png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, mainprog_ptr, - readpng2_error_handler, NULL); - if (!png_ptr) - return 4; /* out of memory */ - - info_ptr = png_create_info_struct(png_ptr); - if (!info_ptr) { - png_destroy_read_struct(&png_ptr, NULL, NULL); - return 4; /* out of memory */ - } - - - /* we could create a second info struct here (end_info), but it's only - * useful if we want to keep pre- and post-IDAT chunk info separated - * (mainly for PNG-aware image editors and converters) */ - - - /* setjmp() must be called in every function that calls a PNG-reading - * libpng function, unless an alternate error handler was installed-- - * but compatible error handlers must either use longjmp() themselves - * (as in this program) or exit immediately, so here we are: */ - - if (setjmp(mainprog_ptr->jmpbuf)) { - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - return 2; - } - - -#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED - /* prepare the reader to ignore all recognized chunks whose data won't be - * used, i.e., all chunks recognized by libpng except for IHDR, PLTE, IDAT, - * IEND, tRNS, bKGD, gAMA, and sRGB (small performance improvement) */ - { - /* These byte strings were copied from png.h. If a future version - * of readpng2.c recognizes more chunks, add them to this list. - */ - static PNG_CONST png_byte chunks_to_process[] = { - 98, 75, 71, 68, '\0', /* bKGD */ - 103, 65, 77, 65, '\0', /* gAMA */ - 115, 82, 71, 66, '\0', /* sRGB */ - }; - - /* Ignore all chunks except for IHDR, PLTE, tRNS, IDAT, and IEND */ - png_set_keep_unknown_chunks(png_ptr, -1 /* PNG_HANDLE_CHUNK_NEVER */, - NULL, -1); - - /* But do not ignore chunks in the "chunks_to_process" list */ - png_set_keep_unknown_chunks(png_ptr, - 0 /* PNG_HANDLE_CHUNK_AS_DEFAULT */, chunks_to_process, - sizeof(chunks_to_process)/5); - } -#endif /* PNG_HANDLE_AS_UNKNOWN_SUPPORTED */ - - - /* instead of doing png_init_io() here, now we set up our callback - * functions for progressive decoding */ - - png_set_progressive_read_fn(png_ptr, mainprog_ptr, - readpng2_info_callback, readpng2_row_callback, readpng2_end_callback); - - - /* make sure we save our pointers for use in readpng2_decode_data() */ - - mainprog_ptr->png_ptr = png_ptr; - mainprog_ptr->info_ptr = info_ptr; - - - /* and that's all there is to initialization */ - - return 0; -} - - - - -/* returns 0 for success, 2 for libpng (longjmp) problem */ - -int readpng2_decode_data(mainprog_info *mainprog_ptr, uch *rawbuf, ulg length) -{ - png_structp png_ptr = (png_structp)mainprog_ptr->png_ptr; - png_infop info_ptr = (png_infop)mainprog_ptr->info_ptr; - - - /* setjmp() must be called in every function that calls a PNG-reading - * libpng function */ - - if (setjmp(mainprog_ptr->jmpbuf)) { - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - mainprog_ptr->png_ptr = NULL; - mainprog_ptr->info_ptr = NULL; - return 2; - } - - - /* hand off the next chunk of input data to libpng for decoding */ - - png_process_data(png_ptr, info_ptr, rawbuf, length); - - return 0; -} - - - - -static void readpng2_info_callback(png_structp png_ptr, png_infop info_ptr) -{ - mainprog_info *mainprog_ptr; - int color_type, bit_depth; - png_uint_32 width, height; -#ifdef PNG_FLOATING_POINT_SUPPORTED - double gamma; -#else - png_fixed_point gamma; -#endif - - - /* setjmp() doesn't make sense here, because we'd either have to exit(), - * longjmp() ourselves, or return control to libpng, which doesn't want - * to see us again. By not doing anything here, libpng will instead jump - * to readpng2_decode_data(), which can return an error value to the main - * program. */ - - - /* retrieve the pointer to our special-purpose struct, using the png_ptr - * that libpng passed back to us (i.e., not a global this time--there's - * no real difference for a single image, but for a multithreaded browser - * decoding several PNG images at the same time, one needs to avoid mixing - * up different images' structs) */ - - mainprog_ptr = png_get_progressive_ptr(png_ptr); - - if (mainprog_ptr == NULL) { /* we be hosed */ - fprintf(stderr, - "readpng2 error: main struct not recoverable in info_callback.\n"); - fflush(stderr); - return; - /* - * Alternatively, we could call our error-handler just like libpng - * does, which would effectively terminate the program. Since this - * can only happen if png_ptr gets redirected somewhere odd or the - * main PNG struct gets wiped, we're probably toast anyway. (If - * png_ptr itself is NULL, we would not have been called.) - */ - } - - - /* this is just like in the non-progressive case */ - - png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, - NULL, NULL, NULL); - mainprog_ptr->width = (ulg)width; - mainprog_ptr->height = (ulg)height; - - - /* since we know we've read all of the PNG file's "header" (i.e., up - * to IDAT), we can check for a background color here */ - - if (mainprog_ptr->need_bgcolor && - png_get_valid(png_ptr, info_ptr, PNG_INFO_bKGD)) - { - png_color_16p pBackground; - - /* it is not obvious from the libpng documentation, but this function - * takes a pointer to a pointer, and it always returns valid red, - * green and blue values, regardless of color_type: */ - png_get_bKGD(png_ptr, info_ptr, &pBackground); - - /* however, it always returns the raw bKGD data, regardless of any - * bit-depth transformations, so check depth and adjust if necessary */ - if (bit_depth == 16) { - mainprog_ptr->bg_red = pBackground->red >> 8; - mainprog_ptr->bg_green = pBackground->green >> 8; - mainprog_ptr->bg_blue = pBackground->blue >> 8; - } else if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { - if (bit_depth == 1) - mainprog_ptr->bg_red = mainprog_ptr->bg_green = - mainprog_ptr->bg_blue = pBackground->gray? 255 : 0; - else if (bit_depth == 2) - mainprog_ptr->bg_red = mainprog_ptr->bg_green = - mainprog_ptr->bg_blue = (255/3) * pBackground->gray; - else /* bit_depth == 4 */ - mainprog_ptr->bg_red = mainprog_ptr->bg_green = - mainprog_ptr->bg_blue = (255/15) * pBackground->gray; - } else { - mainprog_ptr->bg_red = (uch)pBackground->red; - mainprog_ptr->bg_green = (uch)pBackground->green; - mainprog_ptr->bg_blue = (uch)pBackground->blue; - } - } - - - /* as before, let libpng expand palette images to RGB, low-bit-depth - * grayscale images to 8 bits, transparency chunks to full alpha channel; - * strip 16-bit-per-sample images to 8 bits per sample; and convert - * grayscale to RGB[A] */ - - if (color_type == PNG_COLOR_TYPE_PALETTE) - png_set_expand(png_ptr); - if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) - png_set_expand(png_ptr); - if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) - png_set_expand(png_ptr); -#ifdef PNG_READ_16_TO_8_SUPPORTED - if (bit_depth == 16) -# ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED - png_set_scale_16(png_ptr); -# else - png_set_strip_16(png_ptr); -# endif -#endif - if (color_type == PNG_COLOR_TYPE_GRAY || - color_type == PNG_COLOR_TYPE_GRAY_ALPHA) - png_set_gray_to_rgb(png_ptr); - - - /* Unlike the basic viewer, which was designed to operate on local files, - * this program is intended to simulate a web browser--even though we - * actually read from a local file, too. But because we are pretending - * that most of the images originate on the Internet, we follow the recom- - * mendation of the sRGB proposal and treat unlabelled images (no gAMA - * chunk) as existing in the sRGB color space. That is, we assume that - * such images have a file gamma of 0.45455, which corresponds to a PC-like - * display system. This change in assumptions will have no effect on a - * PC-like system, but on a Mac, SGI, NeXT or other system with a non- - * identity lookup table, it will darken unlabelled images, which effec- - * tively favors images from PC-like systems over those originating on - * the local platform. Note that mainprog_ptr->display_exponent is the - * "gamma" value for the entire display system, i.e., the product of - * LUT_exponent and CRT_exponent. */ - -#ifdef PNG_FLOATING_POINT_SUPPORTED - if (png_get_gAMA(png_ptr, info_ptr, &gamma)) - png_set_gamma(png_ptr, mainprog_ptr->display_exponent, gamma); - else - png_set_gamma(png_ptr, mainprog_ptr->display_exponent, 0.45455); -#else - if (png_get_gAMA_fixed(png_ptr, info_ptr, &gamma)) - png_set_gamma_fixed(png_ptr, - (png_fixed_point)(100000*mainprog_ptr->display_exponent+.5), gamma); - else - png_set_gamma_fixed(png_ptr, - (png_fixed_point)(100000*mainprog_ptr->display_exponent+.5), 45455); -#endif - - /* we'll let libpng expand interlaced images, too */ - - mainprog_ptr->passes = png_set_interlace_handling(png_ptr); - - - /* all transformations have been registered; now update info_ptr data and - * then get rowbytes and channels */ - - png_read_update_info(png_ptr, info_ptr); - - mainprog_ptr->rowbytes = (int)png_get_rowbytes(png_ptr, info_ptr); - mainprog_ptr->channels = png_get_channels(png_ptr, info_ptr); - - - /* Call the main program to allocate memory for the image buffer and - * initialize windows and whatnot. (The old-style function-pointer - * invocation is used for compatibility with a few supposedly ANSI - * compilers that nevertheless barf on "fn_ptr()"-style syntax.) */ - - (*mainprog_ptr->mainprog_init)(); - - - /* and that takes care of initialization */ - - return; -} - - - - - -static void readpng2_row_callback(png_structp png_ptr, png_bytep new_row, - png_uint_32 row_num, int pass) -{ - mainprog_info *mainprog_ptr; - - - /* first check whether the row differs from the previous pass; if not, - * nothing to combine or display */ - - if (!new_row) - return; - - - /* retrieve the pointer to our special-purpose struct so we can access - * the old rows and image-display callback function */ - - mainprog_ptr = png_get_progressive_ptr(png_ptr); - - - /* save the pass number for optional use by the front end */ - - mainprog_ptr->pass = pass; - - - /* have libpng either combine the new row data with the existing row data - * from previous passes (if interlaced) or else just copy the new row - * into the main program's image buffer */ - - png_progressive_combine_row(png_ptr, mainprog_ptr->row_pointers[row_num], - new_row); - - - /* finally, call the display routine in the main program with the number - * of the row we just updated */ - - (*mainprog_ptr->mainprog_display_row)(row_num); - - - /* and we're ready for more */ - - return; -} - - - - - -static void readpng2_end_callback(png_structp png_ptr, png_infop info_ptr) -{ - mainprog_info *mainprog_ptr; - - - /* retrieve the pointer to our special-purpose struct */ - - mainprog_ptr = png_get_progressive_ptr(png_ptr); - - - /* let the main program know that it should flush any buffered image - * data to the display now and set a "done" flag or whatever, but note - * that it SHOULD NOT DESTROY THE PNG STRUCTS YET--in other words, do - * NOT call readpng2_cleanup() either here or in the finish_display() - * routine; wait until control returns to the main program via - * readpng2_decode_data() */ - - (*mainprog_ptr->mainprog_finish_display)(); - - - /* all done */ - - return; -} - - - - - -void readpng2_cleanup(mainprog_info *mainprog_ptr) -{ - png_structp png_ptr = (png_structp)mainprog_ptr->png_ptr; - png_infop info_ptr = (png_infop)mainprog_ptr->info_ptr; - - if (png_ptr && info_ptr) - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - - mainprog_ptr->png_ptr = NULL; - mainprog_ptr->info_ptr = NULL; -} - - - - - -static void readpng2_error_handler(png_structp png_ptr, png_const_charp msg) -{ - mainprog_info *mainprog_ptr; - - /* This function, aside from the extra step of retrieving the "error - * pointer" (below) and the fact that it exists within the application - * rather than within libpng, is essentially identical to libpng's - * default error handler. The second point is critical: since both - * setjmp() and longjmp() are called from the same code, they are - * guaranteed to have compatible notions of how big a jmp_buf is, - * regardless of whether _BSD_SOURCE or anything else has (or has not) - * been defined. */ - - fprintf(stderr, "readpng2 libpng error: %s\n", msg); - fflush(stderr); - - mainprog_ptr = png_get_error_ptr(png_ptr); - if (mainprog_ptr == NULL) { /* we are completely hosed now */ - fprintf(stderr, - "readpng2 severe error: jmpbuf not recoverable; terminating.\n"); - fflush(stderr); - exit(99); - } - - /* Now we have our data structure we can use the information in it - * to return control to our own higher level code (all the points - * where 'setjmp' is called in this file.) This will work with other - * error handling mechanisms as well - libpng always calls png_error - * when it can proceed no further, thus, so long as the error handler - * is intercepted, application code can do its own error recovery. - */ - longjmp(mainprog_ptr->jmpbuf, 1); -} diff --git a/libpng16/contrib/gregbook/readpng2.h b/libpng16/contrib/gregbook/readpng2.h deleted file mode 100644 index 6b3660d..0000000 --- a/libpng16/contrib/gregbook/readpng2.h +++ /dev/null @@ -1,116 +0,0 @@ -/*--------------------------------------------------------------------------- - - rpng2 - progressive-model PNG display program readpng2.h - - --------------------------------------------------------------------------- - - Copyright (c) 1998-2008 Greg Roelofs. All rights reserved. - - This software is provided "as is," without warranty of any kind, - express or implied. In no event shall the author or contributors - be held liable for any damages arising in any way from the use of - this software. - - The contents of this file are DUAL-LICENSED. You may modify and/or - redistribute this software according to the terms of one of the - following two licenses (at your option): - - - LICENSE 1 ("BSD-like with advertising clause"): - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute - it freely, subject to the following restrictions: - - 1. Redistributions of source code must retain the above copyright - notice, disclaimer, and this list of conditions. - 2. Redistributions in binary form must reproduce the above copyright - notice, disclaimer, and this list of conditions in the documenta- - tion and/or other materials provided with the distribution. - 3. All advertising materials mentioning features or use of this - software must display the following acknowledgment: - - This product includes software developed by Greg Roelofs - and contributors for the book, "PNG: The Definitive Guide," - published by O'Reilly and Associates. - - - LICENSE 2 (GNU GPL v2 or later): - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - ---------------------------------------------------------------------------*/ - -#ifndef TRUE -# define TRUE 1 -# define FALSE 0 -#endif - -#ifndef MAX -# define MAX(a,b) ((a) > (b)? (a) : (b)) -# define MIN(a,b) ((a) < (b)? (a) : (b)) -#endif - -#ifdef DEBUG -# define Trace(x) {fprintf x ; fflush(stderr); fflush(stdout);} -#else -# define Trace(x) ; -#endif - -enum rpng2_states { - kPreInit = 0, - kWindowInit, - kDone -}; - -typedef unsigned char uch; -typedef unsigned short ush; -typedef unsigned long ulg; - -typedef struct _mainprog_info { - double display_exponent; - ulg width; - ulg height; - void *png_ptr; - void *info_ptr; - void (*mainprog_init)(void); - void (*mainprog_display_row)(ulg row_num); - void (*mainprog_finish_display)(void); - uch *image_data; - uch **row_pointers; - jmp_buf jmpbuf; - int passes; /* not used */ - int pass; - int rowbytes; - int channels; - int need_bgcolor; - int state; - uch bg_red; - uch bg_green; - uch bg_blue; -} mainprog_info; - - -/* prototypes for public functions in readpng2.c */ - -void readpng2_version_info(void); - -int readpng2_check_sig(uch *sig, int num); - -int readpng2_init(mainprog_info *mainprog_ptr); - -int readpng2_decode_data(mainprog_info *mainprog_ptr, uch *rawbuf, ulg length); - -void readpng2_cleanup(mainprog_info *mainprog_ptr); diff --git a/libpng16/contrib/gregbook/readppm.c b/libpng16/contrib/gregbook/readppm.c deleted file mode 100644 index be9a56d..0000000 --- a/libpng16/contrib/gregbook/readppm.c +++ /dev/null @@ -1,179 +0,0 @@ -/*--------------------------------------------------------------------------- - - rpng - simple PNG display program readppm.c - - --------------------------------------------------------------------------- - - This is a special-purpose replacement for readpng.c that allows binary - PPM files to be used in place of PNG images. - - --------------------------------------------------------------------------- - - Copyright (c) 1998-2007 Greg Roelofs. All rights reserved. - - This software is provided "as is," without warranty of any kind, - express or implied. In no event shall the author or contributors - be held liable for any damages arising in any way from the use of - this software. - - The contents of this file are DUAL-LICENSED. You may modify and/or - redistribute this software according to the terms of one of the - following two licenses (at your option): - - - LICENSE 1 ("BSD-like with advertising clause"): - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute - it freely, subject to the following restrictions: - - 1. Redistributions of source code must retain the above copyright - notice, disclaimer, and this list of conditions. - 2. Redistributions in binary form must reproduce the above copyright - notice, disclaimer, and this list of conditions in the documenta- - tion and/or other materials provided with the distribution. - 3. All advertising materials mentioning features or use of this - software must display the following acknowledgment: - - This product includes software developed by Greg Roelofs - and contributors for the book, "PNG: The Definitive Guide," - published by O'Reilly and Associates. - - - LICENSE 2 (GNU GPL v2 or later): - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - ---------------------------------------------------------------------------*/ - -#include -#include - -#include "readpng.h" /* typedefs, common macros, public prototypes */ - - -ulg width, height; -int bit_depth, color_type, channels; -uch *image_data = NULL; -FILE *saved_infile; - - -void readpng_version_info() -{ - fprintf(stderr, " Compiled without libpng, zlib or PBMPLUS/NetPBM.\n"); -} - - -/* return value = 0 for success, 1 for bad sig, 2 for bad IHDR, 4 for no mem */ - -int readpng_init(FILE *infile, ulg *pWidth, ulg *pHeight) -{ - static uch ppmline[256]; - int maxval; - - - saved_infile = infile; - - fgets(ppmline, 256, infile); - if (ppmline[0] != 'P' || ppmline[1] != '6') { - fprintf(stderr, "ERROR: not a PPM file\n"); - return 1; - } - /* possible color types: P5 = grayscale (0), P6 = RGB (2), P8 = RGBA (6) */ - if (ppmline[1] == '6') { - color_type = 2; - channels = 3; - } else if (ppmline[1] == '8') { - color_type = 6; - channels = 4; - } else /* if (ppmline[1] == '5') */ { - color_type = 0; - channels = 1; - } - - do { - fgets(ppmline, 256, infile); - } while (ppmline[0] == '#'); - sscanf(ppmline, "%lu %lu", &width, &height); - - do { - fgets(ppmline, 256, infile); - } while (ppmline[0] == '#'); - sscanf(ppmline, "%d", &maxval); - if (maxval != 255) { - fprintf(stderr, "ERROR: maxval = %d\n", maxval); - return 2; - } - bit_depth = 8; - - *pWidth = width; - *pHeight = height; - - return 0; -} - - - - -/* returns 0 if succeeds, 1 if fails due to no bKGD chunk, 2 if libpng error; - * scales values to 8-bit if necessary */ - -int readpng_get_bgcolor(uch *red, uch *green, uch *blue) -{ - return 1; -} - - - - -/* display_exponent == LUT_exponent * CRT_exponent */ - -uch *readpng_get_image(double display_exponent, int *pChannels, ulg *pRowbytes) -{ - ulg rowbytes; - - - /* expand palette images to RGB, low-bit-depth grayscale images to 8 bits, - * transparency chunks to full alpha channel; strip 16-bit-per-sample - * images to 8 bits per sample; and convert grayscale to RGB[A] */ - - /* GRR WARNING: grayscale needs to be expanded and channels reset! */ - - *pRowbytes = rowbytes = channels*width; - *pChannels = channels; - - if ((image_data = (uch *)malloc(rowbytes*height)) == NULL) { - return NULL; - } - - Trace((stderr, "readpng_get_image: rowbytes = %ld, height = %ld\n", rowbytes, height)); - - - /* now we can go ahead and just read the whole image */ - - fread(image_data, 1L, rowbytes*height, saved_infile); - - - return image_data; -} - - -void readpng_cleanup(int free_image_data) -{ - if (free_image_data && image_data) { - free(image_data); - image_data = NULL; - } -} diff --git a/libpng16/contrib/gregbook/rpng-win.c b/libpng16/contrib/gregbook/rpng-win.c deleted file mode 100644 index f53ddc8..0000000 --- a/libpng16/contrib/gregbook/rpng-win.c +++ /dev/null @@ -1,728 +0,0 @@ -/*--------------------------------------------------------------------------- - - rpng - simple PNG display program rpng-win.c - - This program decodes and displays PNG images, with gamma correction and - optionally with a user-specified background color (in case the image has - transparency). It is very nearly the most basic PNG viewer possible. - This version is for 32-bit Windows; it may compile under 16-bit Windows - with a little tweaking (or maybe not). - - to do: - - handle quoted command-line args (especially filenames with spaces) - - have minimum window width: oh well - - use %.1023s to simplify truncation of title-bar string? - - --------------------------------------------------------------------------- - - Changelog: - - 1.00: initial public release - - 1.01: modified to allow abbreviated options; fixed long/ulong mis- - match; switched to png_jmpbuf() macro - - 1.02: added extra set of parentheses to png_jmpbuf() macro; fixed - command-line parsing bug - - 1.10: enabled "message window"/console (thanks to David Geldreich) - - 2.00: dual-licensed (added GNU GPL) - - 2.01: fixed improper display of usage screen on PNG error(s) - - --------------------------------------------------------------------------- - - Copyright (c) 1998-2008 Greg Roelofs. All rights reserved. - - This software is provided "as is," without warranty of any kind, - express or implied. In no event shall the author or contributors - be held liable for any damages arising in any way from the use of - this software. - - The contents of this file are DUAL-LICENSED. You may modify and/or - redistribute this software according to the terms of one of the - following two licenses (at your option): - - - LICENSE 1 ("BSD-like with advertising clause"): - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute - it freely, subject to the following restrictions: - - 1. Redistributions of source code must retain the above copyright - notice, disclaimer, and this list of conditions. - 2. Redistributions in binary form must reproduce the above copyright - notice, disclaimer, and this list of conditions in the documenta- - tion and/or other materials provided with the distribution. - 3. All advertising materials mentioning features or use of this - software must display the following acknowledgment: - - This product includes software developed by Greg Roelofs - and contributors for the book, "PNG: The Definitive Guide," - published by O'Reilly and Associates. - - - LICENSE 2 (GNU GPL v2 or later): - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - ---------------------------------------------------------------------------*/ - -#define PROGNAME "rpng-win" -#define LONGNAME "Simple PNG Viewer for Windows" -#define VERSION "2.01 of 16 March 2008" - -#include -#include -#include -#include -#include -#ifdef __CYGWIN__ -/* getch replacement. Turns out, we don't really need this, - * but leave it here if we ever enable any of the uses of - * _getch in the main code - */ -#include -#include -#include -int repl_getch( void ) -{ - char ch; - int fd = fileno(stdin); - struct termio old_tty, new_tty; - - ioctl(fd, TCGETA, &old_tty); - new_tty = old_tty; - new_tty.c_lflag &= ~(ICANON | ECHO | ISIG); - ioctl(fd, TCSETA, &new_tty); - fread(&ch, 1, sizeof(ch), stdin); - ioctl(fd, TCSETA, &old_tty); - - return ch; -} -#define _getch repl_getch -#else -#include /* only for _getch() */ -#endif - -/* #define DEBUG : this enables the Trace() macros */ - -#include "readpng.h" /* typedefs, common macros, readpng prototypes */ - - -/* could just include png.h, but this macro is the only thing we need - * (name and typedefs changed to local versions); note that side effects - * only happen with alpha (which could easily be avoided with - * "ush acopy = (alpha);") */ - -#define alpha_composite(composite, fg, alpha, bg) { \ - ush temp = ((ush)(fg)*(ush)(alpha) + \ - (ush)(bg)*(ush)(255 - (ush)(alpha)) + (ush)128); \ - (composite) = (uch)((temp + (temp >> 8)) >> 8); \ -} - - -/* local prototypes */ -static int rpng_win_create_window(HINSTANCE hInst, int showmode); -static int rpng_win_display_image(void); -static void rpng_win_cleanup(void); -LRESULT CALLBACK rpng_win_wndproc(HWND, UINT, WPARAM, LPARAM); - - -static char titlebar[1024]; -static char *progname = PROGNAME; -static char *appname = LONGNAME; -static char *filename; -static FILE *infile; - -static char *bgstr; -static uch bg_red=0, bg_green=0, bg_blue=0; - -static double display_exponent; - -static ulg image_width, image_height, image_rowbytes; -static int image_channels; -static uch *image_data; - -/* Windows-specific variables */ -static ulg wimage_rowbytes; -static uch *dib; -static uch *wimage_data; -static BITMAPINFOHEADER *bmih; - -static HWND global_hwnd; - - - - -int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, PSTR cmd, int showmode) -{ - char *args[1024]; /* arbitrary limit, but should suffice */ - char *p, *q, **argv = args; - int argc = 0; - int rc, alen, flen; - int error = 0; - int have_bg = FALSE; - double LUT_exponent; /* just the lookup table */ - double CRT_exponent = 2.2; /* just the monitor */ - double default_display_exponent; /* whole display system */ - MSG msg; - - - filename = (char *)NULL; - -#ifndef __CYGWIN__ - /* First reenable console output, which normally goes to the bit bucket - * for windowed apps. Closing the console window will terminate the - * app. Thanks to David.Geldreich@realviz.com for supplying the magical - * incantation. */ - - AllocConsole(); - freopen("CONOUT$", "a", stderr); - freopen("CONOUT$", "a", stdout); -#endif - - - /* Next set the default value for our display-system exponent, i.e., - * the product of the CRT exponent and the exponent corresponding to - * the frame-buffer's lookup table (LUT), if any. This is not an - * exhaustive list of LUT values (e.g., OpenStep has a lot of weird - * ones), but it should cover 99% of the current possibilities. And - * yes, these ifdefs are completely wasted in a Windows program... */ - -#if defined(NeXT) - LUT_exponent = 1.0 / 2.2; - /* - if (some_next_function_that_returns_gamma(&next_gamma)) - LUT_exponent = 1.0 / next_gamma; - */ -#elif defined(sgi) - LUT_exponent = 1.0 / 1.7; - /* there doesn't seem to be any documented function to get the - * "gamma" value, so we do it the hard way */ - infile = fopen("/etc/config/system.glGammaVal", "r"); - if (infile) { - double sgi_gamma; - - fgets(tmpline, 80, infile); - fclose(infile); - sgi_gamma = atof(tmpline); - if (sgi_gamma > 0.0) - LUT_exponent = 1.0 / sgi_gamma; - } -#elif defined(Macintosh) - LUT_exponent = 1.8 / 2.61; - /* - if (some_mac_function_that_returns_gamma(&mac_gamma)) - LUT_exponent = mac_gamma / 2.61; - */ -#else - LUT_exponent = 1.0; /* assume no LUT: most PCs */ -#endif - - /* the defaults above give 1.0, 1.3, 1.5 and 2.2, respectively: */ - default_display_exponent = LUT_exponent * CRT_exponent; - - - /* If the user has set the SCREEN_GAMMA environment variable as suggested - * (somewhat imprecisely) in the libpng documentation, use that; otherwise - * use the default value we just calculated. Either way, the user may - * override this via a command-line option. */ - - if ((p = getenv("SCREEN_GAMMA")) != NULL) - display_exponent = atof(p); - else - display_exponent = default_display_exponent; - - - /* Windows really hates command lines, so we have to set up our own argv. - * Note that we do NOT bother with quoted arguments here, so don't use - * filenames with spaces in 'em! */ - - argv[argc++] = PROGNAME; - p = cmd; - for (;;) { - if (*p == ' ') - while (*++p == ' ') - ; - /* now p points at the first non-space after some spaces */ - if (*p == '\0') - break; /* nothing after the spaces: done */ - argv[argc++] = q = p; - while (*q && *q != ' ') - ++q; - /* now q points at a space or the end of the string */ - if (*q == '\0') - break; /* last argv already terminated; quit */ - *q = '\0'; /* change space to terminator */ - p = q + 1; - } - argv[argc] = NULL; /* terminate the argv array itself */ - - - /* Now parse the command line for options and the PNG filename. */ - - while (*++argv && !error) { - if (!strncmp(*argv, "-gamma", 2)) { - if (!*++argv) - ++error; - else { - display_exponent = atof(*argv); - if (display_exponent <= 0.0) - ++error; - } - } else if (!strncmp(*argv, "-bgcolor", 2)) { - if (!*++argv) - ++error; - else { - bgstr = *argv; - if (strlen(bgstr) != 7 || bgstr[0] != '#') - ++error; - else - have_bg = TRUE; - } - } else { - if (**argv != '-') { - filename = *argv; - if (argv[1]) /* shouldn't be any more args after filename */ - ++error; - } else - ++error; /* not expecting any other options */ - } - } - - if (!filename) - ++error; - - - /* print usage screen if any errors up to this point */ - - if (error) { -#ifndef __CYGWIN__ - int ch; -#endif - - fprintf(stderr, "\n%s %s: %s\n\n", PROGNAME, VERSION, appname); - readpng_version_info(); - fprintf(stderr, "\n" - "Usage: %s [-gamma exp] [-bgcolor bg] file.png\n" - " exp \ttransfer-function exponent (``gamma'') of the display\n" - "\t\t system in floating-point format (e.g., ``%.1f''); equal\n" - "\t\t to the product of the lookup-table exponent (varies)\n" - "\t\t and the CRT exponent (usually 2.2); must be positive\n" - " bg \tdesired background color in 7-character hex RGB format\n" - "\t\t (e.g., ``#ff7700'' for orange: same as HTML colors);\n" - "\t\t used with transparent images\n" - "\nPress Q, Esc or mouse button 1 after image is displayed to quit.\n" -#ifndef __CYGWIN__ - "Press Q or Esc to quit this usage screen.\n" -#endif - "\n", PROGNAME, default_display_exponent); -#ifndef __CYGWIN__ - do - ch = _getch(); - while (ch != 'q' && ch != 'Q' && ch != 0x1B); -#endif - exit(1); - } - - - if (!(infile = fopen(filename, "rb"))) { - fprintf(stderr, PROGNAME ": can't open PNG file [%s]\n", filename); - ++error; - } else { - if ((rc = readpng_init(infile, &image_width, &image_height)) != 0) { - switch (rc) { - case 1: - fprintf(stderr, PROGNAME - ": [%s] is not a PNG file: incorrect signature\n", - filename); - break; - case 2: - fprintf(stderr, PROGNAME - ": [%s] has bad IHDR (libpng longjmp)\n", filename); - break; - case 4: - fprintf(stderr, PROGNAME ": insufficient memory\n"); - break; - default: - fprintf(stderr, PROGNAME - ": unknown readpng_init() error\n"); - break; - } - ++error; - } - if (error) - fclose(infile); - } - - - if (error) { -#ifndef __CYGWIN__ - int ch; -#endif - - fprintf(stderr, PROGNAME ": aborting.\n"); -#ifndef __CYGWIN__ - do - ch = _getch(); - while (ch != 'q' && ch != 'Q' && ch != 0x1B); -#endif - exit(2); - } else { - fprintf(stderr, "\n%s %s: %s\n", PROGNAME, VERSION, appname); -#ifndef __CYGWIN__ - fprintf(stderr, - "\n [console window: closing this window will terminate %s]\n\n", - PROGNAME); -#endif - } - - - /* set the title-bar string, but make sure buffer doesn't overflow */ - - alen = strlen(appname); - flen = strlen(filename); - if (alen + flen + 3 > 1023) - sprintf(titlebar, "%s: ...%s", appname, filename+(alen+flen+6-1023)); - else - sprintf(titlebar, "%s: %s", appname, filename); - - - /* if the user didn't specify a background color on the command line, - * check for one in the PNG file--if not, the initialized values of 0 - * (black) will be used */ - - if (have_bg) { - unsigned r, g, b; /* this approach quiets compiler warnings */ - - sscanf(bgstr+1, "%2x%2x%2x", &r, &g, &b); - bg_red = (uch)r; - bg_green = (uch)g; - bg_blue = (uch)b; - } else if (readpng_get_bgcolor(&bg_red, &bg_green, &bg_blue) > 1) { - readpng_cleanup(TRUE); - fprintf(stderr, PROGNAME - ": libpng error while checking for background color\n"); - exit(2); - } - - - /* do the basic Windows initialization stuff, make the window and fill it - * with the background color */ - - if (rpng_win_create_window(hInst, showmode)) - exit(2); - - - /* decode the image, all at once */ - - Trace((stderr, "calling readpng_get_image()\n")) - image_data = readpng_get_image(display_exponent, &image_channels, - &image_rowbytes); - Trace((stderr, "done with readpng_get_image()\n")) - - - /* done with PNG file, so clean up to minimize memory usage (but do NOT - * nuke image_data!) */ - - readpng_cleanup(FALSE); - fclose(infile); - - if (!image_data) { - fprintf(stderr, PROGNAME ": unable to decode PNG image\n"); - exit(3); - } - - - /* display image (composite with background if requested) */ - - Trace((stderr, "calling rpng_win_display_image()\n")) - if (rpng_win_display_image()) { - free(image_data); - exit(4); - } - Trace((stderr, "done with rpng_win_display_image()\n")) - - - /* wait for the user to tell us when to quit */ - - printf( -#ifndef __CYGWIN__ - "Done. Press Q, Esc or mouse button 1 (within image window) to quit.\n" -#else - "Done. Press mouse button 1 (within image window) to quit.\n" -#endif - ); - fflush(stdout); - - while (GetMessage(&msg, NULL, 0, 0)) { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - - - /* OK, we're done: clean up all image and Windows resources and go away */ - - rpng_win_cleanup(); - - return msg.wParam; -} - - - - - -static int rpng_win_create_window(HINSTANCE hInst, int showmode) -{ - uch *dest; - int extra_width, extra_height; - ulg i, j; - WNDCLASSEX wndclass; - - -/*--------------------------------------------------------------------------- - Allocate memory for the display-specific version of the image (round up - to multiple of 4 for Windows DIB). - ---------------------------------------------------------------------------*/ - - wimage_rowbytes = ((3*image_width + 3L) >> 2) << 2; - - if (!(dib = (uch *)malloc(sizeof(BITMAPINFOHEADER) + - wimage_rowbytes*image_height))) - { - return 4; /* fail */ - } - -/*--------------------------------------------------------------------------- - Initialize the DIB. Negative height means to use top-down BMP ordering - (must be uncompressed, but that's what we want). Bit count of 1, 4 or 8 - implies a colormap of RGBX quads, but 24-bit BMPs just use B,G,R values - directly => wimage_data begins immediately after BMP header. - ---------------------------------------------------------------------------*/ - - memset(dib, 0, sizeof(BITMAPINFOHEADER)); - bmih = (BITMAPINFOHEADER *)dib; - bmih->biSize = sizeof(BITMAPINFOHEADER); - bmih->biWidth = image_width; - bmih->biHeight = -((long)image_height); - bmih->biPlanes = 1; - bmih->biBitCount = 24; - bmih->biCompression = 0; - wimage_data = dib + sizeof(BITMAPINFOHEADER); - -/*--------------------------------------------------------------------------- - Fill in background color (black by default); data are in BGR order. - ---------------------------------------------------------------------------*/ - - for (j = 0; j < image_height; ++j) { - dest = wimage_data + j*wimage_rowbytes; - for (i = image_width; i > 0; --i) { - *dest++ = bg_blue; - *dest++ = bg_green; - *dest++ = bg_red; - } - } - -/*--------------------------------------------------------------------------- - Set the window parameters. - ---------------------------------------------------------------------------*/ - - memset(&wndclass, 0, sizeof(wndclass)); - - wndclass.cbSize = sizeof(wndclass); - wndclass.style = CS_HREDRAW | CS_VREDRAW; - wndclass.lpfnWndProc = rpng_win_wndproc; - wndclass.hInstance = hInst; - wndclass.hIcon = LoadIcon(NULL, IDI_APPLICATION); - wndclass.hCursor = LoadCursor(NULL, IDC_ARROW); - wndclass.hbrBackground = (HBRUSH)GetStockObject(DKGRAY_BRUSH); - wndclass.lpszMenuName = NULL; - wndclass.lpszClassName = progname; - wndclass.hIconSm = LoadIcon(NULL, IDI_APPLICATION); - - RegisterClassEx(&wndclass); - -/*--------------------------------------------------------------------------- - Finally, create the window. - ---------------------------------------------------------------------------*/ - - extra_width = 2*(GetSystemMetrics(SM_CXBORDER) + - GetSystemMetrics(SM_CXDLGFRAME)); - extra_height = 2*(GetSystemMetrics(SM_CYBORDER) + - GetSystemMetrics(SM_CYDLGFRAME)) + - GetSystemMetrics(SM_CYCAPTION); - - global_hwnd = CreateWindow(progname, titlebar, WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT, CW_USEDEFAULT, image_width+extra_width, - image_height+extra_height, NULL, NULL, hInst, NULL); - - ShowWindow(global_hwnd, showmode); - UpdateWindow(global_hwnd); - - return 0; - -} /* end function rpng_win_create_window() */ - - - - - -static int rpng_win_display_image() -{ - uch *src, *dest; - uch r, g, b, a; - ulg i, row, lastrow; - RECT rect; - - - Trace((stderr, "beginning display loop (image_channels == %d)\n", - image_channels)) - Trace((stderr, "(width = %ld, rowbytes = %ld, wimage_rowbytes = %d)\n", - image_width, image_rowbytes, wimage_rowbytes)) - - -/*--------------------------------------------------------------------------- - Blast image data to buffer. This whole routine takes place before the - message loop begins, so there's no real point in any pseudo-progressive - display... - ---------------------------------------------------------------------------*/ - - for (lastrow = row = 0; row < image_height; ++row) { - src = image_data + row*image_rowbytes; - dest = wimage_data + row*wimage_rowbytes; - if (image_channels == 3) { - for (i = image_width; i > 0; --i) { - r = *src++; - g = *src++; - b = *src++; - *dest++ = b; - *dest++ = g; /* note reverse order */ - *dest++ = r; - } - } else /* if (image_channels == 4) */ { - for (i = image_width; i > 0; --i) { - r = *src++; - g = *src++; - b = *src++; - a = *src++; - if (a == 255) { - *dest++ = b; - *dest++ = g; - *dest++ = r; - } else if (a == 0) { - *dest++ = bg_blue; - *dest++ = bg_green; - *dest++ = bg_red; - } else { - /* this macro (copied from png.h) composites the - * foreground and background values and puts the - * result into the first argument; there are no - * side effects with the first argument */ - alpha_composite(*dest++, b, a, bg_blue); - alpha_composite(*dest++, g, a, bg_green); - alpha_composite(*dest++, r, a, bg_red); - } - } - } - /* display after every 16 lines */ - if (((row+1) & 0xf) == 0) { - rect.left = 0L; - rect.top = (LONG)lastrow; - rect.right = (LONG)image_width; /* possibly off by one? */ - rect.bottom = (LONG)lastrow + 16L; /* possibly off by one? */ - InvalidateRect(global_hwnd, &rect, FALSE); - UpdateWindow(global_hwnd); /* similar to XFlush() */ - lastrow = row + 1; - } - } - - Trace((stderr, "calling final image-flush routine\n")) - if (lastrow < image_height) { - rect.left = 0L; - rect.top = (LONG)lastrow; - rect.right = (LONG)image_width; /* possibly off by one? */ - rect.bottom = (LONG)image_height; /* possibly off by one? */ - InvalidateRect(global_hwnd, &rect, FALSE); - UpdateWindow(global_hwnd); /* similar to XFlush() */ - } - -/* - last param determines whether or not background is wiped before paint - InvalidateRect(global_hwnd, NULL, TRUE); - UpdateWindow(global_hwnd); - */ - - return 0; -} - - - - - -static void rpng_win_cleanup() -{ - if (image_data) { - free(image_data); - image_data = NULL; - } - - if (dib) { - free(dib); - dib = NULL; - } -} - - - - - -LRESULT CALLBACK rpng_win_wndproc(HWND hwnd, UINT iMsg, WPARAM wP, LPARAM lP) -{ - HDC hdc; - PAINTSTRUCT ps; - int rc; - - switch (iMsg) { - case WM_CREATE: - /* one-time processing here, if any */ - return 0; - - case WM_PAINT: - hdc = BeginPaint(hwnd, &ps); - /* dest */ - rc = StretchDIBits(hdc, 0, 0, image_width, image_height, - /* source */ - 0, 0, image_width, image_height, - wimage_data, (BITMAPINFO *)bmih, - /* iUsage: no clue */ - 0, SRCCOPY); - EndPaint(hwnd, &ps); - return 0; - - /* wait for the user to tell us when to quit */ - case WM_CHAR: - switch (wP) { /* only need one, so ignore repeat count */ - case 'q': - case 'Q': - case 0x1B: /* Esc key */ - PostQuitMessage(0); - } - return 0; - - case WM_LBUTTONDOWN: /* another way of quitting */ - case WM_DESTROY: - PostQuitMessage(0); - return 0; - } - - return DefWindowProc(hwnd, iMsg, wP, lP); -} diff --git a/libpng16/contrib/gregbook/rpng-x.c b/libpng16/contrib/gregbook/rpng-x.c deleted file mode 100644 index 6d10e1b..0000000 --- a/libpng16/contrib/gregbook/rpng-x.c +++ /dev/null @@ -1,904 +0,0 @@ -/*--------------------------------------------------------------------------- - - rpng - simple PNG display program rpng-x.c - - This program decodes and displays PNG images, with gamma correction and - optionally with a user-specified background color (in case the image has - transparency). It is very nearly the most basic PNG viewer possible. - This version is for the X Window System (tested by author under Unix and - by Martin Zinser under OpenVMS; may work under OS/2 with some tweaking). - - to do: - - 8-bit (colormapped) X support - - use %.1023s to simplify truncation of title-bar string? - - --------------------------------------------------------------------------- - - Changelog: - - 1.01: initial public release - - 1.02: modified to allow abbreviated options; fixed long/ulong mis- - match; switched to png_jmpbuf() macro - - 1.10: added support for non-default visuals; fixed X pixel-conversion - - 1.11: added extra set of parentheses to png_jmpbuf() macro; fixed - command-line parsing bug - - 1.12: fixed some small X memory leaks (thanks to François Petitjean) - - 1.13: fixed XFreeGC() crash bug (thanks to Patrick Welche) - - 1.14: added support for X resources (thanks to Gerhard Niklasch) - - 2.00: dual-licensed (added GNU GPL) - - 2.01: fixed improper display of usage screen on PNG error(s) - - --------------------------------------------------------------------------- - - Copyright (c) 1998-2008 Greg Roelofs. All rights reserved. - - This software is provided "as is," without warranty of any kind, - express or implied. In no event shall the author or contributors - be held liable for any damages arising in any way from the use of - this software. - - The contents of this file are DUAL-LICENSED. You may modify and/or - redistribute this software according to the terms of one of the - following two licenses (at your option): - - - LICENSE 1 ("BSD-like with advertising clause"): - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute - it freely, subject to the following restrictions: - - 1. Redistributions of source code must retain the above copyright - notice, disclaimer, and this list of conditions. - 2. Redistributions in binary form must reproduce the above copyright - notice, disclaimer, and this list of conditions in the documenta- - tion and/or other materials provided with the distribution. - 3. All advertising materials mentioning features or use of this - software must display the following acknowledgment: - - This product includes software developed by Greg Roelofs - and contributors for the book, "PNG: The Definitive Guide," - published by O'Reilly and Associates. - - - LICENSE 2 (GNU GPL v2 or later): - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - ---------------------------------------------------------------------------*/ - -#define PROGNAME "rpng-x" -#define LONGNAME "Simple PNG Viewer for X" -#define VERSION "2.01 of 16 March 2008" -#define RESNAME "rpng" /* our X resource application name */ -#define RESCLASS "Rpng" /* our X resource class name */ - -#include -#include -#include -#include -#include -#include -#include -#include - -/* #define DEBUG : this enables the Trace() macros */ - -#include "readpng.h" /* typedefs, common macros, readpng prototypes */ - - -/* could just include png.h, but this macro is the only thing we need - * (name and typedefs changed to local versions); note that side effects - * only happen with alpha (which could easily be avoided with - * "ush acopy = (alpha);") */ - -#define alpha_composite(composite, fg, alpha, bg) { \ - ush temp = ((ush)(fg)*(ush)(alpha) + \ - (ush)(bg)*(ush)(255 - (ush)(alpha)) + (ush)128); \ - (composite) = (uch)((temp + (temp >> 8)) >> 8); \ -} - - -/* local prototypes */ -static int rpng_x_create_window(void); -static int rpng_x_display_image(void); -static void rpng_x_cleanup(void); -static int rpng_x_msb(ulg u32val); - - -static char titlebar[1024], *window_name = titlebar; -static char *appname = LONGNAME; -static char *icon_name = PROGNAME; -static char *res_name = RESNAME; -static char *res_class = RESCLASS; -static char *filename; -static FILE *infile; - -static char *bgstr; -static uch bg_red=0, bg_green=0, bg_blue=0; - -static double display_exponent; - -static ulg image_width, image_height, image_rowbytes; -static int image_channels; -static uch *image_data; - -/* X-specific variables */ -static char *displayname; -static XImage *ximage; -static Display *display; -static int depth; -static Visual *visual; -static XVisualInfo *visual_list; -static int RShift, GShift, BShift; -static ulg RMask, GMask, BMask; -static Window window; -static GC gc; -static Colormap colormap; - -static int have_nondefault_visual = FALSE; -static int have_colormap = FALSE; -static int have_window = FALSE; -static int have_gc = FALSE; -/* -ulg numcolors=0, pixels[256]; -ush reds[256], greens[256], blues[256]; - */ - - - - -int main(int argc, char **argv) -{ -#ifdef sgi - char tmpline[80]; -#endif - char *p; - int rc, alen, flen; - int error = 0; - int have_bg = FALSE; - double LUT_exponent; /* just the lookup table */ - double CRT_exponent = 2.2; /* just the monitor */ - double default_display_exponent; /* whole display system */ - XEvent e; - KeySym k; - - - displayname = (char *)NULL; - filename = (char *)NULL; - - - /* First set the default value for our display-system exponent, i.e., - * the product of the CRT exponent and the exponent corresponding to - * the frame-buffer's lookup table (LUT), if any. This is not an - * exhaustive list of LUT values (e.g., OpenStep has a lot of weird - * ones), but it should cover 99% of the current possibilities. */ - -#if defined(NeXT) - LUT_exponent = 1.0 / 2.2; - /* - if (some_next_function_that_returns_gamma(&next_gamma)) - LUT_exponent = 1.0 / next_gamma; - */ -#elif defined(sgi) - LUT_exponent = 1.0 / 1.7; - /* there doesn't seem to be any documented function to get the - * "gamma" value, so we do it the hard way */ - infile = fopen("/etc/config/system.glGammaVal", "r"); - if (infile) { - double sgi_gamma; - - fgets(tmpline, 80, infile); - fclose(infile); - sgi_gamma = atof(tmpline); - if (sgi_gamma > 0.0) - LUT_exponent = 1.0 / sgi_gamma; - } -#elif defined(Macintosh) - LUT_exponent = 1.8 / 2.61; - /* - if (some_mac_function_that_returns_gamma(&mac_gamma)) - LUT_exponent = mac_gamma / 2.61; - */ -#else - LUT_exponent = 1.0; /* assume no LUT: most PCs */ -#endif - - /* the defaults above give 1.0, 1.3, 1.5 and 2.2, respectively: */ - default_display_exponent = LUT_exponent * CRT_exponent; - - - /* If the user has set the SCREEN_GAMMA environment variable as suggested - * (somewhat imprecisely) in the libpng documentation, use that; otherwise - * use the default value we just calculated. Either way, the user may - * override this via a command-line option. */ - - if ((p = getenv("SCREEN_GAMMA")) != NULL) - display_exponent = atof(p); - else - display_exponent = default_display_exponent; - - - /* Now parse the command line for options and the PNG filename. */ - - while (*++argv && !error) { - if (!strncmp(*argv, "-display", 2)) { - if (!*++argv) - ++error; - else - displayname = *argv; - } else if (!strncmp(*argv, "-gamma", 2)) { - if (!*++argv) - ++error; - else { - display_exponent = atof(*argv); - if (display_exponent <= 0.0) - ++error; - } - } else if (!strncmp(*argv, "-bgcolor", 2)) { - if (!*++argv) - ++error; - else { - bgstr = *argv; - if (strlen(bgstr) != 7 || bgstr[0] != '#') - ++error; - else - have_bg = TRUE; - } - } else { - if (**argv != '-') { - filename = *argv; - if (argv[1]) /* shouldn't be any more args after filename */ - ++error; - } else - ++error; /* not expecting any other options */ - } - } - - if (!filename) - ++error; - - - /* print usage screen if any errors up to this point */ - - if (error) { - fprintf(stderr, "\n%s %s: %s\n", PROGNAME, VERSION, appname); - readpng_version_info(); - fprintf(stderr, "\n" - "Usage: %s [-display xdpy] [-gamma exp] [-bgcolor bg] file.png\n" - " xdpy\tname of the target X display (e.g., ``hostname:0'')\n" - " exp \ttransfer-function exponent (``gamma'') of the display\n" - "\t\t system in floating-point format (e.g., ``%.1f''); equal\n" - "\t\t to the product of the lookup-table exponent (varies)\n" - "\t\t and the CRT exponent (usually 2.2); must be positive\n" - " bg \tdesired background color in 7-character hex RGB format\n" - "\t\t (e.g., ``#ff7700'' for orange: same as HTML colors);\n" - "\t\t used with transparent images\n" - "\nPress Q, Esc or mouse button 1 (within image window, after image\n" - "is displayed) to quit.\n" - "\n", PROGNAME, default_display_exponent); - exit(1); - } - - - if (!(infile = fopen(filename, "rb"))) { - fprintf(stderr, PROGNAME ": can't open PNG file [%s]\n", filename); - ++error; - } else { - if ((rc = readpng_init(infile, &image_width, &image_height)) != 0) { - switch (rc) { - case 1: - fprintf(stderr, PROGNAME - ": [%s] is not a PNG file: incorrect signature\n", - filename); - break; - case 2: - fprintf(stderr, PROGNAME - ": [%s] has bad IHDR (libpng longjmp)\n", filename); - break; - case 4: - fprintf(stderr, PROGNAME ": insufficient memory\n"); - break; - default: - fprintf(stderr, PROGNAME - ": unknown readpng_init() error\n"); - break; - } - ++error; - } else { - display = XOpenDisplay(displayname); - if (!display) { - readpng_cleanup(TRUE); - fprintf(stderr, PROGNAME ": can't open X display [%s]\n", - displayname? displayname : "default"); - ++error; - } - } - if (error) - fclose(infile); - } - - - if (error) { - fprintf(stderr, PROGNAME ": aborting.\n"); - exit(2); - } - - - /* set the title-bar string, but make sure buffer doesn't overflow */ - - alen = strlen(appname); - flen = strlen(filename); - if (alen + flen + 3 > 1023) - sprintf(titlebar, "%s: ...%s", appname, filename+(alen+flen+6-1023)); - else - sprintf(titlebar, "%s: %s", appname, filename); - - - /* if the user didn't specify a background color on the command line, - * check for one in the PNG file--if not, the initialized values of 0 - * (black) will be used */ - - if (have_bg) { - unsigned r, g, b; /* this approach quiets compiler warnings */ - - sscanf(bgstr+1, "%2x%2x%2x", &r, &g, &b); - bg_red = (uch)r; - bg_green = (uch)g; - bg_blue = (uch)b; - } else if (readpng_get_bgcolor(&bg_red, &bg_green, &bg_blue) > 1) { - readpng_cleanup(TRUE); - fprintf(stderr, PROGNAME - ": libpng error while checking for background color\n"); - exit(2); - } - - - /* do the basic X initialization stuff, make the window and fill it - * with the background color */ - - if (rpng_x_create_window()) - exit(2); - - - /* decode the image, all at once */ - - Trace((stderr, "calling readpng_get_image()\n")) - image_data = readpng_get_image(display_exponent, &image_channels, - &image_rowbytes); - Trace((stderr, "done with readpng_get_image()\n")) - - - /* done with PNG file, so clean up to minimize memory usage (but do NOT - * nuke image_data!) */ - - readpng_cleanup(FALSE); - fclose(infile); - - if (!image_data) { - fprintf(stderr, PROGNAME ": unable to decode PNG image\n"); - exit(3); - } - - - /* display image (composite with background if requested) */ - - Trace((stderr, "calling rpng_x_display_image()\n")) - if (rpng_x_display_image()) { - free(image_data); - exit(4); - } - Trace((stderr, "done with rpng_x_display_image()\n")) - - - /* wait for the user to tell us when to quit */ - - printf( - "Done. Press Q, Esc or mouse button 1 (within image window) to quit.\n"); - fflush(stdout); - - do - XNextEvent(display, &e); - while (!(e.type == ButtonPress && e.xbutton.button == Button1) && - !(e.type == KeyPress && /* v--- or 1 for shifted keys */ - ((k = XLookupKeysym(&e.xkey, 0)) == XK_q || k == XK_Escape) )); - - - /* OK, we're done: clean up all image and X resources and go away */ - - rpng_x_cleanup(); - - return 0; -} - - - - - -static int rpng_x_create_window(void) -{ - uch *xdata; - int need_colormap = FALSE; - int screen, pad; - ulg bg_pixel = 0L; - ulg attrmask; - Window root; - XEvent e; - XGCValues gcvalues; - XSetWindowAttributes attr; - XTextProperty windowName, *pWindowName = &windowName; - XTextProperty iconName, *pIconName = &iconName; - XVisualInfo visual_info; - XSizeHints *size_hints; - XWMHints *wm_hints; - XClassHint *class_hints; - - - screen = DefaultScreen(display); - depth = DisplayPlanes(display, screen); - root = RootWindow(display, screen); - -#ifdef DEBUG - XSynchronize(display, True); -#endif - -#if 0 -/* GRR: add 8-bit support */ - if (/* depth != 8 && */ depth != 16 && depth != 24 && depth != 32) { - fprintf(stderr, - "screen depth %d not supported (only 16-, 24- or 32-bit TrueColor)\n", - depth); - return 2; - } - - XMatchVisualInfo(display, screen, depth, - (depth == 8)? PseudoColor : TrueColor, &visual_info); - visual = visual_info.visual; -#else - if (depth != 16 && depth != 24 && depth != 32) { - int visuals_matched = 0; - - Trace((stderr, "default depth is %d: checking other visuals\n", - depth)) - - /* 24-bit first */ - visual_info.screen = screen; - visual_info.depth = 24; - visual_list = XGetVisualInfo(display, - VisualScreenMask | VisualDepthMask, &visual_info, &visuals_matched); - if (visuals_matched == 0) { -/* GRR: add 15-, 16- and 32-bit TrueColor visuals (also DirectColor?) */ - fprintf(stderr, "default screen depth %d not supported, and no" - " 24-bit visuals found\n", depth); - return 2; - } - Trace((stderr, "XGetVisualInfo() returned %d 24-bit visuals\n", - visuals_matched)) - visual = visual_list[0].visual; - depth = visual_list[0].depth; -/* - colormap_size = visual_list[0].colormap_size; - visual_class = visual->class; - visualID = XVisualIDFromVisual(visual); - */ - have_nondefault_visual = TRUE; - need_colormap = TRUE; - } else { - XMatchVisualInfo(display, screen, depth, TrueColor, &visual_info); - visual = visual_info.visual; - } -#endif - - RMask = visual->red_mask; - GMask = visual->green_mask; - BMask = visual->blue_mask; - -/* GRR: add/check 8-bit support */ - if (depth == 8 || need_colormap) { - colormap = XCreateColormap(display, root, visual, AllocNone); - if (!colormap) { - fprintf(stderr, "XCreateColormap() failed\n"); - return 2; - } - have_colormap = TRUE; - } - if (depth == 15 || depth == 16) { - RShift = 15 - rpng_x_msb(RMask); /* these are right-shifts */ - GShift = 15 - rpng_x_msb(GMask); - BShift = 15 - rpng_x_msb(BMask); - } else if (depth > 16) { -#define NO_24BIT_MASKS -#ifdef NO_24BIT_MASKS - RShift = rpng_x_msb(RMask) - 7; /* these are left-shifts */ - GShift = rpng_x_msb(GMask) - 7; - BShift = rpng_x_msb(BMask) - 7; -#else - RShift = 7 - rpng_x_msb(RMask); /* these are right-shifts, too */ - GShift = 7 - rpng_x_msb(GMask); - BShift = 7 - rpng_x_msb(BMask); -#endif - } - if (depth >= 15 && (RShift < 0 || GShift < 0 || BShift < 0)) { - fprintf(stderr, "rpng internal logic error: negative X shift(s)!\n"); - return 2; - } - -/*--------------------------------------------------------------------------- - Finally, create the window. - ---------------------------------------------------------------------------*/ - - attr.backing_store = Always; - attr.event_mask = ExposureMask | KeyPressMask | ButtonPressMask; - attrmask = CWBackingStore | CWEventMask; - if (have_nondefault_visual) { - attr.colormap = colormap; - attr.background_pixel = 0; - attr.border_pixel = 1; - attrmask |= CWColormap | CWBackPixel | CWBorderPixel; - } - - window = XCreateWindow(display, root, 0, 0, image_width, image_height, 0, - depth, InputOutput, visual, attrmask, &attr); - - if (window == None) { - fprintf(stderr, "XCreateWindow() failed\n"); - return 2; - } else - have_window = TRUE; - - if (depth == 8) - XSetWindowColormap(display, window, colormap); - - if (!XStringListToTextProperty(&window_name, 1, pWindowName)) - pWindowName = NULL; - if (!XStringListToTextProperty(&icon_name, 1, pIconName)) - pIconName = NULL; - - /* OK if any hints allocation fails; XSetWMProperties() allows NULLs */ - - if ((size_hints = XAllocSizeHints()) != NULL) { - /* window will not be resizable */ - size_hints->flags = PMinSize | PMaxSize; - size_hints->min_width = size_hints->max_width = (int)image_width; - size_hints->min_height = size_hints->max_height = (int)image_height; - } - - if ((wm_hints = XAllocWMHints()) != NULL) { - wm_hints->initial_state = NormalState; - wm_hints->input = True; - /* wm_hints->icon_pixmap = icon_pixmap; */ - wm_hints->flags = StateHint | InputHint /* | IconPixmapHint */ ; - } - - if ((class_hints = XAllocClassHint()) != NULL) { - class_hints->res_name = res_name; - class_hints->res_class = res_class; - } - - XSetWMProperties(display, window, pWindowName, pIconName, NULL, 0, - size_hints, wm_hints, class_hints); - - /* various properties and hints no longer needed; free memory */ - if (pWindowName) - XFree(pWindowName->value); - if (pIconName) - XFree(pIconName->value); - if (size_hints) - XFree(size_hints); - if (wm_hints) - XFree(wm_hints); - if (class_hints) - XFree(class_hints); - - XMapWindow(display, window); - - gc = XCreateGC(display, window, 0, &gcvalues); - have_gc = TRUE; - -/*--------------------------------------------------------------------------- - Fill window with the specified background color. - ---------------------------------------------------------------------------*/ - - if (depth == 24 || depth == 32) { - bg_pixel = ((ulg)bg_red << RShift) | - ((ulg)bg_green << GShift) | - ((ulg)bg_blue << BShift); - } else if (depth == 16) { - bg_pixel = ((((ulg)bg_red << 8) >> RShift) & RMask) | - ((((ulg)bg_green << 8) >> GShift) & GMask) | - ((((ulg)bg_blue << 8) >> BShift) & BMask); - } else /* depth == 8 */ { - - /* GRR: add 8-bit support */ - - } - - XSetForeground(display, gc, bg_pixel); - XFillRectangle(display, window, gc, 0, 0, image_width, image_height); - -/*--------------------------------------------------------------------------- - Wait for first Expose event to do any drawing, then flush. - ---------------------------------------------------------------------------*/ - - do - XNextEvent(display, &e); - while (e.type != Expose || e.xexpose.count); - - XFlush(display); - -/*--------------------------------------------------------------------------- - Allocate memory for the X- and display-specific version of the image. - ---------------------------------------------------------------------------*/ - - if (depth == 24 || depth == 32) { - xdata = (uch *)malloc(4*image_width*image_height); - pad = 32; - } else if (depth == 16) { - xdata = (uch *)malloc(2*image_width*image_height); - pad = 16; - } else /* depth == 8 */ { - xdata = (uch *)malloc(image_width*image_height); - pad = 8; - } - - if (!xdata) { - fprintf(stderr, PROGNAME ": unable to allocate image memory\n"); - return 4; - } - - ximage = XCreateImage(display, visual, depth, ZPixmap, 0, - (char *)xdata, image_width, image_height, pad, 0); - - if (!ximage) { - fprintf(stderr, PROGNAME ": XCreateImage() failed\n"); - free(xdata); - return 3; - } - - /* to avoid testing the byte order every pixel (or doubling the size of - * the drawing routine with a giant if-test), we arbitrarily set the byte - * order to MSBFirst and let Xlib worry about inverting things on little- - * endian machines (like Linux/x86, old VAXen, etc.)--this is not the most - * efficient approach (the giant if-test would be better), but in the - * interest of clarity, we take the easy way out... */ - - ximage->byte_order = MSBFirst; - - return 0; - -} /* end function rpng_x_create_window() */ - - - - - -static int rpng_x_display_image(void) -{ - uch *src; - char *dest; - uch r, g, b, a; - ulg i, row, lastrow = 0; - ulg pixel; - int ximage_rowbytes = ximage->bytes_per_line; -/* int bpp = ximage->bits_per_pixel; */ - - - Trace((stderr, "beginning display loop (image_channels == %d)\n", - image_channels)) - Trace((stderr, " (width = %ld, rowbytes = %ld, ximage_rowbytes = %d)\n", - image_width, image_rowbytes, ximage_rowbytes)) - Trace((stderr, " (bpp = %d)\n", ximage->bits_per_pixel)) - Trace((stderr, " (byte_order = %s)\n", ximage->byte_order == MSBFirst? - "MSBFirst" : (ximage->byte_order == LSBFirst? "LSBFirst" : "unknown"))) - - if (depth == 24 || depth == 32) { - ulg red, green, blue; - - for (lastrow = row = 0; row < image_height; ++row) { - src = image_data + row*image_rowbytes; - dest = ximage->data + row*ximage_rowbytes; - if (image_channels == 3) { - for (i = image_width; i > 0; --i) { - red = *src++; - green = *src++; - blue = *src++; -#ifdef NO_24BIT_MASKS - pixel = (red << RShift) | - (green << GShift) | - (blue << BShift); - /* recall that we set ximage->byte_order = MSBFirst above */ - /* GRR BUG: this assumes bpp == 32, but may be 24: */ - *dest++ = (char)((pixel >> 24) & 0xff); - *dest++ = (char)((pixel >> 16) & 0xff); - *dest++ = (char)((pixel >> 8) & 0xff); - *dest++ = (char)( pixel & 0xff); -#else - red = (RShift < 0)? red << (-RShift) : red >> RShift; - green = (GShift < 0)? green << (-GShift) : green >> GShift; - blue = (BShift < 0)? blue << (-BShift) : blue >> BShift; - pixel = (red & RMask) | (green & GMask) | (blue & BMask); - /* recall that we set ximage->byte_order = MSBFirst above */ - *dest++ = (char)((pixel >> 24) & 0xff); - *dest++ = (char)((pixel >> 16) & 0xff); - *dest++ = (char)((pixel >> 8) & 0xff); - *dest++ = (char)( pixel & 0xff); -#endif - } - } else /* if (image_channels == 4) */ { - for (i = image_width; i > 0; --i) { - r = *src++; - g = *src++; - b = *src++; - a = *src++; - if (a == 255) { - red = r; - green = g; - blue = b; - } else if (a == 0) { - red = bg_red; - green = bg_green; - blue = bg_blue; - } else { - /* this macro (from png.h) composites the foreground - * and background values and puts the result into the - * first argument */ - alpha_composite(red, r, a, bg_red); - alpha_composite(green, g, a, bg_green); - alpha_composite(blue, b, a, bg_blue); - } - pixel = (red << RShift) | - (green << GShift) | - (blue << BShift); - /* recall that we set ximage->byte_order = MSBFirst above */ - *dest++ = (char)((pixel >> 24) & 0xff); - *dest++ = (char)((pixel >> 16) & 0xff); - *dest++ = (char)((pixel >> 8) & 0xff); - *dest++ = (char)( pixel & 0xff); - } - } - /* display after every 16 lines */ - if (((row+1) & 0xf) == 0) { - XPutImage(display, window, gc, ximage, 0, (int)lastrow, 0, - (int)lastrow, image_width, 16); - XFlush(display); - lastrow = row + 1; - } - } - - } else if (depth == 16) { - ush red, green, blue; - - for (lastrow = row = 0; row < image_height; ++row) { - src = image_data + row*image_rowbytes; - dest = ximage->data + row*ximage_rowbytes; - if (image_channels == 3) { - for (i = image_width; i > 0; --i) { - red = ((ush)(*src) << 8); - ++src; - green = ((ush)(*src) << 8); - ++src; - blue = ((ush)(*src) << 8); - ++src; - pixel = ((red >> RShift) & RMask) | - ((green >> GShift) & GMask) | - ((blue >> BShift) & BMask); - /* recall that we set ximage->byte_order = MSBFirst above */ - *dest++ = (char)((pixel >> 8) & 0xff); - *dest++ = (char)( pixel & 0xff); - } - } else /* if (image_channels == 4) */ { - for (i = image_width; i > 0; --i) { - r = *src++; - g = *src++; - b = *src++; - a = *src++; - if (a == 255) { - red = ((ush)r << 8); - green = ((ush)g << 8); - blue = ((ush)b << 8); - } else if (a == 0) { - red = ((ush)bg_red << 8); - green = ((ush)bg_green << 8); - blue = ((ush)bg_blue << 8); - } else { - /* this macro (from png.h) composites the foreground - * and background values and puts the result back into - * the first argument (== fg byte here: safe) */ - alpha_composite(r, r, a, bg_red); - alpha_composite(g, g, a, bg_green); - alpha_composite(b, b, a, bg_blue); - red = ((ush)r << 8); - green = ((ush)g << 8); - blue = ((ush)b << 8); - } - pixel = ((red >> RShift) & RMask) | - ((green >> GShift) & GMask) | - ((blue >> BShift) & BMask); - /* recall that we set ximage->byte_order = MSBFirst above */ - *dest++ = (char)((pixel >> 8) & 0xff); - *dest++ = (char)( pixel & 0xff); - } - } - /* display after every 16 lines */ - if (((row+1) & 0xf) == 0) { - XPutImage(display, window, gc, ximage, 0, (int)lastrow, 0, - (int)lastrow, image_width, 16); - XFlush(display); - lastrow = row + 1; - } - } - - } else /* depth == 8 */ { - - /* GRR: add 8-bit support */ - - } - - Trace((stderr, "calling final XPutImage()\n")) - if (lastrow < image_height) { - XPutImage(display, window, gc, ximage, 0, (int)lastrow, 0, - (int)lastrow, image_width, image_height-lastrow); - XFlush(display); - } - - return 0; -} - - - - -static void rpng_x_cleanup(void) -{ - if (image_data) { - free(image_data); - image_data = NULL; - } - - if (ximage) { - if (ximage->data) { - free(ximage->data); /* we allocated it, so we free it */ - ximage->data = (char *)NULL; /* instead of XDestroyImage() */ - } - XDestroyImage(ximage); - ximage = NULL; - } - - if (have_gc) - XFreeGC(display, gc); - - if (have_window) - XDestroyWindow(display, window); - - if (have_colormap) - XFreeColormap(display, colormap); - - if (have_nondefault_visual) - XFree(visual_list); -} - - - - - -static int rpng_x_msb(ulg u32val) -{ - int i; - - for (i = 31; i >= 0; --i) { - if (u32val & 0x80000000L) - break; - u32val <<= 1; - } - return i; -} diff --git a/libpng16/contrib/gregbook/rpng2-win.c b/libpng16/contrib/gregbook/rpng2-win.c deleted file mode 100644 index 223e737..0000000 --- a/libpng16/contrib/gregbook/rpng2-win.c +++ /dev/null @@ -1,1253 +0,0 @@ -/*--------------------------------------------------------------------------- - - rpng2 - progressive-model PNG display program rpng2-win.c - - This program decodes and displays PNG files progressively, as if it were - a web browser (though the front end is only set up to read from files). - It supports gamma correction, user-specified background colors, and user- - specified background patterns (for transparent images). This version is - for 32-bit Windows; it may compile under 16-bit Windows with a little - tweaking (or maybe not). Thanks to Adam Costello and Pieter S. van der - Meulen for the "diamond" and "radial waves" patterns, respectively. - - to do (someday, maybe): - - handle quoted command-line args (especially filenames with spaces) - - finish resizable checkerboard-gradient (sizes 4-128?) - - use %.1023s to simplify truncation of title-bar string? - - have minimum window width: oh well - - --------------------------------------------------------------------------- - - Changelog: - - 1.01: initial public release - - 1.02: fixed cut-and-paste error in usage screen (oops...) - - 1.03: modified to allow abbreviated options - - 1.04: removed bogus extra argument from usage fprintf() [Glenn R-P?]; - fixed command-line parsing bug - - 1.10: enabled "message window"/console (thanks to David Geldreich) - - 1.20: added runtime MMX-enabling/disabling and new -mmx* options - - 1.21: made minor tweak to usage screen to fit within 25-line console - - 1.22: added AMD64/EM64T support (__x86_64__) - - 2.00: dual-licensed (added GNU GPL) - - 2.01: fixed 64-bit typo in readpng2.c - - 2.02: fixed improper display of usage screen on PNG error(s); fixed - unexpected-EOF and file-read-error cases - - 2.03: removed runtime MMX-enabling/disabling and obsolete -mmx* options - - --------------------------------------------------------------------------- - - Copyright (c) 1998-2008 Greg Roelofs. All rights reserved. - - This software is provided "as is," without warranty of any kind, - express or implied. In no event shall the author or contributors - be held liable for any damages arising in any way from the use of - this software. - - The contents of this file are DUAL-LICENSED. You may modify and/or - redistribute this software according to the terms of one of the - following two licenses (at your option): - - - LICENSE 1 ("BSD-like with advertising clause"): - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute - it freely, subject to the following restrictions: - - 1. Redistributions of source code must retain the above copyright - notice, disclaimer, and this list of conditions. - 2. Redistributions in binary form must reproduce the above copyright - notice, disclaimer, and this list of conditions in the documenta- - tion and/or other materials provided with the distribution. - 3. All advertising materials mentioning features or use of this - software must display the following acknowledgment: - - This product includes software developed by Greg Roelofs - and contributors for the book, "PNG: The Definitive Guide," - published by O'Reilly and Associates. - - - LICENSE 2 (GNU GPL v2 or later): - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - ---------------------------------------------------------------------------*/ - -#define PROGNAME "rpng2-win" -#define LONGNAME "Progressive PNG Viewer for Windows" -#define VERSION "2.02 of 16 March 2008" - -#include -#include -#include -#include /* for jmpbuf declaration in readpng2.h */ -#include -#include /* only for PvdM background code */ -#include -#ifdef __CYGWIN__ -/* getch replacement. Turns out, we don't really need this, - * but leave it here if we ever enable any of the uses of - * _getch in the main code - */ -#include -#include -#include -int repl_getch( void ) -{ - char ch; - int fd = fileno(stdin); - struct termio old_tty, new_tty; - - ioctl(fd, TCGETA, &old_tty); - new_tty = old_tty; - new_tty.c_lflag &= ~(ICANON | ECHO | ISIG); - ioctl(fd, TCSETA, &new_tty); - fread(&ch, 1, sizeof(ch), stdin); - ioctl(fd, TCSETA, &old_tty); - - return ch; -} -#define _getch repl_getch -#else -#include /* only for _getch() */ -#endif - -/* all for PvdM background code: */ -#ifndef PI -# define PI 3.141592653589793238 -#endif -#define PI_2 (PI*0.5) -#define INV_PI_360 (360.0 / PI) -#define MAX(a,b) (a>b?a:b) -#define MIN(a,b) (a> 8)) >> 8); \ -} - - -#define INBUFSIZE 4096 /* with pseudo-timing on (1 sec delay/block), this - * block size corresponds roughly to a download - * speed 10% faster than theoretical 33.6K maximum - * (assuming 8 data bits, 1 stop bit and no other - * overhead) */ - -/* local prototypes */ -static void rpng2_win_init(void); -static int rpng2_win_create_window(void); -static int rpng2_win_load_bg_image(void); -static void rpng2_win_display_row(ulg row); -static void rpng2_win_finish_display(void); -static void rpng2_win_cleanup(void); -LRESULT CALLBACK rpng2_win_wndproc(HWND, UINT, WPARAM, LPARAM); - - -static char titlebar[1024]; -static char *progname = PROGNAME; -static char *appname = LONGNAME; -static char *filename; -static FILE *infile; - -static mainprog_info rpng2_info; - -static uch inbuf[INBUFSIZE]; -static int incount; - -static int pat = 6; /* must be less than num_bgpat */ -static int bg_image = 0; -static int bgscale = 16; -static ulg bg_rowbytes; -static uch *bg_data; - -static struct rgb_color { - uch r, g, b; -} rgb[] = { - { 0, 0, 0}, /* 0: black */ - {255, 255, 255}, /* 1: white */ - {173, 132, 57}, /* 2: tan */ - { 64, 132, 0}, /* 3: medium green */ - {189, 117, 1}, /* 4: gold */ - {253, 249, 1}, /* 5: yellow */ - { 0, 0, 255}, /* 6: blue */ - { 0, 0, 120}, /* 7: medium blue */ - {255, 0, 255}, /* 8: magenta */ - { 64, 0, 64}, /* 9: dark magenta */ - {255, 0, 0}, /* 10: red */ - { 64, 0, 0}, /* 11: dark red */ - {255, 127, 0}, /* 12: orange */ - {192, 96, 0}, /* 13: darker orange */ - { 24, 60, 0}, /* 14: dark green-yellow */ - { 85, 125, 200} /* 15: ice blue */ -}; -/* not used for now, but should be for error-checking: -static int num_rgb = sizeof(rgb) / sizeof(struct rgb_color); - */ - -/* - This whole struct is a fairly cheesy way to keep the number of - command-line options to a minimum. The radial-waves background - type is a particularly poor fit to the integer elements of the - struct...but a few macros and a little fixed-point math will do - wonders for ya. - - type bits: - F E D C B A 9 8 7 6 5 4 3 2 1 0 - | | | | | - | | +-+-+-- 0 = sharp-edged checkerboard - | | 1 = soft diamonds - | | 2 = radial waves - | | 3-7 = undefined - | +-- gradient #2 inverted? - +-- alternating columns inverted? - */ -static struct background_pattern { - ush type; - int rgb1_max, rgb1_min; /* or bg_freq, bg_gray */ - int rgb2_max, rgb2_min; /* or bg_bsat, bg_brot (both scaled by 10)*/ -} bg[] = { - {0+8, 2,0, 1,15}, /* checkered: tan/black vs. white/ice blue */ - {0+24, 2,0, 1,0}, /* checkered: tan/black vs. white/black */ - {0+8, 4,5, 0,2}, /* checkered: gold/yellow vs. black/tan */ - {0+8, 4,5, 0,6}, /* checkered: gold/yellow vs. black/blue */ - {0, 7,0, 8,9}, /* checkered: deep blue/black vs. magenta */ - {0+8, 13,0, 5,14}, /* checkered: orange/black vs. yellow */ - {0+8, 12,0, 10,11}, /* checkered: orange/black vs. red */ - {1, 7,0, 8,0}, /* diamonds: deep blue/black vs. magenta */ - {1, 12,0, 11,0}, /* diamonds: orange vs. dark red */ - {1, 10,0, 7,0}, /* diamonds: red vs. medium blue */ - {1, 4,0, 5,0}, /* diamonds: gold vs. yellow */ - {1, 3,0, 0,0}, /* diamonds: medium green vs. black */ - {2, 16, 100, 20, 0}, /* radial: ~hard radial color-beams */ - {2, 18, 100, 10, 2}, /* radial: soft, curved radial color-beams */ - {2, 16, 256, 100, 250}, /* radial: very tight spiral */ - {2, 10000, 256, 11, 0} /* radial: dipole-moire' (almost fractal) */ -}; -static int num_bgpat = sizeof(bg) / sizeof(struct background_pattern); - - -/* Windows-specific global variables (could go in struct, but messy...) */ -static ulg wimage_rowbytes; -static uch *dib; -static uch *wimage_data; -static BITMAPINFOHEADER *bmih; - -static HWND global_hwnd; -static HINSTANCE global_hInst; -static int global_showmode; - - - - -int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, PSTR cmd, int showmode) -{ - char *args[1024]; /* arbitrary limit, but should suffice */ - char **argv = args; - char *p, *q, *bgstr = NULL; - int argc = 0; - int rc, alen, flen; - int error = 0; - int timing = FALSE; - int have_bg = FALSE; - double LUT_exponent; /* just the lookup table */ - double CRT_exponent = 2.2; /* just the monitor */ - double default_display_exponent; /* whole display system */ - MSG msg; - - - /* First initialize a few things, just to be sure--memset takes care of - * default background color (black), booleans (FALSE), pointers (NULL), - * etc. */ - - global_hInst = hInst; - global_showmode = showmode; - filename = (char *)NULL; - memset(&rpng2_info, 0, sizeof(mainprog_info)); - -#ifndef __CYGWIN__ - /* Next reenable console output, which normally goes to the bit bucket - * for windowed apps. Closing the console window will terminate the - * app. Thanks to David.Geldreich@realviz.com for supplying the magical - * incantation. */ - - AllocConsole(); - freopen("CONOUT$", "a", stderr); - freopen("CONOUT$", "a", stdout); -#endif - - /* Set the default value for our display-system exponent, i.e., the - * product of the CRT exponent and the exponent corresponding to - * the frame-buffer's lookup table (LUT), if any. This is not an - * exhaustive list of LUT values (e.g., OpenStep has a lot of weird - * ones), but it should cover 99% of the current possibilities. And - * yes, these ifdefs are completely wasted in a Windows program... */ - -#if defined(NeXT) - /* third-party utilities can modify the default LUT exponent */ - LUT_exponent = 1.0 / 2.2; - /* - if (some_next_function_that_returns_gamma(&next_gamma)) - LUT_exponent = 1.0 / next_gamma; - */ -#elif defined(sgi) - LUT_exponent = 1.0 / 1.7; - /* there doesn't seem to be any documented function to - * get the "gamma" value, so we do it the hard way */ - infile = fopen("/etc/config/system.glGammaVal", "r"); - if (infile) { - double sgi_gamma; - - fgets(tmpline, 80, infile); - fclose(infile); - sgi_gamma = atof(tmpline); - if (sgi_gamma > 0.0) - LUT_exponent = 1.0 / sgi_gamma; - } -#elif defined(Macintosh) - LUT_exponent = 1.8 / 2.61; - /* - if (some_mac_function_that_returns_gamma(&mac_gamma)) - LUT_exponent = mac_gamma / 2.61; - */ -#else - LUT_exponent = 1.0; /* assume no LUT: most PCs */ -#endif - - /* the defaults above give 1.0, 1.3, 1.5 and 2.2, respectively: */ - default_display_exponent = LUT_exponent * CRT_exponent; - - - /* If the user has set the SCREEN_GAMMA environment variable as suggested - * (somewhat imprecisely) in the libpng documentation, use that; otherwise - * use the default value we just calculated. Either way, the user may - * override this via a command-line option. */ - - if ((p = getenv("SCREEN_GAMMA")) != NULL) - rpng2_info.display_exponent = atof(p); - else - rpng2_info.display_exponent = default_display_exponent; - - - /* Windows really hates command lines, so we have to set up our own argv. - * Note that we do NOT bother with quoted arguments here, so don't use - * filenames with spaces in 'em! */ - - argv[argc++] = PROGNAME; - p = cmd; - for (;;) { - if (*p == ' ') - while (*++p == ' ') - ; - /* now p points at the first non-space after some spaces */ - if (*p == '\0') - break; /* nothing after the spaces: done */ - argv[argc++] = q = p; - while (*q && *q != ' ') - ++q; - /* now q points at a space or the end of the string */ - if (*q == '\0') - break; /* last argv already terminated; quit */ - *q = '\0'; /* change space to terminator */ - p = q + 1; - } - argv[argc] = NULL; /* terminate the argv array itself */ - - - /* Now parse the command line for options and the PNG filename. */ - - while (*++argv && !error) { - if (!strncmp(*argv, "-gamma", 2)) { - if (!*++argv) - ++error; - else { - rpng2_info.display_exponent = atof(*argv); - if (rpng2_info.display_exponent <= 0.0) - ++error; - } - } else if (!strncmp(*argv, "-bgcolor", 4)) { - if (!*++argv) - ++error; - else { - bgstr = *argv; - if (strlen(bgstr) != 7 || bgstr[0] != '#') - ++error; - else { - have_bg = TRUE; - bg_image = FALSE; - } - } - } else if (!strncmp(*argv, "-bgpat", 4)) { - if (!*++argv) - ++error; - else { - pat = atoi(*argv) - 1; - if (pat < 0 || pat >= num_bgpat) - ++error; - else { - bg_image = TRUE; - have_bg = FALSE; - } - } - } else if (!strncmp(*argv, "-timing", 2)) { - timing = TRUE; - } else { - if (**argv != '-') { - filename = *argv; - if (argv[1]) /* shouldn't be any more args after filename */ - ++error; - } else - ++error; /* not expecting any other options */ - } - } - - if (!filename) - ++error; - - - /* print usage screen if any errors up to this point */ - - if (error) { -#ifndef __CYGWIN__ - int ch; -#endif - - fprintf(stderr, "\n%s %s: %s\n\n", PROGNAME, VERSION, appname); - readpng2_version_info(); - fprintf(stderr, "\n" - "Usage: %s [-gamma exp] [-bgcolor bg | -bgpat pat] [-timing]\n" - " %*s file.png\n\n" - " exp \ttransfer-function exponent (``gamma'') of the display\n" - "\t\t system in floating-point format (e.g., ``%.1f''); equal\n" - "\t\t to the product of the lookup-table exponent (varies)\n" - "\t\t and the CRT exponent (usually 2.2); must be positive\n" - " bg \tdesired background color in 7-character hex RGB format\n" - "\t\t (e.g., ``#ff7700'' for orange: same as HTML colors);\n" - "\t\t used with transparent images; overrides -bgpat option\n" - " pat \tdesired background pattern number (1-%d); used with\n" - "\t\t transparent images; overrides -bgcolor option\n" - " -timing\tenables delay for every block read, to simulate modem\n" - "\t\t download of image (~36 Kbps)\n" - "\nPress Q, Esc or mouse button 1 after image is displayed to quit.\n" -#ifndef __CYGWIN__ - "Press Q or Esc to quit this usage screen. ", -#else - , -#endif - PROGNAME, -#if (defined(__i386__) || defined(_M_IX86) || defined(__x86_64__)) && \ - !(defined(__CYGWIN__) || defined(__MINGW32__)) - (int)strlen(PROGNAME), " ", -#endif - (int)strlen(PROGNAME), " ", default_display_exponent, num_bgpat); - fflush(stderr); -#ifndef __CYGWIN__ - do - ch = _getch(); - while (ch != 'q' && ch != 'Q' && ch != 0x1B); -#endif - exit(1); - } - - - if (!(infile = fopen(filename, "rb"))) { - fprintf(stderr, PROGNAME ": can't open PNG file [%s]\n", filename); - ++error; - } else { - incount = fread(inbuf, 1, INBUFSIZE, infile); - if (incount < 8 || !readpng2_check_sig(inbuf, 8)) { - fprintf(stderr, PROGNAME - ": [%s] is not a PNG file: incorrect signature\n", - filename); - ++error; - } else if ((rc = readpng2_init(&rpng2_info)) != 0) { - switch (rc) { - case 2: - fprintf(stderr, PROGNAME - ": [%s] has bad IHDR (libpng longjmp)\n", filename); - break; - case 4: - fprintf(stderr, PROGNAME ": insufficient memory\n"); - break; - default: - fprintf(stderr, PROGNAME - ": unknown readpng2_init() error\n"); - break; - } - ++error; - } - if (error) - fclose(infile); - } - - - if (error) { -#ifndef __CYGWIN__ - int ch; -#endif - - fprintf(stderr, PROGNAME ": aborting.\n"); -#ifndef __CYGWIN__ - do - ch = _getch(); - while (ch != 'q' && ch != 'Q' && ch != 0x1B); -#endif - exit(2); - } else { - fprintf(stderr, "\n%s %s: %s\n", PROGNAME, VERSION, appname); -#ifndef __CYGWIN__ - fprintf(stderr, - "\n [console window: closing this window will terminate %s]\n\n", - PROGNAME); -#endif - fflush(stderr); - } - - - /* set the title-bar string, but make sure buffer doesn't overflow */ - - alen = strlen(appname); - flen = strlen(filename); - if (alen + flen + 3 > 1023) - sprintf(titlebar, "%s: ...%s", appname, filename+(alen+flen+6-1023)); - else - sprintf(titlebar, "%s: %s", appname, filename); - - - /* set some final rpng2_info variables before entering main data loop */ - - if (have_bg) { - unsigned r, g, b; /* this approach quiets compiler warnings */ - - sscanf(bgstr+1, "%2x%2x%2x", &r, &g, &b); - rpng2_info.bg_red = (uch)r; - rpng2_info.bg_green = (uch)g; - rpng2_info.bg_blue = (uch)b; - } else - rpng2_info.need_bgcolor = TRUE; - - rpng2_info.state = kPreInit; - rpng2_info.mainprog_init = rpng2_win_init; - rpng2_info.mainprog_display_row = rpng2_win_display_row; - rpng2_info.mainprog_finish_display = rpng2_win_finish_display; - - - /* OK, this is the fun part: call readpng2_decode_data() at the start of - * the loop to deal with our first buffer of data (read in above to verify - * that the file is a PNG image), then loop through the file and continue - * calling the same routine to handle each chunk of data. It in turn - * passes the data to libpng, which will invoke one or more of our call- - * backs as decoded data become available. We optionally call Sleep() for - * one second per iteration to simulate downloading the image via an analog - * modem. */ - - for (;;) { - Trace((stderr, "about to call readpng2_decode_data()\n")) - if (readpng2_decode_data(&rpng2_info, inbuf, incount)) - ++error; - Trace((stderr, "done with readpng2_decode_data()\n")) - - if (error || incount != INBUFSIZE || rpng2_info.state == kDone) { - if (rpng2_info.state == kDone) { - Trace((stderr, "done decoding PNG image\n")) - } else if (ferror(infile)) { - fprintf(stderr, PROGNAME - ": error while reading PNG image file\n"); - exit(3); - } else if (feof(infile)) { - fprintf(stderr, PROGNAME ": end of file reached " - "(unexpectedly) while reading PNG image file\n"); - exit(3); - } else /* if (error) */ { - /* will print error message below */ - } - break; - } - - if (timing) - Sleep(1000L); - - incount = fread(inbuf, 1, INBUFSIZE, infile); - } - - - /* clean up PNG stuff and report any decoding errors */ - - fclose(infile); - Trace((stderr, "about to call readpng2_cleanup()\n")) - readpng2_cleanup(&rpng2_info); - - if (error) { - fprintf(stderr, PROGNAME ": libpng error while decoding PNG image\n"); - exit(3); - } - - - /* wait for the user to tell us when to quit */ - - while (GetMessage(&msg, NULL, 0, 0)) { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - - - /* we're done: clean up all image and Windows resources and go away */ - - Trace((stderr, "about to call rpng2_win_cleanup()\n")) - rpng2_win_cleanup(); - - return msg.wParam; -} - - - - - -/* this function is called by readpng2_info_callback() in readpng2.c, which - * in turn is called by libpng after all of the pre-IDAT chunks have been - * read and processed--i.e., we now have enough info to finish initializing */ - -static void rpng2_win_init() -{ - ulg i; - ulg rowbytes = rpng2_info.rowbytes; - - Trace((stderr, "beginning rpng2_win_init()\n")) - Trace((stderr, " rowbytes = %d\n", rpng2_info.rowbytes)) - Trace((stderr, " width = %ld\n", rpng2_info.width)) - Trace((stderr, " height = %ld\n", rpng2_info.height)) - - rpng2_info.image_data = (uch *)malloc(rowbytes * rpng2_info.height); - if (!rpng2_info.image_data) { - readpng2_cleanup(&rpng2_info); - return; - } - - rpng2_info.row_pointers = (uch **)malloc(rpng2_info.height * sizeof(uch *)); - if (!rpng2_info.row_pointers) { - free(rpng2_info.image_data); - rpng2_info.image_data = NULL; - readpng2_cleanup(&rpng2_info); - return; - } - - for (i = 0; i < rpng2_info.height; ++i) - rpng2_info.row_pointers[i] = rpng2_info.image_data + i*rowbytes; - -/*--------------------------------------------------------------------------- - Do the basic Windows initialization stuff, make the window, and fill it - with the user-specified, file-specified or default background color. - ---------------------------------------------------------------------------*/ - - if (rpng2_win_create_window()) { - readpng2_cleanup(&rpng2_info); - return; - } - - rpng2_info.state = kWindowInit; -} - - - - - -static int rpng2_win_create_window() -{ - uch bg_red = rpng2_info.bg_red; - uch bg_green = rpng2_info.bg_green; - uch bg_blue = rpng2_info.bg_blue; - uch *dest; - int extra_width, extra_height; - ulg i, j; - WNDCLASSEX wndclass; - RECT rect; - - -/*--------------------------------------------------------------------------- - Allocate memory for the display-specific version of the image (round up - to multiple of 4 for Windows DIB). - ---------------------------------------------------------------------------*/ - - wimage_rowbytes = ((3*rpng2_info.width + 3L) >> 2) << 2; - - if (!(dib = (uch *)malloc(sizeof(BITMAPINFOHEADER) + - wimage_rowbytes*rpng2_info.height))) - { - return 4; /* fail */ - } - -/*--------------------------------------------------------------------------- - Initialize the DIB. Negative height means to use top-down BMP ordering - (must be uncompressed, but that's what we want). Bit count of 1, 4 or 8 - implies a colormap of RGBX quads, but 24-bit BMPs just use B,G,R values - directly => wimage_data begins immediately after BMP header. - ---------------------------------------------------------------------------*/ - - memset(dib, 0, sizeof(BITMAPINFOHEADER)); - bmih = (BITMAPINFOHEADER *)dib; - bmih->biSize = sizeof(BITMAPINFOHEADER); - bmih->biWidth = rpng2_info.width; - bmih->biHeight = -((long)rpng2_info.height); - bmih->biPlanes = 1; - bmih->biBitCount = 24; - bmih->biCompression = 0; - wimage_data = dib + sizeof(BITMAPINFOHEADER); - -/*--------------------------------------------------------------------------- - Fill window with the specified background color (default is black), but - defer loading faked "background image" until window is displayed (may be - slow to compute). Data are in BGR order. - ---------------------------------------------------------------------------*/ - - if (bg_image) { /* just fill with black for now */ - memset(wimage_data, 0, wimage_rowbytes*rpng2_info.height); - } else { - for (j = 0; j < rpng2_info.height; ++j) { - dest = wimage_data + j*wimage_rowbytes; - for (i = rpng2_info.width; i > 0; --i) { - *dest++ = bg_blue; - *dest++ = bg_green; - *dest++ = bg_red; - } - } - } - -/*--------------------------------------------------------------------------- - Set the window parameters. - ---------------------------------------------------------------------------*/ - - memset(&wndclass, 0, sizeof(wndclass)); - - wndclass.cbSize = sizeof(wndclass); - wndclass.style = CS_HREDRAW | CS_VREDRAW; - wndclass.lpfnWndProc = rpng2_win_wndproc; - wndclass.hInstance = global_hInst; - wndclass.hIcon = LoadIcon(NULL, IDI_APPLICATION); - wndclass.hCursor = LoadCursor(NULL, IDC_ARROW); - wndclass.hbrBackground = (HBRUSH)GetStockObject(DKGRAY_BRUSH); - wndclass.lpszMenuName = NULL; - wndclass.lpszClassName = progname; - wndclass.hIconSm = LoadIcon(NULL, IDI_APPLICATION); - - RegisterClassEx(&wndclass); - -/*--------------------------------------------------------------------------- - Finally, create the window. - ---------------------------------------------------------------------------*/ - - extra_width = 2*(GetSystemMetrics(SM_CXBORDER) + - GetSystemMetrics(SM_CXDLGFRAME)); - extra_height = 2*(GetSystemMetrics(SM_CYBORDER) + - GetSystemMetrics(SM_CYDLGFRAME)) + - GetSystemMetrics(SM_CYCAPTION); - - global_hwnd = CreateWindow(progname, titlebar, WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT, CW_USEDEFAULT, rpng2_info.width+extra_width, - rpng2_info.height+extra_height, NULL, NULL, global_hInst, NULL); - - ShowWindow(global_hwnd, global_showmode); - UpdateWindow(global_hwnd); - -/*--------------------------------------------------------------------------- - Now compute the background image and display it. If it fails (memory - allocation), revert to a plain background color. - ---------------------------------------------------------------------------*/ - - if (bg_image) { - static const char *msg = "Computing background image..."; - int x, y, len = strlen(msg); - HDC hdc = GetDC(global_hwnd); - TEXTMETRIC tm; - - GetTextMetrics(hdc, &tm); - x = (rpng2_info.width - len*tm.tmAveCharWidth)/2; - y = (rpng2_info.height - tm.tmHeight)/2; - SetBkMode(hdc, TRANSPARENT); - SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT)); - /* this can still begin out of bounds even if x is positive (???): */ - TextOut(hdc, ((x < 0)? 0 : x), ((y < 0)? 0 : y), msg, len); - ReleaseDC(global_hwnd, hdc); - - rpng2_win_load_bg_image(); /* resets bg_image if fails */ - } - - if (!bg_image) { - for (j = 0; j < rpng2_info.height; ++j) { - dest = wimage_data + j*wimage_rowbytes; - for (i = rpng2_info.width; i > 0; --i) { - *dest++ = bg_blue; - *dest++ = bg_green; - *dest++ = bg_red; - } - } - } - - rect.left = 0L; - rect.top = 0L; - rect.right = (LONG)rpng2_info.width; /* possibly off by one? */ - rect.bottom = (LONG)rpng2_info.height; /* possibly off by one? */ - InvalidateRect(global_hwnd, &rect, FALSE); - UpdateWindow(global_hwnd); /* similar to XFlush() */ - - return 0; - -} /* end function rpng2_win_create_window() */ - - - - - -static int rpng2_win_load_bg_image() -{ - uch *src, *dest; - uch r1, r2, g1, g2, b1, b2; - uch r1_inv, r2_inv, g1_inv, g2_inv, b1_inv, b2_inv; - int k, hmax, max; - int xidx, yidx, yidx_max = (bgscale-1); - int even_odd_vert, even_odd_horiz, even_odd; - int invert_gradient2 = (bg[pat].type & 0x08); - int invert_column; - ulg i, row; - -/*--------------------------------------------------------------------------- - Allocate buffer for fake background image to be used with transparent - images; if this fails, revert to plain background color. - ---------------------------------------------------------------------------*/ - - bg_rowbytes = 3 * rpng2_info.width; - bg_data = (uch *)malloc(bg_rowbytes * rpng2_info.height); - if (!bg_data) { - fprintf(stderr, PROGNAME - ": unable to allocate memory for background image\n"); - bg_image = 0; - return 1; - } - -/*--------------------------------------------------------------------------- - Vertical gradients (ramps) in NxN squares, alternating direction and - colors (N == bgscale). - ---------------------------------------------------------------------------*/ - - if ((bg[pat].type & 0x07) == 0) { - uch r1_min = rgb[bg[pat].rgb1_min].r; - uch g1_min = rgb[bg[pat].rgb1_min].g; - uch b1_min = rgb[bg[pat].rgb1_min].b; - uch r2_min = rgb[bg[pat].rgb2_min].r; - uch g2_min = rgb[bg[pat].rgb2_min].g; - uch b2_min = rgb[bg[pat].rgb2_min].b; - int r1_diff = rgb[bg[pat].rgb1_max].r - r1_min; - int g1_diff = rgb[bg[pat].rgb1_max].g - g1_min; - int b1_diff = rgb[bg[pat].rgb1_max].b - b1_min; - int r2_diff = rgb[bg[pat].rgb2_max].r - r2_min; - int g2_diff = rgb[bg[pat].rgb2_max].g - g2_min; - int b2_diff = rgb[bg[pat].rgb2_max].b - b2_min; - - for (row = 0; row < rpng2_info.height; ++row) { - yidx = row % bgscale; - even_odd_vert = (row / bgscale) & 1; - - r1 = r1_min + (r1_diff * yidx) / yidx_max; - g1 = g1_min + (g1_diff * yidx) / yidx_max; - b1 = b1_min + (b1_diff * yidx) / yidx_max; - r1_inv = r1_min + (r1_diff * (yidx_max-yidx)) / yidx_max; - g1_inv = g1_min + (g1_diff * (yidx_max-yidx)) / yidx_max; - b1_inv = b1_min + (b1_diff * (yidx_max-yidx)) / yidx_max; - - r2 = r2_min + (r2_diff * yidx) / yidx_max; - g2 = g2_min + (g2_diff * yidx) / yidx_max; - b2 = b2_min + (b2_diff * yidx) / yidx_max; - r2_inv = r2_min + (r2_diff * (yidx_max-yidx)) / yidx_max; - g2_inv = g2_min + (g2_diff * (yidx_max-yidx)) / yidx_max; - b2_inv = b2_min + (b2_diff * (yidx_max-yidx)) / yidx_max; - - dest = bg_data + row*bg_rowbytes; - for (i = 0; i < rpng2_info.width; ++i) { - even_odd_horiz = (i / bgscale) & 1; - even_odd = even_odd_vert ^ even_odd_horiz; - invert_column = - (even_odd_horiz && (bg[pat].type & 0x10)); - if (even_odd == 0) { /* gradient #1 */ - if (invert_column) { - *dest++ = r1_inv; - *dest++ = g1_inv; - *dest++ = b1_inv; - } else { - *dest++ = r1; - *dest++ = g1; - *dest++ = b1; - } - } else { /* gradient #2 */ - if ((invert_column && invert_gradient2) || - (!invert_column && !invert_gradient2)) - { - *dest++ = r2; /* not inverted or */ - *dest++ = g2; /* doubly inverted */ - *dest++ = b2; - } else { - *dest++ = r2_inv; - *dest++ = g2_inv; /* singly inverted */ - *dest++ = b2_inv; - } - } - } - } - -/*--------------------------------------------------------------------------- - Soft gradient-diamonds with scale = bgscale. Code contributed by Adam - M. Costello. - ---------------------------------------------------------------------------*/ - - } else if ((bg[pat].type & 0x07) == 1) { - - hmax = (bgscale-1)/2; /* half the max weight of a color */ - max = 2*hmax; /* the max weight of a color */ - - r1 = rgb[bg[pat].rgb1_max].r; - g1 = rgb[bg[pat].rgb1_max].g; - b1 = rgb[bg[pat].rgb1_max].b; - r2 = rgb[bg[pat].rgb2_max].r; - g2 = rgb[bg[pat].rgb2_max].g; - b2 = rgb[bg[pat].rgb2_max].b; - - for (row = 0; row < rpng2_info.height; ++row) { - yidx = row % bgscale; - if (yidx > hmax) - yidx = bgscale-1 - yidx; - dest = bg_data + row*bg_rowbytes; - for (i = 0; i < rpng2_info.width; ++i) { - xidx = i % bgscale; - if (xidx > hmax) - xidx = bgscale-1 - xidx; - k = xidx + yidx; - *dest++ = (k*r1 + (max-k)*r2) / max; - *dest++ = (k*g1 + (max-k)*g2) / max; - *dest++ = (k*b1 + (max-k)*b2) / max; - } - } - -/*--------------------------------------------------------------------------- - Radial "starburst" with azimuthal sinusoids; [eventually number of sinu- - soids will equal bgscale?]. This one is slow but very cool. Code con- - tributed by Pieter S. van der Meulen (originally in Smalltalk). - ---------------------------------------------------------------------------*/ - - } else if ((bg[pat].type & 0x07) == 2) { - uch ch; - int ii, x, y, hw, hh, grayspot; - double freq, rotate, saturate, gray, intensity; - double angle=0.0, aoffset=0.0, maxDist, dist; - double red=0.0, green=0.0, blue=0.0, hue, s, v, f, p, q, t; - - fprintf(stderr, "%s: computing radial background...", - PROGNAME); - fflush(stderr); - - hh = rpng2_info.height / 2; - hw = rpng2_info.width / 2; - - /* variables for radial waves: - * aoffset: number of degrees to rotate hue [CURRENTLY NOT USED] - * freq: number of color beams originating from the center - * grayspot: size of the graying center area (anti-alias) - * rotate: rotation of the beams as a function of radius - * saturate: saturation of beams' shape azimuthally - */ - angle = CLIP(angle, 0.0, 360.0); - grayspot = CLIP(bg[pat].bg_gray, 1, (hh + hw)); - freq = MAX((double)bg[pat].bg_freq, 0.0); - saturate = (double)bg[pat].bg_bsat * 0.1; - rotate = (double)bg[pat].bg_brot * 0.1; - gray = 0.0; - intensity = 0.0; - maxDist = (double)((hw*hw) + (hh*hh)); - - for (row = 0; row < rpng2_info.height; ++row) { - y = row - hh; - dest = bg_data + row*bg_rowbytes; - for (i = 0; i < rpng2_info.width; ++i) { - x = i - hw; - angle = (x == 0)? PI_2 : atan((double)y / (double)x); - gray = (double)MAX(ABS(y), ABS(x)) / grayspot; - gray = MIN(1.0, gray); - dist = (double)((x*x) + (y*y)) / maxDist; - intensity = cos((angle+(rotate*dist*PI)) * freq) * - gray * saturate; - intensity = (MAX(MIN(intensity,1.0),-1.0) + 1.0) * 0.5; - hue = (angle + PI) * INV_PI_360 + aoffset; - s = gray * ((double)(ABS(x)+ABS(y)) / (double)(hw + hh)); - s = MIN(MAX(s,0.0), 1.0); - v = MIN(MAX(intensity,0.0), 1.0); - - if (s == 0.0) { - ch = (uch)(v * 255.0); - *dest++ = ch; - *dest++ = ch; - *dest++ = ch; - } else { - if ((hue < 0.0) || (hue >= 360.0)) - hue -= (((int)(hue / 360.0)) * 360.0); - hue /= 60.0; - ii = (int)hue; - f = hue - (double)ii; - p = (1.0 - s) * v; - q = (1.0 - (s * f)) * v; - t = (1.0 - (s * (1.0 - f))) * v; - if (ii == 0) { red = v; green = t; blue = p; } - else if (ii == 1) { red = q; green = v; blue = p; } - else if (ii == 2) { red = p; green = v; blue = t; } - else if (ii == 3) { red = p; green = q; blue = v; } - else if (ii == 4) { red = t; green = p; blue = v; } - else if (ii == 5) { red = v; green = p; blue = q; } - *dest++ = (uch)(red * 255.0); - *dest++ = (uch)(green * 255.0); - *dest++ = (uch)(blue * 255.0); - } - } - } - fprintf(stderr, "done.\n"); - fflush(stderr); - } - -/*--------------------------------------------------------------------------- - Blast background image to display buffer before beginning PNG decode; - calling function will handle invalidation and UpdateWindow() call. - ---------------------------------------------------------------------------*/ - - for (row = 0; row < rpng2_info.height; ++row) { - src = bg_data + row*bg_rowbytes; - dest = wimage_data + row*wimage_rowbytes; - for (i = rpng2_info.width; i > 0; --i) { - r1 = *src++; - g1 = *src++; - b1 = *src++; - *dest++ = b1; - *dest++ = g1; /* note reverse order */ - *dest++ = r1; - } - } - - return 0; - -} /* end function rpng2_win_load_bg_image() */ - - - - - -static void rpng2_win_display_row(ulg row) -{ - uch bg_red = rpng2_info.bg_red; - uch bg_green = rpng2_info.bg_green; - uch bg_blue = rpng2_info.bg_blue; - uch *src, *src2=NULL, *dest; - uch r, g, b, a; - ulg i; - static int rows=0; - static ulg firstrow; - -/*--------------------------------------------------------------------------- - rows and firstrow simply track how many rows (and which ones) have not - yet been displayed; alternatively, we could call InvalidateRect() for - every row and not bother with the records-keeping. - ---------------------------------------------------------------------------*/ - - Trace((stderr, "beginning rpng2_win_display_row()\n")) - - if (rows == 0) - firstrow = row; /* first row not yet displayed */ - - ++rows; /* count of rows received but not yet displayed */ - -/*--------------------------------------------------------------------------- - Aside from the use of the rpng2_info struct and the lack of an outer - loop (over rows), this routine is identical to rpng_win_display_image() - in the non-progressive version of the program. - ---------------------------------------------------------------------------*/ - - src = rpng2_info.image_data + row*rpng2_info.rowbytes; - if (bg_image) - src2 = bg_data + row*bg_rowbytes; - dest = wimage_data + row*wimage_rowbytes; - - if (rpng2_info.channels == 3) { - for (i = rpng2_info.width; i > 0; --i) { - r = *src++; - g = *src++; - b = *src++; - *dest++ = b; - *dest++ = g; /* note reverse order */ - *dest++ = r; - } - } else /* if (rpng2_info.channels == 4) */ { - for (i = rpng2_info.width; i > 0; --i) { - r = *src++; - g = *src++; - b = *src++; - a = *src++; - if (bg_image) { - bg_red = *src2++; - bg_green = *src2++; - bg_blue = *src2++; - } - if (a == 255) { - *dest++ = b; - *dest++ = g; - *dest++ = r; - } else if (a == 0) { - *dest++ = bg_blue; - *dest++ = bg_green; - *dest++ = bg_red; - } else { - /* this macro (copied from png.h) composites the - * foreground and background values and puts the - * result into the first argument; there are no - * side effects with the first argument */ - alpha_composite(*dest++, b, a, bg_blue); - alpha_composite(*dest++, g, a, bg_green); - alpha_composite(*dest++, r, a, bg_red); - } - } - } - -/*--------------------------------------------------------------------------- - Display after every 16 rows or when on last row. (Region may include - previously displayed lines due to interlacing--i.e., not contiguous.) - ---------------------------------------------------------------------------*/ - - if ((rows & 0xf) == 0 || row == rpng2_info.height-1) { - RECT rect; - - rect.left = 0L; - rect.top = (LONG)firstrow; - rect.right = (LONG)rpng2_info.width; /* possibly off by one? */ - rect.bottom = (LONG)row + 1L; /* possibly off by one? */ - InvalidateRect(global_hwnd, &rect, FALSE); - UpdateWindow(global_hwnd); /* similar to XFlush() */ - rows = 0; - } - -} /* end function rpng2_win_display_row() */ - - - - - -static void rpng2_win_finish_display() -{ - Trace((stderr, "beginning rpng2_win_finish_display()\n")) - - /* last row has already been displayed by rpng2_win_display_row(), so - * we have nothing to do here except set a flag and let the user know - * that the image is done */ - - rpng2_info.state = kDone; - printf( -#ifndef __CYGWIN__ - "Done. Press Q, Esc or mouse button 1 (within image window) to quit.\n" -#else - "Done. Press mouse button 1 (within image window) to quit.\n" -#endif - ); - fflush(stdout); -} - - - - - -static void rpng2_win_cleanup() -{ - if (bg_image && bg_data) { - free(bg_data); - bg_data = NULL; - } - - if (rpng2_info.image_data) { - free(rpng2_info.image_data); - rpng2_info.image_data = NULL; - } - - if (rpng2_info.row_pointers) { - free(rpng2_info.row_pointers); - rpng2_info.row_pointers = NULL; - } - - if (dib) { - free(dib); - dib = NULL; - } -} - - - - - -LRESULT CALLBACK rpng2_win_wndproc(HWND hwnd, UINT iMsg, WPARAM wP, LPARAM lP) -{ - HDC hdc; - PAINTSTRUCT ps; - int rc; - - switch (iMsg) { - case WM_CREATE: - /* one-time processing here, if any */ - return 0; - - case WM_PAINT: - hdc = BeginPaint(hwnd, &ps); - rc = StretchDIBits(hdc, 0, 0, rpng2_info.width, rpng2_info.height, - 0, 0, rpng2_info.width, rpng2_info.height, - wimage_data, (BITMAPINFO *)bmih, - 0, SRCCOPY); - EndPaint(hwnd, &ps); - return 0; - - /* wait for the user to tell us when to quit */ - case WM_CHAR: - switch (wP) { /* only need one, so ignore repeat count */ - case 'q': - case 'Q': - case 0x1B: /* Esc key */ - PostQuitMessage(0); - } - return 0; - - case WM_LBUTTONDOWN: /* another way of quitting */ - case WM_DESTROY: - PostQuitMessage(0); - return 0; - } - - return DefWindowProc(hwnd, iMsg, wP, lP); -} diff --git a/libpng16/contrib/gregbook/rpng2-x.c b/libpng16/contrib/gregbook/rpng2-x.c deleted file mode 100644 index 7f24b63..0000000 --- a/libpng16/contrib/gregbook/rpng2-x.c +++ /dev/null @@ -1,2107 +0,0 @@ -/*--------------------------------------------------------------------------- - - rpng2 - progressive-model PNG display program rpng2-x.c - - This program decodes and displays PNG files progressively, as if it were - a web browser (though the front end is only set up to read from files). - It supports gamma correction, user-specified background colors, and user- - specified background patterns (for transparent images). This version is - for the X Window System (tested by the author under Unix and by Martin - Zinser under OpenVMS; may work under OS/2 with a little tweaking). - - Thanks to Adam Costello and Pieter S. van der Meulen for the "diamond" - and "radial waves" patterns, respectively. - - to do (someday, maybe): - - fix expose/redraw code: don't draw entire row if only part exposed - - 8-bit (colormapped) X support - - finish resizable checkerboard-gradient (sizes 4-128?) - - use %.1023s to simplify truncation of title-bar string? - - --------------------------------------------------------------------------- - - Changelog: - - 1.01: initial public release - - 1.02: modified to allow abbreviated options; fixed char/uchar mismatch - - 1.10: added support for non-default visuals; fixed X pixel-conversion - - 1.11: added -usleep option for demos; fixed command-line parsing bug - - 1.12: added -pause option for demos and testing - - 1.20: added runtime MMX-enabling/disabling and new -mmx* options - - 1.21: fixed some small X memory leaks (thanks to François Petitjean) - - 1.22: fixed XFreeGC() crash bug (thanks to Patrick Welche) - - 1.23: added -bgpat 0 mode (std white/gray checkerboard, 8x8 squares) - - 1.30: added -loop option for -bgpat (ifdef FEATURE_LOOP); fixed bpp = - 24; added support for X resources (thanks to Gerhard Niklasch) - - 1.31: added code to skip unused chunks (thanks to Glenn Randers-Pehrson) - - 1.32: added AMD64/EM64T support (__x86_64__); added basic expose/redraw - handling - - 2.00: dual-licensed (added GNU GPL) - - 2.01: fixed 64-bit typo in readpng2.c; fixed -pause usage description - - 2.02: fixed improper display of usage screen on PNG error(s); fixed - unexpected-EOF and file-read-error cases; fixed Trace() cut-and- - paste bugs - - 2.03: deleted runtime MMX-enabling/disabling and obsolete -mmx* options - - --------------------------------------------------------------------------- - - Copyright (c) 1998-2008 Greg Roelofs. All rights reserved. - - This software is provided "as is," without warranty of any kind, - express or implied. In no event shall the author or contributors - be held liable for any damages arising in any way from the use of - this software. - - The contents of this file are DUAL-LICENSED. You may modify and/or - redistribute this software according to the terms of one of the - following two licenses (at your option): - - - LICENSE 1 ("BSD-like with advertising clause"): - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute - it freely, subject to the following restrictions: - - 1. Redistributions of source code must retain the above copyright - notice, disclaimer, and this list of conditions. - 2. Redistributions in binary form must reproduce the above copyright - notice, disclaimer, and this list of conditions in the documenta- - tion and/or other materials provided with the distribution. - 3. All advertising materials mentioning features or use of this - software must display the following acknowledgment: - - This product includes software developed by Greg Roelofs - and contributors for the book, "PNG: The Definitive Guide," - published by O'Reilly and Associates. - - - LICENSE 2 (GNU GPL v2 or later): - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - ---------------------------------------------------------------------------*/ - -#define PROGNAME "rpng2-x" -#define LONGNAME "Progressive PNG Viewer for X" -#define VERSION "2.03 of 25 February 2010" -#define RESNAME "rpng2" /* our X resource application name */ -#define RESCLASS "Rpng" /* our X resource class name */ - -#include -#include -#include -#include -#include /* for jmpbuf declaration in readpng2.h */ -#include -#include /* only for PvdM background code */ -#include -#include -#include -#include /* defines XK_* macros */ - -#ifdef VMS -# include -#endif - -/* all for PvdM background code: */ -#ifndef PI -# define PI 3.141592653589793238 -#endif -#define PI_2 (PI*0.5) -#define INV_PI_360 (360.0 / PI) -#define MAX(a,b) (a>b?a:b) -#define MIN(a,b) (a> 8)) >> 8); \ -} - - -#define INBUFSIZE 4096 /* with pseudo-timing on (1 sec delay/block), this - * block size corresponds roughly to a download - * speed 10% faster than theoretical 33.6K maximum - * (assuming 8 data bits, 1 stop bit and no other - * overhead) */ - -/* local prototypes */ -static void rpng2_x_init (void); -static int rpng2_x_create_window (void); -static int rpng2_x_load_bg_image (void); -static void rpng2_x_display_row (ulg row); -static void rpng2_x_finish_display (void); -static void rpng2_x_redisplay_image (ulg startcol, ulg startrow, - ulg width, ulg height); -#ifdef FEATURE_LOOP -static void rpng2_x_reload_bg_image (void); -static int is_number (char *p); -#endif -static void rpng2_x_cleanup (void); -static int rpng2_x_msb (ulg u32val); - - -static char titlebar[1024], *window_name = titlebar; -static char *appname = LONGNAME; -static char *icon_name = PROGNAME; -static char *res_name = RESNAME; -static char *res_class = RESCLASS; -static char *filename; -static FILE *infile; - -static mainprog_info rpng2_info; - -static uch inbuf[INBUFSIZE]; -static int incount; - -static int pat = 6; /* must be less than num_bgpat */ -static int bg_image = 0; -static int bgscale, bgscale_default = 16; -static ulg bg_rowbytes; -static uch *bg_data; - -int pause_after_pass = FALSE; -int demo_timing = FALSE; -ulg usleep_duration = 0L; - -static struct rgb_color { - uch r, g, b; -} rgb[] = { - { 0, 0, 0}, /* 0: black */ - {255, 255, 255}, /* 1: white */ - {173, 132, 57}, /* 2: tan */ - { 64, 132, 0}, /* 3: medium green */ - {189, 117, 1}, /* 4: gold */ - {253, 249, 1}, /* 5: yellow */ - { 0, 0, 255}, /* 6: blue */ - { 0, 0, 120}, /* 7: medium blue */ - {255, 0, 255}, /* 8: magenta */ - { 64, 0, 64}, /* 9: dark magenta */ - {255, 0, 0}, /* 10: red */ - { 64, 0, 0}, /* 11: dark red */ - {255, 127, 0}, /* 12: orange */ - {192, 96, 0}, /* 13: darker orange */ - { 24, 60, 0}, /* 14: dark green-yellow */ - { 85, 125, 200}, /* 15: ice blue */ - {192, 192, 192} /* 16: Netscape/Mosaic gray */ -}; -/* not used for now, but should be for error-checking: -static int num_rgb = sizeof(rgb) / sizeof(struct rgb_color); - */ - -/* - This whole struct is a fairly cheesy way to keep the number of - command-line options to a minimum. The radial-waves background - type is a particularly poor fit to the integer elements of the - struct...but a few macros and a little fixed-point math will do - wonders for ya. - - type bits: - F E D C B A 9 8 7 6 5 4 3 2 1 0 - | | | | | - | | +-+-+-- 0 = sharp-edged checkerboard - | | 1 = soft diamonds - | | 2 = radial waves - | | 3-7 = undefined - | +-- gradient #2 inverted? - +-- alternating columns inverted? - */ -static struct background_pattern { - ush type; - int rgb1_max, rgb1_min; /* or bg_freq, bg_gray */ - int rgb2_max, rgb2_min; /* or bg_bsat, bg_brot (both scaled by 10)*/ -} bg[] = { - {0, 1,1, 16,16}, /* checkered: white vs. light gray (basic) */ - {0+8, 2,0, 1,15}, /* checkered: tan/black vs. white/ice blue */ - {0+24, 2,0, 1,0}, /* checkered: tan/black vs. white/black */ - {0+8, 4,5, 0,2}, /* checkered: gold/yellow vs. black/tan */ - {0+8, 4,5, 0,6}, /* checkered: gold/yellow vs. black/blue */ - {0, 7,0, 8,9}, /* checkered: deep blue/black vs. magenta */ - {0+8, 13,0, 5,14}, /* checkered: orange/black vs. yellow */ - {0+8, 12,0, 10,11}, /* checkered: orange/black vs. red */ - {1, 7,0, 8,0}, /* diamonds: deep blue/black vs. magenta */ - {1, 12,0, 11,0}, /* diamonds: orange vs. dark red */ - {1, 10,0, 7,0}, /* diamonds: red vs. medium blue */ - {1, 4,0, 5,0}, /* diamonds: gold vs. yellow */ - {1, 3,0, 0,0}, /* diamonds: medium green vs. black */ - {2, 16, 100, 20, 0}, /* radial: ~hard radial color-beams */ - {2, 18, 100, 10, 2}, /* radial: soft, curved radial color-beams */ - {2, 16, 256, 100, 250}, /* radial: very tight spiral */ - {2, 10000, 256, 11, 0} /* radial: dipole-moire' (almost fractal) */ -}; -static int num_bgpat = sizeof(bg) / sizeof(struct background_pattern); - - -/* X-specific variables */ -static char *displayname; -static XImage *ximage; -static Display *display; -static int depth; -static Visual *visual; -static XVisualInfo *visual_list; -static int RShift, GShift, BShift; -static ulg RMask, GMask, BMask; -static Window window; -static GC gc; -static Colormap colormap; - -static int have_nondefault_visual = FALSE; -static int have_colormap = FALSE; -static int have_window = FALSE; -static int have_gc = FALSE; - - - - -int main(int argc, char **argv) -{ -#ifdef sgi - char tmpline[80]; -#endif - char *p, *bgstr = NULL; - int rc, alen, flen; - int error = 0; - int timing = FALSE; - int have_bg = FALSE; -#ifdef FEATURE_LOOP - int loop = FALSE; - long loop_interval = -1; /* seconds (100,000 max) */ -#endif - double LUT_exponent; /* just the lookup table */ - double CRT_exponent = 2.2; /* just the monitor */ - double default_display_exponent; /* whole display system */ - XEvent e; - KeySym k; - - - /* First initialize a few things, just to be sure--memset takes care of - * default background color (black), booleans (FALSE), pointers (NULL), - * etc. */ - - displayname = (char *)NULL; - filename = (char *)NULL; - memset(&rpng2_info, 0, sizeof(mainprog_info)); - - - /* Set the default value for our display-system exponent, i.e., the - * product of the CRT exponent and the exponent corresponding to - * the frame-buffer's lookup table (LUT), if any. This is not an - * exhaustive list of LUT values (e.g., OpenStep has a lot of weird - * ones), but it should cover 99% of the current possibilities. */ - -#if defined(NeXT) - /* third-party utilities can modify the default LUT exponent */ - LUT_exponent = 1.0 / 2.2; - /* - if (some_next_function_that_returns_gamma(&next_gamma)) - LUT_exponent = 1.0 / next_gamma; - */ -#elif defined(sgi) - LUT_exponent = 1.0 / 1.7; - /* there doesn't seem to be any documented function to - * get the "gamma" value, so we do it the hard way */ - infile = fopen("/etc/config/system.glGammaVal", "r"); - if (infile) { - double sgi_gamma; - - fgets(tmpline, 80, infile); - fclose(infile); - sgi_gamma = atof(tmpline); - if (sgi_gamma > 0.0) - LUT_exponent = 1.0 / sgi_gamma; - } -#elif defined(Macintosh) - LUT_exponent = 1.8 / 2.61; - /* - if (some_mac_function_that_returns_gamma(&mac_gamma)) - LUT_exponent = mac_gamma / 2.61; - */ -#else - LUT_exponent = 1.0; /* assume no LUT: most PCs */ -#endif - - /* the defaults above give 1.0, 1.3, 1.5 and 2.2, respectively: */ - default_display_exponent = LUT_exponent * CRT_exponent; - - - /* If the user has set the SCREEN_GAMMA environment variable as suggested - * (somewhat imprecisely) in the libpng documentation, use that; otherwise - * use the default value we just calculated. Either way, the user may - * override this via a command-line option. */ - - if ((p = getenv("SCREEN_GAMMA")) != NULL) - rpng2_info.display_exponent = atof(p); - else - rpng2_info.display_exponent = default_display_exponent; - - - /* Now parse the command line for options and the PNG filename. */ - - while (*++argv && !error) { - if (!strncmp(*argv, "-display", 2)) { - if (!*++argv) - ++error; - else - displayname = *argv; - } else if (!strncmp(*argv, "-gamma", 2)) { - if (!*++argv) - ++error; - else { - rpng2_info.display_exponent = atof(*argv); - if (rpng2_info.display_exponent <= 0.0) - ++error; - } - } else if (!strncmp(*argv, "-bgcolor", 4)) { - if (!*++argv) - ++error; - else { - bgstr = *argv; - if (strlen(bgstr) != 7 || bgstr[0] != '#') - ++error; - else { - have_bg = TRUE; - bg_image = FALSE; - } - } - } else if (!strncmp(*argv, "-bgpat", 4)) { - if (!*++argv) - ++error; - else { - pat = atoi(*argv); - if (pat >= 0 && pat < num_bgpat) { - bg_image = TRUE; - have_bg = FALSE; - } else - ++error; - } - } else if (!strncmp(*argv, "-usleep", 2)) { - if (!*++argv) - ++error; - else { - usleep_duration = (ulg)atol(*argv); - demo_timing = TRUE; - } - } else if (!strncmp(*argv, "-pause", 2)) { - pause_after_pass = TRUE; - } else if (!strncmp(*argv, "-timing", 2)) { - timing = TRUE; -#ifdef FEATURE_LOOP - } else if (!strncmp(*argv, "-loop", 2)) { - loop = TRUE; - if (!argv[1] || !is_number(argv[1])) - loop_interval = 2; - else { - ++argv; - loop_interval = atol(*argv); - if (loop_interval < 0) - loop_interval = 2; - else if (loop_interval > 100000) /* bit more than one day */ - loop_interval = 100000; - } -#endif - } else { - if (**argv != '-') { - filename = *argv; - if (argv[1]) /* shouldn't be any more args after filename */ - ++error; - } else - ++error; /* not expecting any other options */ - } - } - - if (!filename) - ++error; - - - /* print usage screen if any errors up to this point */ - - if (error) { - fprintf(stderr, "\n%s %s: %s\n\n", PROGNAME, VERSION, appname); - readpng2_version_info(); - fprintf(stderr, "\n" - "Usage: %s [-display xdpy] [-gamma exp] [-bgcolor bg | -bgpat pat]\n" -#ifdef FEATURE_LOOP - " %*s [-usleep dur | -timing] [-pause] [-loop [sec]] file.png\n\n" -#else - " %*s [-usleep dur | -timing] [-pause] file.png\n\n" -#endif - " xdpy\tname of the target X display (e.g., ``hostname:0'')\n" - " exp \ttransfer-function exponent (``gamma'') of the display\n" - "\t\t system in floating-point format (e.g., ``%.1f''); equal\n" - "\t\t to the product of the lookup-table exponent (varies)\n" - "\t\t and the CRT exponent (usually 2.2); must be positive\n" - " bg \tdesired background color in 7-character hex RGB format\n" - "\t\t (e.g., ``#ff7700'' for orange: same as HTML colors);\n" - "\t\t used with transparent images; overrides -bgpat\n" - " pat \tdesired background pattern number (0-%d); used with\n" - "\t\t transparent images; overrides -bgcolor\n" -#ifdef FEATURE_LOOP - " -loop\tloops through background images after initial display\n" - "\t\t is complete (depends on -bgpat)\n" - " sec \tseconds to display each background image (default = 2)\n" -#endif - " dur \tduration in microseconds to wait after displaying each\n" - "\t\t row (for demo purposes)\n" - " -timing\tenables delay for every block read, to simulate modem\n" - "\t\t download of image (~36 Kbps)\n" - " -pause\tpauses after displaying each pass until mouse clicked\n" - "\nPress Q, Esc or mouse button 1 (within image window, after image\n" - "is displayed) to quit.\n" - "\n", PROGNAME, - (int)strlen(PROGNAME), " ", default_display_exponent, num_bgpat-1); - exit(1); - } - - - if (!(infile = fopen(filename, "rb"))) { - fprintf(stderr, PROGNAME ": can't open PNG file [%s]\n", filename); - ++error; - } else { - incount = fread(inbuf, 1, INBUFSIZE, infile); - if (incount < 8 || !readpng2_check_sig(inbuf, 8)) { - fprintf(stderr, PROGNAME - ": [%s] is not a PNG file: incorrect signature\n", - filename); - ++error; - } else if ((rc = readpng2_init(&rpng2_info)) != 0) { - switch (rc) { - case 2: - fprintf(stderr, PROGNAME - ": [%s] has bad IHDR (libpng longjmp)\n", filename); - break; - case 4: - fprintf(stderr, PROGNAME ": insufficient memory\n"); - break; - default: - fprintf(stderr, PROGNAME - ": unknown readpng2_init() error\n"); - break; - } - ++error; - } else { - Trace((stderr, "about to call XOpenDisplay()\n")) - display = XOpenDisplay(displayname); - if (!display) { - readpng2_cleanup(&rpng2_info); - fprintf(stderr, PROGNAME ": can't open X display [%s]\n", - displayname? displayname : "default"); - ++error; - } - } - if (error) - fclose(infile); - } - - - if (error) { - fprintf(stderr, PROGNAME ": aborting.\n"); - exit(2); - } - - - /* set the title-bar string, but make sure buffer doesn't overflow */ - - alen = strlen(appname); - flen = strlen(filename); - if (alen + flen + 3 > 1023) - sprintf(titlebar, "%s: ...%s", appname, filename+(alen+flen+6-1023)); - else - sprintf(titlebar, "%s: %s", appname, filename); - - - /* set some final rpng2_info variables before entering main data loop */ - - if (have_bg) { - unsigned r, g, b; /* this approach quiets compiler warnings */ - - sscanf(bgstr+1, "%2x%2x%2x", &r, &g, &b); - rpng2_info.bg_red = (uch)r; - rpng2_info.bg_green = (uch)g; - rpng2_info.bg_blue = (uch)b; - } else - rpng2_info.need_bgcolor = TRUE; - - rpng2_info.state = kPreInit; - rpng2_info.mainprog_init = rpng2_x_init; - rpng2_info.mainprog_display_row = rpng2_x_display_row; - rpng2_info.mainprog_finish_display = rpng2_x_finish_display; - - - /* OK, this is the fun part: call readpng2_decode_data() at the start of - * the loop to deal with our first buffer of data (read in above to verify - * that the file is a PNG image), then loop through the file and continue - * calling the same routine to handle each chunk of data. It in turn - * passes the data to libpng, which will invoke one or more of our call- - * backs as decoded data become available. We optionally call sleep() for - * one second per iteration to simulate downloading the image via an analog - * modem. */ - - for (;;) { - Trace((stderr, "about to call readpng2_decode_data()\n")) - if (readpng2_decode_data(&rpng2_info, inbuf, incount)) - ++error; - Trace((stderr, "done with readpng2_decode_data()\n")) - - if (error || incount != INBUFSIZE || rpng2_info.state == kDone) { - if (rpng2_info.state == kDone) { - Trace((stderr, "done decoding PNG image\n")) - } else if (ferror(infile)) { - fprintf(stderr, PROGNAME - ": error while reading PNG image file\n"); - exit(3); - } else if (feof(infile)) { - fprintf(stderr, PROGNAME ": end of file reached " - "(unexpectedly) while reading PNG image file\n"); - exit(3); - } else /* if (error) */ { - /* will print error message below */ - } - break; - } - - if (timing) - sleep(1); - - incount = fread(inbuf, 1, INBUFSIZE, infile); - } - - - /* clean up PNG stuff and report any decoding errors */ - - fclose(infile); - Trace((stderr, "about to call readpng2_cleanup()\n")) - readpng2_cleanup(&rpng2_info); - - if (error) { - fprintf(stderr, PROGNAME ": libpng error while decoding PNG image\n"); - exit(3); - } - - -#ifdef FEATURE_LOOP - - if (loop && bg_image) { - Trace((stderr, "entering -loop loop (FEATURE_LOOP)\n")) - for (;;) { - int i, use_sleep; - struct timeval now, then; - - /* get current time and add loop_interval to get target time */ - if (gettimeofday(&then, NULL) == 0) { - then.tv_sec += loop_interval; - use_sleep = FALSE; - } else - use_sleep = TRUE; - - /* do quick check for a quit event but don't wait for it */ - /* GRR BUG: should also check for Expose events and redraw... */ - if (XCheckMaskEvent(display, KeyPressMask | ButtonPressMask, &e)) - if (QUIT(e,k)) - break; - - /* generate next background image */ - if (++pat >= num_bgpat) - pat = 0; - rpng2_x_reload_bg_image(); - - /* wait for timeout, using whatever means are available */ - if (use_sleep || gettimeofday(&now, NULL) != 0) { - for (i = loop_interval; i > 0; --i) { - sleep(1); - /* GRR BUG: also need to check for Expose (and redraw!) */ - if (XCheckMaskEvent(display, KeyPressMask | ButtonPressMask, - &e) && QUIT(e,k)) - break; - } - } else { - /* Y2038 BUG! */ - if (now.tv_sec < then.tv_sec || - (now.tv_sec == then.tv_sec && now.tv_usec < then.tv_usec)) - { - int quit = FALSE; - long seconds_to_go = then.tv_sec - now.tv_sec; - long usleep_usec; - - /* basically chew up most of remaining loop-interval with - * calls to sleep(1) interleaved with checks for quit - * events, but also recalc time-to-go periodically; when - * done, clean up any remaining time with usleep() call - * (could also use SIGALRM, but signals are a pain...) */ - while (seconds_to_go-- > 1) { - int seconds_done = 0; - - for (i = seconds_to_go; i > 0 && !quit; --i) { - sleep(1); - /* GRR BUG: need to check for Expose and redraw */ - if (XCheckMaskEvent(display, KeyPressMask | - ButtonPressMask, &e) && QUIT(e,k)) - quit = TRUE; - if (++seconds_done > 1000) - break; /* time to redo seconds_to_go meas. */ - } - if (quit) - break; - - /* OK, more than 1000 seconds since last check: - * correct the time-to-go measurement for drift */ - if (gettimeofday(&now, NULL) == 0) { - if (now.tv_sec >= then.tv_sec) - break; - seconds_to_go = then.tv_sec - now.tv_sec; - } else - ++seconds_to_go; /* restore what we subtracted */ - } - if (quit) - break; /* breaks outer do-loop, skips redisplay */ - - /* since difference between "now" and "then" is already - * eaten up to within a couple of seconds, don't need to - * worry about overflow--but might have overshot (neg.) */ - if (gettimeofday(&now, NULL) == 0) { - usleep_usec = 1000000L*(then.tv_sec - now.tv_sec) + - then.tv_usec - now.tv_usec; - if (usleep_usec > 0) - usleep((ulg)usleep_usec); - } - } - } - - /* composite image against new background and display (note that - * we do not take into account the time spent doing this...) */ - rpng2_x_redisplay_image (0, 0, rpng2_info.width, rpng2_info.height); - } - - } else /* FALL THROUGH and do the normal thing */ - -#endif /* FEATURE_LOOP */ - - /* wait for the user to tell us when to quit */ - - if (rpng2_info.state >= kWindowInit) { - Trace((stderr, "entering final wait-for-quit-event loop\n")) - do { - XNextEvent(display, &e); - if (e.type == Expose) { - XExposeEvent *ex = (XExposeEvent *)&e; - rpng2_x_redisplay_image (ex->x, ex->y, ex->width, ex->height); - } - } while (!QUIT(e,k)); - } else { - fprintf(stderr, PROGNAME ": init callback never called: probable " - "libpng error while decoding PNG metadata\n"); - exit(4); - } - - - /* we're done: clean up all image and X resources and go away */ - - Trace((stderr, "about to call rpng2_x_cleanup()\n")) - rpng2_x_cleanup(); - - return 0; -} - - - - - -/* this function is called by readpng2_info_callback() in readpng2.c, which - * in turn is called by libpng after all of the pre-IDAT chunks have been - * read and processed--i.e., we now have enough info to finish initializing */ - -static void rpng2_x_init(void) -{ - ulg i; - ulg rowbytes = rpng2_info.rowbytes; - - Trace((stderr, "beginning rpng2_x_init()\n")) - Trace((stderr, " rowbytes = %d\n", rpng2_info.rowbytes)) - Trace((stderr, " width = %ld\n", rpng2_info.width)) - Trace((stderr, " height = %ld\n", rpng2_info.height)) - - rpng2_info.image_data = (uch *)malloc(rowbytes * rpng2_info.height); - if (!rpng2_info.image_data) { - readpng2_cleanup(&rpng2_info); - return; - } - - rpng2_info.row_pointers = (uch **)malloc(rpng2_info.height * sizeof(uch *)); - if (!rpng2_info.row_pointers) { - free(rpng2_info.image_data); - rpng2_info.image_data = NULL; - readpng2_cleanup(&rpng2_info); - return; - } - - for (i = 0; i < rpng2_info.height; ++i) - rpng2_info.row_pointers[i] = rpng2_info.image_data + i*rowbytes; - - - /* do the basic X initialization stuff, make the window, and fill it with - * the user-specified, file-specified or default background color or - * pattern */ - - if (rpng2_x_create_window()) { - - /* GRR TEMPORARY HACK: this is fundamentally no different from cases - * above; libpng should call our error handler to longjmp() back to us - * when png_ptr goes away. If we/it segfault instead, seems like a - * libpng bug... */ - - /* we're here via libpng callback, so if window fails, clean and bail */ - readpng2_cleanup(&rpng2_info); - rpng2_x_cleanup(); - exit(2); - } - - rpng2_info.state = kWindowInit; -} - - - - - -static int rpng2_x_create_window(void) -{ - ulg bg_red = rpng2_info.bg_red; - ulg bg_green = rpng2_info.bg_green; - ulg bg_blue = rpng2_info.bg_blue; - ulg bg_pixel = 0L; - ulg attrmask; - int need_colormap = FALSE; - int screen, pad; - uch *xdata; - Window root; - XEvent e; - XGCValues gcvalues; - XSetWindowAttributes attr; - XTextProperty windowName, *pWindowName = &windowName; - XTextProperty iconName, *pIconName = &iconName; - XVisualInfo visual_info; - XSizeHints *size_hints; - XWMHints *wm_hints; - XClassHint *class_hints; - - - Trace((stderr, "beginning rpng2_x_create_window()\n")) - - screen = DefaultScreen(display); - depth = DisplayPlanes(display, screen); - root = RootWindow(display, screen); - -#ifdef DEBUG - XSynchronize(display, True); -#endif - - if (depth != 16 && depth != 24 && depth != 32) { - int visuals_matched = 0; - - Trace((stderr, "default depth is %d: checking other visuals\n", - depth)) - - /* 24-bit first */ - visual_info.screen = screen; - visual_info.depth = 24; - visual_list = XGetVisualInfo(display, - VisualScreenMask | VisualDepthMask, &visual_info, &visuals_matched); - if (visuals_matched == 0) { -/* GRR: add 15-, 16- and 32-bit TrueColor visuals (also DirectColor?) */ - fprintf(stderr, "default screen depth %d not supported, and no" - " 24-bit visuals found\n", depth); - return 2; - } - Trace((stderr, "XGetVisualInfo() returned %d 24-bit visuals\n", - visuals_matched)) - visual = visual_list[0].visual; - depth = visual_list[0].depth; -/* - colormap_size = visual_list[0].colormap_size; - visual_class = visual->class; - visualID = XVisualIDFromVisual(visual); - */ - have_nondefault_visual = TRUE; - need_colormap = TRUE; - } else { - XMatchVisualInfo(display, screen, depth, TrueColor, &visual_info); - visual = visual_info.visual; - } - - RMask = visual->red_mask; - GMask = visual->green_mask; - BMask = visual->blue_mask; - -/* GRR: add/check 8-bit support */ - if (depth == 8 || need_colormap) { - colormap = XCreateColormap(display, root, visual, AllocNone); - if (!colormap) { - fprintf(stderr, "XCreateColormap() failed\n"); - return 2; - } - have_colormap = TRUE; - if (depth == 8) - bg_image = FALSE; /* gradient just wastes palette entries */ - } - if (depth == 15 || depth == 16) { - RShift = 15 - rpng2_x_msb(RMask); /* these are right-shifts */ - GShift = 15 - rpng2_x_msb(GMask); - BShift = 15 - rpng2_x_msb(BMask); - } else if (depth > 16) { - RShift = rpng2_x_msb(RMask) - 7; /* these are left-shifts */ - GShift = rpng2_x_msb(GMask) - 7; - BShift = rpng2_x_msb(BMask) - 7; - } - if (depth >= 15 && (RShift < 0 || GShift < 0 || BShift < 0)) { - fprintf(stderr, "rpng2 internal logic error: negative X shift(s)!\n"); - return 2; - } - -/*--------------------------------------------------------------------------- - Finally, create the window. - ---------------------------------------------------------------------------*/ - - attr.backing_store = Always; - attr.event_mask = ExposureMask | KeyPressMask | ButtonPressMask; - attrmask = CWBackingStore | CWEventMask; - if (have_nondefault_visual) { - attr.colormap = colormap; - attr.background_pixel = 0; - attr.border_pixel = 1; - attrmask |= CWColormap | CWBackPixel | CWBorderPixel; - } - - window = XCreateWindow(display, root, 0, 0, rpng2_info.width, - rpng2_info.height, 0, depth, InputOutput, visual, attrmask, &attr); - - if (window == None) { - fprintf(stderr, "XCreateWindow() failed\n"); - return 2; - } else - have_window = TRUE; - - if (depth == 8) - XSetWindowColormap(display, window, colormap); - - if (!XStringListToTextProperty(&window_name, 1, pWindowName)) - pWindowName = NULL; - if (!XStringListToTextProperty(&icon_name, 1, pIconName)) - pIconName = NULL; - - /* OK if either hints allocation fails; XSetWMProperties() allows NULLs */ - - if ((size_hints = XAllocSizeHints()) != NULL) { - /* window will not be resizable */ - size_hints->flags = PMinSize | PMaxSize; - size_hints->min_width = size_hints->max_width = (int)rpng2_info.width; - size_hints->min_height = size_hints->max_height = - (int)rpng2_info.height; - } - - if ((wm_hints = XAllocWMHints()) != NULL) { - wm_hints->initial_state = NormalState; - wm_hints->input = True; - /* wm_hints->icon_pixmap = icon_pixmap; */ - wm_hints->flags = StateHint | InputHint /* | IconPixmapHint */ ; - } - - if ((class_hints = XAllocClassHint()) != NULL) { - class_hints->res_name = res_name; - class_hints->res_class = res_class; - } - - XSetWMProperties(display, window, pWindowName, pIconName, NULL, 0, - size_hints, wm_hints, class_hints); - - /* various properties and hints no longer needed; free memory */ - if (pWindowName) - XFree(pWindowName->value); - if (pIconName) - XFree(pIconName->value); - if (size_hints) - XFree(size_hints); - if (wm_hints) - XFree(wm_hints); - if (class_hints) - XFree(class_hints); - - XMapWindow(display, window); - - gc = XCreateGC(display, window, 0, &gcvalues); - have_gc = TRUE; - -/*--------------------------------------------------------------------------- - Allocate memory for the X- and display-specific version of the image. - ---------------------------------------------------------------------------*/ - - if (depth == 24 || depth == 32) { - xdata = (uch *)malloc(4*rpng2_info.width*rpng2_info.height); - pad = 32; - } else if (depth == 16) { - xdata = (uch *)malloc(2*rpng2_info.width*rpng2_info.height); - pad = 16; - } else /* depth == 8 */ { - xdata = (uch *)malloc(rpng2_info.width*rpng2_info.height); - pad = 8; - } - - if (!xdata) { - fprintf(stderr, PROGNAME ": unable to allocate image memory\n"); - return 4; - } - - ximage = XCreateImage(display, visual, depth, ZPixmap, 0, - (char *)xdata, rpng2_info.width, rpng2_info.height, pad, 0); - - if (!ximage) { - fprintf(stderr, PROGNAME ": XCreateImage() failed\n"); - free(xdata); - return 3; - } - - /* to avoid testing the byte order every pixel (or doubling the size of - * the drawing routine with a giant if-test), we arbitrarily set the byte - * order to MSBFirst and let Xlib worry about inverting things on little- - * endian machines (e.g., Linux/x86, old VAXen, etc.)--this is not the - * most efficient approach (the giant if-test would be better), but in - * the interest of clarity, we'll take the easy way out... */ - - ximage->byte_order = MSBFirst; - -/*--------------------------------------------------------------------------- - Fill window with the specified background color (default is black) or - faked "background image" (but latter is disabled if 8-bit; gradients - just waste palette entries). - ---------------------------------------------------------------------------*/ - - if (bg_image) - rpng2_x_load_bg_image(); /* resets bg_image if fails */ - - if (!bg_image) { - if (depth == 24 || depth == 32) { - bg_pixel = (bg_red << RShift) | - (bg_green << GShift) | - (bg_blue << BShift); - } else if (depth == 16) { - bg_pixel = (((bg_red << 8) >> RShift) & RMask) | - (((bg_green << 8) >> GShift) & GMask) | - (((bg_blue << 8) >> BShift) & BMask); - } else /* depth == 8 */ { - - /* GRR: add 8-bit support */ - - } - XSetForeground(display, gc, bg_pixel); - XFillRectangle(display, window, gc, 0, 0, rpng2_info.width, - rpng2_info.height); - } - -/*--------------------------------------------------------------------------- - Wait for first Expose event to do any drawing, then flush and return. - ---------------------------------------------------------------------------*/ - - do - XNextEvent(display, &e); - while (e.type != Expose || e.xexpose.count); - - XFlush(display); - - return 0; - -} /* end function rpng2_x_create_window() */ - - - - - -static int rpng2_x_load_bg_image(void) -{ - uch *src; - char *dest; - uch r1, r2, g1, g2, b1, b2; - uch r1_inv, r2_inv, g1_inv, g2_inv, b1_inv, b2_inv; - int k, hmax, max; - int xidx, yidx, yidx_max; - int even_odd_vert, even_odd_horiz, even_odd; - int invert_gradient2 = (bg[pat].type & 0x08); - int invert_column; - int ximage_rowbytes = ximage->bytes_per_line; - ulg i, row; - ulg pixel; - -/*--------------------------------------------------------------------------- - Allocate buffer for fake background image to be used with transparent - images; if this fails, revert to plain background color. - ---------------------------------------------------------------------------*/ - - bg_rowbytes = 3 * rpng2_info.width; - bg_data = (uch *)malloc(bg_rowbytes * rpng2_info.height); - if (!bg_data) { - fprintf(stderr, PROGNAME - ": unable to allocate memory for background image\n"); - bg_image = 0; - return 1; - } - - bgscale = (pat == 0)? 8 : bgscale_default; - yidx_max = bgscale - 1; - -/*--------------------------------------------------------------------------- - Vertical gradients (ramps) in NxN squares, alternating direction and - colors (N == bgscale). - ---------------------------------------------------------------------------*/ - - if ((bg[pat].type & 0x07) == 0) { - uch r1_min = rgb[bg[pat].rgb1_min].r; - uch g1_min = rgb[bg[pat].rgb1_min].g; - uch b1_min = rgb[bg[pat].rgb1_min].b; - uch r2_min = rgb[bg[pat].rgb2_min].r; - uch g2_min = rgb[bg[pat].rgb2_min].g; - uch b2_min = rgb[bg[pat].rgb2_min].b; - int r1_diff = rgb[bg[pat].rgb1_max].r - r1_min; - int g1_diff = rgb[bg[pat].rgb1_max].g - g1_min; - int b1_diff = rgb[bg[pat].rgb1_max].b - b1_min; - int r2_diff = rgb[bg[pat].rgb2_max].r - r2_min; - int g2_diff = rgb[bg[pat].rgb2_max].g - g2_min; - int b2_diff = rgb[bg[pat].rgb2_max].b - b2_min; - - for (row = 0; row < rpng2_info.height; ++row) { - yidx = (int)(row % bgscale); - even_odd_vert = (int)((row / bgscale) & 1); - - r1 = r1_min + (r1_diff * yidx) / yidx_max; - g1 = g1_min + (g1_diff * yidx) / yidx_max; - b1 = b1_min + (b1_diff * yidx) / yidx_max; - r1_inv = r1_min + (r1_diff * (yidx_max-yidx)) / yidx_max; - g1_inv = g1_min + (g1_diff * (yidx_max-yidx)) / yidx_max; - b1_inv = b1_min + (b1_diff * (yidx_max-yidx)) / yidx_max; - - r2 = r2_min + (r2_diff * yidx) / yidx_max; - g2 = g2_min + (g2_diff * yidx) / yidx_max; - b2 = b2_min + (b2_diff * yidx) / yidx_max; - r2_inv = r2_min + (r2_diff * (yidx_max-yidx)) / yidx_max; - g2_inv = g2_min + (g2_diff * (yidx_max-yidx)) / yidx_max; - b2_inv = b2_min + (b2_diff * (yidx_max-yidx)) / yidx_max; - - dest = (char *)bg_data + row*bg_rowbytes; - for (i = 0; i < rpng2_info.width; ++i) { - even_odd_horiz = (int)((i / bgscale) & 1); - even_odd = even_odd_vert ^ even_odd_horiz; - invert_column = - (even_odd_horiz && (bg[pat].type & 0x10)); - if (even_odd == 0) { /* gradient #1 */ - if (invert_column) { - *dest++ = r1_inv; - *dest++ = g1_inv; - *dest++ = b1_inv; - } else { - *dest++ = r1; - *dest++ = g1; - *dest++ = b1; - } - } else { /* gradient #2 */ - if ((invert_column && invert_gradient2) || - (!invert_column && !invert_gradient2)) - { - *dest++ = r2; /* not inverted or */ - *dest++ = g2; /* doubly inverted */ - *dest++ = b2; - } else { - *dest++ = r2_inv; - *dest++ = g2_inv; /* singly inverted */ - *dest++ = b2_inv; - } - } - } - } - -/*--------------------------------------------------------------------------- - Soft gradient-diamonds with scale = bgscale. Code contributed by Adam - M. Costello. - ---------------------------------------------------------------------------*/ - - } else if ((bg[pat].type & 0x07) == 1) { - - hmax = (bgscale-1)/2; /* half the max weight of a color */ - max = 2*hmax; /* the max weight of a color */ - - r1 = rgb[bg[pat].rgb1_max].r; - g1 = rgb[bg[pat].rgb1_max].g; - b1 = rgb[bg[pat].rgb1_max].b; - r2 = rgb[bg[pat].rgb2_max].r; - g2 = rgb[bg[pat].rgb2_max].g; - b2 = rgb[bg[pat].rgb2_max].b; - - for (row = 0; row < rpng2_info.height; ++row) { - yidx = (int)(row % bgscale); - if (yidx > hmax) - yidx = bgscale-1 - yidx; - dest = (char *)bg_data + row*bg_rowbytes; - for (i = 0; i < rpng2_info.width; ++i) { - xidx = (int)(i % bgscale); - if (xidx > hmax) - xidx = bgscale-1 - xidx; - k = xidx + yidx; - *dest++ = (k*r1 + (max-k)*r2) / max; - *dest++ = (k*g1 + (max-k)*g2) / max; - *dest++ = (k*b1 + (max-k)*b2) / max; - } - } - -/*--------------------------------------------------------------------------- - Radial "starburst" with azimuthal sinusoids; [eventually number of sinu- - soids will equal bgscale?]. This one is slow but very cool. Code con- - tributed by Pieter S. van der Meulen (originally in Smalltalk). - ---------------------------------------------------------------------------*/ - - } else if ((bg[pat].type & 0x07) == 2) { - uch ch; - int ii, x, y, hw, hh, grayspot; - double freq, rotate, saturate, gray, intensity; - double angle=0.0, aoffset=0.0, maxDist, dist; - double red=0.0, green=0.0, blue=0.0, hue, s, v, f, p, q, t; - - fprintf(stderr, "%s: computing radial background...", - PROGNAME); - fflush(stderr); - - hh = (int)(rpng2_info.height / 2); - hw = (int)(rpng2_info.width / 2); - - /* variables for radial waves: - * aoffset: number of degrees to rotate hue [CURRENTLY NOT USED] - * freq: number of color beams originating from the center - * grayspot: size of the graying center area (anti-alias) - * rotate: rotation of the beams as a function of radius - * saturate: saturation of beams' shape azimuthally - */ - angle = CLIP(angle, 0.0, 360.0); - grayspot = CLIP(bg[pat].bg_gray, 1, (hh + hw)); - freq = MAX((double)bg[pat].bg_freq, 0.0); - saturate = (double)bg[pat].bg_bsat * 0.1; - rotate = (double)bg[pat].bg_brot * 0.1; - gray = 0.0; - intensity = 0.0; - maxDist = (double)((hw*hw) + (hh*hh)); - - for (row = 0; row < rpng2_info.height; ++row) { - y = (int)(row - hh); - dest = (char *)bg_data + row*bg_rowbytes; - for (i = 0; i < rpng2_info.width; ++i) { - x = (int)(i - hw); - angle = (x == 0)? PI_2 : atan((double)y / (double)x); - gray = (double)MAX(ABS(y), ABS(x)) / grayspot; - gray = MIN(1.0, gray); - dist = (double)((x*x) + (y*y)) / maxDist; - intensity = cos((angle+(rotate*dist*PI)) * freq) * - gray * saturate; - intensity = (MAX(MIN(intensity,1.0),-1.0) + 1.0) * 0.5; - hue = (angle + PI) * INV_PI_360 + aoffset; - s = gray * ((double)(ABS(x)+ABS(y)) / (double)(hw + hh)); - s = MIN(MAX(s,0.0), 1.0); - v = MIN(MAX(intensity,0.0), 1.0); - - if (s == 0.0) { - ch = (uch)(v * 255.0); - *dest++ = ch; - *dest++ = ch; - *dest++ = ch; - } else { - if ((hue < 0.0) || (hue >= 360.0)) - hue -= (((int)(hue / 360.0)) * 360.0); - hue /= 60.0; - ii = (int)hue; - f = hue - (double)ii; - p = (1.0 - s) * v; - q = (1.0 - (s * f)) * v; - t = (1.0 - (s * (1.0 - f))) * v; - if (ii == 0) { red = v; green = t; blue = p; } - else if (ii == 1) { red = q; green = v; blue = p; } - else if (ii == 2) { red = p; green = v; blue = t; } - else if (ii == 3) { red = p; green = q; blue = v; } - else if (ii == 4) { red = t; green = p; blue = v; } - else if (ii == 5) { red = v; green = p; blue = q; } - *dest++ = (uch)(red * 255.0); - *dest++ = (uch)(green * 255.0); - *dest++ = (uch)(blue * 255.0); - } - } - } - fprintf(stderr, "done.\n"); - fflush(stderr); - } - -/*--------------------------------------------------------------------------- - Blast background image to display buffer before beginning PNG decode. - ---------------------------------------------------------------------------*/ - - if (depth == 24 || depth == 32) { - ulg red, green, blue; - int bpp = ximage->bits_per_pixel; - - for (row = 0; row < rpng2_info.height; ++row) { - src = bg_data + row*bg_rowbytes; - dest = ximage->data + row*ximage_rowbytes; - if (bpp == 32) { /* slightly optimized version */ - for (i = rpng2_info.width; i > 0; --i) { - red = *src++; - green = *src++; - blue = *src++; - pixel = (red << RShift) | - (green << GShift) | - (blue << BShift); - /* recall that we set ximage->byte_order = MSBFirst above */ - *dest++ = (char)((pixel >> 24) & 0xff); - *dest++ = (char)((pixel >> 16) & 0xff); - *dest++ = (char)((pixel >> 8) & 0xff); - *dest++ = (char)( pixel & 0xff); - } - } else { - for (i = rpng2_info.width; i > 0; --i) { - red = *src++; - green = *src++; - blue = *src++; - pixel = (red << RShift) | - (green << GShift) | - (blue << BShift); - /* recall that we set ximage->byte_order = MSBFirst above */ - /* GRR BUG? this assumes bpp == 24 & bits are packed low */ - /* (probably need to use RShift, RMask, etc.) */ - *dest++ = (char)((pixel >> 16) & 0xff); - *dest++ = (char)((pixel >> 8) & 0xff); - *dest++ = (char)( pixel & 0xff); - } - } - } - - } else if (depth == 16) { - ush red, green, blue; - - for (row = 0; row < rpng2_info.height; ++row) { - src = bg_data + row*bg_rowbytes; - dest = ximage->data + row*ximage_rowbytes; - for (i = rpng2_info.width; i > 0; --i) { - red = ((ush)(*src) << 8); ++src; - green = ((ush)(*src) << 8); ++src; - blue = ((ush)(*src) << 8); ++src; - pixel = ((red >> RShift) & RMask) | - ((green >> GShift) & GMask) | - ((blue >> BShift) & BMask); - /* recall that we set ximage->byte_order = MSBFirst above */ - *dest++ = (char)((pixel >> 8) & 0xff); - *dest++ = (char)( pixel & 0xff); - } - } - - } else /* depth == 8 */ { - - /* GRR: add 8-bit support */ - - } - - XPutImage(display, window, gc, ximage, 0, 0, 0, 0, rpng2_info.width, - rpng2_info.height); - - return 0; - -} /* end function rpng2_x_load_bg_image() */ - - - - - -static void rpng2_x_display_row(ulg row) -{ - uch bg_red = rpng2_info.bg_red; - uch bg_green = rpng2_info.bg_green; - uch bg_blue = rpng2_info.bg_blue; - uch *src, *src2=NULL; - char *dest; - uch r, g, b, a; - int ximage_rowbytes = ximage->bytes_per_line; - ulg i, pixel; - static int rows=0, prevpass=(-1); - static ulg firstrow; - -/*--------------------------------------------------------------------------- - rows and firstrow simply track how many rows (and which ones) have not - yet been displayed; alternatively, we could call XPutImage() for every - row and not bother with the records-keeping. - ---------------------------------------------------------------------------*/ - - Trace((stderr, "beginning rpng2_x_display_row()\n")) - - if (rpng2_info.pass != prevpass) { - if (pause_after_pass && rpng2_info.pass > 0) { - XEvent e; - KeySym k; - - fprintf(stderr, - "%s: end of pass %d of 7; click in image window to continue\n", - PROGNAME, prevpass + 1); - do - XNextEvent(display, &e); - while (!QUIT(e,k)); - } - fprintf(stderr, "%s: pass %d of 7\r", PROGNAME, rpng2_info.pass + 1); - fflush(stderr); - prevpass = rpng2_info.pass; - } - - if (rows == 0) - firstrow = row; /* first row that is not yet displayed */ - - ++rows; /* count of rows received but not yet displayed */ - -/*--------------------------------------------------------------------------- - Aside from the use of the rpng2_info struct, the lack of an outer loop - (over rows) and moving the XPutImage() call outside the "if (depth)" - tests, this routine is identical to rpng_x_display_image() in the non- - progressive version of the program. - ---------------------------------------------------------------------------*/ - - if (depth == 24 || depth == 32) { - ulg red, green, blue; - int bpp = ximage->bits_per_pixel; - - src = rpng2_info.image_data + row*rpng2_info.rowbytes; - if (bg_image) - src2 = bg_data + row*bg_rowbytes; - dest = ximage->data + row*ximage_rowbytes; - if (rpng2_info.channels == 3) { - for (i = rpng2_info.width; i > 0; --i) { - red = *src++; - green = *src++; - blue = *src++; - pixel = (red << RShift) | - (green << GShift) | - (blue << BShift); - /* recall that we set ximage->byte_order = MSBFirst above */ - if (bpp == 32) { - *dest++ = (char)((pixel >> 24) & 0xff); - *dest++ = (char)((pixel >> 16) & 0xff); - *dest++ = (char)((pixel >> 8) & 0xff); - *dest++ = (char)( pixel & 0xff); - } else { - /* GRR BUG? this assumes bpp == 24 & bits are packed low */ - /* (probably need to use RShift, RMask, etc.) */ - *dest++ = (char)((pixel >> 16) & 0xff); - *dest++ = (char)((pixel >> 8) & 0xff); - *dest++ = (char)( pixel & 0xff); - } - } - } else /* if (rpng2_info.channels == 4) */ { - for (i = rpng2_info.width; i > 0; --i) { - r = *src++; - g = *src++; - b = *src++; - a = *src++; - if (bg_image) { - bg_red = *src2++; - bg_green = *src2++; - bg_blue = *src2++; - } - if (a == 255) { - red = r; - green = g; - blue = b; - } else if (a == 0) { - red = bg_red; - green = bg_green; - blue = bg_blue; - } else { - /* this macro (from png.h) composites the foreground - * and background values and puts the result into the - * first argument */ - alpha_composite(red, r, a, bg_red); - alpha_composite(green, g, a, bg_green); - alpha_composite(blue, b, a, bg_blue); - } - pixel = (red << RShift) | - (green << GShift) | - (blue << BShift); - /* recall that we set ximage->byte_order = MSBFirst above */ - if (bpp == 32) { - *dest++ = (char)((pixel >> 24) & 0xff); - *dest++ = (char)((pixel >> 16) & 0xff); - *dest++ = (char)((pixel >> 8) & 0xff); - *dest++ = (char)( pixel & 0xff); - } else { - /* GRR BUG? this assumes bpp == 24 & bits are packed low */ - /* (probably need to use RShift, RMask, etc.) */ - *dest++ = (char)((pixel >> 16) & 0xff); - *dest++ = (char)((pixel >> 8) & 0xff); - *dest++ = (char)( pixel & 0xff); - } - } - } - - } else if (depth == 16) { - ush red, green, blue; - - src = rpng2_info.row_pointers[row]; - if (bg_image) - src2 = bg_data + row*bg_rowbytes; - dest = ximage->data + row*ximage_rowbytes; - if (rpng2_info.channels == 3) { - for (i = rpng2_info.width; i > 0; --i) { - red = ((ush)(*src) << 8); - ++src; - green = ((ush)(*src) << 8); - ++src; - blue = ((ush)(*src) << 8); - ++src; - pixel = ((red >> RShift) & RMask) | - ((green >> GShift) & GMask) | - ((blue >> BShift) & BMask); - /* recall that we set ximage->byte_order = MSBFirst above */ - *dest++ = (char)((pixel >> 8) & 0xff); - *dest++ = (char)( pixel & 0xff); - } - } else /* if (rpng2_info.channels == 4) */ { - for (i = rpng2_info.width; i > 0; --i) { - r = *src++; - g = *src++; - b = *src++; - a = *src++; - if (bg_image) { - bg_red = *src2++; - bg_green = *src2++; - bg_blue = *src2++; - } - if (a == 255) { - red = ((ush)r << 8); - green = ((ush)g << 8); - blue = ((ush)b << 8); - } else if (a == 0) { - red = ((ush)bg_red << 8); - green = ((ush)bg_green << 8); - blue = ((ush)bg_blue << 8); - } else { - /* this macro (from png.h) composites the foreground - * and background values and puts the result back into - * the first argument (== fg byte here: safe) */ - alpha_composite(r, r, a, bg_red); - alpha_composite(g, g, a, bg_green); - alpha_composite(b, b, a, bg_blue); - red = ((ush)r << 8); - green = ((ush)g << 8); - blue = ((ush)b << 8); - } - pixel = ((red >> RShift) & RMask) | - ((green >> GShift) & GMask) | - ((blue >> BShift) & BMask); - /* recall that we set ximage->byte_order = MSBFirst above */ - *dest++ = (char)((pixel >> 8) & 0xff); - *dest++ = (char)( pixel & 0xff); - } - } - - } else /* depth == 8 */ { - - /* GRR: add 8-bit support */ - - } - - -/*--------------------------------------------------------------------------- - Display after every 16 rows or when on one of last two rows. (Region - may include previously displayed lines due to interlacing--i.e., not - contiguous. Also, second-to-last row is final one in interlaced images - with odd number of rows.) For demos, flush (and delay) after every 16th - row so "sparse" passes don't go twice as fast. - ---------------------------------------------------------------------------*/ - - if (demo_timing && (row - firstrow >= 16 || row >= rpng2_info.height-2)) { - XPutImage(display, window, gc, ximage, 0, (int)firstrow, 0, - (int)firstrow, rpng2_info.width, row - firstrow + 1); - XFlush(display); - rows = 0; - usleep(usleep_duration); - } else - if (!demo_timing && ((rows & 0xf) == 0 || row >= rpng2_info.height-2)) { - XPutImage(display, window, gc, ximage, 0, (int)firstrow, 0, - (int)firstrow, rpng2_info.width, row - firstrow + 1); - XFlush(display); - rows = 0; - } - -} - - - - - -static void rpng2_x_finish_display(void) -{ - Trace((stderr, "beginning rpng2_x_finish_display()\n")) - - /* last row has already been displayed by rpng2_x_display_row(), so we - * have nothing to do here except set a flag and let the user know that - * the image is done */ - - rpng2_info.state = kDone; - printf( - "Done. Press Q, Esc or mouse button 1 (within image window) to quit.\n"); - fflush(stdout); -} - - - - - -static void rpng2_x_redisplay_image(ulg startcol, ulg startrow, - ulg width, ulg height) -{ - uch bg_red = rpng2_info.bg_red; - uch bg_green = rpng2_info.bg_green; - uch bg_blue = rpng2_info.bg_blue; - uch *src, *src2=NULL; - char *dest; - uch r, g, b, a; - ulg i, row, lastrow = 0; - ulg pixel; - int ximage_rowbytes = ximage->bytes_per_line; - - - Trace((stderr, "beginning display loop (image_channels == %d)\n", - rpng2_info.channels)) - Trace((stderr, " (width = %ld, rowbytes = %d, ximage_rowbytes = %d)\n", - rpng2_info.width, rpng2_info.rowbytes, ximage_rowbytes)) - Trace((stderr, " (bpp = %d)\n", ximage->bits_per_pixel)) - Trace((stderr, " (byte_order = %s)\n", ximage->byte_order == MSBFirst? - "MSBFirst" : (ximage->byte_order == LSBFirst? "LSBFirst" : "unknown"))) - -/*--------------------------------------------------------------------------- - Aside from the use of the rpng2_info struct and of src2 (for background - image), this routine is identical to rpng_x_display_image() in the non- - progressive version of the program--for the simple reason that redisplay - of the image against a new background happens after the image is fully - decoded and therefore is, by definition, non-progressive. - ---------------------------------------------------------------------------*/ - - if (depth == 24 || depth == 32) { - ulg red, green, blue; - int bpp = ximage->bits_per_pixel; - - for (lastrow = row = startrow; row < startrow+height; ++row) { - src = rpng2_info.image_data + row*rpng2_info.rowbytes; - if (bg_image) - src2 = bg_data + row*bg_rowbytes; - dest = ximage->data + row*ximage_rowbytes; - if (rpng2_info.channels == 3) { - for (i = rpng2_info.width; i > 0; --i) { - red = *src++; - green = *src++; - blue = *src++; -#ifdef NO_24BIT_MASKS - pixel = (red << RShift) | - (green << GShift) | - (blue << BShift); - /* recall that we set ximage->byte_order = MSBFirst above */ - if (bpp == 32) { - *dest++ = (char)((pixel >> 24) & 0xff); - *dest++ = (char)((pixel >> 16) & 0xff); - *dest++ = (char)((pixel >> 8) & 0xff); - *dest++ = (char)( pixel & 0xff); - } else { - /* this assumes bpp == 24 & bits are packed low */ - /* (probably need to use RShift, RMask, etc.) */ - *dest++ = (char)((pixel >> 16) & 0xff); - *dest++ = (char)((pixel >> 8) & 0xff); - *dest++ = (char)( pixel & 0xff); - } -#else - red = (RShift < 0)? red << (-RShift) : red >> RShift; - green = (GShift < 0)? green << (-GShift) : green >> GShift; - blue = (BShift < 0)? blue << (-BShift) : blue >> BShift; - pixel = (red & RMask) | (green & GMask) | (blue & BMask); - /* recall that we set ximage->byte_order = MSBFirst above */ - if (bpp == 32) { - *dest++ = (char)((pixel >> 24) & 0xff); - *dest++ = (char)((pixel >> 16) & 0xff); - *dest++ = (char)((pixel >> 8) & 0xff); - *dest++ = (char)( pixel & 0xff); - } else { - /* GRR BUG */ - /* this assumes bpp == 24 & bits are packed low */ - /* (probably need to use RShift/RMask/etc. here, too) */ - *dest++ = (char)((pixel >> 16) & 0xff); - *dest++ = (char)((pixel >> 8) & 0xff); - *dest++ = (char)( pixel & 0xff); - } -#endif - } - - } else /* if (rpng2_info.channels == 4) */ { - for (i = rpng2_info.width; i > 0; --i) { - r = *src++; - g = *src++; - b = *src++; - a = *src++; - if (bg_image) { - bg_red = *src2++; - bg_green = *src2++; - bg_blue = *src2++; - } - if (a == 255) { - red = r; - green = g; - blue = b; - } else if (a == 0) { - red = bg_red; - green = bg_green; - blue = bg_blue; - } else { - /* this macro (from png.h) composites the foreground - * and background values and puts the result into the - * first argument */ - alpha_composite(red, r, a, bg_red); - alpha_composite(green, g, a, bg_green); - alpha_composite(blue, b, a, bg_blue); - } -#ifdef NO_24BIT_MASKS - pixel = (red << RShift) | - (green << GShift) | - (blue << BShift); - /* recall that we set ximage->byte_order = MSBFirst above */ - if (bpp == 32) { - *dest++ = (char)((pixel >> 24) & 0xff); - *dest++ = (char)((pixel >> 16) & 0xff); - *dest++ = (char)((pixel >> 8) & 0xff); - *dest++ = (char)( pixel & 0xff); - } else { - /* this assumes bpp == 24 & bits are packed low */ - /* (probably need to use RShift, RMask, etc.) */ - *dest++ = (char)((pixel >> 16) & 0xff); - *dest++ = (char)((pixel >> 8) & 0xff); - *dest++ = (char)( pixel & 0xff); - } -#else - red = (RShift < 0)? red << (-RShift) : red >> RShift; - green = (GShift < 0)? green << (-GShift) : green >> GShift; - blue = (BShift < 0)? blue << (-BShift) : blue >> BShift; - pixel = (red & RMask) | (green & GMask) | (blue & BMask); - /* recall that we set ximage->byte_order = MSBFirst above */ - if (bpp == 32) { - *dest++ = (char)((pixel >> 24) & 0xff); - *dest++ = (char)((pixel >> 16) & 0xff); - *dest++ = (char)((pixel >> 8) & 0xff); - *dest++ = (char)( pixel & 0xff); - } else { - /* GRR BUG */ - /* this assumes bpp == 24 & bits are packed low */ - /* (probably need to use RShift/RMask/etc. here, too) */ - *dest++ = (char)((pixel >> 16) & 0xff); - *dest++ = (char)((pixel >> 8) & 0xff); - *dest++ = (char)( pixel & 0xff); - } -#endif - } - } - /* display after every 16 lines */ - if (((row+1) & 0xf) == 0) { - XPutImage(display, window, gc, ximage, 0, (int)lastrow, 0, - (int)lastrow, rpng2_info.width, 16); - XFlush(display); - lastrow = row + 1; - } - } - - } else if (depth == 16) { - ush red, green, blue; - - for (lastrow = row = startrow; row < startrow+height; ++row) { - src = rpng2_info.row_pointers[row]; - if (bg_image) - src2 = bg_data + row*bg_rowbytes; - dest = ximage->data + row*ximage_rowbytes; - if (rpng2_info.channels == 3) { - for (i = rpng2_info.width; i > 0; --i) { - red = ((ush)(*src) << 8); - ++src; - green = ((ush)(*src) << 8); - ++src; - blue = ((ush)(*src) << 8); - ++src; - pixel = ((red >> RShift) & RMask) | - ((green >> GShift) & GMask) | - ((blue >> BShift) & BMask); - /* recall that we set ximage->byte_order = MSBFirst above */ - *dest++ = (char)((pixel >> 8) & 0xff); - *dest++ = (char)( pixel & 0xff); - } - } else /* if (rpng2_info.channels == 4) */ { - for (i = rpng2_info.width; i > 0; --i) { - r = *src++; - g = *src++; - b = *src++; - a = *src++; - if (bg_image) { - bg_red = *src2++; - bg_green = *src2++; - bg_blue = *src2++; - } - if (a == 255) { - red = ((ush)r << 8); - green = ((ush)g << 8); - blue = ((ush)b << 8); - } else if (a == 0) { - red = ((ush)bg_red << 8); - green = ((ush)bg_green << 8); - blue = ((ush)bg_blue << 8); - } else { - /* this macro (from png.h) composites the foreground - * and background values and puts the result back into - * the first argument (== fg byte here: safe) */ - alpha_composite(r, r, a, bg_red); - alpha_composite(g, g, a, bg_green); - alpha_composite(b, b, a, bg_blue); - red = ((ush)r << 8); - green = ((ush)g << 8); - blue = ((ush)b << 8); - } - pixel = ((red >> RShift) & RMask) | - ((green >> GShift) & GMask) | - ((blue >> BShift) & BMask); - /* recall that we set ximage->byte_order = MSBFirst above */ - *dest++ = (char)((pixel >> 8) & 0xff); - *dest++ = (char)( pixel & 0xff); - } - } - /* display after every 16 lines */ - if (((row+1) & 0xf) == 0) { - XPutImage(display, window, gc, ximage, 0, (int)lastrow, 0, - (int)lastrow, rpng2_info.width, 16); - XFlush(display); - lastrow = row + 1; - } - } - - } else /* depth == 8 */ { - - /* GRR: add 8-bit support */ - - } - - Trace((stderr, "calling final XPutImage()\n")) - if (lastrow < startrow+height) { - XPutImage(display, window, gc, ximage, 0, (int)lastrow, 0, - (int)lastrow, rpng2_info.width, rpng2_info.height-lastrow); - XFlush(display); - } - -} /* end function rpng2_x_redisplay_image() */ - - - - - -#ifdef FEATURE_LOOP - -static void rpng2_x_reload_bg_image(void) -{ - char *dest; - uch r1, r2, g1, g2, b1, b2; - uch r1_inv, r2_inv, g1_inv, g2_inv, b1_inv, b2_inv; - int k, hmax, max; - int xidx, yidx, yidx_max; - int even_odd_vert, even_odd_horiz, even_odd; - int invert_gradient2 = (bg[pat].type & 0x08); - int invert_column; - ulg i, row; - - - bgscale = (pat == 0)? 8 : bgscale_default; - yidx_max = bgscale - 1; - -/*--------------------------------------------------------------------------- - Vertical gradients (ramps) in NxN squares, alternating direction and - colors (N == bgscale). - ---------------------------------------------------------------------------*/ - - if ((bg[pat].type & 0x07) == 0) { - uch r1_min = rgb[bg[pat].rgb1_min].r; - uch g1_min = rgb[bg[pat].rgb1_min].g; - uch b1_min = rgb[bg[pat].rgb1_min].b; - uch r2_min = rgb[bg[pat].rgb2_min].r; - uch g2_min = rgb[bg[pat].rgb2_min].g; - uch b2_min = rgb[bg[pat].rgb2_min].b; - int r1_diff = rgb[bg[pat].rgb1_max].r - r1_min; - int g1_diff = rgb[bg[pat].rgb1_max].g - g1_min; - int b1_diff = rgb[bg[pat].rgb1_max].b - b1_min; - int r2_diff = rgb[bg[pat].rgb2_max].r - r2_min; - int g2_diff = rgb[bg[pat].rgb2_max].g - g2_min; - int b2_diff = rgb[bg[pat].rgb2_max].b - b2_min; - - for (row = 0; row < rpng2_info.height; ++row) { - yidx = (int)(row % bgscale); - even_odd_vert = (int)((row / bgscale) & 1); - - r1 = r1_min + (r1_diff * yidx) / yidx_max; - g1 = g1_min + (g1_diff * yidx) / yidx_max; - b1 = b1_min + (b1_diff * yidx) / yidx_max; - r1_inv = r1_min + (r1_diff * (yidx_max-yidx)) / yidx_max; - g1_inv = g1_min + (g1_diff * (yidx_max-yidx)) / yidx_max; - b1_inv = b1_min + (b1_diff * (yidx_max-yidx)) / yidx_max; - - r2 = r2_min + (r2_diff * yidx) / yidx_max; - g2 = g2_min + (g2_diff * yidx) / yidx_max; - b2 = b2_min + (b2_diff * yidx) / yidx_max; - r2_inv = r2_min + (r2_diff * (yidx_max-yidx)) / yidx_max; - g2_inv = g2_min + (g2_diff * (yidx_max-yidx)) / yidx_max; - b2_inv = b2_min + (b2_diff * (yidx_max-yidx)) / yidx_max; - - dest = (char *)bg_data + row*bg_rowbytes; - for (i = 0; i < rpng2_info.width; ++i) { - even_odd_horiz = (int)((i / bgscale) & 1); - even_odd = even_odd_vert ^ even_odd_horiz; - invert_column = - (even_odd_horiz && (bg[pat].type & 0x10)); - if (even_odd == 0) { /* gradient #1 */ - if (invert_column) { - *dest++ = r1_inv; - *dest++ = g1_inv; - *dest++ = b1_inv; - } else { - *dest++ = r1; - *dest++ = g1; - *dest++ = b1; - } - } else { /* gradient #2 */ - if ((invert_column && invert_gradient2) || - (!invert_column && !invert_gradient2)) - { - *dest++ = r2; /* not inverted or */ - *dest++ = g2; /* doubly inverted */ - *dest++ = b2; - } else { - *dest++ = r2_inv; - *dest++ = g2_inv; /* singly inverted */ - *dest++ = b2_inv; - } - } - } - } - -/*--------------------------------------------------------------------------- - Soft gradient-diamonds with scale = bgscale. Code contributed by Adam - M. Costello. - ---------------------------------------------------------------------------*/ - - } else if ((bg[pat].type & 0x07) == 1) { - - hmax = (bgscale-1)/2; /* half the max weight of a color */ - max = 2*hmax; /* the max weight of a color */ - - r1 = rgb[bg[pat].rgb1_max].r; - g1 = rgb[bg[pat].rgb1_max].g; - b1 = rgb[bg[pat].rgb1_max].b; - r2 = rgb[bg[pat].rgb2_max].r; - g2 = rgb[bg[pat].rgb2_max].g; - b2 = rgb[bg[pat].rgb2_max].b; - - for (row = 0; row < rpng2_info.height; ++row) { - yidx = (int)(row % bgscale); - if (yidx > hmax) - yidx = bgscale-1 - yidx; - dest = (char *)bg_data + row*bg_rowbytes; - for (i = 0; i < rpng2_info.width; ++i) { - xidx = (int)(i % bgscale); - if (xidx > hmax) - xidx = bgscale-1 - xidx; - k = xidx + yidx; - *dest++ = (k*r1 + (max-k)*r2) / max; - *dest++ = (k*g1 + (max-k)*g2) / max; - *dest++ = (k*b1 + (max-k)*b2) / max; - } - } - -/*--------------------------------------------------------------------------- - Radial "starburst" with azimuthal sinusoids; [eventually number of sinu- - soids will equal bgscale?]. This one is slow but very cool. Code con- - tributed by Pieter S. van der Meulen (originally in Smalltalk). - ---------------------------------------------------------------------------*/ - - } else if ((bg[pat].type & 0x07) == 2) { - uch ch; - int ii, x, y, hw, hh, grayspot; - double freq, rotate, saturate, gray, intensity; - double angle=0.0, aoffset=0.0, maxDist, dist; - double red=0.0, green=0.0, blue=0.0, hue, s, v, f, p, q, t; - - hh = (int)(rpng2_info.height / 2); - hw = (int)(rpng2_info.width / 2); - - /* variables for radial waves: - * aoffset: number of degrees to rotate hue [CURRENTLY NOT USED] - * freq: number of color beams originating from the center - * grayspot: size of the graying center area (anti-alias) - * rotate: rotation of the beams as a function of radius - * saturate: saturation of beams' shape azimuthally - */ - angle = CLIP(angle, 0.0, 360.0); - grayspot = CLIP(bg[pat].bg_gray, 1, (hh + hw)); - freq = MAX((double)bg[pat].bg_freq, 0.0); - saturate = (double)bg[pat].bg_bsat * 0.1; - rotate = (double)bg[pat].bg_brot * 0.1; - gray = 0.0; - intensity = 0.0; - maxDist = (double)((hw*hw) + (hh*hh)); - - for (row = 0; row < rpng2_info.height; ++row) { - y = (int)(row - hh); - dest = (char *)bg_data + row*bg_rowbytes; - for (i = 0; i < rpng2_info.width; ++i) { - x = (int)(i - hw); - angle = (x == 0)? PI_2 : atan((double)y / (double)x); - gray = (double)MAX(ABS(y), ABS(x)) / grayspot; - gray = MIN(1.0, gray); - dist = (double)((x*x) + (y*y)) / maxDist; - intensity = cos((angle+(rotate*dist*PI)) * freq) * - gray * saturate; - intensity = (MAX(MIN(intensity,1.0),-1.0) + 1.0) * 0.5; - hue = (angle + PI) * INV_PI_360 + aoffset; - s = gray * ((double)(ABS(x)+ABS(y)) / (double)(hw + hh)); - s = MIN(MAX(s,0.0), 1.0); - v = MIN(MAX(intensity,0.0), 1.0); - - if (s == 0.0) { - ch = (uch)(v * 255.0); - *dest++ = ch; - *dest++ = ch; - *dest++ = ch; - } else { - if ((hue < 0.0) || (hue >= 360.0)) - hue -= (((int)(hue / 360.0)) * 360.0); - hue /= 60.0; - ii = (int)hue; - f = hue - (double)ii; - p = (1.0 - s) * v; - q = (1.0 - (s * f)) * v; - t = (1.0 - (s * (1.0 - f))) * v; - if (ii == 0) { red = v; green = t; blue = p; } - else if (ii == 1) { red = q; green = v; blue = p; } - else if (ii == 2) { red = p; green = v; blue = t; } - else if (ii == 3) { red = p; green = q; blue = v; } - else if (ii == 4) { red = t; green = p; blue = v; } - else if (ii == 5) { red = v; green = p; blue = q; } - *dest++ = (uch)(red * 255.0); - *dest++ = (uch)(green * 255.0); - *dest++ = (uch)(blue * 255.0); - } - } - } - } - -} /* end function rpng2_x_reload_bg_image() */ - - - - - -static int is_number(char *p) -{ - while (*p) { - if (!isdigit(*p)) - return FALSE; - ++p; - } - return TRUE; -} - -#endif /* FEATURE_LOOP */ - - - - - -static void rpng2_x_cleanup(void) -{ - if (bg_image && bg_data) { - free(bg_data); - bg_data = NULL; - } - - if (rpng2_info.image_data) { - free(rpng2_info.image_data); - rpng2_info.image_data = NULL; - } - - if (rpng2_info.row_pointers) { - free(rpng2_info.row_pointers); - rpng2_info.row_pointers = NULL; - } - - if (ximage) { - if (ximage->data) { - free(ximage->data); /* we allocated it, so we free it */ - ximage->data = (char *)NULL; /* instead of XDestroyImage() */ - } - XDestroyImage(ximage); - ximage = NULL; - } - - if (have_gc) - XFreeGC(display, gc); - - if (have_window) - XDestroyWindow(display, window); - - if (have_colormap) - XFreeColormap(display, colormap); - - if (have_nondefault_visual) - XFree(visual_list); -} - - - - - -static int rpng2_x_msb(ulg u32val) -{ - int i; - - for (i = 31; i >= 0; --i) { - if (u32val & 0x80000000L) - break; - u32val <<= 1; - } - return i; -} diff --git a/libpng16/contrib/gregbook/toucan.png b/libpng16/contrib/gregbook/toucan.png deleted file mode 100644 index 03960d4..0000000 Binary files a/libpng16/contrib/gregbook/toucan.png and /dev/null differ diff --git a/libpng16/contrib/gregbook/wpng.c b/libpng16/contrib/gregbook/wpng.c deleted file mode 100644 index a06e352..0000000 --- a/libpng16/contrib/gregbook/wpng.c +++ /dev/null @@ -1,853 +0,0 @@ -/*--------------------------------------------------------------------------- - - wpng - simple PNG-writing program wpng.c - - This program converts certain NetPBM binary files (grayscale and RGB, - maxval = 255) to PNG. Non-interlaced PNGs are written progressively; - interlaced PNGs are read and written in one memory-intensive blast. - - Thanks to Jean-loup Gailly for providing the necessary trick to read - interactive text from the keyboard while stdin is redirected. Thanks - to Cosmin Truta for Cygwin fixes. - - NOTE: includes provisional support for PNM type "8" (portable alphamap) - images, presumed to be a 32-bit interleaved RGBA format; no pro- - vision for possible interleaved grayscale+alpha (16-bit) format. - THIS IS UNLIKELY TO BECOME AN OFFICIAL NETPBM ALPHA FORMAT! - - to do: - - delete output file if quit before calling any writepng routines - - process backspace with -text option under DOS/Win? (currently get ^H) - - --------------------------------------------------------------------------- - - Changelog: - - 1.01: initial public release - - 1.02: modified to allow abbreviated options - - 1.03: removed extraneous character from usage screen; fixed bug in - command-line parsing - - 1.04: fixed DOS/OS2/Win32 detection, including partial Cygwin fix - (see http://home.att.net/~perlspinr/diffs/GregBook_cygwin.diff) - - 2.00: dual-licensed (added GNU GPL) - - [REPORTED BUG (win32 only): "contrib/gregbook/wpng.c - cmd line - dose not work! In order to do something useful I needed to redirect - both input and output, with cygwin and with bcc32 as well. Under - Linux, the same wpng appears to work fine. I don't know what is - the problem."] - - --------------------------------------------------------------------------- - - Copyright (c) 1998-2007 Greg Roelofs. All rights reserved. - - This software is provided "as is," without warranty of any kind, - express or implied. In no event shall the author or contributors - be held liable for any damages arising in any way from the use of - this software. - - The contents of this file are DUAL-LICENSED. You may modify and/or - redistribute this software according to the terms of one of the - following two licenses (at your option): - - - LICENSE 1 ("BSD-like with advertising clause"): - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute - it freely, subject to the following restrictions: - - 1. Redistributions of source code must retain the above copyright - notice, disclaimer, and this list of conditions. - 2. Redistributions in binary form must reproduce the above copyright - notice, disclaimer, and this list of conditions in the documenta- - tion and/or other materials provided with the distribution. - 3. All advertising materials mentioning features or use of this - software must display the following acknowledgment: - - This product includes software developed by Greg Roelofs - and contributors for the book, "PNG: The Definitive Guide," - published by O'Reilly and Associates. - - - LICENSE 2 (GNU GPL v2 or later): - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - ---------------------------------------------------------------------------*/ - -#define PROGNAME "wpng" -#define VERSION "2.00 of 2 June 2007" -#define APPNAME "Simple PGM/PPM/PAM to PNG Converter" - -#if defined(__MSDOS__) || defined(__OS2__) -# define DOS_OS2_W32 -#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) -# ifndef __GNUC__ /* treat Win32 native ports of gcc as Unix environments */ -# define DOS_OS2_W32 -# endif -#endif - -#include -#include -#include -#include /* for jmpbuf declaration in writepng.h */ -#include - -#ifdef DOS_OS2_W32 -# include /* for isatty(), setmode() prototypes */ -# include /* O_BINARY for fdopen() without text translation */ -# ifdef __EMX__ -# ifndef getch -# define getch() _read_kbd(0, 1, 0) /* need getche() */ -# endif -# else /* !__EMX__ */ -# ifdef __GO32__ -# include -# define getch() getkey() /* GRR: need getche() */ -# else -# include /* for getche() console input */ -# endif -# endif /* ?__EMX__ */ -# define FGETS(buf,len,stream) dos_kbd_gets(buf,len) -#else -# include /* for isatty() prototype */ -# define FGETS fgets -#endif - -/* #define DEBUG : this enables the Trace() macros */ - -/* #define FORBID_LATIN1_CTRL : this requires the user to re-enter any - text that includes control characters discouraged by the PNG spec; text - that includes an escape character (27) must be re-entered regardless */ - -#include "writepng.h" /* typedefs, common macros, writepng prototypes */ - - - -/* local prototypes */ - -static int wpng_isvalid_latin1(uch *p, int len); -static void wpng_cleanup(void); - -#ifdef DOS_OS2_W32 - static char *dos_kbd_gets(char *buf, int len); -#endif - - - -static mainprog_info wpng_info; /* lone global */ - - - -int main(int argc, char **argv) -{ -#ifndef DOS_OS2_W32 - FILE *keybd; -#endif -#ifdef sgi - FILE *tmpfile; /* or we could just use keybd, since no overlap */ - char tmpline[80]; -#endif - char *inname = NULL, outname[256]; - char *p, pnmchar, pnmline[256]; - char *bgstr, *textbuf = NULL; - ulg rowbytes; - int rc, len = 0; - int error = 0; - int text = FALSE; - int maxval; - double LUT_exponent; /* just the lookup table */ - double CRT_exponent = 2.2; /* just the monitor */ - double default_display_exponent; /* whole display system */ - double default_gamma = 0.0; - - - wpng_info.infile = NULL; - wpng_info.outfile = NULL; - wpng_info.image_data = NULL; - wpng_info.row_pointers = NULL; - wpng_info.filter = FALSE; - wpng_info.interlaced = FALSE; - wpng_info.have_bg = FALSE; - wpng_info.have_time = FALSE; - wpng_info.have_text = 0; - wpng_info.gamma = 0.0; - - - /* First get the default value for our display-system exponent, i.e., - * the product of the CRT exponent and the exponent corresponding to - * the frame-buffer's lookup table (LUT), if any. If the PNM image - * looks correct on the user's display system, its file gamma is the - * inverse of this value. (Note that this is not an exhaustive list - * of LUT values--e.g., OpenStep has a lot of weird ones--but it should - * cover 99% of the current possibilities. This section must ensure - * that default_display_exponent is positive.) */ - -#if defined(NeXT) - /* third-party utilities can modify the default LUT exponent */ - LUT_exponent = 1.0 / 2.2; - /* - if (some_next_function_that_returns_gamma(&next_gamma)) - LUT_exponent = 1.0 / next_gamma; - */ -#elif defined(sgi) - LUT_exponent = 1.0 / 1.7; - /* there doesn't seem to be any documented function to - * get the "gamma" value, so we do it the hard way */ - tmpfile = fopen("/etc/config/system.glGammaVal", "r"); - if (tmpfile) { - double sgi_gamma; - - fgets(tmpline, 80, tmpfile); - fclose(tmpfile); - sgi_gamma = atof(tmpline); - if (sgi_gamma > 0.0) - LUT_exponent = 1.0 / sgi_gamma; - } -#elif defined(Macintosh) - LUT_exponent = 1.8 / 2.61; - /* - if (some_mac_function_that_returns_gamma(&mac_gamma)) - LUT_exponent = mac_gamma / 2.61; - */ -#else - LUT_exponent = 1.0; /* assume no LUT: most PCs */ -#endif - - /* the defaults above give 1.0, 1.3, 1.5 and 2.2, respectively: */ - default_display_exponent = LUT_exponent * CRT_exponent; - - - /* If the user has set the SCREEN_GAMMA environment variable as suggested - * (somewhat imprecisely) in the libpng documentation, use that; otherwise - * use the default value we just calculated. Either way, the user may - * override this via a command-line option. */ - - if ((p = getenv("SCREEN_GAMMA")) != NULL) { - double exponent = atof(p); - - if (exponent > 0.0) - default_gamma = 1.0 / exponent; - } - - if (default_gamma == 0.0) - default_gamma = 1.0 / default_display_exponent; - - - /* Now parse the command line for options and the PNM filename. */ - - while (*++argv && !error) { - if (!strncmp(*argv, "-i", 2)) { - wpng_info.interlaced = TRUE; - } else if (!strncmp(*argv, "-time", 3)) { - wpng_info.modtime = time(NULL); - wpng_info.have_time = TRUE; - } else if (!strncmp(*argv, "-text", 3)) { - text = TRUE; - } else if (!strncmp(*argv, "-gamma", 2)) { - if (!*++argv) - ++error; - else { - wpng_info.gamma = atof(*argv); - if (wpng_info.gamma <= 0.0) - ++error; - else if (wpng_info.gamma > 1.01) - fprintf(stderr, PROGNAME - " warning: file gammas are usually less than 1.0\n"); - } - } else if (!strncmp(*argv, "-bgcolor", 4)) { - if (!*++argv) - ++error; - else { - bgstr = *argv; - if (strlen(bgstr) != 7 || bgstr[0] != '#') - ++error; - else { - unsigned r, g, b; /* this way quiets compiler warnings */ - - sscanf(bgstr+1, "%2x%2x%2x", &r, &g, &b); - wpng_info.bg_red = (uch)r; - wpng_info.bg_green = (uch)g; - wpng_info.bg_blue = (uch)b; - wpng_info.have_bg = TRUE; - } - } - } else { - if (**argv != '-') { - inname = *argv; - if (argv[1]) /* shouldn't be any more args after filename */ - ++error; - } else - ++error; /* not expecting any other options */ - } - } - - - /* open the input and output files, or register an error and abort */ - - if (!inname) { - if (isatty(0)) { - fprintf(stderr, PROGNAME - ": must give input filename or provide image data via stdin\n"); - ++error; - } else { -#ifdef DOS_OS2_W32 - /* some buggy C libraries require BOTH setmode() and fdopen(bin) */ - setmode(fileno(stdin), O_BINARY); - setmode(fileno(stdout), O_BINARY); -#endif - if ((wpng_info.infile = fdopen(fileno(stdin), "rb")) == NULL) { - fprintf(stderr, PROGNAME - ": unable to reopen stdin in binary mode\n"); - ++error; - } else - if ((wpng_info.outfile = fdopen(fileno(stdout), "wb")) == NULL) { - fprintf(stderr, PROGNAME - ": unable to reopen stdout in binary mode\n"); - fclose(wpng_info.infile); - ++error; - } else - wpng_info.filter = TRUE; - } - } else if ((len = strlen(inname)) > 250) { - fprintf(stderr, PROGNAME ": input filename is too long [%d chars]\n", - len); - ++error; - } else if (!(wpng_info.infile = fopen(inname, "rb"))) { - fprintf(stderr, PROGNAME ": can't open input file [%s]\n", inname); - ++error; - } - - if (!error) { - fgets(pnmline, 256, wpng_info.infile); - if (pnmline[0] != 'P' || ((pnmchar = pnmline[1]) != '5' && - pnmchar != '6' && pnmchar != '8')) - { - fprintf(stderr, PROGNAME - ": input file [%s] is not a binary PGM, PPM or PAM file\n", - inname); - ++error; - } else { - wpng_info.pnmtype = (int)(pnmchar - '0'); - if (wpng_info.pnmtype != 8) - wpng_info.have_bg = FALSE; /* no need for bg if opaque */ - do { - fgets(pnmline, 256, wpng_info.infile); /* lose any comments */ - } while (pnmline[0] == '#'); - sscanf(pnmline, "%ld %ld", &wpng_info.width, &wpng_info.height); - do { - fgets(pnmline, 256, wpng_info.infile); /* more comment lines */ - } while (pnmline[0] == '#'); - sscanf(pnmline, "%d", &maxval); - if (wpng_info.width <= 0L || wpng_info.height <= 0L || - maxval != 255) - { - fprintf(stderr, PROGNAME - ": only positive width/height, maxval == 255 allowed \n"); - ++error; - } - wpng_info.sample_depth = 8; /* <==> maxval 255 */ - - if (!wpng_info.filter) { - /* make outname from inname */ - if ((p = strrchr(inname, '.')) == NULL || - (p - inname) != (len - 4)) - { - strcpy(outname, inname); - strcpy(outname+len, ".png"); - } else { - len -= 4; - strncpy(outname, inname, len); - strcpy(outname+len, ".png"); - } - /* check if outname already exists; if not, open */ - if ((wpng_info.outfile = fopen(outname, "rb")) != NULL) { - fprintf(stderr, PROGNAME ": output file exists [%s]\n", - outname); - fclose(wpng_info.outfile); - ++error; - } else if (!(wpng_info.outfile = fopen(outname, "wb"))) { - fprintf(stderr, PROGNAME ": can't open output file [%s]\n", - outname); - ++error; - } - } - } - if (error) { - fclose(wpng_info.infile); - wpng_info.infile = NULL; - if (wpng_info.filter) { - fclose(wpng_info.outfile); - wpng_info.outfile = NULL; - } - } - } - - - /* if we had any errors, print usage and die horrible death...arrr! */ - - if (error) { - fprintf(stderr, "\n%s %s: %s\n", PROGNAME, VERSION, APPNAME); - writepng_version_info(); - fprintf(stderr, "\n" -"Usage: %s [-gamma exp] [-bgcolor bg] [-text] [-time] [-interlace] pnmfile\n" -"or: ... | %s [-gamma exp] [-bgcolor bg] [-text] [-time] [-interlace] | ...\n" - " exp \ttransfer-function exponent (``gamma'') of the image in\n" - "\t\t floating-point format (e.g., ``%.5f''); if image looks\n" - "\t\t correct on given display system, image gamma is equal to\n" - "\t\t inverse of display-system exponent, i.e., 1 / (LUT * CRT)\n" - "\t\t (where LUT = lookup-table exponent and CRT = CRT exponent;\n" - "\t\t first varies, second is usually 2.2, all are positive)\n" - " bg \tdesired background color for alpha-channel images, in\n" - "\t\t 7-character hex RGB format (e.g., ``#ff7700'' for orange:\n" - "\t\t same as HTML colors)\n" - " -text\tprompt interactively for text info (tEXt chunks)\n" - " -time\tinclude a tIME chunk (last modification time)\n" - " -interlace\twrite interlaced PNG image\n" - "\n" -"pnmfile or stdin must be a binary PGM (`P5'), PPM (`P6') or (extremely\n" -"unofficial and unsupported!) PAM (`P8') file. Currently it is required\n" -"to have maxval == 255 (i.e., no scaling). If pnmfile is specified, it\n" -"is converted to the corresponding PNG file with the same base name but a\n" -"``.png'' extension; files read from stdin are converted and sent to stdout.\n" -"The conversion is progressive (low memory usage) unless interlacing is\n" -"requested; in that case the whole image will be buffered in memory and\n" -"written in one call.\n" - "\n", PROGNAME, PROGNAME, default_gamma); - exit(1); - } - - - /* prepare the text buffers for libpng's use; note that even though - * PNG's png_text struct includes a length field, we don't have to fill - * it out */ - - if (text && -#ifndef DOS_OS2_W32 - (keybd = fdopen(fileno(stderr), "r")) != NULL && -#endif - (textbuf = (char *)malloc((5 + 9)*75)) != NULL) - { - int i, valid, result; - - fprintf(stderr, - "Enter text info (no more than 72 characters per line);\n"); - fprintf(stderr, "to skip a field, hit the key.\n"); - /* note: just leaves len == 1 */ - - do { - valid = TRUE; - p = textbuf + TEXT_TITLE_OFFSET; - fprintf(stderr, " Title: "); - fflush(stderr); - if (FGETS(p, 74, keybd) && (len = strlen(p)) > 1) { - if (p[len-1] == '\n') - p[--len] = '\0'; - wpng_info.title = p; - wpng_info.have_text |= TEXT_TITLE; - if ((result = wpng_isvalid_latin1((uch *)p, len)) >= 0) { - fprintf(stderr, " " PROGNAME " warning: character code" - " %u is %sdiscouraged by the PNG\n specification " - "[first occurrence was at character position #%d]\n", - (unsigned)p[result], (p[result] == 27)? "strongly " : "", - result+1); - fflush(stderr); -#ifdef FORBID_LATIN1_CTRL - wpng_info.have_text &= ~TEXT_TITLE; - valid = FALSE; -#else - if (p[result] == 27) { /* escape character */ - wpng_info.have_text &= ~TEXT_TITLE; - valid = FALSE; - } -#endif - } - } - } while (!valid); - - do { - valid = TRUE; - p = textbuf + TEXT_AUTHOR_OFFSET; - fprintf(stderr, " Author: "); - fflush(stderr); - if (FGETS(p, 74, keybd) && (len = strlen(p)) > 1) { - if (p[len-1] == '\n') - p[--len] = '\0'; - wpng_info.author = p; - wpng_info.have_text |= TEXT_AUTHOR; - if ((result = wpng_isvalid_latin1((uch *)p, len)) >= 0) { - fprintf(stderr, " " PROGNAME " warning: character code" - " %u is %sdiscouraged by the PNG\n specification " - "[first occurrence was at character position #%d]\n", - (unsigned)p[result], (p[result] == 27)? "strongly " : "", - result+1); - fflush(stderr); -#ifdef FORBID_LATIN1_CTRL - wpng_info.have_text &= ~TEXT_AUTHOR; - valid = FALSE; -#else - if (p[result] == 27) { /* escape character */ - wpng_info.have_text &= ~TEXT_AUTHOR; - valid = FALSE; - } -#endif - } - } - } while (!valid); - - do { - valid = TRUE; - p = textbuf + TEXT_DESC_OFFSET; - fprintf(stderr, " Description (up to 9 lines):\n"); - for (i = 1; i < 10; ++i) { - fprintf(stderr, " [%d] ", i); - fflush(stderr); - if (FGETS(p, 74, keybd) && (len = strlen(p)) > 1) - p += len; /* now points at NULL; char before is newline */ - else - break; - } - if ((len = p - (textbuf + TEXT_DESC_OFFSET)) > 1) { - if (p[-1] == '\n') { - p[-1] = '\0'; - --len; - } - wpng_info.desc = textbuf + TEXT_DESC_OFFSET; - wpng_info.have_text |= TEXT_DESC; - p = textbuf + TEXT_DESC_OFFSET; - if ((result = wpng_isvalid_latin1((uch *)p, len)) >= 0) { - fprintf(stderr, " " PROGNAME " warning: character code" - " %u is %sdiscouraged by the PNG\n specification " - "[first occurrence was at character position #%d]\n", - (unsigned)p[result], (p[result] == 27)? "strongly " : "", - result+1); - fflush(stderr); -#ifdef FORBID_LATIN1_CTRL - wpng_info.have_text &= ~TEXT_DESC; - valid = FALSE; -#else - if (p[result] == 27) { /* escape character */ - wpng_info.have_text &= ~TEXT_DESC; - valid = FALSE; - } -#endif - } - } - } while (!valid); - - do { - valid = TRUE; - p = textbuf + TEXT_COPY_OFFSET; - fprintf(stderr, " Copyright: "); - fflush(stderr); - if (FGETS(p, 74, keybd) && (len = strlen(p)) > 1) { - if (p[len-1] == '\n') - p[--len] = '\0'; - wpng_info.copyright = p; - wpng_info.have_text |= TEXT_COPY; - if ((result = wpng_isvalid_latin1((uch *)p, len)) >= 0) { - fprintf(stderr, " " PROGNAME " warning: character code" - " %u is %sdiscouraged by the PNG\n specification " - "[first occurrence was at character position #%d]\n", - (unsigned)p[result], (p[result] == 27)? "strongly " : "", - result+1); - fflush(stderr); -#ifdef FORBID_LATIN1_CTRL - wpng_info.have_text &= ~TEXT_COPY; - valid = FALSE; -#else - if (p[result] == 27) { /* escape character */ - wpng_info.have_text &= ~TEXT_COPY; - valid = FALSE; - } -#endif - } - } - } while (!valid); - - do { - valid = TRUE; - p = textbuf + TEXT_EMAIL_OFFSET; - fprintf(stderr, " E-mail: "); - fflush(stderr); - if (FGETS(p, 74, keybd) && (len = strlen(p)) > 1) { - if (p[len-1] == '\n') - p[--len] = '\0'; - wpng_info.email = p; - wpng_info.have_text |= TEXT_EMAIL; - if ((result = wpng_isvalid_latin1((uch *)p, len)) >= 0) { - fprintf(stderr, " " PROGNAME " warning: character code" - " %u is %sdiscouraged by the PNG\n specification " - "[first occurrence was at character position #%d]\n", - (unsigned)p[result], (p[result] == 27)? "strongly " : "", - result+1); - fflush(stderr); -#ifdef FORBID_LATIN1_CTRL - wpng_info.have_text &= ~TEXT_EMAIL; - valid = FALSE; -#else - if (p[result] == 27) { /* escape character */ - wpng_info.have_text &= ~TEXT_EMAIL; - valid = FALSE; - } -#endif - } - } - } while (!valid); - - do { - valid = TRUE; - p = textbuf + TEXT_URL_OFFSET; - fprintf(stderr, " URL: "); - fflush(stderr); - if (FGETS(p, 74, keybd) && (len = strlen(p)) > 1) { - if (p[len-1] == '\n') - p[--len] = '\0'; - wpng_info.url = p; - wpng_info.have_text |= TEXT_URL; - if ((result = wpng_isvalid_latin1((uch *)p, len)) >= 0) { - fprintf(stderr, " " PROGNAME " warning: character code" - " %u is %sdiscouraged by the PNG\n specification " - "[first occurrence was at character position #%d]\n", - (unsigned)p[result], (p[result] == 27)? "strongly " : "", - result+1); - fflush(stderr); -#ifdef FORBID_LATIN1_CTRL - wpng_info.have_text &= ~TEXT_URL; - valid = FALSE; -#else - if (p[result] == 27) { /* escape character */ - wpng_info.have_text &= ~TEXT_URL; - valid = FALSE; - } -#endif - } - } - } while (!valid); - -#ifndef DOS_OS2_W32 - fclose(keybd); -#endif - - } else if (text) { - fprintf(stderr, PROGNAME ": unable to allocate memory for text\n"); - text = FALSE; - wpng_info.have_text = 0; - } - - - /* allocate libpng stuff, initialize transformations, write pre-IDAT data */ - - if ((rc = writepng_init(&wpng_info)) != 0) { - switch (rc) { - case 2: - fprintf(stderr, PROGNAME - ": libpng initialization problem (longjmp)\n"); - break; - case 4: - fprintf(stderr, PROGNAME ": insufficient memory\n"); - break; - case 11: - fprintf(stderr, PROGNAME - ": internal logic error (unexpected PNM type)\n"); - break; - default: - fprintf(stderr, PROGNAME - ": unknown writepng_init() error\n"); - break; - } - exit(rc); - } - - - /* free textbuf, since it's a completely local variable and all text info - * has just been written to the PNG file */ - - if (text && textbuf) { - free(textbuf); - textbuf = NULL; - } - - - /* calculate rowbytes on basis of image type; note that this becomes much - * more complicated if we choose to support PBM type, ASCII PNM types, or - * 16-bit-per-sample binary data [currently not an official NetPBM type] */ - - if (wpng_info.pnmtype == 5) - rowbytes = wpng_info.width; - else if (wpng_info.pnmtype == 6) - rowbytes = wpng_info.width * 3; - else /* if (wpng_info.pnmtype == 8) */ - rowbytes = wpng_info.width * 4; - - - /* read and write the image, either in its entirety (if writing interlaced - * PNG) or row by row (if non-interlaced) */ - - fprintf(stderr, "Encoding image data...\n"); - fflush(stderr); - - if (wpng_info.interlaced) { - long i; - ulg bytes; - ulg image_bytes = rowbytes * wpng_info.height; /* overflow? */ - - wpng_info.image_data = (uch *)malloc(image_bytes); - wpng_info.row_pointers = (uch **)malloc(wpng_info.height*sizeof(uch *)); - if (wpng_info.image_data == NULL || wpng_info.row_pointers == NULL) { - fprintf(stderr, PROGNAME ": insufficient memory for image data\n"); - writepng_cleanup(&wpng_info); - wpng_cleanup(); - exit(5); - } - for (i = 0; i < wpng_info.height; ++i) - wpng_info.row_pointers[i] = wpng_info.image_data + i*rowbytes; - bytes = fread(wpng_info.image_data, 1, image_bytes, wpng_info.infile); - if (bytes != image_bytes) { - fprintf(stderr, PROGNAME ": expected %lu bytes, got %lu bytes\n", - image_bytes, bytes); - fprintf(stderr, " (continuing anyway)\n"); - } - if (writepng_encode_image(&wpng_info) != 0) { - fprintf(stderr, PROGNAME - ": libpng problem (longjmp) while writing image data\n"); - writepng_cleanup(&wpng_info); - wpng_cleanup(); - exit(2); - } - - } else /* not interlaced: write progressively (row by row) */ { - long j; - ulg bytes; - - wpng_info.image_data = (uch *)malloc(rowbytes); - if (wpng_info.image_data == NULL) { - fprintf(stderr, PROGNAME ": insufficient memory for row data\n"); - writepng_cleanup(&wpng_info); - wpng_cleanup(); - exit(5); - } - error = 0; - for (j = wpng_info.height; j > 0L; --j) { - bytes = fread(wpng_info.image_data, 1, rowbytes, wpng_info.infile); - if (bytes != rowbytes) { - fprintf(stderr, PROGNAME - ": expected %lu bytes, got %lu bytes (row %ld)\n", rowbytes, - bytes, wpng_info.height-j); - ++error; - break; - } - if (writepng_encode_row(&wpng_info) != 0) { - fprintf(stderr, PROGNAME - ": libpng problem (longjmp) while writing row %ld\n", - wpng_info.height-j); - ++error; - break; - } - } - if (error) { - writepng_cleanup(&wpng_info); - wpng_cleanup(); - exit(2); - } - if (writepng_encode_finish(&wpng_info) != 0) { - fprintf(stderr, PROGNAME ": error on final libpng call\n"); - writepng_cleanup(&wpng_info); - wpng_cleanup(); - exit(2); - } - } - - - /* OK, we're done (successfully): clean up all resources and quit */ - - fprintf(stderr, "Done.\n"); - fflush(stderr); - - writepng_cleanup(&wpng_info); - wpng_cleanup(); - - return 0; -} - - - - - -static int wpng_isvalid_latin1(uch *p, int len) -{ - int i, result = -1; - - for (i = 0; i < len; ++i) { - if (p[i] == 10 || (p[i] > 31 && p[i] < 127) || p[i] > 160) - continue; /* character is completely OK */ - if (result < 0 || (p[result] != 27 && p[i] == 27)) - result = i; /* mark location of first questionable one */ - } /* or of first escape character (bad) */ - - return result; -} - - - - - -static void wpng_cleanup(void) -{ - if (wpng_info.outfile) { - fclose(wpng_info.outfile); - wpng_info.outfile = NULL; - } - - if (wpng_info.infile) { - fclose(wpng_info.infile); - wpng_info.infile = NULL; - } - - if (wpng_info.image_data) { - free(wpng_info.image_data); - wpng_info.image_data = NULL; - } - - if (wpng_info.row_pointers) { - free(wpng_info.row_pointers); - wpng_info.row_pointers = NULL; - } -} - - - - -#ifdef DOS_OS2_W32 - -static char *dos_kbd_gets(char *buf, int len) -{ - int ch, count=0; - - do { - buf[count++] = ch = getche(); - } while (ch != '\r' && count < len-1); - - buf[count--] = '\0'; /* terminate string */ - if (buf[count] == '\r') /* Enter key makes CR, so change to newline */ - buf[count] = '\n'; - - fprintf(stderr, "\n"); /* Enter key does *not* cause a newline */ - fflush(stderr); - - return buf; -} - -#endif /* DOS_OS2_W32 */ diff --git a/libpng16/contrib/gregbook/writepng.c b/libpng16/contrib/gregbook/writepng.c deleted file mode 100644 index 0dda62e..0000000 --- a/libpng16/contrib/gregbook/writepng.c +++ /dev/null @@ -1,401 +0,0 @@ -/*--------------------------------------------------------------------------- - - wpng - simple PNG-writing program writepng.c - - --------------------------------------------------------------------------- - - Copyright (c) 1998-2007 Greg Roelofs. All rights reserved. - - This software is provided "as is," without warranty of any kind, - express or implied. In no event shall the author or contributors - be held liable for any damages arising in any way from the use of - this software. - - The contents of this file are DUAL-LICENSED. You may modify and/or - redistribute this software according to the terms of one of the - following two licenses (at your option): - - - LICENSE 1 ("BSD-like with advertising clause"): - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute - it freely, subject to the following restrictions: - - 1. Redistributions of source code must retain the above copyright - notice, disclaimer, and this list of conditions. - 2. Redistributions in binary form must reproduce the above copyright - notice, disclaimer, and this list of conditions in the documenta- - tion and/or other materials provided with the distribution. - 3. All advertising materials mentioning features or use of this - software must display the following acknowledgment: - - This product includes software developed by Greg Roelofs - and contributors for the book, "PNG: The Definitive Guide," - published by O'Reilly and Associates. - - - LICENSE 2 (GNU GPL v2 or later): - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - ---------------------------------------------------------------------------*/ - - -#include /* for exit() prototype */ -#include - -#include "png.h" /* libpng header, includes setjmp.h */ -#include "writepng.h" /* typedefs, common macros, public prototypes */ - - -/* local prototype */ - -static void writepng_error_handler(png_structp png_ptr, png_const_charp msg); - - - -void writepng_version_info(void) -{ - fprintf(stderr, " Compiled with libpng %s; using libpng %s.\n", - PNG_LIBPNG_VER_STRING, png_libpng_ver); - fprintf(stderr, " Compiled with zlib %s; using zlib %s.\n", - ZLIB_VERSION, zlib_version); -} - - - - -/* returns 0 for success, 2 for libpng problem, 4 for out of memory, 11 for - * unexpected pnmtype; note that outfile might be stdout */ - -int writepng_init(mainprog_info *mainprog_ptr) -{ - png_structp png_ptr; /* note: temporary variables! */ - png_infop info_ptr; - int color_type, interlace_type; - - - /* could also replace libpng warning-handler (final NULL), but no need: */ - - png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, mainprog_ptr, - writepng_error_handler, NULL); - if (!png_ptr) - return 4; /* out of memory */ - - info_ptr = png_create_info_struct(png_ptr); - if (!info_ptr) { - png_destroy_write_struct(&png_ptr, NULL); - return 4; /* out of memory */ - } - - - /* setjmp() must be called in every function that calls a PNG-writing - * libpng function, unless an alternate error handler was installed-- - * but compatible error handlers must either use longjmp() themselves - * (as in this program) or some other method to return control to - * application code, so here we go: */ - - if (setjmp(mainprog_ptr->jmpbuf)) { - png_destroy_write_struct(&png_ptr, &info_ptr); - return 2; - } - - - /* make sure outfile is (re)opened in BINARY mode */ - - png_init_io(png_ptr, mainprog_ptr->outfile); - - - /* set the compression levels--in general, always want to leave filtering - * turned on (except for palette images) and allow all of the filters, - * which is the default; want 32K zlib window, unless entire image buffer - * is 16K or smaller (unknown here)--also the default; usually want max - * compression (NOT the default); and remaining compression flags should - * be left alone */ - - png_set_compression_level(png_ptr, Z_BEST_COMPRESSION); -/* - >> this is default for no filtering; Z_FILTERED is default otherwise: - png_set_compression_strategy(png_ptr, Z_DEFAULT_STRATEGY); - >> these are all defaults: - png_set_compression_mem_level(png_ptr, 8); - png_set_compression_window_bits(png_ptr, 15); - png_set_compression_method(png_ptr, 8); - */ - - - /* set the image parameters appropriately */ - - if (mainprog_ptr->pnmtype == 5) - color_type = PNG_COLOR_TYPE_GRAY; - else if (mainprog_ptr->pnmtype == 6) - color_type = PNG_COLOR_TYPE_RGB; - else if (mainprog_ptr->pnmtype == 8) - color_type = PNG_COLOR_TYPE_RGB_ALPHA; - else { - png_destroy_write_struct(&png_ptr, &info_ptr); - return 11; - } - - interlace_type = mainprog_ptr->interlaced? PNG_INTERLACE_ADAM7 : - PNG_INTERLACE_NONE; - - png_set_IHDR(png_ptr, info_ptr, mainprog_ptr->width, mainprog_ptr->height, - mainprog_ptr->sample_depth, color_type, interlace_type, - PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); - - if (mainprog_ptr->gamma > 0.0) - png_set_gAMA(png_ptr, info_ptr, mainprog_ptr->gamma); - - if (mainprog_ptr->have_bg) { /* we know it's RGBA, not gray+alpha */ - png_color_16 background; - - background.red = mainprog_ptr->bg_red; - background.green = mainprog_ptr->bg_green; - background.blue = mainprog_ptr->bg_blue; - png_set_bKGD(png_ptr, info_ptr, &background); - } - - if (mainprog_ptr->have_time) { - png_time modtime; - - png_convert_from_time_t(&modtime, mainprog_ptr->modtime); - png_set_tIME(png_ptr, info_ptr, &modtime); - } - - if (mainprog_ptr->have_text) { - png_text text[6]; - int num_text = 0; - - if (mainprog_ptr->have_text & TEXT_TITLE) { - text[num_text].compression = PNG_TEXT_COMPRESSION_NONE; - text[num_text].key = "Title"; - text[num_text].text = mainprog_ptr->title; - ++num_text; - } - if (mainprog_ptr->have_text & TEXT_AUTHOR) { - text[num_text].compression = PNG_TEXT_COMPRESSION_NONE; - text[num_text].key = "Author"; - text[num_text].text = mainprog_ptr->author; - ++num_text; - } - if (mainprog_ptr->have_text & TEXT_DESC) { - text[num_text].compression = PNG_TEXT_COMPRESSION_NONE; - text[num_text].key = "Description"; - text[num_text].text = mainprog_ptr->desc; - ++num_text; - } - if (mainprog_ptr->have_text & TEXT_COPY) { - text[num_text].compression = PNG_TEXT_COMPRESSION_NONE; - text[num_text].key = "Copyright"; - text[num_text].text = mainprog_ptr->copyright; - ++num_text; - } - if (mainprog_ptr->have_text & TEXT_EMAIL) { - text[num_text].compression = PNG_TEXT_COMPRESSION_NONE; - text[num_text].key = "E-mail"; - text[num_text].text = mainprog_ptr->email; - ++num_text; - } - if (mainprog_ptr->have_text & TEXT_URL) { - text[num_text].compression = PNG_TEXT_COMPRESSION_NONE; - text[num_text].key = "URL"; - text[num_text].text = mainprog_ptr->url; - ++num_text; - } - png_set_text(png_ptr, info_ptr, text, num_text); - } - - - /* write all chunks up to (but not including) first IDAT */ - - png_write_info(png_ptr, info_ptr); - - - /* if we wanted to write any more text info *after* the image data, we - * would set up text struct(s) here and call png_set_text() again, with - * just the new data; png_set_tIME() could also go here, but it would - * have no effect since we already called it above (only one tIME chunk - * allowed) */ - - - /* set up the transformations: for now, just pack low-bit-depth pixels - * into bytes (one, two or four pixels per byte) */ - - png_set_packing(png_ptr); -/* png_set_shift(png_ptr, &sig_bit); to scale low-bit-depth values */ - - - /* make sure we save our pointers for use in writepng_encode_image() */ - - mainprog_ptr->png_ptr = png_ptr; - mainprog_ptr->info_ptr = info_ptr; - - - /* OK, that's all we need to do for now; return happy */ - - return 0; -} - - - - - -/* returns 0 for success, 2 for libpng (longjmp) problem */ - -int writepng_encode_image(mainprog_info *mainprog_ptr) -{ - png_structp png_ptr = (png_structp)mainprog_ptr->png_ptr; - png_infop info_ptr = (png_infop)mainprog_ptr->info_ptr; - - - /* as always, setjmp() must be called in every function that calls a - * PNG-writing libpng function */ - - if (setjmp(mainprog_ptr->jmpbuf)) { - png_destroy_write_struct(&png_ptr, &info_ptr); - mainprog_ptr->png_ptr = NULL; - mainprog_ptr->info_ptr = NULL; - return 2; - } - - - /* and now we just write the whole image; libpng takes care of interlacing - * for us */ - - png_write_image(png_ptr, mainprog_ptr->row_pointers); - - - /* since that's it, we also close out the end of the PNG file now--if we - * had any text or time info to write after the IDATs, second argument - * would be info_ptr, but we optimize slightly by sending NULL pointer: */ - - png_write_end(png_ptr, NULL); - - return 0; -} - - - - - -/* returns 0 if succeeds, 2 if libpng problem */ - -int writepng_encode_row(mainprog_info *mainprog_ptr) /* NON-interlaced only! */ -{ - png_structp png_ptr = (png_structp)mainprog_ptr->png_ptr; - png_infop info_ptr = (png_infop)mainprog_ptr->info_ptr; - - - /* as always, setjmp() must be called in every function that calls a - * PNG-writing libpng function */ - - if (setjmp(mainprog_ptr->jmpbuf)) { - png_destroy_write_struct(&png_ptr, &info_ptr); - mainprog_ptr->png_ptr = NULL; - mainprog_ptr->info_ptr = NULL; - return 2; - } - - - /* image_data points at our one row of image data */ - - png_write_row(png_ptr, mainprog_ptr->image_data); - - return 0; -} - - - - - -/* returns 0 if succeeds, 2 if libpng problem */ - -int writepng_encode_finish(mainprog_info *mainprog_ptr) /* NON-interlaced! */ -{ - png_structp png_ptr = (png_structp)mainprog_ptr->png_ptr; - png_infop info_ptr = (png_infop)mainprog_ptr->info_ptr; - - - /* as always, setjmp() must be called in every function that calls a - * PNG-writing libpng function */ - - if (setjmp(mainprog_ptr->jmpbuf)) { - png_destroy_write_struct(&png_ptr, &info_ptr); - mainprog_ptr->png_ptr = NULL; - mainprog_ptr->info_ptr = NULL; - return 2; - } - - - /* close out PNG file; if we had any text or time info to write after - * the IDATs, second argument would be info_ptr: */ - - png_write_end(png_ptr, NULL); - - return 0; -} - - - - - -void writepng_cleanup(mainprog_info *mainprog_ptr) -{ - png_structp png_ptr = (png_structp)mainprog_ptr->png_ptr; - png_infop info_ptr = (png_infop)mainprog_ptr->info_ptr; - - if (png_ptr && info_ptr) - png_destroy_write_struct(&png_ptr, &info_ptr); -} - - - - - -static void writepng_error_handler(png_structp png_ptr, png_const_charp msg) -{ - mainprog_info *mainprog_ptr; - - /* This function, aside from the extra step of retrieving the "error - * pointer" (below) and the fact that it exists within the application - * rather than within libpng, is essentially identical to libpng's - * default error handler. The second point is critical: since both - * setjmp() and longjmp() are called from the same code, they are - * guaranteed to have compatible notions of how big a jmp_buf is, - * regardless of whether _BSD_SOURCE or anything else has (or has not) - * been defined. */ - - fprintf(stderr, "writepng libpng error: %s\n", msg); - fflush(stderr); - - mainprog_ptr = png_get_error_ptr(png_ptr); - if (mainprog_ptr == NULL) { /* we are completely hosed now */ - fprintf(stderr, - "writepng severe error: jmpbuf not recoverable; terminating.\n"); - fflush(stderr); - exit(99); - } - - /* Now we have our data structure we can use the information in it - * to return control to our own higher level code (all the points - * where 'setjmp' is called in this file.) This will work with other - * error handling mechanisms as well - libpng always calls png_error - * when it can proceed no further, thus, so long as the error handler - * is intercepted, application code can do its own error recovery. - */ - longjmp(mainprog_ptr->jmpbuf, 1); -} diff --git a/libpng16/contrib/gregbook/writepng.h b/libpng16/contrib/gregbook/writepng.h deleted file mode 100644 index 78b966b..0000000 --- a/libpng16/contrib/gregbook/writepng.h +++ /dev/null @@ -1,133 +0,0 @@ -/*--------------------------------------------------------------------------- - - wpng - simple PNG-writing program writepng.h - - --------------------------------------------------------------------------- - - Copyright (c) 1998-2007 Greg Roelofs. All rights reserved. - - This software is provided "as is," without warranty of any kind, - express or implied. In no event shall the author or contributors - be held liable for any damages arising in any way from the use of - this software. - - The contents of this file are DUAL-LICENSED. You may modify and/or - redistribute this software according to the terms of one of the - following two licenses (at your option): - - - LICENSE 1 ("BSD-like with advertising clause"): - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute - it freely, subject to the following restrictions: - - 1. Redistributions of source code must retain the above copyright - notice, disclaimer, and this list of conditions. - 2. Redistributions in binary form must reproduce the above copyright - notice, disclaimer, and this list of conditions in the documenta- - tion and/or other materials provided with the distribution. - 3. All advertising materials mentioning features or use of this - software must display the following acknowledgment: - - This product includes software developed by Greg Roelofs - and contributors for the book, "PNG: The Definitive Guide," - published by O'Reilly and Associates. - - - LICENSE 2 (GNU GPL v2 or later): - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - ---------------------------------------------------------------------------*/ - -#ifndef TRUE -# define TRUE 1 -# define FALSE 0 -#endif - -#ifndef MAX -# define MAX(a,b) ((a) > (b)? (a) : (b)) -# define MIN(a,b) ((a) < (b)? (a) : (b)) -#endif - -#ifdef DEBUG -# define Trace(x) {fprintf x ; fflush(stderr); fflush(stdout);} -#else -# define Trace(x) ; -#endif - -#define TEXT_TITLE 0x01 -#define TEXT_AUTHOR 0x02 -#define TEXT_DESC 0x04 -#define TEXT_COPY 0x08 -#define TEXT_EMAIL 0x10 -#define TEXT_URL 0x20 - -#define TEXT_TITLE_OFFSET 0 -#define TEXT_AUTHOR_OFFSET 72 -#define TEXT_COPY_OFFSET (2*72) -#define TEXT_EMAIL_OFFSET (3*72) -#define TEXT_URL_OFFSET (4*72) -#define TEXT_DESC_OFFSET (5*72) - -typedef unsigned char uch; -typedef unsigned short ush; -typedef unsigned long ulg; - -typedef struct _mainprog_info { - double gamma; - long width; - long height; - time_t modtime; - FILE *infile; - FILE *outfile; - void *png_ptr; - void *info_ptr; - uch *image_data; - uch **row_pointers; - char *title; - char *author; - char *desc; - char *copyright; - char *email; - char *url; - int filter; /* command-line-filter flag, not PNG row filter! */ - int pnmtype; - int sample_depth; - int interlaced; - int have_bg; - int have_time; - int have_text; - jmp_buf jmpbuf; - uch bg_red; - uch bg_green; - uch bg_blue; -} mainprog_info; - - -/* prototypes for public functions in writepng.c */ - -void writepng_version_info(void); - -int writepng_init(mainprog_info *mainprog_ptr); - -int writepng_encode_image(mainprog_info *mainprog_ptr); - -int writepng_encode_row(mainprog_info *mainprog_ptr); - -int writepng_encode_finish(mainprog_info *mainprog_ptr); - -void writepng_cleanup(mainprog_info *mainprog_ptr); diff --git a/libpng16/contrib/libtests/fakepng.c b/libpng16/contrib/libtests/fakepng.c deleted file mode 100644 index ba360d1..0000000 --- a/libpng16/contrib/libtests/fakepng.c +++ /dev/null @@ -1,57 +0,0 @@ -/* Fake a PNG - just write it out directly. */ -#include -#include /* for crc32 */ - -void -put_uLong(uLong val) -{ - putchar(val >> 24); - putchar(val >> 16); - putchar(val >> 8); - putchar(val >> 0); -} - -void -put_chunk(const unsigned char *chunk, uInt length) -{ - uLong crc; - - put_uLong(length-4); /* Exclude the tag */ - - fwrite(chunk, length, 1, stdout); - - crc = crc32(0, Z_NULL, 0); - put_uLong(crc32(crc, chunk, length)); -} - -const unsigned char signature[] = -{ - 137, 80, 78, 71, 13, 10, 26, 10 -}; - -const unsigned char IHDR[] = -{ - 73, 72, 68, 82, /* IHDR */ - 0, 0, 0, 1, /* width */ - 0, 0, 0, 1, /* height */ - 1, /* bit depth */ - 0, /* color type: greyscale */ - 0, /* compression method */ - 0, /* filter method */ - 0 /* interlace method: none */ -}; - -const unsigned char unknown[] = -{ - 'u', 'n', 'K', 'n' /* "unKn" - private safe to copy */ -}; - -int -main(void) -{ - fwrite(signature, sizeof signature, 1, stdout); - put_chunk(IHDR, sizeof IHDR); - - for(;;) - put_chunk(unknown, sizeof unknown); -} diff --git a/libpng16/contrib/libtests/gentests.sh b/libpng16/contrib/libtests/gentests.sh deleted file mode 100644 index f0f8d23..0000000 --- a/libpng16/contrib/libtests/gentests.sh +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2013 John Cunningham Bowler -# -# Last changed in libpng 1.6.0 [February 14, 2013] -# -# This code is released under the libpng license. -# For conditions of distribution and use, see the disclaimer -# and license in png.h -# -# Generate a set of PNG test images. The images are generated in a -# sub-directory called 'tests' by default, however a command line argument will -# change that name. The generation requires a built version of makepng in the -# current directory. -# -usage(){ - exec >&2 - echo "$0 []" - echo ' Generate a set of PNG test files in "directory" ("tests" by default)' - exit 1 -} - -mp="$PWD/makepng" -test -x "$mp" || { - exec >&2 - echo "$0: the 'makepng' program must exist" - echo " in the directory within which this program:" - echo " $mp" - echo " is executed" - usage -} - -# Just one argument: the directory -testdir="tests" -test $# -gt 1 && { - testdir="$1" - shift -} -test $# -eq 0 || usage - -# Take care not to clobber something -if test -e "$testdir" -then - test -d "$testdir" || usage -else - # mkdir -p isn't portable, so do the following - mkdir "$testdir" 2>/dev/null || mkdir -p "$testdir" || usage -fi - -# This fails in a very satisfactory way if it's not accessible -cd "$testdir" -:>"test$$.png" || { - exec >&2 - echo "$testdir: directory not writable" - usage -} -rm "test$$.png" || { - exec >&2 - echo "$testdir: you have create but not write privileges here." - echo " This is unexpected. You have a spurion; "'"'"test$$.png"'"'"." - echo " You need to remove this yourself. Try a different directory." - exit 1 -} - -# Now call makepng ($mp) to create every file we can think of with a -# reasonable name -doit(){ - for gamma in "" --sRGB --linear --1.8 - do - case "$gamma" in - "") - gname=;; - --sRGB) - gname="-srgb";; - --linear) - gname="-lin";; - --1.8) - gname="-18";; - *) - gname="-$gamma";; - esac - "$mp" $gamma "$1" "$2" "test-$1-$2$gname.png" - done -} -# -for ct in gray palette -do - for bd in 1 2 4 8 - do - doit "$ct" "$bd" - done -done -# -doit "gray" "16" -# -for ct in gray-alpha rgb rgb-alpha -do - for bd in 8 16 - do - doit "$ct" "$bd" - done -done diff --git a/libpng16/contrib/libtests/makepng.c b/libpng16/contrib/libtests/makepng.c deleted file mode 100644 index 9f11b29..0000000 --- a/libpng16/contrib/libtests/makepng.c +++ /dev/null @@ -1,1486 +0,0 @@ -/* makepng.c - * - * Copyright (c) 2013 John Cunningham Bowler - * - * Last changed in libpng 1.6.1 [March 28, 2013] - * - * This code is released under the libpng license. - * For conditions of distribution and use, see the disclaimer - * and license in png.h - * - * Make a test PNG image. The arguments are as follows: - * - * makepng [--sRGB|--linear|--1.8] [--color=] color-type bit-depth \ - * [file-name] - * - * The color-type may be numeric (and must match the numbers used by the PNG - * specification) or one of the format names listed below. The bit-depth is the - * component bit depth, or the pixel bit-depth for a color-mapped image. - * - * Without any options no color-space information is written, with the options - * an sRGB or the appropriate gAMA chunk is written. "1.8" refers to the - * display system used on older Apple computers to correct for high ambient - * light levels in the viewing environment; it applies a transform of - * approximately value^(1/1.45) to the color values and so a gAMA chunk of 65909 - * is written (1.45/2.2). - * - * The image data is generated internally. Unless --color is given the images - * used are as follows: - * - * 1 channel: a square image with a diamond, the least luminous colors are on - * the edge of the image, the most luminous in the center. - * - * 2 channels: the color channel increases in luminosity from top to bottom, the - * alpha channel increases in opacity from left to right. - * - * 3 channels: linear combinations of, from the top-left corner clockwise, - * black, green, white, red. - * - * 4 channels: linear combinations of, from the top-left corner clockwise, - * transparent, red, green, blue. - * - * For color-mapped images a four channel color-map is used and the PNG file has - * a tRNS chunk, as follows: - * - * 1-bit: entry 0 is transparent-red, entry 1 is opaque-white - * 2-bit: entry 0: transparent-green - * entry 1: 40%-red - * entry 2: 80%-blue - * entry 3: opaque-white - * 4-bit: the 16 combinations of the 2-bit case - * 8-bit: the 256 combinations of the 4-bit case - * - * The palette always has 2^bit-depth entries and the tRNS chunk one fewer. The - * image is the 1-channel diamond, but using palette index, not luminosity. - * - * Image size is determined by the final pixel depth in bits, i.e. channels x - * bit-depth, as follows: - * - * 8 bits or less: 64x64 - * 16 bits: 256x256 - * More than 16 bits: 1024x1024 - * - * Row filtering is turned off (the 'none' filter is used on every row) and the - * images are not interlaced. - * - * If --color is given then the whole image has that color, color-mapped images - * will have exactly one palette entry and all image files with be 16x16 in - * size. The color value is 1 to 4 decimal numbers as appropriate for the color - * type. - * - * If file-name is given then the PNG is written to that file, else it is - * written to stdout. Notice that stdout is not supported on systems where, by - * default, it assumes text output; this program makes no attempt to change the - * text mode of stdout! - */ -#define _ISOC99_SOURCE /* for strtoull */ - -#include /* for offsetof */ -#include -#include -#include -#include -#include -#include - -#if defined(HAVE_CONFIG_H) && !defined(PNG_NO_CONFIG_H) -# include -#endif - -/* Define the following to use this test against your installed libpng, rather - * than the one being built here: - */ -#ifdef PNG_FREESTANDING_TESTS -# include -#else -# include "../../png.h" -#endif - -/* This structure is used for inserting extra chunks (the --insert argument, not - * documented above.) - */ -typedef struct chunk_insert -{ - struct chunk_insert *next; - void (*insert)(png_structp, png_infop, int, png_charpp); - int nparams; - png_charp parameters[1]; -} chunk_insert; - -static int -channels_of_type(int color_type) -{ - if (color_type & PNG_COLOR_MASK_PALETTE) - return 1; - - else - { - int channels = 1; - - if (color_type & PNG_COLOR_MASK_COLOR) - channels = 3; - - if (color_type & PNG_COLOR_MASK_ALPHA) - return channels + 1; - - else - return channels; - } -} - -static int -pixel_depth_of_type(int color_type, int bit_depth) -{ - return channels_of_type(color_type) * bit_depth; -} - -static unsigned int -image_size_of_type(int color_type, int bit_depth, unsigned int *colors) -{ - if (*colors) - return 16; - - else - { - int pixel_depth = pixel_depth_of_type(color_type, bit_depth); - - if (pixel_depth < 8) - return 64; - - else if (pixel_depth > 16) - return 1024; - - else - return 256; - } -} - -static void -set_color(png_colorp color, png_bytep trans, unsigned int red, - unsigned int green, unsigned int blue, unsigned int alpha, - png_const_bytep gamma_table) -{ - color->red = gamma_table[red]; - color->green = gamma_table[green]; - color->blue = gamma_table[blue]; - *trans = (png_byte)alpha; -} - -static int -generate_palette(png_colorp palette, png_bytep trans, int bit_depth, - png_const_bytep gamma_table, unsigned int *colors) -{ - /* - * 1-bit: entry 0 is transparent-red, entry 1 is opaque-white - * 2-bit: entry 0: transparent-green - * entry 1: 40%-red - * entry 2: 80%-blue - * entry 3: opaque-white - * 4-bit: the 16 combinations of the 2-bit case - * 8-bit: the 256 combinations of the 4-bit case - */ - switch (colors[0]) - { - default: - fprintf(stderr, "makepng: --colors=...: invalid count %u\n", - colors[0]); - exit(1); - - case 1: - set_color(palette+0, trans+0, colors[1], colors[1], colors[1], 255, - gamma_table); - return 1; - - case 2: - set_color(palette+0, trans+0, colors[1], colors[1], colors[1], - colors[2], gamma_table); - return 1; - - case 3: - set_color(palette+0, trans+0, colors[1], colors[2], colors[3], 255, - gamma_table); - return 1; - - case 4: - set_color(palette+0, trans+0, colors[1], colors[2], colors[3], - colors[4], gamma_table); - return 1; - - case 0: - if (bit_depth == 1) - { - set_color(palette+0, trans+0, 255, 0, 0, 0, gamma_table); - set_color(palette+1, trans+1, 255, 255, 255, 255, gamma_table); - return 2; - } - - else - { - unsigned int size = 1U << (bit_depth/2); /* 2, 4 or 16 */ - unsigned int x, y, ip; - - for (x=0; x> 3; - - if (offset < rowbytes && (bit_depth < 16 || offset+1 < rowbytes)) - { - row += offset; - - switch (bit_depth) - { - case 1: - case 2: - case 4: - /* Don't gamma correct - values get smashed */ - { - unsigned int shift = (8 - bit_depth) - (x & 0x7U); - - mask <<= shift; - value = (value << shift) & mask; - *row = (png_byte)((*row & ~mask) | value); - } - return; - - default: - fprintf(stderr, "makepng: bad bit depth (internal error)\n"); - exit(1); - - case 16: - value = (unsigned int)floor(65535*pow(value/65535.,conv)+.5); - *row++ = (png_byte)(value >> 8); - *row = (png_byte)value; - return; - - case 8: - *row = gamma_table[value]; - return; - } - } - - else - { - fprintf(stderr, "makepng: row buffer overflow (internal error)\n"); - exit(1); - } - } - - else - { - fprintf(stderr, "makepng: component overflow (internal error)\n"); - exit(1); - } -} - -static void -generate_row(png_bytep row, size_t rowbytes, unsigned int y, int color_type, - int bit_depth, png_const_bytep gamma_table, double conv, - unsigned int *colors) -{ - png_uint_32 size_max = image_size_of_type(color_type, bit_depth, colors)-1; - png_uint_32 depth_max = (1U << bit_depth)-1; /* up to 65536 */ - - if (colors[0] == 0) switch (channels_of_type(color_type)) - { - /* 1 channel: a square image with a diamond, the least luminous colors are on - * the edge of the image, the most luminous in the center. - */ - case 1: - { - png_uint_32 x; - png_uint_32 base = 2*size_max - abs(2*y-size_max); - - for (x=0; x<=size_max; ++x) - { - png_uint_32 luma = base - abs(2*x-size_max); - - /* 'luma' is now in the range 0..2*size_max, we need - * 0..depth_max - */ - luma = (luma*depth_max + size_max) / (2*size_max); - set_value(row, rowbytes, x, bit_depth, luma, gamma_table, conv); - } - } - break; - - /* 2 channels: the color channel increases in luminosity from top to bottom, - * the alpha channel increases in opacity from left to right. - */ - case 2: - { - png_uint_32 alpha = (depth_max * y * 2 + size_max) / (2 * size_max); - png_uint_32 x; - - for (x=0; x<=size_max; ++x) - { - set_value(row, rowbytes, 2*x, bit_depth, - (depth_max * x * 2 + size_max) / (2 * size_max), gamma_table, - conv); - set_value(row, rowbytes, 2*x+1, bit_depth, alpha, gamma_table, - conv); - } - } - break; - - /* 3 channels: linear combinations of, from the top-left corner clockwise, - * black, green, white, red. - */ - case 3: - { - /* x0: the black->red scale (the value of the red component) at the - * start of the row (blue and green are 0). - * x1: the green->white scale (the value of the red and blue - * components at the end of the row; green is depth_max). - */ - png_uint_32 Y = (depth_max * y * 2 + size_max) / (2 * size_max); - png_uint_32 x; - - /* Interpolate x/depth_max from start to end: - * - * start end difference - * red: Y Y 0 - * green: 0 depth_max depth_max - * blue: 0 Y Y - */ - for (x=0; x<=size_max; ++x) - { - set_value(row, rowbytes, 3*x+0, bit_depth, /* red */ Y, - gamma_table, conv); - set_value(row, rowbytes, 3*x+1, bit_depth, /* green */ - (depth_max * x * 2 + size_max) / (2 * size_max), - gamma_table, conv); - set_value(row, rowbytes, 3*x+2, bit_depth, /* blue */ - (Y * x * 2 + size_max) / (2 * size_max), - gamma_table, conv); - } - } - break; - - /* 4 channels: linear combinations of, from the top-left corner clockwise, - * transparent, red, green, blue. - */ - case 4: - { - /* x0: the transparent->blue scale (the value of the blue and alpha - * components) at the start of the row (red and green are 0). - * x1: the red->green scale (the value of the red and green - * components at the end of the row; blue is 0 and alpha is - * depth_max). - */ - png_uint_32 Y = (depth_max * y * 2 + size_max) / (2 * size_max); - png_uint_32 x; - - /* Interpolate x/depth_max from start to end: - * - * start end difference - * red: 0 depth_max-Y depth_max-Y - * green: 0 Y Y - * blue: Y 0 -Y - * alpha: Y depth_max depth_max-Y - */ - for (x=0; x<=size_max; ++x) - { - set_value(row, rowbytes, 4*x+0, bit_depth, /* red */ - ((depth_max-Y) * x * 2 + size_max) / (2 * size_max), - gamma_table, conv); - set_value(row, rowbytes, 4*x+1, bit_depth, /* green */ - (Y * x * 2 + size_max) / (2 * size_max), - gamma_table, conv); - set_value(row, rowbytes, 4*x+2, bit_depth, /* blue */ - Y - (Y * x * 2 + size_max) / (2 * size_max), - gamma_table, conv); - set_value(row, rowbytes, 4*x+3, bit_depth, /* alpha */ - Y + ((depth_max-Y) * x * 2 + size_max) / (2 * size_max), - gamma_table, conv); - } - } - break; - - default: - fprintf(stderr, "makepng: internal bad channel count\n"); - exit(2); - } - - else if (color_type & PNG_COLOR_MASK_PALETTE) - { - /* Palette with fixed color: the image rows are all 0 and the image width - * is 16. - */ - memset(row, 0, rowbytes); - } - - else if (colors[0] == channels_of_type(color_type)) - switch (channels_of_type(color_type)) - { - case 1: - { - const png_uint_32 luma = colors[1]; - png_uint_32 x; - - for (x=0; x<=size_max; ++x) - set_value(row, rowbytes, x, bit_depth, luma, gamma_table, - conv); - } - break; - - case 2: - { - const png_uint_32 luma = colors[1]; - const png_uint_32 alpha = colors[2]; - png_uint_32 x; - - for (x=0; x 0 && gamma < 1000) - gamma = PNG_FP_1; - - if (gamma > 0) - real_gamma = gamma; - - { - unsigned int i; - - if (real_gamma == 45455) for (i=0; i<256; ++i) - { - gamma_table[i] = (png_byte)i; - conv = 1.; - } - - else - { - /* Convert 'i' from sRGB (45455) to real_gamma, this makes - * the images look the same regardless of the gAMA chunk. - */ - conv = real_gamma; - conv /= 45455; - - gamma_table[0] = 0; - - for (i=1; i<255; ++i) - gamma_table[i] = (png_byte)floor(pow(i/255.,conv) * 255 + .5); - - gamma_table[255] = 255; - } - } - - png_set_IHDR(png_ptr, info_ptr, size, size, bit_depth, color_type, - PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - - if (color_type & PNG_COLOR_MASK_PALETTE) - { - int npalette; - png_color palette[256]; - png_byte trans[256]; - - npalette = generate_palette(palette, trans, bit_depth, gamma_table, - colors); - png_set_PLTE(png_ptr, info_ptr, palette, npalette); - png_set_tRNS(png_ptr, info_ptr, trans, npalette-1, - NULL/*transparent color*/); - - /* Reset gamma_table to prevent the image rows being changed */ - for (npalette=0; npalette<256; ++npalette) - gamma_table[npalette] = (png_byte)npalette; - } - - if (gamma == PNG_DEFAULT_sRGB) - png_set_sRGB(png_ptr, info_ptr, PNG_sRGB_INTENT_ABSOLUTE); - - else if (gamma > 0) /* Else don't set color space information */ - { - png_set_gAMA_fixed(png_ptr, info_ptr, real_gamma); - - /* Just use the sRGB values here. */ - png_set_cHRM_fixed(png_ptr, info_ptr, - /* color x y */ - /* white */ 31270, 32900, - /* red */ 64000, 33000, - /* green */ 30000, 60000, - /* blue */ 15000, 6000 - ); - } - - /* Insert extra information. */ - while (insert != NULL) - { - insert->insert(png_ptr, info_ptr, insert->nparams, insert->parameters); - insert = insert->next; - } - - /* Write the file header. */ - png_write_info(png_ptr, info_ptr); - - /* Restrict the filters */ - png_set_filter(png_ptr, PNG_FILTER_TYPE_BASE, filters); - - { - int passes = png_set_interlace_handling(png_ptr); - int pass; - png_size_t rowbytes = png_get_rowbytes(png_ptr, info_ptr); - - row = malloc(rowbytes); - - if (row == NULL) - png_error(png_ptr, "OOM allocating row buffer"); - - for (pass = 0; pass < passes; ++pass) - { - unsigned int y; - - for (y=0; y 0) - { - /* Round up to a multiple of 4 here to allow an iCCP profile - * to be padded to a 4x boundary. - */ - png_bytep data = malloc((total+3)&~3); - - if (data != NULL) - { - size_t new_size = 0; - - for (;;) - { - ch = getc(fp); - if (ch == EOF) break; - data[new_size++] = (png_byte)ch; - } - - if (ferror(fp) || new_size != total) - { - perror("temporary file"); - fprintf(stderr, "temporary file read error\n"); - free(data); - } - - else - { - (void)fclose(fp); - *result = data; - return total; - } - } - - else - fprintf(stderr, "%s: out of memory loading file\n", name); - } - - else - fprintf(stderr, "%s: empty file\n", name); - } - } - } - - else - { - perror(name); - fprintf(stderr, "%s: open failed\n", name); - } - - fclose(fp); - } - - else - fprintf(stderr, "makepng: %s: could not open temporary file\n", name); - - exit(1); - return 0; -} - -static png_size_t -load_fake(png_charp param, png_bytepp profile) -{ - char *endptr = NULL; - unsigned long long int size = strtoull(param, &endptr, 0/*base*/); - - /* The 'fake' format is *[string] */ - if (endptr != NULL && *endptr == '*') - { - size_t len = strlen(++endptr); - size_t result = (size_t)size; - - if (len == 0) len = 1; /* capture the terminating '\0' */ - - /* Now repeat that string to fill 'size' bytes. */ - if (result == size && (*profile = malloc(result)) != NULL) - { - png_bytep out = *profile; - - if (len == 1) - memset(out, *endptr, result); - - else - { - while (size >= len) - { - memcpy(out, endptr, len); - out += len; - size -= len; - } - memcpy(out, endptr, size); - } - - return result; - } - - else - { - fprintf(stderr, "%s: size exceeds system limits\n", param); - exit(1); - } - } - - return 0; -} - -static void -check_param_count(int nparams, int expect) -{ - if (nparams != expect) - { - fprintf(stderr, "bad parameter count (internal error)\n"); - exit(1); - } -} - -static void -insert_iCCP(png_structp png_ptr, png_infop info_ptr, int nparams, - png_charpp params) -{ - png_bytep profile = NULL; - png_uint_32 proflen = 0; - int result; - - check_param_count(nparams, 2); - - switch (params[1][0]) - { - case '<': - { - png_size_t filelen = load_file(params[1]+1, &profile); - if (filelen > 0xfffffffc) /* Maximum profile length */ - { - fprintf(stderr, "%s: file too long (%lu) for an ICC profile\n", - params[1]+1, (unsigned long)filelen); - exit(1); - } - - proflen = (png_uint_32)filelen; - } - break; - - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': - { - png_size_t fake_len = load_fake(params[1], &profile); - - if (fake_len > 0) /* else a simple parameter */ - { - if (fake_len > 0xffffffff) /* Maximum profile length */ - { - fprintf(stderr, - "%s: fake data too long (%lu) for an ICC profile\n", - params[1], (unsigned long)fake_len); - exit(1); - } - proflen = (png_uint_32)(fake_len & ~3U); - /* Always fix up the profile length. */ - png_save_uint_32(profile, proflen); - break; - } - } - - default: - fprintf(stderr, "--insert iCCP \"%s\": unrecognized\n", params[1]); - fprintf(stderr, " use '<' to read a file: \" 3) - { - png_uint_32 prof_header = png_get_uint_32(profile); - - if (prof_header != proflen) - { - fprintf(stderr, "--insert iCCP %s: profile length field wrong:\n", - params[1]); - fprintf(stderr, " actual %lu, recorded value %lu (corrected)\n", - (unsigned long)proflen, (unsigned long)prof_header); - png_save_uint_32(profile, proflen); - } - } - - if (result && profile != NULL && proflen >=4) - png_set_iCCP(png_ptr, info_ptr, params[0], PNG_COMPRESSION_TYPE_BASE, - profile, proflen); - - if (profile) - free(profile); - - if (!result) - exit(1); -} - -static void -clear_text(png_text *text, png_charp keyword) -{ - text->compression = -1; /* none */ - text->key = keyword; - text->text = NULL; - text->text_length = 0; /* libpng calculates this */ - text->itxt_length = 0; /* libpng calculates this */ - text->lang = NULL; - text->lang_key = NULL; -} - -static void -set_text(png_structp png_ptr, png_infop info_ptr, png_textp text, - png_charp param) -{ - switch (param[0]) - { - case '<': - { - png_bytep file = NULL; - - text->text_length = load_file(param+1, &file); - text->text = (png_charp)file; - } - break; - - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': - { - png_bytep data = NULL; - png_size_t fake_len = load_fake(param, &data); - - if (fake_len > 0) /* else a simple parameter */ - { - text->text_length = fake_len; - text->text = (png_charp)data; - break; - } - } - - default: - text->text = param; - break; - } - - png_set_text(png_ptr, info_ptr, text, 1); - - if (text->text != param) - free(text->text); -} - -static void -insert_tEXt(png_structp png_ptr, png_infop info_ptr, int nparams, - png_charpp params) -{ - png_text text; - - check_param_count(nparams, 2); - clear_text(&text, params[0]); - set_text(png_ptr, info_ptr, &text, params[1]); -} - -static void -insert_zTXt(png_structp png_ptr, png_infop info_ptr, int nparams, - png_charpp params) -{ - png_text text; - - check_param_count(nparams, 2); - clear_text(&text, params[0]); - text.compression = 0; /* deflate */ - set_text(png_ptr, info_ptr, &text, params[1]); -} - -static void -insert_iTXt(png_structp png_ptr, png_infop info_ptr, int nparams, - png_charpp params) -{ - png_text text; - - check_param_count(nparams, 4); - clear_text(&text, params[0]); - text.compression = 2; /* iTXt + deflate */ - text.lang = params[1];/* language tag */ - text.lang_key = params[2]; /* translated keyword */ - set_text(png_ptr, info_ptr, &text, params[3]); -} - -static void -insert_hIST(png_structp png_ptr, png_infop info_ptr, int nparams, png_charpp params) -{ - int i; - png_uint_16 freq[256]; - - /* libpng takes the count from the PLTE count; we don't check it here but we - * do set the array to 0 for unspecified entries. - */ - memset(freq, 0, sizeof freq); - for (i=0; inext = NULL; - cip->insert = insert; - cip->nparams = nparams; - for (i=0; iparameters[i] = list[i]; - - return cip; -} - -static chunk_insert * -find_insert(png_const_charp what, png_charp param) -{ - png_uint_32 chunk = 0; - png_charp parameter_list[1024]; - int i, nparams; - - /* Assemble the chunk name */ - for (i=0; i<4; ++i) - { - char ch = what[i]; - - if ((ch >= 65 && ch <= 90) || (ch >= 97 && ch <= 122)) - chunk = (chunk << 8) + what[i]; - - else - break; - } - - if (i < 4 || what[4] != 0) - { - fprintf(stderr, "makepng --insert \"%s\": invalid chunk name\n", what); - exit(1); - } - - /* Assemble the parameter list. */ - nparams = find_parameters(what, param, parameter_list, 1024); - -# define CHUNK(a,b,c,d) (((a)<<24)+((b)<<16)+((c)<<8)+(d)) - - switch (chunk) - { - case CHUNK(105,67,67,80): /* iCCP */ - if (nparams == 2) - return make_insert(what, insert_iCCP, nparams, parameter_list); - break; - - case CHUNK(116,69,88,116): /* tEXt */ - if (nparams == 2) - return make_insert(what, insert_tEXt, nparams, parameter_list); - break; - - case CHUNK(122,84,88,116): /* zTXt */ - if (nparams == 2) - return make_insert(what, insert_zTXt, nparams, parameter_list); - break; - - case CHUNK(105,84,88,116): /* iTXt */ - if (nparams == 4) - return make_insert(what, insert_iTXt, nparams, parameter_list); - break; - - case CHUNK(104,73,83,84): /* hIST */ - if (nparams <= 256) - return make_insert(what, insert_hIST, nparams, parameter_list); - break; - -#if 0 - case CHUNK(115,80,76,84): /* sPLT */ - return make_insert(what, insert_sPLT, nparams, parameter_list); -#endif - - default: - fprintf(stderr, "makepng --insert \"%s\": unrecognized chunk name\n", - what); - exit(1); - } - - bad_parameter_count(what, nparams); - return NULL; -} - -/* This is a not-very-good parser for a sequence of numbers (including 0). It - * doesn't accept some apparently valid things, but it accepts all the sensible - * combinations. - */ -static void -parse_color(char *arg, unsigned int *colors) -{ - unsigned int ncolors = 0; - - while (*arg && ncolors < 4) - { - char *ep = arg; - - unsigned long ul = strtoul(arg, &ep, 0); - - if (ul > 65535) - { - fprintf(stderr, "makepng --color=...'%s': too big\n", arg); - exit(1); - } - - if (ep == arg) - { - fprintf(stderr, "makepng --color=...'%s': not a valid color\n", arg); - exit(1); - } - - if (*ep) ++ep; /* skip a separator */ - arg = ep; - - colors[++ncolors] = (unsigned int)ul; /* checked above */ - } - - if (*arg) - { - fprintf(stderr, "makepng --color=...'%s': too many values\n", arg); - exit(1); - } - - *colors = ncolors; -} - -int -main(int argc, char **argv) -{ - FILE *fp = stdout; - const char *file_name = NULL; - int color_type = 8; /* invalid */ - int bit_depth = 32; /* invalid */ - unsigned int colors[5]; - unsigned int filters = PNG_ALL_FILTERS; - png_fixed_point gamma = 0; /* not set */ - chunk_insert *head_insert = NULL; - chunk_insert **insert_ptr = &head_insert; - - memset(colors, 0, sizeof colors); - - while (--argc > 0) - { - char *arg = *++argv; - - if (strcmp(arg, "--sRGB") == 0) - { - gamma = PNG_DEFAULT_sRGB; - continue; - } - - if (strcmp(arg, "--linear") == 0) - { - gamma = PNG_FP_1; - continue; - } - - if (strcmp(arg, "--1.8") == 0) - { - gamma = PNG_GAMMA_MAC_18; - continue; - } - - if (strcmp(arg, "--nofilters") == 0) - { - filters = PNG_FILTER_NONE; - continue; - } - - if (strncmp(arg, "--color=", 8) == 0) - { - parse_color(arg+8, colors); - continue; - } - - if (argc >= 3 && strcmp(arg, "--insert") == 0) - { - png_const_charp what = *++argv; - png_charp param = *++argv; - chunk_insert *new_insert; - - argc -= 2; - - new_insert = find_insert(what, param); - - if (new_insert != NULL) - { - *insert_ptr = new_insert; - insert_ptr = &new_insert->next; - } - - continue; - } - - if (arg[0] == '-') - { - fprintf(stderr, "makepng: %s: invalid option\n", arg); - exit(1); - } - - if (strcmp(arg, "palette") == 0) - { - color_type = PNG_COLOR_TYPE_PALETTE; - continue; - } - - if (strncmp(arg, "gray", 4) == 0) - { - if (arg[4] == 0) - { - color_type = PNG_COLOR_TYPE_GRAY; - continue; - } - - else if (strcmp(arg+4, "a") == 0 || - strcmp(arg+4, "alpha") == 0 || - strcmp(arg+4, "-alpha") == 0) - { - color_type = PNG_COLOR_TYPE_GRAY_ALPHA; - continue; - } - } - - if (strncmp(arg, "rgb", 3) == 0) - { - if (arg[3] == 0) - { - color_type = PNG_COLOR_TYPE_RGB; - continue; - } - - else if (strcmp(arg+3, "a") == 0 || - strcmp(arg+3, "alpha") == 0 || - strcmp(arg+3, "-alpha") == 0) - { - color_type = PNG_COLOR_TYPE_RGB_ALPHA; - continue; - } - } - - if (color_type == 8 && isdigit(arg[0])) - { - color_type = atoi(arg); - if (color_type < 0 || color_type > 6 || color_type == 1 || - color_type == 5) - { - fprintf(stderr, "makepng: %s: not a valid color type\n", arg); - exit(1); - } - - continue; - } - - if (bit_depth == 32 && isdigit(arg[0])) - { - bit_depth = atoi(arg); - if (bit_depth <= 0 || bit_depth > 16 || - (bit_depth & -bit_depth) != bit_depth) - { - fprintf(stderr, "makepng: %s: not a valid bit depth\n", arg); - exit(1); - } - - continue; - } - - if (argc == 1) /* It's the file name */ - { - fp = fopen(arg, "wb"); - if (fp == NULL) - { - fprintf(stderr, "%s: %s: could not open\n", arg, strerror(errno)); - exit(1); - } - - file_name = arg; - continue; - } - - fprintf(stderr, "makepng: %s: unknown argument\n", arg); - exit(1); - } /* argument while loop */ - - if (color_type == 8 || bit_depth == 32) - { - fprintf(stderr, "usage: makepng [--sRGB|--linear|--1.8] " - "[--color=...] color-type bit-depth [file-name]\n" - " Make a test PNG file, by default writes to stdout.\n"); - exit(1); - } - - /* Check the colors */ - { - const unsigned int lim = (color_type == PNG_COLOR_TYPE_PALETTE ? 255U : - (1U< lim) - { - fprintf(stderr, "makepng: --color=...: %u out of range [0..%u]\n", - colors[i], lim); - exit(1); - } - } - - /* Restrict the filters for more speed to those we know are used for the - * generated images. - */ - if (filters == PNG_ALL_FILTERS) - { - if ((color_type & PNG_COLOR_MASK_PALETTE) != 0 || bit_depth < 8) - filters = PNG_FILTER_NONE; - - else if (color_type & PNG_COLOR_MASK_COLOR) /* rgb */ - { - if (bit_depth == 8) - filters &= ~(PNG_FILTER_NONE | PNG_FILTER_AVG); - - else - filters = PNG_FILTER_SUB | PNG_FILTER_PAETH; - } - - else /* gray 8 or 16-bit */ - filters &= ~PNG_FILTER_NONE; - } - - { - int ret = write_png(&file_name, fp, color_type, bit_depth, gamma, - head_insert, filters, colors); - - if (ret != 0 && file_name != NULL) - remove(file_name); - - return ret; - } -} diff --git a/libpng16/contrib/libtests/pngstest.c b/libpng16/contrib/libtests/pngstest.c deleted file mode 100644 index ff9eadf..0000000 --- a/libpng16/contrib/libtests/pngstest.c +++ /dev/null @@ -1,3807 +0,0 @@ -/*- - * pngstest.c - * - * Copyright (c) 2013 John Cunningham Bowler - * - * Last changed in libpng 1.6.8 [(PENDING RELEASE)] - * - * This code is released under the libpng license. - * For conditions of distribution and use, see the disclaimer - * and license in png.h - * - * Test for the PNG 'simplified' APIs. - */ -#define _ISOC90_SOURCE 1 -#define MALLOC_CHECK_ 2/*glibc facility: turn on debugging*/ - -#include -#include -#include -#include -#include -#include -#include - -#if defined(HAVE_CONFIG_H) && !defined(PNG_NO_CONFIG_H) -# include -#endif - -/* Define the following to use this test against your installed libpng, rather - * than the one being built here: - */ -#ifdef PNG_FREESTANDING_TESTS -# include -#else -# include "../../png.h" -#endif - -#ifdef PNG_SIMPLIFIED_READ_SUPPORTED /* Else nothing can be done */ -#include "../tools/sRGB.h" - -/* KNOWN ISSUES - * - * These defines switch on alternate algorithms for format conversions to match - * the current libpng implementation; they are set to allow pngstest to pass - * even though libpng is producing answers that are not as correct as they - * should be. - */ -#define ALLOW_UNUSED_GPC 0 - /* If true include unused static GPC functions and declare an external array - * of them to hide the fact that they are unused. This is for development - * use while testing the correct function to use to take into account libpng - * misbehavior, such as using a simple power law to correct sRGB to linear. - */ - -/* The following is to support direct compilation of this file as C++ */ -#ifdef __cplusplus -# define voidcast(type, value) static_cast(value) -# define aligncastconst(type, value) \ - static_cast(static_cast(value)) -#else -# define voidcast(type, value) (value) -# define aligncastconst(type, value) ((const void*)(value)) -#endif /* __cplusplus */ - -/* During parallel runs of pngstest each temporary file needs a unique name, - * this is used to permit uniqueness using a command line argument which can be - * up to 22 characters long. - */ -static char tmpf[23] = "TMP"; - -/* Generate random bytes. This uses a boring repeatable algorithm and it - * is implemented here so that it gives the same set of numbers on every - * architecture. It's a linear congruential generator (Knuth or Sedgewick - * "Algorithms") but it comes from the 'feedback taps' table in Horowitz and - * Hill, "The Art of Electronics". - */ -static void -make_random_bytes(png_uint_32* seed, void* pv, size_t size) -{ - png_uint_32 u0 = seed[0], u1 = seed[1]; - png_bytep bytes = voidcast(png_bytep, pv); - - /* There are thirty three bits, the next bit in the sequence is bit-33 XOR - * bit-20. The top 1 bit is in u1, the bottom 32 are in u0. - */ - size_t i; - for (i=0; i> (20-8)) ^ ((u1 << 7) | (u0 >> (32-7)))) & 0xff; - u1 <<= 8; - u1 |= u0 >> 24; - u0 <<= 8; - u0 |= u; - *bytes++ = (png_byte)u; - } - - seed[0] = u0; - seed[1] = u1; -} - -static void -random_color(png_colorp color) -{ - static png_uint_32 color_seed[2] = { 0x12345678, 0x9abcdef }; - make_random_bytes(color_seed, color, sizeof *color); -} - -/* Math support - neither Cygwin nor Visual Studio have C99 support and we need - * a predictable rounding function, so make one here: - */ -static double -closestinteger(double x) -{ - return floor(x + .5); -} - -/* Cast support: remove GCC whines. */ -static png_byte -u8d(double d) -{ - d = closestinteger(d); - return (png_byte)d; -} - -static png_uint_16 -u16d(double d) -{ - d = closestinteger(d); - return (png_uint_16)d; -} - -/* sRGB support: use exact calculations rounded to the nearest int, see the - * fesetround() call in main(). sRGB_to_d optimizes the 8 to 16-bit conversion. - */ -static double sRGB_to_d[256]; -static double g22_to_d[256]; - -static void -init_sRGB_to_d(void) -{ - int i; - - sRGB_to_d[0] = 0; - for (i=1; i<255; ++i) - sRGB_to_d[i] = linear_from_sRGB(i/255.); - sRGB_to_d[255] = 1; - - g22_to_d[0] = 0; - for (i=1; i<255; ++i) - g22_to_d[i] = pow(i/255., 1/.45455); - g22_to_d[255] = 1; -} - -static png_byte -sRGB(double linear /*range 0.0 .. 1.0*/) -{ - return u8d(255 * sRGB_from_linear(linear)); -} - -static png_byte -isRGB(int fixed_linear) -{ - return sRGB(fixed_linear / 65535.); -} - -#if 0 /* not used */ -static png_byte -unpremultiply(int component, int alpha) -{ - if (alpha <= component) - return 255; /* Arbitrary, but consistent with the libpng code */ - - else if (alpha >= 65535) - return isRGB(component); - - else - return sRGB((double)component / alpha); -} -#endif - -static png_uint_16 -ilinear(int fixed_srgb) -{ - return u16d(65535 * sRGB_to_d[fixed_srgb]); -} - -static png_uint_16 -ilineara(int fixed_srgb, int alpha) -{ - return u16d((257 * alpha) * sRGB_to_d[fixed_srgb]); -} - -static png_uint_16 -ilinear_g22(int fixed_srgb) -{ - return u16d(65535 * g22_to_d[fixed_srgb]); -} - -#if ALLOW_UNUSED_GPC -static png_uint_16 -ilineara_g22(int fixed_srgb, int alpha) -{ - return u16d((257 * alpha) * g22_to_d[fixed_srgb]); -} -#endif - -static double -YfromRGBint(int ir, int ig, int ib) -{ - double r = ir; - double g = ig; - double b = ib; - return YfromRGB(r, g, b); -} - -#if 0 /* unused */ -/* The error that results from using a 2.2 power law in place of the correct - * sRGB transform, given an 8-bit value which might be either sRGB or power-law. - */ -static int -power_law_error8(int value) -{ - if (value > 0 && value < 255) - { - double vd = value / 255.; - double e = fabs( - pow(sRGB_to_d[value], 1/2.2) - sRGB_from_linear(pow(vd, 2.2))); - - /* Always allow an extra 1 here for rounding errors */ - e = 1+floor(255 * e); - return (int)e; - } - - return 0; -} - -static int error_in_sRGB_roundtrip = 56; /* by experiment */ -static int -power_law_error16(int value) -{ - if (value > 0 && value < 65535) - { - /* Round trip the value through an 8-bit representation but using - * non-matching to/from conversions. - */ - double vd = value / 65535.; - double e = fabs( - pow(sRGB_from_linear(vd), 2.2) - linear_from_sRGB(pow(vd, 1/2.2))); - - /* Always allow an extra 1 here for rounding errors */ - e = error_in_sRGB_roundtrip+floor(65535 * e); - return (int)e; - } - - return 0; -} - -static int -compare_8bit(int v1, int v2, int error_limit, int multiple_algorithms) -{ - int e = abs(v1-v2); - int ev1, ev2; - - if (e <= error_limit) - return 1; - - if (!multiple_algorithms) - return 0; - - ev1 = power_law_error8(v1); - if (e <= ev1) - return 1; - - ev2 = power_law_error8(v2); - if (e <= ev2) - return 1; - - return 0; -} - -static int -compare_16bit(int v1, int v2, int error_limit, int multiple_algorithms) -{ - int e = abs(v1-v2); - int ev1, ev2; - - if (e <= error_limit) - return 1; - - /* "multiple_algorithms" in this case means that a color-map has been - * involved somewhere, so we can deduce that the values were forced to 8-bit - * (like the via_linear case for 8-bit.) - */ - if (!multiple_algorithms) - return 0; - - ev1 = power_law_error16(v1); - if (e <= ev1) - return 1; - - ev2 = power_law_error16(v2); - if (e <= ev2) - return 1; - - return 0; -} -#endif /* unused */ - -#define READ_FILE 1 /* else memory */ -#define USE_STDIO 2 /* else use file name */ -#define STRICT 4 /* fail on warnings too */ -#define VERBOSE 8 -#define KEEP_TMPFILES 16 /* else delete temporary files */ -#define KEEP_GOING 32 -#define ACCUMULATE 64 -#define FAST_WRITE 128 -#define sRGB_16BIT 256 - -static void -print_opts(png_uint_32 opts) -{ - if (opts & READ_FILE) - printf(" --file"); - if (opts & USE_STDIO) - printf(" --stdio"); - if (opts & STRICT) - printf(" --strict"); - if (opts & VERBOSE) - printf(" --verbose"); - if (opts & KEEP_TMPFILES) - printf(" --preserve"); - if (opts & KEEP_GOING) - printf(" --keep-going"); - if (opts & ACCUMULATE) - printf(" --accumulate"); - if (!(opts & FAST_WRITE)) /* --fast is currently the default */ - printf(" --slow"); - if (opts & sRGB_16BIT) - printf(" --sRGB-16bit"); -} - -#define FORMAT_NO_CHANGE 0x80000000 /* additional flag */ - -/* A name table for all the formats - defines the format of the '+' arguments to - * pngstest. - */ -#define FORMAT_COUNT 64 -#define FORMAT_MASK 0x3f -static PNG_CONST char * PNG_CONST format_names[FORMAT_COUNT] = -{ - "sRGB-gray", - "sRGB-gray+alpha", - "sRGB-rgb", - "sRGB-rgb+alpha", - "linear-gray", - "linear-gray+alpha", - "linear-rgb", - "linear-rgb+alpha", - - "color-mapped-sRGB-gray", - "color-mapped-sRGB-gray+alpha", - "color-mapped-sRGB-rgb", - "color-mapped-sRGB-rgb+alpha", - "color-mapped-linear-gray", - "color-mapped-linear-gray+alpha", - "color-mapped-linear-rgb", - "color-mapped-linear-rgb+alpha", - - "sRGB-gray", - "sRGB-gray+alpha", - "sRGB-bgr", - "sRGB-bgr+alpha", - "linear-gray", - "linear-gray+alpha", - "linear-bgr", - "linear-bgr+alpha", - - "color-mapped-sRGB-gray", - "color-mapped-sRGB-gray+alpha", - "color-mapped-sRGB-bgr", - "color-mapped-sRGB-bgr+alpha", - "color-mapped-linear-gray", - "color-mapped-linear-gray+alpha", - "color-mapped-linear-bgr", - "color-mapped-linear-bgr+alpha", - - "sRGB-gray", - "alpha+sRGB-gray", - "sRGB-rgb", - "alpha+sRGB-rgb", - "linear-gray", - "alpha+linear-gray", - "linear-rgb", - "alpha+linear-rgb", - - "color-mapped-sRGB-gray", - "color-mapped-alpha+sRGB-gray", - "color-mapped-sRGB-rgb", - "color-mapped-alpha+sRGB-rgb", - "color-mapped-linear-gray", - "color-mapped-alpha+linear-gray", - "color-mapped-linear-rgb", - "color-mapped-alpha+linear-rgb", - - "sRGB-gray", - "alpha+sRGB-gray", - "sRGB-bgr", - "alpha+sRGB-bgr", - "linear-gray", - "alpha+linear-gray", - "linear-bgr", - "alpha+linear-bgr", - - "color-mapped-sRGB-gray", - "color-mapped-alpha+sRGB-gray", - "color-mapped-sRGB-bgr", - "color-mapped-alpha+sRGB-bgr", - "color-mapped-linear-gray", - "color-mapped-alpha+linear-gray", - "color-mapped-linear-bgr", - "color-mapped-alpha+linear-bgr", -}; - -/* Decode an argument to a format number. */ -static png_uint_32 -formatof(const char *arg) -{ - char *ep; - unsigned long format = strtoul(arg, &ep, 0); - - if (ep > arg && *ep == 0 && format < FORMAT_COUNT) - return (png_uint_32)format; - - else for (format=0; format < FORMAT_COUNT; ++format) - { - if (strcmp(format_names[format], arg) == 0) - return (png_uint_32)format; - } - - fprintf(stderr, "pngstest: format name '%s' invalid\n", arg); - return FORMAT_COUNT; -} - -/* Bitset/test functions for formats */ -#define FORMAT_SET_COUNT (FORMAT_COUNT / 32) -typedef struct -{ - png_uint_32 bits[FORMAT_SET_COUNT]; -} -format_list; - -static void format_init(format_list *pf) -{ - int i; - for (i=0; ibits[i] = 0; /* All off */ -} - -#if 0 /* currently unused */ -static void format_clear(format_list *pf) -{ - int i; - for (i=0; ibits[i] = 0; -} -#endif - -static int format_is_initial(format_list *pf) -{ - int i; - for (i=0; ibits[i] != 0) - return 0; - - return 1; -} - -static int format_set(format_list *pf, png_uint_32 format) -{ - if (format < FORMAT_COUNT) - return pf->bits[format >> 5] |= ((png_uint_32)1) << (format & 31); - - return 0; -} - -#if 0 /* currently unused */ -static int format_unset(format_list *pf, png_uint_32 format) -{ - if (format < FORMAT_COUNT) - return pf->bits[format >> 5] &= ~((png_uint_32)1) << (format & 31); - - return 0; -} -#endif - -static int format_isset(format_list *pf, png_uint_32 format) -{ - return format < FORMAT_COUNT && - (pf->bits[format >> 5] & (((png_uint_32)1) << (format & 31))) != 0; -} - -static void format_default(format_list *pf, int redundant) -{ - if (redundant) - { - int i; - - /* set everything, including flags that are pointless */ - for (i=0; ibits[i] = ~(png_uint_32)0; - } - - else - { - png_uint_32 f; - - for (f=0; finput_file != NULL) - rewind(image->input_file); -} - -/* Free the image buffer; the buffer is re-used on a re-read, this is just for - * cleanup. - */ -static void -freebuffer(Image *image) -{ - if (image->buffer) free(image->buffer); - image->buffer = NULL; - image->bufsize = 0; - image->allocsize = 0; -} - -/* Delete function; cleans out all the allocated data and the temporary file in - * the image. - */ -static void -freeimage(Image *image) -{ - freebuffer(image); - png_image_free(&image->image); - - if (image->input_file != NULL) - { - fclose(image->input_file); - image->input_file = NULL; - } - - if (image->input_memory != NULL) - { - free(image->input_memory); - image->input_memory = NULL; - image->input_memory_size = 0; - } - - if (image->tmpfile_name[0] != 0 && (image->opts & KEEP_TMPFILES) == 0) - { - remove(image->tmpfile_name); - image->tmpfile_name[0] = 0; - } -} - -/* This is actually a re-initializer; allows an image structure to be re-used by - * freeing everything that relates to an old image. - */ -static void initimage(Image *image, png_uint_32 opts, const char *file_name, - int stride_extra) -{ - freeimage(image); - memset(&image->image, 0, sizeof image->image); - image->opts = opts; - image->file_name = file_name; - image->stride_extra = stride_extra; -} - -/* Make sure the image buffer is big enough; allows re-use of the buffer if the - * image is re-read. - */ -#define BUFFER_INIT8 73 -static void -allocbuffer(Image *image) -{ - png_size_t size = PNG_IMAGE_BUFFER_SIZE(image->image, image->stride); - - if (size+32 > image->bufsize) - { - freebuffer(image); - image->buffer = voidcast(png_bytep, malloc(size+32)); - if (image->buffer == NULL) - { - fflush(stdout); - fprintf(stderr, - "simpletest: out of memory allocating %lu(+32) byte buffer\n", - (unsigned long)size); - exit(1); - } - image->bufsize = size+32; - } - - memset(image->buffer, 95, image->bufsize); - memset(image->buffer+16, BUFFER_INIT8, size); - image->allocsize = size; -} - -/* Make sure 16 bytes match the given byte. */ -static int -check16(png_const_bytep bp, int b) -{ - int i = 16; - - do - if (*bp != b) return 1; - while (--i); - - return 0; -} - -/* Check for overwrite in the image buffer. */ -static void -checkbuffer(Image *image, const char *arg) -{ - if (check16(image->buffer, 95)) - { - fflush(stdout); - fprintf(stderr, "%s: overwrite at start of image buffer\n", arg); - exit(1); - } - - if (check16(image->buffer+16+image->allocsize, 95)) - { - fflush(stdout); - fprintf(stderr, "%s: overwrite at end of image buffer\n", arg); - exit(1); - } -} - -/* ERROR HANDLING */ -/* Log a terminal error, also frees the libpng part of the image if necessary. - */ -static int -logerror(Image *image, const char *a1, const char *a2, const char *a3) -{ - fflush(stdout); - if (image->image.warning_or_error) - fprintf(stderr, "%s%s%s: %s\n", a1, a2, a3, image->image.message); - - else - fprintf(stderr, "%s%s%s\n", a1, a2, a3); - - if (image->image.opaque != NULL) - { - fprintf(stderr, "%s: image opaque pointer non-NULL on error\n", - image->file_name); - png_image_free(&image->image); - } - - return 0; -} - -/* Log an error and close a file (just a utility to do both things in one - * function call.) - */ -static int -logclose(Image *image, FILE *f, const char *name, const char *operation) -{ - int e = errno; - - fclose(f); - return logerror(image, name, operation, strerror(e)); -} - -/* Make sure the png_image has been freed - validates that libpng is doing what - * the spec says and freeing the image. - */ -static int -checkopaque(Image *image) -{ - if (image->image.opaque != NULL) - { - png_image_free(&image->image); - return logerror(image, image->file_name, ": opaque not NULL", ""); - } - - else if (image->image.warning_or_error != 0 && (image->opts & STRICT) != 0) - return logerror(image, image->file_name, " --strict", ""); - - else - return 1; -} - -/* IMAGE COMPARISON/CHECKING */ -/* Compare the pixels of two images, which should be the same but aren't. The - * images must have been checked for a size match. - */ -typedef struct -{ - /* The components, for grayscale images the gray value is in 'g' and if alpha - * is not present 'a' is set to 255 or 65535 according to format. - */ - int r, g, b, a; -} Pixel; - -typedef struct -{ - /* The background as the original sRGB 8-bit value converted to the final - * integer format and as a double precision linear value in the range 0..1 - * for with partially transparent pixels. - */ - int ir, ig, ib; - double dr, dg, db; /* linear r,g,b scaled to 0..1 */ -} Background; - -/* Basic image formats; control the data but not the layout thereof. */ -#define BASE_FORMATS\ - (PNG_FORMAT_FLAG_ALPHA|PNG_FORMAT_FLAG_COLOR|PNG_FORMAT_FLAG_LINEAR) - -/* Read a Pixel from a buffer. The code below stores the correct routine for - * the format in a function pointer, these are the routines: - */ -static void -gp_g8(Pixel *p, png_const_voidp pb) -{ - png_const_bytep pp = voidcast(png_const_bytep, pb); - - p->r = p->g = p->b = pp[0]; - p->a = 255; -} - -static void -gp_ga8(Pixel *p, png_const_voidp pb) -{ - png_const_bytep pp = voidcast(png_const_bytep, pb); - - p->r = p->g = p->b = pp[0]; - p->a = pp[1]; -} - -#ifdef PNG_FORMAT_AFIRST_SUPPORTED -static void -gp_ag8(Pixel *p, png_const_voidp pb) -{ - png_const_bytep pp = voidcast(png_const_bytep, pb); - - p->r = p->g = p->b = pp[1]; - p->a = pp[0]; -} -#endif - -static void -gp_rgb8(Pixel *p, png_const_voidp pb) -{ - png_const_bytep pp = voidcast(png_const_bytep, pb); - - p->r = pp[0]; - p->g = pp[1]; - p->b = pp[2]; - p->a = 255; -} - -#ifdef PNG_FORMAT_BGR_SUPPORTED -static void -gp_bgr8(Pixel *p, png_const_voidp pb) -{ - png_const_bytep pp = voidcast(png_const_bytep, pb); - - p->r = pp[2]; - p->g = pp[1]; - p->b = pp[0]; - p->a = 255; -} -#endif - -static void -gp_rgba8(Pixel *p, png_const_voidp pb) -{ - png_const_bytep pp = voidcast(png_const_bytep, pb); - - p->r = pp[0]; - p->g = pp[1]; - p->b = pp[2]; - p->a = pp[3]; -} - -#ifdef PNG_FORMAT_BGR_SUPPORTED -static void -gp_bgra8(Pixel *p, png_const_voidp pb) -{ - png_const_bytep pp = voidcast(png_const_bytep, pb); - - p->r = pp[2]; - p->g = pp[1]; - p->b = pp[0]; - p->a = pp[3]; -} -#endif - -#ifdef PNG_FORMAT_AFIRST_SUPPORTED -static void -gp_argb8(Pixel *p, png_const_voidp pb) -{ - png_const_bytep pp = voidcast(png_const_bytep, pb); - - p->r = pp[1]; - p->g = pp[2]; - p->b = pp[3]; - p->a = pp[0]; -} -#endif - -#if defined(PNG_FORMAT_AFIRST_SUPPORTED) && defined(PNG_FORMAT_BGR_SUPPORTED) -static void -gp_abgr8(Pixel *p, png_const_voidp pb) -{ - png_const_bytep pp = voidcast(png_const_bytep, pb); - - p->r = pp[3]; - p->g = pp[2]; - p->b = pp[1]; - p->a = pp[0]; -} -#endif - -static void -gp_g16(Pixel *p, png_const_voidp pb) -{ - png_const_uint_16p pp = voidcast(png_const_uint_16p, pb); - - p->r = p->g = p->b = pp[0]; - p->a = 65535; -} - -static void -gp_ga16(Pixel *p, png_const_voidp pb) -{ - png_const_uint_16p pp = voidcast(png_const_uint_16p, pb); - - p->r = p->g = p->b = pp[0]; - p->a = pp[1]; -} - -#ifdef PNG_FORMAT_AFIRST_SUPPORTED -static void -gp_ag16(Pixel *p, png_const_voidp pb) -{ - png_const_uint_16p pp = voidcast(png_const_uint_16p, pb); - - p->r = p->g = p->b = pp[1]; - p->a = pp[0]; -} -#endif - -static void -gp_rgb16(Pixel *p, png_const_voidp pb) -{ - png_const_uint_16p pp = voidcast(png_const_uint_16p, pb); - - p->r = pp[0]; - p->g = pp[1]; - p->b = pp[2]; - p->a = 65535; -} - -#ifdef PNG_FORMAT_BGR_SUPPORTED -static void -gp_bgr16(Pixel *p, png_const_voidp pb) -{ - png_const_uint_16p pp = voidcast(png_const_uint_16p, pb); - - p->r = pp[2]; - p->g = pp[1]; - p->b = pp[0]; - p->a = 65535; -} -#endif - -static void -gp_rgba16(Pixel *p, png_const_voidp pb) -{ - png_const_uint_16p pp = voidcast(png_const_uint_16p, pb); - - p->r = pp[0]; - p->g = pp[1]; - p->b = pp[2]; - p->a = pp[3]; -} - -#ifdef PNG_FORMAT_BGR_SUPPORTED -static void -gp_bgra16(Pixel *p, png_const_voidp pb) -{ - png_const_uint_16p pp = voidcast(png_const_uint_16p, pb); - - p->r = pp[2]; - p->g = pp[1]; - p->b = pp[0]; - p->a = pp[3]; -} -#endif - -#ifdef PNG_FORMAT_AFIRST_SUPPORTED -static void -gp_argb16(Pixel *p, png_const_voidp pb) -{ - png_const_uint_16p pp = voidcast(png_const_uint_16p, pb); - - p->r = pp[1]; - p->g = pp[2]; - p->b = pp[3]; - p->a = pp[0]; -} -#endif - -#if defined(PNG_FORMAT_AFIRST_SUPPORTED) && defined(PNG_FORMAT_BGR_SUPPORTED) -static void -gp_abgr16(Pixel *p, png_const_voidp pb) -{ - png_const_uint_16p pp = voidcast(png_const_uint_16p, pb); - - p->r = pp[3]; - p->g = pp[2]; - p->b = pp[1]; - p->a = pp[0]; -} -#endif - -/* Given a format, return the correct one of the above functions. */ -static void (* -get_pixel(png_uint_32 format))(Pixel *p, png_const_voidp pb) -{ - /* The color-map flag is irrelevant here - the caller of the function - * returned must either pass the buffer or, for a color-mapped image, the - * correct entry in the color-map. - */ - if (format & PNG_FORMAT_FLAG_LINEAR) - { - if (format & PNG_FORMAT_FLAG_COLOR) - { -# ifdef PNG_FORMAT_BGR_SUPPORTED - if (format & PNG_FORMAT_FLAG_BGR) - { - if (format & PNG_FORMAT_FLAG_ALPHA) - { -# ifdef PNG_FORMAT_AFIRST_SUPPORTED - if (format & PNG_FORMAT_FLAG_AFIRST) - return gp_abgr16; - - else -# endif - return gp_bgra16; - } - - else - return gp_bgr16; - } - - else -# endif - { - if (format & PNG_FORMAT_FLAG_ALPHA) - { -# ifdef PNG_FORMAT_AFIRST_SUPPORTED - if (format & PNG_FORMAT_FLAG_AFIRST) - return gp_argb16; - - else -# endif - return gp_rgba16; - } - - else - return gp_rgb16; - } - } - - else - { - if (format & PNG_FORMAT_FLAG_ALPHA) - { -# ifdef PNG_FORMAT_AFIRST_SUPPORTED - if (format & PNG_FORMAT_FLAG_AFIRST) - return gp_ag16; - - else -# endif - return gp_ga16; - } - - else - return gp_g16; - } - } - - else - { - if (format & PNG_FORMAT_FLAG_COLOR) - { -# ifdef PNG_FORMAT_BGR_SUPPORTED - if (format & PNG_FORMAT_FLAG_BGR) - { - if (format & PNG_FORMAT_FLAG_ALPHA) - { -# ifdef PNG_FORMAT_AFIRST_SUPPORTED - if (format & PNG_FORMAT_FLAG_AFIRST) - return gp_abgr8; - - else -# endif - return gp_bgra8; - } - - else - return gp_bgr8; - } - - else -# endif - { - if (format & PNG_FORMAT_FLAG_ALPHA) - { -# ifdef PNG_FORMAT_AFIRST_SUPPORTED - if (format & PNG_FORMAT_FLAG_AFIRST) - return gp_argb8; - - else -# endif - return gp_rgba8; - } - - else - return gp_rgb8; - } - } - - else - { - if (format & PNG_FORMAT_FLAG_ALPHA) - { -# ifdef PNG_FORMAT_AFIRST_SUPPORTED - if (format & PNG_FORMAT_FLAG_AFIRST) - return gp_ag8; - - else -# endif - return gp_ga8; - } - - else - return gp_g8; - } - } -} - -/* Convertion between pixel formats. The code above effectively eliminates the - * component ordering changes leaving three basic changes: - * - * 1) Remove an alpha channel by pre-multiplication or compositing on a - * background color. (Adding an alpha channel is a no-op.) - * - * 2) Remove color by mapping to grayscale. (Grayscale to color is a no-op.) - * - * 3) Convert between 8-bit and 16-bit components. (Both directtions are - * relevant.) - * - * This gives the following base format conversion matrix: - * - * OUT: ----- 8-bit ----- ----- 16-bit ----- - * IN G GA RGB RGBA G GA RGB RGBA - * 8 G . . . . lin lin lin lin - * 8 GA bckg . bckc . pre' pre pre' pre - * 8 RGB g8 g8 . . glin glin lin lin - * 8 RGBA g8b g8 bckc . gpr' gpre pre' pre - * 16 G sRGB sRGB sRGB sRGB . . . . - * 16 GA b16g unpg b16c unpc A . A . - * 16 RGB sG sG sRGB sRGB g16 g16 . . - * 16 RGBA gb16 sGp cb16 sCp g16 g16' A . - * - * 8-bit to 8-bit: - * bckg: composite on gray background - * bckc: composite on color background - * g8: convert sRGB components to sRGB grayscale - * g8b: convert sRGB components to grayscale and composite on gray background - * - * 8-bit to 16-bit: - * lin: make sRGB components linear, alpha := 65535 - * pre: make sRGB components linear and premultiply by alpha (scale alpha) - * pre': as 'pre' but alpha := 65535 - * glin: make sRGB components linear, convert to grayscale, alpha := 65535 - * gpre: make sRGB components grayscale and linear and premultiply by alpha - * gpr': as 'gpre' but alpha := 65535 - * - * 16-bit to 8-bit: - * sRGB: convert linear components to sRGB, alpha := 255 - * unpg: unpremultiply gray component and convert to sRGB (scale alpha) - * unpc: unpremultiply color components and convert to sRGB (scale alpha) - * b16g: composite linear onto gray background and convert the result to sRGB - * b16c: composite linear onto color background and convert the result to sRGB - * sG: convert linear RGB to sRGB grayscale - * sGp: unpremultiply RGB then convert to sRGB grayscale - * sCp: unpremultiply RGB then convert to sRGB - * gb16: composite linear onto background and convert to sRGB grayscale - * (order doesn't matter, the composite and grayscale operations permute) - * cb16: composite linear onto background and convert to sRGB - * - * 16-bit to 16-bit: - * A: set alpha to 65535 - * g16: convert linear RGB to linear grayscale (alpha := 65535) - * g16': as 'g16' but alpha is unchanged - */ -/* Simple copy: */ -static void -gpc_noop(Pixel *out, const Pixel *in, const Background *back) -{ - (void)back; - out->r = in->r; - out->g = in->g; - out->b = in->b; - out->a = in->a; -} - -#if ALLOW_UNUSED_GPC -static void -gpc_nop8(Pixel *out, const Pixel *in, const Background *back) -{ - (void)back; - if (in->a == 0) - out->r = out->g = out->b = 255; - - else - { - out->r = in->r; - out->g = in->g; - out->b = in->b; - } - - out->a = in->a; -} -#endif - -#if ALLOW_UNUSED_GPC -static void -gpc_nop6(Pixel *out, const Pixel *in, const Background *back) -{ - (void)back; - if (in->a == 0) - out->r = out->g = out->b = 65535; - - else - { - out->r = in->r; - out->g = in->g; - out->b = in->b; - } - - out->a = in->a; -} -#endif - -/* 8-bit to 8-bit conversions */ -/* bckg: composite on gray background */ -static void -gpc_bckg(Pixel *out, const Pixel *in, const Background *back) -{ - if (in->a <= 0) - out->r = out->g = out->b = back->ig; - - else if (in->a >= 255) - out->r = out->g = out->b = in->g; - - else - { - double a = in->a / 255.; - - out->r = out->g = out->b = sRGB(sRGB_to_d[in->g] * a + back->dg * (1-a)); - } - - out->a = 255; -} - -/* bckc: composite on color background */ -static void -gpc_bckc(Pixel *out, const Pixel *in, const Background *back) -{ - if (in->a <= 0) - { - out->r = back->ir; - out->g = back->ig; - out->b = back->ib; - } - - else if (in->a >= 255) - { - out->r = in->r; - out->g = in->g; - out->b = in->b; - } - - else - { - double a = in->a / 255.; - - out->r = sRGB(sRGB_to_d[in->r] * a + back->dr * (1-a)); - out->g = sRGB(sRGB_to_d[in->g] * a + back->dg * (1-a)); - out->b = sRGB(sRGB_to_d[in->b] * a + back->db * (1-a)); - } - - out->a = 255; -} - -/* g8: convert sRGB components to sRGB grayscale */ -static void -gpc_g8(Pixel *out, const Pixel *in, const Background *back) -{ - (void)back; - - if (in->r == in->g && in->g == in->b) - out->r = out->g = out->b = in->g; - - else - out->r = out->g = out->b = - sRGB(YfromRGB(sRGB_to_d[in->r], sRGB_to_d[in->g], sRGB_to_d[in->b])); - - out->a = in->a; -} - -/* g8b: convert sRGB components to grayscale and composite on gray background */ -static void -gpc_g8b(Pixel *out, const Pixel *in, const Background *back) -{ - if (in->a <= 0) - out->r = out->g = out->b = back->ig; - - else if (in->a >= 255) - { - if (in->r == in->g && in->g == in->b) - out->r = out->g = out->b = in->g; - - else - out->r = out->g = out->b = sRGB(YfromRGB( - sRGB_to_d[in->r], sRGB_to_d[in->g], sRGB_to_d[in->b])); - } - - else - { - double a = in->a/255.; - - out->r = out->g = out->b = sRGB(a * YfromRGB(sRGB_to_d[in->r], - sRGB_to_d[in->g], sRGB_to_d[in->b]) + back->dg * (1-a)); - } - - out->a = 255; -} - -/* 8-bit to 16-bit conversions */ -/* lin: make sRGB components linear, alpha := 65535 */ -static void -gpc_lin(Pixel *out, const Pixel *in, const Background *back) -{ - (void)back; - - out->r = ilinear(in->r); - - if (in->g == in->r) - { - out->g = out->r; - - if (in->b == in->r) - out->b = out->r; - - else - out->b = ilinear(in->b); - } - - else - { - out->g = ilinear(in->g); - - if (in->b == in->r) - out->b = out->r; - - else if (in->b == in->g) - out->b = out->g; - - else - out->b = ilinear(in->b); - } - - out->a = 65535; -} - -/* pre: make sRGB components linear and premultiply by alpha (scale alpha) */ -static void -gpc_pre(Pixel *out, const Pixel *in, const Background *back) -{ - (void)back; - - out->r = ilineara(in->r, in->a); - - if (in->g == in->r) - { - out->g = out->r; - - if (in->b == in->r) - out->b = out->r; - - else - out->b = ilineara(in->b, in->a); - } - - else - { - out->g = ilineara(in->g, in->a); - - if (in->b == in->r) - out->b = out->r; - - else if (in->b == in->g) - out->b = out->g; - - else - out->b = ilineara(in->b, in->a); - } - - out->a = in->a * 257; -} - -/* pre': as 'pre' but alpha := 65535 */ -static void -gpc_preq(Pixel *out, const Pixel *in, const Background *back) -{ - (void)back; - - out->r = ilineara(in->r, in->a); - - if (in->g == in->r) - { - out->g = out->r; - - if (in->b == in->r) - out->b = out->r; - - else - out->b = ilineara(in->b, in->a); - } - - else - { - out->g = ilineara(in->g, in->a); - - if (in->b == in->r) - out->b = out->r; - - else if (in->b == in->g) - out->b = out->g; - - else - out->b = ilineara(in->b, in->a); - } - - out->a = 65535; -} - -/* glin: make sRGB components linear, convert to grayscale, alpha := 65535 */ -static void -gpc_glin(Pixel *out, const Pixel *in, const Background *back) -{ - (void)back; - - if (in->r == in->g && in->g == in->b) - out->r = out->g = out->b = ilinear(in->g); - - else - out->r = out->g = out->b = u16d(65535 * - YfromRGB(sRGB_to_d[in->r], sRGB_to_d[in->g], sRGB_to_d[in->b])); - - out->a = 65535; -} - -/* gpre: make sRGB components grayscale and linear and premultiply by alpha */ -static void -gpc_gpre(Pixel *out, const Pixel *in, const Background *back) -{ - (void)back; - - if (in->r == in->g && in->g == in->b) - out->r = out->g = out->b = ilineara(in->g, in->a); - - else - out->r = out->g = out->b = u16d(in->a * 257 * - YfromRGB(sRGB_to_d[in->r], sRGB_to_d[in->g], sRGB_to_d[in->b])); - - out->a = 257 * in->a; -} - -/* gpr': as 'gpre' but alpha := 65535 */ -static void -gpc_gprq(Pixel *out, const Pixel *in, const Background *back) -{ - (void)back; - - if (in->r == in->g && in->g == in->b) - out->r = out->g = out->b = ilineara(in->g, in->a); - - else - out->r = out->g = out->b = u16d(in->a * 257 * - YfromRGB(sRGB_to_d[in->r], sRGB_to_d[in->g], sRGB_to_d[in->b])); - - out->a = 65535; -} - -/* 8-bit to 16-bit conversions for gAMA 45455 encoded values */ -/* Lin: make gAMA 45455 components linear, alpha := 65535 */ -static void -gpc_Lin(Pixel *out, const Pixel *in, const Background *back) -{ - (void)back; - - out->r = ilinear_g22(in->r); - - if (in->g == in->r) - { - out->g = out->r; - - if (in->b == in->r) - out->b = out->r; - - else - out->b = ilinear_g22(in->b); - } - - else - { - out->g = ilinear_g22(in->g); - - if (in->b == in->r) - out->b = out->r; - - else if (in->b == in->g) - out->b = out->g; - - else - out->b = ilinear_g22(in->b); - } - - out->a = 65535; -} - -#if ALLOW_UNUSED_GPC -/* Pre: make gAMA 45455 components linear and premultiply by alpha (scale alpha) - */ -static void -gpc_Pre(Pixel *out, const Pixel *in, const Background *back) -{ - (void)back; - - out->r = ilineara_g22(in->r, in->a); - - if (in->g == in->r) - { - out->g = out->r; - - if (in->b == in->r) - out->b = out->r; - - else - out->b = ilineara_g22(in->b, in->a); - } - - else - { - out->g = ilineara_g22(in->g, in->a); - - if (in->b == in->r) - out->b = out->r; - - else if (in->b == in->g) - out->b = out->g; - - else - out->b = ilineara_g22(in->b, in->a); - } - - out->a = in->a * 257; -} -#endif - -#if ALLOW_UNUSED_GPC -/* Pre': as 'Pre' but alpha := 65535 */ -static void -gpc_Preq(Pixel *out, const Pixel *in, const Background *back) -{ - (void)back; - - out->r = ilineara_g22(in->r, in->a); - - if (in->g == in->r) - { - out->g = out->r; - - if (in->b == in->r) - out->b = out->r; - - else - out->b = ilineara_g22(in->b, in->a); - } - - else - { - out->g = ilineara_g22(in->g, in->a); - - if (in->b == in->r) - out->b = out->r; - - else if (in->b == in->g) - out->b = out->g; - - else - out->b = ilineara_g22(in->b, in->a); - } - - out->a = 65535; -} -#endif - -#if ALLOW_UNUSED_GPC -/* Glin: make gAMA 45455 components linear, convert to grayscale, alpha := 65535 - */ -static void -gpc_Glin(Pixel *out, const Pixel *in, const Background *back) -{ - (void)back; - - if (in->r == in->g && in->g == in->b) - out->r = out->g = out->b = ilinear_g22(in->g); - - else - out->r = out->g = out->b = u16d(65535 * - YfromRGB(g22_to_d[in->r], g22_to_d[in->g], g22_to_d[in->b])); - - out->a = 65535; -} -#endif - -#if ALLOW_UNUSED_GPC -/* Gpre: make gAMA 45455 components grayscale and linear and premultiply by - * alpha. - */ -static void -gpc_Gpre(Pixel *out, const Pixel *in, const Background *back) -{ - (void)back; - - if (in->r == in->g && in->g == in->b) - out->r = out->g = out->b = ilineara_g22(in->g, in->a); - - else - out->r = out->g = out->b = u16d(in->a * 257 * - YfromRGB(g22_to_d[in->r], g22_to_d[in->g], g22_to_d[in->b])); - - out->a = 257 * in->a; -} -#endif - -#if ALLOW_UNUSED_GPC -/* Gpr': as 'Gpre' but alpha := 65535 */ -static void -gpc_Gprq(Pixel *out, const Pixel *in, const Background *back) -{ - (void)back; - - if (in->r == in->g && in->g == in->b) - out->r = out->g = out->b = ilineara_g22(in->g, in->a); - - else - out->r = out->g = out->b = u16d(in->a * 257 * - YfromRGB(g22_to_d[in->r], g22_to_d[in->g], g22_to_d[in->b])); - - out->a = 65535; -} -#endif - -/* 16-bit to 8-bit conversions */ -/* sRGB: convert linear components to sRGB, alpha := 255 */ -static void -gpc_sRGB(Pixel *out, const Pixel *in, const Background *back) -{ - (void)back; - - out->r = isRGB(in->r); - - if (in->g == in->r) - { - out->g = out->r; - - if (in->b == in->r) - out->b = out->r; - - else - out->b = isRGB(in->b); - } - - else - { - out->g = isRGB(in->g); - - if (in->b == in->r) - out->b = out->r; - - else if (in->b == in->g) - out->b = out->g; - - else - out->b = isRGB(in->b); - } - - out->a = 255; -} - -/* unpg: unpremultiply gray component and convert to sRGB (scale alpha) */ -static void -gpc_unpg(Pixel *out, const Pixel *in, const Background *back) -{ - (void)back; - - if (in->a <= 128) - { - out->r = out->g = out->b = 255; - out->a = 0; - } - - else - { - out->r = out->g = out->b = sRGB((double)in->g / in->a); - out->a = u8d(in->a / 257.); - } -} - -/* unpc: unpremultiply color components and convert to sRGB (scale alpha) */ -static void -gpc_unpc(Pixel *out, const Pixel *in, const Background *back) -{ - (void)back; - - if (in->a <= 128) - { - out->r = out->g = out->b = 255; - out->a = 0; - } - - else - { - out->r = sRGB((double)in->r / in->a); - out->g = sRGB((double)in->g / in->a); - out->b = sRGB((double)in->b / in->a); - out->a = u8d(in->a / 257.); - } -} - -/* b16g: composite linear onto gray background and convert the result to sRGB */ -static void -gpc_b16g(Pixel *out, const Pixel *in, const Background *back) -{ - if (in->a <= 0) - out->r = out->g = out->b = back->ig; - - else - { - double a = in->a/65535.; - double a1 = 1-a; - - a /= 65535; - out->r = out->g = out->b = sRGB(in->g * a + back->dg * a1); - } - - out->a = 255; -} - -/* b16c: composite linear onto color background and convert the result to sRGB*/ -static void -gpc_b16c(Pixel *out, const Pixel *in, const Background *back) -{ - if (in->a <= 0) - { - out->r = back->ir; - out->g = back->ig; - out->b = back->ib; - } - - else - { - double a = in->a/65535.; - double a1 = 1-a; - - a /= 65535; - out->r = sRGB(in->r * a + back->dr * a1); - out->g = sRGB(in->g * a + back->dg * a1); - out->b = sRGB(in->b * a + back->db * a1); - } - - out->a = 255; -} - -/* sG: convert linear RGB to sRGB grayscale */ -static void -gpc_sG(Pixel *out, const Pixel *in, const Background *back) -{ - (void)back; - - out->r = out->g = out->b = sRGB(YfromRGBint(in->r, in->g, in->b)/65535); - out->a = 255; -} - -/* sGp: unpremultiply RGB then convert to sRGB grayscale */ -static void -gpc_sGp(Pixel *out, const Pixel *in, const Background *back) -{ - (void)back; - - if (in->a <= 128) - { - out->r = out->g = out->b = 255; - out->a = 0; - } - - else - { - out->r = out->g = out->b = sRGB(YfromRGBint(in->r, in->g, in->b)/in->a); - out->a = u8d(in->a / 257.); - } -} - -/* sCp: unpremultiply RGB then convert to sRGB */ -static void -gpc_sCp(Pixel *out, const Pixel *in, const Background *back) -{ - (void)back; - - if (in->a <= 128) - { - out->r = out->g = out->b = 255; - out->a = 0; - } - - else - { - out->r = sRGB((double)in->r / in->a); - out->g = sRGB((double)in->g / in->a); - out->b = sRGB((double)in->b / in->a); - out->a = u8d(in->a / 257.); - } -} - -/* gb16: composite linear onto background and convert to sRGB grayscale */ -/* (order doesn't matter, the composite and grayscale operations permute) */ -static void -gpc_gb16(Pixel *out, const Pixel *in, const Background *back) -{ - if (in->a <= 0) - out->r = out->g = out->b = back->ig; - - else if (in->a >= 65535) - out->r = out->g = out->b = isRGB(in->g); - - else - { - double a = in->a / 65535.; - double a1 = 1-a; - - a /= 65535; - out->r = out->g = out->b = sRGB(in->g * a + back->dg * a1); - } - - out->a = 255; -} - -/* cb16: composite linear onto background and convert to sRGB */ -static void -gpc_cb16(Pixel *out, const Pixel *in, const Background *back) -{ - if (in->a <= 0) - { - out->r = back->ir; - out->g = back->ig; - out->b = back->ib; - } - - else if (in->a >= 65535) - { - out->r = isRGB(in->r); - out->g = isRGB(in->g); - out->b = isRGB(in->b); - } - - else - { - double a = in->a / 65535.; - double a1 = 1-a; - - a /= 65535; - out->r = sRGB(in->r * a + back->dr * a1); - out->g = sRGB(in->g * a + back->dg * a1); - out->b = sRGB(in->b * a + back->db * a1); - } - - out->a = 255; -} - -/* 16-bit to 16-bit conversions */ -/* A: set alpha to 65535 */ -static void -gpc_A(Pixel *out, const Pixel *in, const Background *back) -{ - (void)back; - out->r = in->r; - out->g = in->g; - out->b = in->b; - out->a = 65535; -} - -/* g16: convert linear RGB to linear grayscale (alpha := 65535) */ -static void -gpc_g16(Pixel *out, const Pixel *in, const Background *back) -{ - (void)back; - out->r = out->g = out->b = u16d(YfromRGBint(in->r, in->g, in->b)); - out->a = 65535; -} - -/* g16': as 'g16' but alpha is unchanged */ -static void -gpc_g16q(Pixel *out, const Pixel *in, const Background *back) -{ - (void)back; - out->r = out->g = out->b = u16d(YfromRGBint(in->r, in->g, in->b)); - out->a = in->a; -} - -#if ALLOW_UNUSED_GPC -/* Unused functions (to hide them from GCC unused function warnings) */ -void (* const gpc_unused[]) - (Pixel *out, const Pixel *in, const Background *back) = -{ - gpc_Pre, gpc_Preq, gpc_Glin, gpc_Gpre, gpc_Gprq, gpc_nop8, gpc_nop6 -}; -#endif - -/* OUT: ----- 8-bit ----- ----- 16-bit ----- - * IN G GA RGB RGBA G GA RGB RGBA - * 8 G . . . . lin lin lin lin - * 8 GA bckg . bckc . pre' pre pre' pre - * 8 RGB g8 g8 . . glin glin lin lin - * 8 RGBA g8b g8 bckc . gpr' gpre pre' pre - * 16 G sRGB sRGB sRGB sRGB . . . . - * 16 GA b16g unpg b16c unpc A . A . - * 16 RGB sG sG sRGB sRGB g16 g16 . . - * 16 RGBA gb16 sGp cb16 sCp g16 g16' A . - * - * The matrix is held in an array indexed thus: - * - * gpc_fn[out_format & BASE_FORMATS][in_format & BASE_FORMATS]; - */ -/* This will produce a compile time error if the FORMAT_FLAG values don't - * match the above matrix! - */ -#if PNG_FORMAT_FLAG_ALPHA == 1 && PNG_FORMAT_FLAG_COLOR == 2 &&\ - PNG_FORMAT_FLAG_LINEAR == 4 -static void (* const gpc_fn[8/*in*/][8/*out*/]) - (Pixel *out, const Pixel *in, const Background *back) = -{ -/*out: G-8 GA-8 RGB-8 RGBA-8 G-16 GA-16 RGB-16 RGBA-16 */ - {gpc_noop,gpc_noop,gpc_noop,gpc_noop, gpc_Lin, gpc_Lin, gpc_Lin, gpc_Lin }, - {gpc_bckg,gpc_noop,gpc_bckc,gpc_noop, gpc_preq,gpc_pre, gpc_preq,gpc_pre }, - {gpc_g8, gpc_g8, gpc_noop,gpc_noop, gpc_glin,gpc_glin,gpc_lin, gpc_lin }, - {gpc_g8b, gpc_g8, gpc_bckc,gpc_noop, gpc_gprq,gpc_gpre,gpc_preq,gpc_pre }, - {gpc_sRGB,gpc_sRGB,gpc_sRGB,gpc_sRGB, gpc_noop,gpc_noop,gpc_noop,gpc_noop}, - {gpc_b16g,gpc_unpg,gpc_b16c,gpc_unpc, gpc_A, gpc_noop,gpc_A, gpc_noop}, - {gpc_sG, gpc_sG, gpc_sRGB,gpc_sRGB, gpc_g16, gpc_g16, gpc_noop,gpc_noop}, - {gpc_gb16,gpc_sGp, gpc_cb16,gpc_sCp, gpc_g16, gpc_g16q,gpc_A, gpc_noop} -}; - -/* The array is repeated for the cases where both the input and output are color - * mapped because then different algorithms are used. - */ -static void (* const gpc_fn_colormapped[8/*in*/][8/*out*/]) - (Pixel *out, const Pixel *in, const Background *back) = -{ -/*out: G-8 GA-8 RGB-8 RGBA-8 G-16 GA-16 RGB-16 RGBA-16 */ - {gpc_noop,gpc_noop,gpc_noop,gpc_noop, gpc_lin, gpc_lin, gpc_lin, gpc_lin }, - {gpc_bckg,gpc_noop,gpc_bckc,gpc_noop, gpc_preq,gpc_pre, gpc_preq,gpc_pre }, - {gpc_g8, gpc_g8, gpc_noop,gpc_noop, gpc_glin,gpc_glin,gpc_lin, gpc_lin }, - {gpc_g8b, gpc_g8, gpc_bckc,gpc_noop, gpc_gprq,gpc_gpre,gpc_preq,gpc_pre }, - {gpc_sRGB,gpc_sRGB,gpc_sRGB,gpc_sRGB, gpc_noop,gpc_noop,gpc_noop,gpc_noop}, - {gpc_b16g,gpc_unpg,gpc_b16c,gpc_unpc, gpc_A, gpc_noop,gpc_A, gpc_noop}, - {gpc_sG, gpc_sG, gpc_sRGB,gpc_sRGB, gpc_g16, gpc_g16, gpc_noop,gpc_noop}, - {gpc_gb16,gpc_sGp, gpc_cb16,gpc_sCp, gpc_g16, gpc_g16q,gpc_A, gpc_noop} -}; - -/* The error arrays record the error in the same matrix; 64 entries, however - * the different algorithms used in libpng for colormap and direct conversions - * mean that four separate matrices are used (for each combination of - * colormapped and direct.) - * - * In some cases the conversion between sRGB formats goes via a linear - * intermediate; an sRGB to linear conversion (as above) is followed by a simple - * linear to sRGB step with no other conversions. This is done by a separate - * error array from an arbitrary 'in' format to one of the four basic outputs - * (since final output is always sRGB not colormapped). - * - * These arrays may be modified if the --accumulate flag is set during the run; - * then instead of logging errors they are simply added in. - * - * The three entries are currently for transparent, partially transparent and - * opaque input pixel values. Notice that alpha should be exact in each case. - * - * Errors in alpha should only occur when converting from a direct format - * to a colormapped format, when alpha is effectively smashed (so large - * errors can occur.) There should be no error in the '0' and 'opaque' - * values. The fourth entry in the array is used for the alpha error (and it - * should always be zero for the 'via linear' case since this is never color - * mapped.) - * - * Mapping to a colormap smashes the colors, it is necessary to have separate - * values for these cases because they are much larger; it is very much - * impossible to obtain a reasonable result, these are held in - * gpc_error_to_colormap. - */ -#if PNG_FORMAT_FLAG_COLORMAP == 8 /* extra check also required */ -/* START MACHINE GENERATED */ -static png_uint_16 gpc_error[16/*in*/][16/*out*/][4/*a*/] = -{ - { /* input: sRGB-gray */ - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 372, 0 }, { 0, 0, 372, 0 }, { 0, 0, 372, 0 }, { 0, 0, 372, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 } - }, { /* input: sRGB-gray+alpha */ - { 0, 18, 0, 0 }, { 0, 0, 0, 0 }, { 0, 20, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 897, 788, 0 }, { 0, 897, 788, 0 }, { 0, 897, 788, 0 }, { 0, 897, 788, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 } - }, { /* input: sRGB-rgb */ - { 0, 0, 19, 0 }, { 0, 0, 19, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 893, 0 }, { 0, 0, 893, 0 }, { 0, 0, 811, 0 }, { 0, 0, 811, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 } - }, { /* input: sRGB-rgb+alpha */ - { 0, 4, 13, 0 }, { 0, 14, 13, 0 }, { 0, 19, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 832, 764, 0 }, { 0, 832, 764, 0 }, { 0, 897, 788, 0 }, { 0, 897, 788, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 } - }, { /* input: linear-gray */ - { 0, 0, 9, 0 }, { 0, 0, 9, 0 }, { 0, 0, 9, 0 }, { 0, 0, 9, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 } - }, { /* input: linear-gray+alpha */ - { 0, 74, 9, 0 }, { 0, 20, 9, 0 }, { 0, 74, 9, 0 }, { 0, 20, 9, 0 }, - { 0, 0, 0, 0 }, { 0, 1, 0, 0 }, { 0, 0, 0, 0 }, { 0, 1, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 } - }, { /* input: linear-rgb */ - { 0, 0, 9, 0 }, { 0, 0, 9, 0 }, { 0, 0, 9, 0 }, { 0, 0, 9, 0 }, - { 0, 0, 4, 0 }, { 0, 0, 4, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 } - }, { /* input: linear-rgb+alpha */ - { 0, 126, 143, 0 }, { 0, 9, 7, 0 }, { 0, 74, 9, 0 }, { 0, 16, 9, 0 }, - { 0, 4, 4, 0 }, { 0, 5, 4, 0 }, { 0, 0, 0, 0 }, { 0, 1, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 } - }, { /* input: color-mapped-sRGB-gray */ - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 } - }, { /* input: color-mapped-sRGB-gray+alpha */ - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 } - }, { /* input: color-mapped-sRGB-rgb */ - { 0, 0, 13, 0 }, { 0, 0, 13, 0 }, { 0, 0, 8, 0 }, { 0, 0, 8, 0 }, - { 0, 0, 673, 0 }, { 0, 0, 673, 0 }, { 0, 0, 674, 0 }, { 0, 0, 674, 0 }, - { 0, 0, 1, 0 }, { 0, 0, 1, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 460, 0 }, { 0, 0, 460, 0 }, { 0, 0, 263, 0 }, { 0, 0, 263, 0 } - }, { /* input: color-mapped-sRGB-rgb+alpha */ - { 0, 6, 8, 0 }, { 0, 7, 8, 0 }, { 0, 75, 8, 0 }, { 0, 9, 8, 0 }, - { 0, 585, 427, 0 }, { 0, 585, 427, 0 }, { 0, 717, 409, 0 }, { 0, 717, 409, 0 }, - { 0, 1, 1, 0 }, { 0, 1, 1, 0 }, { 0, 1, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 13323, 460, 0 }, { 0, 334, 460, 0 }, { 0, 16480, 263, 0 }, { 0, 243, 263, 0 } - }, { /* input: color-mapped-linear-gray */ - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 282, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 } - }, { /* input: color-mapped-linear-gray+alpha */ - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 253, 282, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 } - }, { /* input: color-mapped-linear-rgb */ - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 265, 0 }, { 0, 0, 0, 0 } - }, { /* input: color-mapped-linear-rgb+alpha */ - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 243, 265, 0 } - } -}; -static png_uint_16 gpc_error_via_linear[16][4/*out*/][4] = -{ - { /* input: sRGB-gray */ - { 0, 0, 7, 0 }, { 0, 0, 7, 0 }, { 0, 0, 7, 0 }, { 0, 0, 7, 0 } - }, { /* input: sRGB-gray+alpha */ - { 0, 15, 15, 0 }, { 0, 186, 15, 0 }, { 0, 15, 15, 0 }, { 0, 186, 15, 0 } - }, { /* input: sRGB-rgb */ - { 0, 0, 19, 0 }, { 0, 0, 19, 0 }, { 0, 0, 15, 0 }, { 0, 0, 15, 0 } - }, { /* input: sRGB-rgb+alpha */ - { 0, 12, 14, 0 }, { 0, 180, 14, 0 }, { 0, 14, 15, 0 }, { 0, 186, 15, 0 } - }, { /* input: linear-gray */ - { 0, 0, 1, 0 }, { 0, 0, 1, 0 }, { 0, 0, 1, 0 }, { 0, 0, 1, 0 } - }, { /* input: linear-gray+alpha */ - { 0, 1, 1, 0 }, { 0, 1, 1, 0 }, { 0, 1, 1, 0 }, { 0, 1, 1, 0 } - }, { /* input: linear-rgb */ - { 0, 0, 1, 0 }, { 0, 0, 1, 0 }, { 0, 0, 1, 0 }, { 0, 0, 1, 0 } - }, { /* input: linear-rgb+alpha */ - { 0, 1, 1, 0 }, { 0, 8, 1, 0 }, { 0, 1, 1, 0 }, { 0, 1, 1, 0 } - }, { /* input: color-mapped-sRGB-gray */ - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 } - }, { /* input: color-mapped-sRGB-gray+alpha */ - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 } - }, { /* input: color-mapped-sRGB-rgb */ - { 0, 0, 13, 0 }, { 0, 0, 13, 0 }, { 0, 0, 14, 0 }, { 0, 0, 14, 0 } - }, { /* input: color-mapped-sRGB-rgb+alpha */ - { 0, 4, 8, 0 }, { 0, 9, 8, 0 }, { 0, 8, 3, 0 }, { 0, 32, 3, 0 } - }, { /* input: color-mapped-linear-gray */ - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 } - }, { /* input: color-mapped-linear-gray+alpha */ - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 } - }, { /* input: color-mapped-linear-rgb */ - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 } - }, { /* input: color-mapped-linear-rgb+alpha */ - { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 } - } -}; -static png_uint_16 gpc_error_to_colormap[8/*i*/][8/*o*/][4] = -{ - { /* input: sRGB-gray */ - { 0, 0, 9, 0 }, { 0, 0, 9, 0 }, { 0, 0, 9, 0 }, { 0, 0, 9, 0 }, - { 0, 0, 560, 0 }, { 0, 0, 560, 0 }, { 0, 0, 560, 0 }, { 0, 0, 560, 0 } - }, { /* input: sRGB-gray+alpha */ - { 0, 19, 2, 0 }, { 0, 255, 2, 25 }, { 0, 88, 2, 0 }, { 0, 255, 2, 25 }, - { 0, 1012, 745, 0 }, { 0, 16026, 745, 6425 }, { 0, 1012, 745, 0 }, { 0, 16026, 745, 6425 } - }, { /* input: sRGB-rgb */ - { 0, 0, 19, 0 }, { 0, 0, 19, 0 }, { 0, 0, 25, 0 }, { 0, 0, 25, 0 }, - { 0, 0, 937, 0 }, { 0, 0, 937, 0 }, { 0, 0, 13677, 0 }, { 0, 0, 13677, 0 } - }, { /* input: sRGB-rgb+alpha */ - { 0, 63, 77, 0 }, { 0, 255, 19, 25 }, { 0, 220, 25, 0 }, { 0, 255, 25, 67 }, - { 0, 17534, 18491, 0 }, { 0, 15614, 2824, 6425 }, { 0, 14019, 13677, 0 }, { 0, 48573, 13677, 17219 } - }, { /* input: linear-gray */ - { 0, 0, 73, 0 }, { 0, 0, 73, 0 }, { 0, 0, 73, 0 }, { 0, 0, 73, 0 }, - { 0, 0, 18817, 0 }, { 0, 0, 18817, 0 }, { 0, 0, 18817, 0 }, { 0, 0, 18817, 0 } - }, { /* input: linear-gray+alpha */ - { 0, 74, 74, 0 }, { 0, 255, 74, 25 }, { 0, 97, 74, 0 }, { 0, 255, 74, 25 }, - { 0, 18919, 18907, 0 }, { 0, 24549, 18907, 6552 }, { 0, 18919, 18907, 0 }, { 0, 24549, 18907, 6552 } - }, { /* input: linear-rgb */ - { 0, 0, 73, 0 }, { 0, 0, 73, 0 }, { 0, 0, 98, 0 }, { 0, 0, 98, 0 }, - { 0, 0, 18664, 0 }, { 0, 0, 18664, 0 }, { 0, 0, 24998, 0 }, { 0, 0, 24998, 0 } - }, { /* input: linear-rgb+alpha */ - { 0, 181, 196, 0 }, { 0, 255, 61, 25 }, { 206, 187, 98, 0 }, { 0, 255, 98, 67 }, - { 0, 18141, 18137, 0 }, { 0, 17494, 17504, 6553 }, { 0, 24979, 24992, 0 }, { 0, 46509, 24992, 17347 } - } -}; -/* END MACHINE GENERATED */ -#endif /* COLORMAP flag check */ -#endif /* flag checks */ - -typedef struct -{ - /* Basic pixel information: */ - Image* in_image; /* Input image */ - const Image* out_image; /* Output image */ - - /* 'background' is the value passed to the gpc_ routines, it may be NULL if - * it should not be used (*this* program has an error if it crashes as a - * result!) - */ - Background background_color; - const Background* background; - - /* Precalculated values: */ - int in_opaque; /* Value of input alpha that is opaque */ - int is_palette; /* Sample values come from the palette */ - int accumulate; /* Accumlate component errors (don't log) */ - int output_8bit; /* Output is 8 bit (else 16 bit) */ - - void (*in_gp)(Pixel*, png_const_voidp); - void (*out_gp)(Pixel*, png_const_voidp); - - void (*transform)(Pixel *out, const Pixel *in, const Background *back); - /* A function to perform the required transform */ - - void (*from_linear)(Pixel *out, const Pixel *in, const Background *back); - /* For 'via_linear' transforms the final, from linear, step, else NULL */ - - png_uint_16 error[4]; - /* Three error values for transparent, partially transparent and opaque - * input pixels (in turn). - */ - - png_uint_16 *error_ptr; - /* Where these are stored in the static array (for 'accumulate') */ -} -Transform; - -/* Return a 'transform' as above for the given format conversion. */ -static void -transform_from_formats(Transform *result, Image *in_image, - const Image *out_image, png_const_colorp background, int via_linear) -{ - png_uint_32 in_format, out_format; - png_uint_32 in_base, out_base; - - memset(result, 0, sizeof *result); - - /* Store the original images for error messages */ - result->in_image = in_image; - result->out_image = out_image; - - in_format = in_image->image.format; - out_format = out_image->image.format; - - if (in_format & PNG_FORMAT_FLAG_LINEAR) - result->in_opaque = 65535; - else - result->in_opaque = 255; - - result->output_8bit = (out_format & PNG_FORMAT_FLAG_LINEAR) == 0; - - result->is_palette = 0; /* set by caller if required */ - result->accumulate = (in_image->opts & ACCUMULATE) != 0; - - /* The loaders (which need the ordering information) */ - result->in_gp = get_pixel(in_format); - result->out_gp = get_pixel(out_format); - - /* Remove the ordering information: */ - in_format &= BASE_FORMATS | PNG_FORMAT_FLAG_COLORMAP; - in_base = in_format & BASE_FORMATS; - out_format &= BASE_FORMATS | PNG_FORMAT_FLAG_COLORMAP; - out_base = out_format & BASE_FORMATS; - - if (via_linear) - { - /* Check for an error in this program: */ - if (out_format & (PNG_FORMAT_FLAG_LINEAR|PNG_FORMAT_FLAG_COLORMAP)) - { - fprintf(stderr, "internal transform via linear error 0x%x->0x%x\n", - in_format, out_format); - exit(1); - } - - result->transform = gpc_fn[in_base][out_base | PNG_FORMAT_FLAG_LINEAR]; - result->from_linear = gpc_fn[out_base | PNG_FORMAT_FLAG_LINEAR][out_base]; - result->error_ptr = gpc_error_via_linear[in_format][out_format]; - } - - else if (~in_format & out_format & PNG_FORMAT_FLAG_COLORMAP) - { - /* The input is not colormapped but the output is, the errors will - * typically be large (only the grayscale-no-alpha case permits preserving - * even 8-bit values.) - */ - result->transform = gpc_fn[in_base][out_base]; - result->from_linear = NULL; - result->error_ptr = gpc_error_to_colormap[in_base][out_base]; - } - - else - { - /* The caller handles the colormap->pixel value conversion, so the - * transform function just gets a pixel value, however because libpng - * currently contains a different implementation for mapping a colormap if - * both input and output are colormapped we need different conversion - * functions to deal with errors in the libpng implementation. - */ - if (in_format & out_format & PNG_FORMAT_FLAG_COLORMAP) - result->transform = gpc_fn_colormapped[in_base][out_base]; - else - result->transform = gpc_fn[in_base][out_base]; - result->from_linear = NULL; - result->error_ptr = gpc_error[in_format][out_format]; - } - - /* Follow the libpng simplified API rules to work out what to pass to the gpc - * routines as a background value, if one is not required pass NULL so that - * this program crashes in the even of a programming error. - */ - result->background = NULL; /* default: not required */ - - /* Rule 1: background only need be supplied if alpha is to be removed */ - if (in_format & ~out_format & PNG_FORMAT_FLAG_ALPHA) - { - /* The input value is 'NULL' to use the background and (otherwise) an sRGB - * background color (to use a solid color). The code above uses a fixed - * byte value, BUFFER_INIT8, for buffer even for 16-bit output. For - * linear (16-bit) output the sRGB background color is ignored; the - * composition is always on the background (so BUFFER_INIT8 * 257), except - * that for the colormap (i.e. linear colormapped output) black is used. - */ - result->background = &result->background_color; - - if (out_format & PNG_FORMAT_FLAG_LINEAR || via_linear) - { - if (out_format & PNG_FORMAT_FLAG_COLORMAP) - { - result->background_color.ir = - result->background_color.ig = - result->background_color.ib = 0; - result->background_color.dr = - result->background_color.dg = - result->background_color.db = 0; - } - - else - { - result->background_color.ir = - result->background_color.ig = - result->background_color.ib = BUFFER_INIT8 * 257; - result->background_color.dr = - result->background_color.dg = - result->background_color.db = 0; - } - } - - else /* sRGB output */ - { - if (background != NULL) - { - if (out_format & PNG_FORMAT_FLAG_COLOR) - { - result->background_color.ir = background->red; - result->background_color.ig = background->green; - result->background_color.ib = background->blue; - /* TODO: sometimes libpng uses the power law conversion here, how - * to handle this? - */ - result->background_color.dr = sRGB_to_d[background->red]; - result->background_color.dg = sRGB_to_d[background->green]; - result->background_color.db = sRGB_to_d[background->blue]; - } - - else /* grayscale: libpng only looks at 'g' */ - { - result->background_color.ir = - result->background_color.ig = - result->background_color.ib = background->green; - /* TODO: sometimes libpng uses the power law conversion here, how - * to handle this? - */ - result->background_color.dr = - result->background_color.dg = - result->background_color.db = sRGB_to_d[background->green]; - } - } - - else if ((out_format & PNG_FORMAT_FLAG_COLORMAP) == 0) - { - result->background_color.ir = - result->background_color.ig = - result->background_color.ib = BUFFER_INIT8; - /* TODO: sometimes libpng uses the power law conversion here, how - * to handle this? - */ - result->background_color.dr = - result->background_color.dg = - result->background_color.db = sRGB_to_d[BUFFER_INIT8]; - } - - /* Else the output is colormapped and a background color must be - * provided; if pngstest crashes then that is a bug in this program - * (though libpng should png_error as well.) - */ - else - result->background = NULL; - } - } - - if (result->background == NULL) - { - result->background_color.ir = - result->background_color.ig = - result->background_color.ib = -1; /* not used */ - result->background_color.dr = - result->background_color.dg = - result->background_color.db = 1E30; /* not used */ - } - - - /* Copy the error values into the Transform: */ - result->error[0] = result->error_ptr[0]; - result->error[1] = result->error_ptr[1]; - result->error[2] = result->error_ptr[2]; - result->error[3] = result->error_ptr[3]; -} - - -/* Compare two pixels. - * - * OLD error values: -static int error_to_linear = 811; * by experiment * -static int error_to_linear_grayscale = 424; * by experiment * -static int error_to_sRGB = 6; * by experiment * -static int error_to_sRGB_grayscale = 17; * libpng error by calculation + - 2 by experiment * -static int error_in_compose = 2; * by experiment * -static int error_in_premultiply = 1; - * - * The following is *just* the result of a round trip from 8-bit sRGB to linear - * then back to 8-bit sRGB when it is done by libpng. There are two problems: - * - * 1) libpng currently uses a 2.2 power law with no linear segment, this results - * in instability in the low values and even with 16-bit precision sRGB(1) ends - * up mapping to sRGB(0) as a result of rounding in the 16-bit representation. - * This gives an error of 1 in the handling of value 1 only. - * - * 2) libpng currently uses an intermediate 8-bit linear value in gamma - * correction of 8-bit values. This results in many more errors, the worse of - * which is mapping sRGB(14) to sRGB(0). - * - * The general 'error_via_linear' is more complex because of pre-multiplication, - * this compounds the 8-bit errors according to the alpha value of the pixel. - * As a result 256 values are pre-calculated for error_via_linear. - */ -#if 0 -static int error_in_libpng_gamma; -static int error_via_linear[256]; /* Indexed by 8-bit alpha */ - -static void -init_error_via_linear(void) -{ - int alpha; - - error_via_linear[0] = 255; /* transparent pixel */ - - for (alpha=1; alpha<=255; ++alpha) - { - /* 16-bit values less than 128.5 get rounded to 8-bit 0 and so the worst - * case error arises with 16-bit 128.5, work out what sRGB - * (non-associated) value generates 128.5; any value less than this is - * going to map to 0, so the worst error is floor(value). - * - * Note that errors are considerably higher (more than a factor of 2) - * because libpng uses a simple power law for sRGB data at present. - * - * Add .1 for arithmetic errors inside libpng. - */ - double v = floor(255*pow(.5/*(128.5 * 255 / 65535)*/ / alpha, 1/2.2)+.1); - - error_via_linear[alpha] = (int)v; - } - - /* This is actually 14.99, but, despite the closeness to 15, 14 seems to work - * ok in this case. - */ - error_in_libpng_gamma = 14; -} -#endif - -static void -print_pixel(char string[64], const Pixel *pixel, png_uint_32 format) -{ - switch (format & (PNG_FORMAT_FLAG_ALPHA|PNG_FORMAT_FLAG_COLOR)) - { - case 0: - sprintf(string, "%s(%d)", format_names[format], pixel->g); - break; - - case PNG_FORMAT_FLAG_ALPHA: - sprintf(string, "%s(%d,%d)", format_names[format], pixel->g, - pixel->a); - break; - - case PNG_FORMAT_FLAG_COLOR: - sprintf(string, "%s(%d,%d,%d)", format_names[format], - pixel->r, pixel->g, pixel->b); - break; - - case PNG_FORMAT_FLAG_COLOR|PNG_FORMAT_FLAG_ALPHA: - sprintf(string, "%s(%d,%d,%d,%d)", format_names[format], - pixel->r, pixel->g, pixel->b, pixel->a); - break; - - default: - sprintf(string, "invalid-format"); - break; - } -} - -static int -logpixel(const Transform *transform, png_uint_32 x, png_uint_32 y, - const Pixel *in, const Pixel *calc, const Pixel *out, const char *reason) -{ - const png_uint_32 in_format = transform->in_image->image.format; - const png_uint_32 out_format = transform->out_image->image.format; - - png_uint_32 back_format = out_format & ~PNG_FORMAT_FLAG_ALPHA; - const char *via_linear = ""; - - char pixel_in[64], pixel_calc[64], pixel_out[64], pixel_loc[64]; - char background_info[100]; - - print_pixel(pixel_in, in, in_format); - print_pixel(pixel_calc, calc, out_format); - print_pixel(pixel_out, out, out_format); - - if (transform->is_palette) - sprintf(pixel_loc, "palette: %lu", (unsigned long)y); - else - sprintf(pixel_loc, "%lu,%lu", (unsigned long)x, (unsigned long)y); - - if (transform->from_linear != NULL) - { - via_linear = " (via linear)"; - /* And as a result the *read* format which did any background processing - * was itself linear, so the background color information is also - * linear. - */ - back_format |= PNG_FORMAT_FLAG_LINEAR; - } - - if (transform->background != NULL) - { - Pixel back; - char pixel_back[64]; - - back.r = transform->background->ir; - back.g = transform->background->ig; - back.b = transform->background->ib; - back.a = -1; /* not used */ - - print_pixel(pixel_back, &back, back_format); - sprintf(background_info, " on background %s", pixel_back); - } - - else - background_info[0] = 0; - - if (transform->in_image->file_name != transform->out_image->file_name) - { - char error_buffer[512]; - sprintf(error_buffer, - "(%s) %s error%s:\n %s%s ->\n %s\n not: %s.\n" - "Use --preserve and examine: ", pixel_loc, reason, via_linear, - pixel_in, background_info, pixel_out, pixel_calc); - return logerror(transform->in_image, transform->in_image->file_name, - error_buffer, transform->out_image->file_name); - } - - else - { - char error_buffer[512]; - sprintf(error_buffer, - "(%s) %s error%s:\n %s%s ->\n %s\n not: %s.\n" - " The error happened when reading the original file with this format.", - pixel_loc, reason, via_linear, pixel_in, background_info, pixel_out, - pixel_calc); - return logerror(transform->in_image, transform->in_image->file_name, - error_buffer, ""); - } -} - -static int -cmppixel(Transform *transform, png_const_voidp in, png_const_voidp out, - png_uint_32 x, png_uint_32 y/*or palette index*/) -{ - int maxerr; - png_const_charp errmsg; - Pixel pixel_in, pixel_calc, pixel_out; - - transform->in_gp(&pixel_in, in); - - if (transform->from_linear == NULL) - transform->transform(&pixel_calc, &pixel_in, transform->background); - - else - { - transform->transform(&pixel_out, &pixel_in, transform->background); - transform->from_linear(&pixel_calc, &pixel_out, NULL); - } - - transform->out_gp(&pixel_out, out); - - /* Eliminate the case where the input and output values match exactly. */ - if (pixel_calc.a == pixel_out.a && pixel_calc.r == pixel_out.r && - pixel_calc.g == pixel_out.g && pixel_calc.b == pixel_out.b) - return 1; - - /* Eliminate the case where the output pixel is transparent and the output - * is 8-bit - any component values are valid. Don't check the input alpha - * here to also skip the 16-bit small alpha cases. - */ - if (transform->output_8bit && pixel_calc.a == 0 && pixel_out.a == 0) - return 1; - - /* Check for alpha errors first; an alpha error can damage the components too - * so avoid spurious checks on components if one is found. - */ - errmsg = NULL; - { - int err_a = abs(pixel_calc.a-pixel_out.a); - - if (err_a > transform->error[3]) - { - /* If accumulating check the components too */ - if (transform->accumulate) - transform->error[3] = (png_uint_16)err_a; - - else - errmsg = "alpha"; - } - } - - /* Now if *either* of the output alphas are 0 but alpha is within tolerance - * eliminate the 8-bit component comparison. - */ - if (errmsg == NULL && transform->output_8bit && - (pixel_calc.a == 0 || pixel_out.a == 0)) - return 1; - - if (errmsg == NULL) /* else just signal an alpha error */ - { - int err_r = abs(pixel_calc.r - pixel_out.r); - int err_g = abs(pixel_calc.g - pixel_out.g); - int err_b = abs(pixel_calc.b - pixel_out.b); - int limit; - - if ((err_r | err_g | err_b) == 0) - return 1; /* exact match */ - - /* Mismatch on a component, check the input alpha */ - if (pixel_in.a >= transform->in_opaque) - { - errmsg = "opaque component"; - limit = 2; /* opaque */ - } - - else if (pixel_in.a > 0) - { - errmsg = "alpha component"; - limit = 1; /* partially transparent */ - } - - else - { - errmsg = "transparent component (background)"; - limit = 0; /* transparent */ - } - - maxerr = err_r; - if (maxerr < err_g) maxerr = err_g; - if (maxerr < err_b) maxerr = err_b; - - if (maxerr <= transform->error[limit]) - return 1; /* within the error limits */ - - /* Handle a component mis-match; log it, just return an error code, or - * accumulate it. - */ - if (transform->accumulate) - { - transform->error[limit] = (png_uint_16)maxerr; - return 1; /* to cause the caller to keep going */ - } - } - - /* Failure to match and not accumulating, so the error must be logged. */ - return logpixel(transform, x, y, &pixel_in, &pixel_calc, &pixel_out, errmsg); -} - -static png_byte -component_loc(png_byte loc[4], png_uint_32 format) -{ - /* Given a format return the number of channels and the location of - * each channel. - * - * The mask 'loc' contains the component offset of the channels in the - * following order. Note that if 'format' is grayscale the entries 1-3 must - * all contain the location of the gray channel. - * - * 0: alpha - * 1: red or gray - * 2: green or gray - * 3: blue or gray - */ - png_byte channels; - - if (format & PNG_FORMAT_FLAG_COLOR) - { - channels = 3; - - loc[2] = 1; - -# ifdef PNG_FORMAT_BGR_SUPPORTED - if (format & PNG_FORMAT_FLAG_BGR) - { - loc[1] = 2; - loc[3] = 0; - } - - else -# endif - { - loc[1] = 0; - loc[3] = 2; - } - } - - else - { - channels = 1; - loc[1] = loc[2] = loc[3] = 0; - } - - if (format & PNG_FORMAT_FLAG_ALPHA) - { -# ifdef PNG_FORMAT_AFIRST_SUPPORTED - if (format & PNG_FORMAT_FLAG_AFIRST) - { - loc[0] = 0; - ++loc[1]; - ++loc[2]; - ++loc[3]; - } - - else -# endif - loc[0] = channels; - - ++channels; - } - - else - loc[0] = 4; /* not present */ - - return channels; -} - -/* Compare two images, the original 'a', which was written out then read back in - * to * give image 'b'. The formats may have been changed. - */ -static int -compare_two_images(Image *a, Image *b, int via_linear, - png_const_colorp background) -{ - ptrdiff_t stridea = a->stride; - ptrdiff_t strideb = b->stride; - png_const_bytep rowa = a->buffer+16; - png_const_bytep rowb = b->buffer+16; - const png_uint_32 width = a->image.width; - const png_uint_32 height = a->image.height; - const png_uint_32 formata = a->image.format; - const png_uint_32 formatb = b->image.format; - const unsigned int a_sample = PNG_IMAGE_SAMPLE_SIZE(formata); - const unsigned int b_sample = PNG_IMAGE_SAMPLE_SIZE(formatb); - int alpha_added, alpha_removed; - int bchannels; - int btoa[4]; - png_uint_32 y; - Transform tr; - - /* This should never happen: */ - if (width != b->image.width || height != b->image.height) - return logerror(a, a->file_name, ": width x height changed: ", - b->file_name); - - /* Set up the background and the transform */ - transform_from_formats(&tr, a, b, background, via_linear); - - /* Find the first row and inter-row space. */ - if (!(formata & PNG_FORMAT_FLAG_COLORMAP) && - (formata & PNG_FORMAT_FLAG_LINEAR)) - stridea *= 2; - - if (!(formatb & PNG_FORMAT_FLAG_COLORMAP) && - (formatb & PNG_FORMAT_FLAG_LINEAR)) - strideb *= 2; - - if (stridea < 0) rowa += (height-1) * (-stridea); - if (strideb < 0) rowb += (height-1) * (-strideb); - - /* First shortcut the two colormap case by comparing the image data; if it - * matches then we expect the colormaps to match, although this is not - * absolutely necessary for an image match. If the colormaps fail to match - * then there is a problem in libpng. - */ - if (formata & formatb & PNG_FORMAT_FLAG_COLORMAP) - { - /* Only check colormap entries that actually exist; */ - png_const_bytep ppa, ppb; - int match; - png_byte in_use[256], amax = 0, bmax = 0; - - memset(in_use, 0, sizeof in_use); - - ppa = rowa; - ppb = rowb; - - /* Do this the slow way to accumulate the 'in_use' flags, don't break out - * of the loop until the end; this validates the color-mapped data to - * ensure all pixels are valid color-map indexes. - */ - for (y=0, match=1; y bmax) - bmax = bval; - - if (bval != aval) - match = 0; - - in_use[aval] = 1; - if (aval > amax) - amax = aval; - } - } - - /* If the buffers match then the colormaps must too. */ - if (match) - { - /* Do the color-maps match, entry by entry? Only check the 'in_use' - * entries. An error here should be logged as a color-map error. - */ - png_const_bytep a_cmap = (png_const_bytep)a->colormap; - png_const_bytep b_cmap = (png_const_bytep)b->colormap; - int result = 1; /* match by default */ - - /* This is used in logpixel to get the error message correct. */ - tr.is_palette = 1; - - for (y=0; y<256; ++y, a_cmap += a_sample, b_cmap += b_sample) - if (in_use[y]) - { - /* The colormap entries should be valid, but because libpng doesn't - * do any checking at present the original image may contain invalid - * pixel values. These cause an error here (at present) unless - * accumulating errors in which case the program just ignores them. - */ - if (y >= a->image.colormap_entries) - { - if ((a->opts & ACCUMULATE) == 0) - { - char pindex[9]; - sprintf(pindex, "%lu[%lu]", (unsigned long)y, - (unsigned long)a->image.colormap_entries); - logerror(a, a->file_name, ": bad pixel index: ", pindex); - } - result = 0; - } - - else if (y >= b->image.colormap_entries) - { - if ((a->opts & ACCUMULATE) == 0) - { - char pindex[9]; - sprintf(pindex, "%lu[%lu]", (unsigned long)y, - (unsigned long)b->image.colormap_entries); - logerror(b, b->file_name, ": bad pixel index: ", pindex); - } - result = 0; - } - - /* All the mismatches are logged here; there can only be 256! */ - else if (!cmppixel(&tr, a_cmap, b_cmap, 0, y)) - result = 0; - } - - /* If reqested copy the error values back from the Transform. */ - if (a->opts & ACCUMULATE) - { - tr.error_ptr[0] = tr.error[0]; - tr.error_ptr[1] = tr.error[1]; - tr.error_ptr[2] = tr.error[2]; - tr.error_ptr[3] = tr.error[3]; - result = 1; /* force a continue */ - } - - return result; - } - - /* else the image buffers don't match pixel-wise so compare sample values - * instead, but first validate that the pixel indexes are in range (but - * only if not accumulating, when the error is ignored.) - */ - else if ((a->opts & ACCUMULATE) == 0) - { - /* Check the original image first, - * TODO: deal with input images with bad pixel values? - */ - if (amax >= a->image.colormap_entries) - { - char pindex[9]; - sprintf(pindex, "%d[%lu]", amax, - (unsigned long)a->image.colormap_entries); - return logerror(a, a->file_name, ": bad pixel index: ", pindex); - } - - else if (bmax >= b->image.colormap_entries) - { - char pindex[9]; - sprintf(pindex, "%d[%lu]", bmax, - (unsigned long)b->image.colormap_entries); - return logerror(b, b->file_name, ": bad pixel index: ", pindex); - } - } - } - - /* We can directly compare pixel values without the need to use the read - * or transform support (i.e. a memory compare) if: - * - * 1) The bit depth has not changed. - * 2) RGB to grayscale has not been done (the reverse is ok; we just compare - * the three RGB values to the original grayscale.) - * 3) An alpha channel has not been removed from an 8-bit format, or the - * 8-bit alpha value of the pixel was 255 (opaque). - * - * If an alpha channel has been *added* then it must have the relevant opaque - * value (255 or 65535). - * - * The fist two the tests (in the order given above) (using the boolean - * equivalence !a && !b == !(a || b)) - */ - if (!(((formata ^ formatb) & PNG_FORMAT_FLAG_LINEAR) | - (formata & (formatb ^ PNG_FORMAT_FLAG_COLOR) & PNG_FORMAT_FLAG_COLOR))) - { - /* Was an alpha channel changed? */ - const png_uint_32 alpha_changed = (formata ^ formatb) & - PNG_FORMAT_FLAG_ALPHA; - - /* Was an alpha channel removed? (The third test.) If so the direct - * comparison is only possible if the input alpha is opaque. - */ - alpha_removed = (formata & alpha_changed) != 0; - - /* Was an alpha channel added? */ - alpha_added = (formatb & alpha_changed) != 0; - - /* The channels may have been moved between input and output, this finds - * out how, recording the result in the btoa array, which says where in - * 'a' to find each channel of 'b'. If alpha was added then btoa[alpha] - * ends up as 4 (and is not used.) - */ - { - int i; - png_byte aloc[4]; - png_byte bloc[4]; - - /* The following are used only if the formats match, except that - * 'bchannels' is a flag for matching formats. btoa[x] says, for each - * channel in b, where to find the corresponding value in a, for the - * bchannels. achannels may be different for a gray to rgb transform - * (a will be 1 or 2, b will be 3 or 4 channels.) - */ - (void)component_loc(aloc, formata); - bchannels = component_loc(bloc, formatb); - - /* Hence the btoa array. */ - for (i=0; i<4; ++i) if (bloc[i] < 4) - btoa[bloc[i]] = aloc[i]; /* may be '4' for alpha */ - - if (alpha_added) - alpha_added = bloc[0]; /* location of alpha channel in image b */ - - else - alpha_added = 4; /* Won't match an image b channel */ - - if (alpha_removed) - alpha_removed = aloc[0]; /* location of alpha channel in image a */ - - else - alpha_removed = 4; - } - } - - else - { - /* Direct compare is not possible, cancel out all the corresponding local - * variables. - */ - bchannels = 0; - alpha_removed = alpha_added = 4; - btoa[3] = btoa[2] = btoa[1] = btoa[0] = 4; /* 4 == not present */ - } - - for (y=0; ycolormap + a_sample * *ppa++; - else - psa = ppa, ppa += a_sample; - - if (formatb & PNG_FORMAT_FLAG_COLORMAP) - psb = (png_const_bytep)b->colormap + b_sample * *ppb++; - else - psb = ppb, ppb += b_sample; - - /* Do the fast test if possible. */ - if (bchannels) - { - /* Check each 'b' channel against either the corresponding 'a' - * channel or the opaque alpha value, as appropriate. If - * alpha_removed value is set (not 4) then also do this only if the - * 'a' alpha channel (alpha_removed) is opaque; only relevant for - * the 8-bit case. - */ - if (formatb & PNG_FORMAT_FLAG_LINEAR) /* 16-bit checks */ - { - png_const_uint_16p pua = aligncastconst(png_const_uint_16p, psa); - png_const_uint_16p pub = aligncastconst(png_const_uint_16p, psb); - - switch (bchannels) - { - case 4: - if (pua[btoa[3]] != pub[3]) break; - case 3: - if (pua[btoa[2]] != pub[2]) break; - case 2: - if (pua[btoa[1]] != pub[1]) break; - case 1: - if (pua[btoa[0]] != pub[0]) break; - if (alpha_added != 4 && pub[alpha_added] != 65535) break; - continue; /* x loop */ - default: - break; /* impossible */ - } - } - - else if (alpha_removed == 4 || psa[alpha_removed] == 255) - { - switch (bchannels) - { - case 4: - if (psa[btoa[3]] != psb[3]) break; - case 3: - if (psa[btoa[2]] != psb[2]) break; - case 2: - if (psa[btoa[1]] != psb[1]) break; - case 1: - if (psa[btoa[0]] != psb[0]) break; - if (alpha_added != 4 && psb[alpha_added] != 255) break; - continue; /* x loop */ - default: - break; /* impossible */ - } - } - } - - /* If we get to here the fast match failed; do the slow match for this - * pixel. - */ - if (!cmppixel(&tr, psa, psb, x, y) && (a->opts & KEEP_GOING) == 0) - return 0; /* error case */ - } - } - - /* If reqested copy the error values back from the Transform. */ - if (a->opts & ACCUMULATE) - { - tr.error_ptr[0] = tr.error[0]; - tr.error_ptr[1] = tr.error[1]; - tr.error_ptr[2] = tr.error[2]; - tr.error_ptr[3] = tr.error[3]; - } - - return 1; -} - -/* Read the file; how the read gets done depends on which of input_file and - * input_memory have been set. - */ -static int -read_file(Image *image, png_uint_32 format, png_const_colorp background) -{ - memset(&image->image, 0, sizeof image->image); - image->image.version = PNG_IMAGE_VERSION; - - if (image->input_memory != NULL) - { - if (!png_image_begin_read_from_memory(&image->image, image->input_memory, - image->input_memory_size)) - return logerror(image, "memory init: ", image->file_name, ""); - } - -# ifdef PNG_STDIO_SUPPORTED - else if (image->input_file != NULL) - { - if (!png_image_begin_read_from_stdio(&image->image, image->input_file)) - return logerror(image, "stdio init: ", image->file_name, ""); - } - - else - { - if (!png_image_begin_read_from_file(&image->image, image->file_name)) - return logerror(image, "file init: ", image->file_name, ""); - } -# else - else - { - return logerror(image, "unsupported file/stdio init: ", - image->file_name, ""); - } -# endif - - /* This must be set after the begin_read call: */ - if (image->opts & sRGB_16BIT) - image->image.flags |= PNG_IMAGE_FLAG_16BIT_sRGB; - - /* Have an initialized image with all the data we need plus, maybe, an - * allocated file (myfile) or buffer (mybuffer) that need to be freed. - */ - { - int result; - png_uint_32 image_format; - - /* Print both original and output formats. */ - image_format = image->image.format; - - if (image->opts & VERBOSE) - { - printf("%s %lu x %lu %s -> %s", image->file_name, - (unsigned long)image->image.width, - (unsigned long)image->image.height, - format_names[image_format & FORMAT_MASK], - (format & FORMAT_NO_CHANGE) != 0 || image->image.format == format - ? "no change" : format_names[format & FORMAT_MASK]); - - if (background != NULL) - printf(" background(%d,%d,%d)\n", background->red, - background->green, background->blue); - else - printf("\n"); - - fflush(stdout); - } - - /* 'NO_CHANGE' combined with the color-map flag forces the base format - * flags to be set on read to ensure that the original representation is - * not lost in the pass through a colormap format. - */ - if ((format & FORMAT_NO_CHANGE) != 0) - { - if ((format & PNG_FORMAT_FLAG_COLORMAP) != 0 && - (image_format & PNG_FORMAT_FLAG_COLORMAP) != 0) - format = (image_format & ~BASE_FORMATS) | (format & BASE_FORMATS); - - else - format = image_format; - } - - image->image.format = format; - - image->stride = PNG_IMAGE_ROW_STRIDE(image->image) + image->stride_extra; - allocbuffer(image); - - result = png_image_finish_read(&image->image, background, - image->buffer+16, (png_int_32)image->stride, image->colormap); - - checkbuffer(image, image->file_name); - - if (result) - return checkopaque(image); - - else - return logerror(image, image->file_name, ": image read failed", ""); - } -} - -/* Reads from a filename, which must be in image->file_name, but uses - * image->opts to choose the method. The file is always read in its native - * format (the one the simplified API suggests). - */ -static int -read_one_file(Image *image) -{ - if (!(image->opts & READ_FILE) || (image->opts & USE_STDIO)) - { - /* memory or stdio. */ - FILE *f = fopen(image->file_name, "rb"); - - if (f != NULL) - { - if (image->opts & READ_FILE) - image->input_file = f; - - else /* memory */ - { - if (fseek(f, 0, SEEK_END) == 0) - { - long int cb = ftell(f); - - if (cb > 0 && (unsigned long int)cb < (size_t)~(size_t)0) - { - png_bytep b = voidcast(png_bytep, malloc((size_t)cb)); - - if (b != NULL) - { - rewind(f); - - if (fread(b, (size_t)cb, 1, f) == 1) - { - fclose(f); - image->input_memory_size = cb; - image->input_memory = b; - } - - else - { - free(b); - return logclose(image, f, image->file_name, - ": read failed: "); - } - } - - else - return logclose(image, f, image->file_name, - ": out of memory: "); - } - - else if (cb == 0) - return logclose(image, f, image->file_name, - ": zero length: "); - - else - return logclose(image, f, image->file_name, - ": tell failed: "); - } - - else - return logclose(image, f, image->file_name, ": seek failed: "); - } - } - - else - return logerror(image, image->file_name, ": open failed: ", - strerror(errno)); - } - - return read_file(image, FORMAT_NO_CHANGE, NULL); -} - -#ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED -static int -write_one_file(Image *output, Image *image, int convert_to_8bit) -{ - if (image->opts & FAST_WRITE) - image->image.flags |= PNG_IMAGE_FLAG_FAST; - - if (image->opts & USE_STDIO) - { - FILE *f = tmpfile(); - - if (f != NULL) - { - if (png_image_write_to_stdio(&image->image, f, convert_to_8bit, - image->buffer+16, (png_int_32)image->stride, image->colormap)) - { - if (fflush(f) == 0) - { - rewind(f); - initimage(output, image->opts, "tmpfile", image->stride_extra); - output->input_file = f; - if (!checkopaque(image)) - return 0; - } - - else - return logclose(image, f, "tmpfile", ": flush: "); - } - - else - { - fclose(f); - return logerror(image, "tmpfile", ": write failed", ""); - } - } - - else - return logerror(image, "tmpfile", ": open: ", strerror(errno)); - } - - else - { - static int counter = 0; - char name[32]; - - sprintf(name, "%s%d.png", tmpf, ++counter); - - if (png_image_write_to_file(&image->image, name, convert_to_8bit, - image->buffer+16, (png_int_32)image->stride, image->colormap)) - { - initimage(output, image->opts, output->tmpfile_name, - image->stride_extra); - /* Afterwards, or freeimage will delete it! */ - strcpy(output->tmpfile_name, name); - - if (!checkopaque(image)) - return 0; - } - - else - return logerror(image, name, ": write failed", ""); - } - - /* 'output' has an initialized temporary image, read this back in and compare - * this against the original: there should be no change since the original - * format was written unmodified unless 'convert_to_8bit' was specified. - * However, if the original image was color-mapped, a simple read will zap - * the linear, color and maybe alpha flags, this will cause spurious failures - * under some circumstances. - */ - if (read_file(output, image->image.format | FORMAT_NO_CHANGE, NULL)) - { - png_uint_32 original_format = image->image.format; - - if (convert_to_8bit) - original_format &= ~PNG_FORMAT_FLAG_LINEAR; - - if ((output->image.format & BASE_FORMATS) != - (original_format & BASE_FORMATS)) - return logerror(image, image->file_name, ": format changed on read: ", - output->file_name); - - return compare_two_images(image, output, 0/*via linear*/, NULL); - } - - else - return logerror(output, output->tmpfile_name, - ": read of new file failed", ""); -} -#endif - -static int -testimage(Image *image, png_uint_32 opts, format_list *pf) -{ - int result; - Image copy; - - /* Copy the original data, stealing it from 'image' */ - checkopaque(image); - copy = *image; - - copy.opts = opts; - copy.buffer = NULL; - copy.bufsize = 0; - copy.allocsize = 0; - - image->input_file = NULL; - image->input_memory = NULL; - image->input_memory_size = 0; - image->tmpfile_name[0] = 0; - - { - png_uint_32 counter; - Image output; - - newimage(&output); - - result = 1; - - /* Use the low bit of 'counter' to indicate whether or not to do alpha - * removal with a background color or by composting onto the image; this - * step gets skipped if it isn't relevant - */ - for (counter=0; counter<2*FORMAT_COUNT; ++counter) - if (format_isset(pf, counter >> 1)) - { - png_uint_32 format = counter >> 1; - - png_color background_color; - png_colorp background = NULL; - - /* If there is a format change that removes the alpha channel then - * the background is relevant. If the output is 8-bit color-mapped - * then a background color *must* be provided, otherwise there are - * two tests to do - one with a color, the other with NULL. The - * NULL test happens second. - */ - if ((counter & 1) == 0) - { - if ((format & PNG_FORMAT_FLAG_ALPHA) == 0 && - (image->image.format & PNG_FORMAT_FLAG_ALPHA) != 0) - { - /* Alpha/transparency will be removed, the background is - * relevant: make it a color the first time - */ - random_color(&background_color); - background = &background_color; - - /* BUT if the output is to a color-mapped 8-bit format then - * the background must always be a color, so increment 'counter' - * to skip the NULL test. - */ - if ((format & PNG_FORMAT_FLAG_COLORMAP) != 0 && - (format & PNG_FORMAT_FLAG_LINEAR) == 0) - ++counter; - } - - /* Otherwise an alpha channel is not being eliminated, just leave - * background NULL and skip the (counter & 1) NULL test. - */ - else - ++counter; - } - /* else just use NULL for background */ - - resetimage(©); - copy.opts = opts; /* in case read_file needs to change it */ - - result = read_file(©, format, background); - if (!result) - break; - - /* Make sure the file just read matches the original file. */ - result = compare_two_images(image, ©, 0/*via linear*/, background); - if (!result) - break; - -# ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED - /* Write the *copy* just made to a new file to make sure the write - * side works ok. Check the conversion to sRGB if the copy is - * linear. - */ - output.opts = opts; - result = write_one_file(&output, ©, 0/*convert to 8bit*/); - if (!result) - break; - - /* Validate against the original too; the background is needed here - * as well so that compare_two_images knows what color was used. - */ - result = compare_two_images(image, &output, 0, background); - if (!result) - break; - - if ((format & PNG_FORMAT_FLAG_LINEAR) != 0 && - (format & PNG_FORMAT_FLAG_COLORMAP) == 0) - { - /* 'output' is linear, convert to the corresponding sRGB format. - */ - output.opts = opts; - result = write_one_file(&output, ©, 1/*convert to 8bit*/); - if (!result) - break; - - /* This may involve a conversion via linear; in the ideal world - * this would round-trip correctly, but libpng 1.5.7 is not the - * ideal world so allow a drift (error_via_linear). - * - * 'image' has an alpha channel but 'output' does not then there - * will a strip-alpha-channel operation (because 'output' is - * linear), handle this by composing on black when doing the - * comparison. - */ - result = compare_two_images(image, &output, 1/*via_linear*/, - background); - if (!result) - break; - } -# endif /* PNG_SIMPLIFIED_WRITE_SUPPORTED */ - } - - freeimage(&output); - } - - freeimage(©); - - return result; -} - -static int -test_one_file(const char *file_name, format_list *formats, png_uint_32 opts, - int stride_extra, int log_pass) -{ - int result; - Image image; - - newimage(&image); - initimage(&image, opts, file_name, stride_extra); - result = read_one_file(&image); - if (result) - result = testimage(&image, opts, formats); - freeimage(&image); - - /* Ensure that stderr is flushed into any log file */ - fflush(stderr); - - if (log_pass) - { - if (result) - printf("PASS:"); - - else - printf("FAIL:"); - -# ifndef PNG_SIMPLIFIED_WRITE_SUPPORTED - printf(" (no write)"); -# endif - - print_opts(opts); - printf(" %s\n", file_name); - /* stdout may not be line-buffered if it is piped to a file, so: */ - fflush(stdout); - } - - else if (!result) - exit(1); - - return result; -} - -int -main(int argc, char **argv) -{ - png_uint_32 opts = FAST_WRITE; - format_list formats; - const char *touch = NULL; - int log_pass = 0; - int redundant = 0; - int stride_extra = 0; - int retval = 0; - int c; - - init_sRGB_to_d(); -#if 0 - init_error_via_linear(); -#endif - format_init(&formats); - - for (c=1; c= sizeof tmpf) - { - fflush(stdout); - fprintf(stderr, "%s: %s is too long for a temp file prefix\n", - argv[0], argv[c]); - exit(99); - } - - /* Safe: checked above */ - strcpy(tmpf, argv[c]); - } - - else - { - fflush(stdout); - fprintf(stderr, "%s: %s requires a temporary file prefix\n", - argv[0], arg); - exit(99); - } - } - else if (strcmp(arg, "--touch") == 0) - { - if (c+1 < argc) - touch = argv[++c]; - - else - { - fflush(stdout); - fprintf(stderr, "%s: %s requires a file name argument\n", - argv[0], arg); - exit(99); - } - } - else if (arg[0] == '+') - { - png_uint_32 format = formatof(arg+1); - - if (format > FORMAT_COUNT) - exit(99); - - format_set(&formats, format); - } - else if (arg[0] == '-' && arg[1] != 0 && (arg[1] != '0' || arg[2] != 0)) - { - fflush(stdout); - fprintf(stderr, "%s: unknown option: %s\n", argv[0], arg); - exit(99); - } - else - { - if (format_is_initial(&formats)) - format_default(&formats, redundant); - - if (arg[0] == '-') - { - const int term = (arg[1] == '0' ? 0 : '\n'); - unsigned int ich = 0; - - /* Loop reading files, use a static buffer to simplify this and just - * stop if the name gets to long. - */ - static char buffer[4096]; - - do - { - int ch = getchar(); - - /* Don't allow '\0' in file names, and terminate with '\n' or, - * for -0, just '\0' (use -print0 to find to make this work!) - */ - if (ch == EOF || ch == term || ch == 0) - { - buffer[ich] = 0; - - if (ich > 0 && !test_one_file(buffer, &formats, opts, - stride_extra, log_pass)) - retval = 1; - - if (ch == EOF) - break; - - ich = 0; - --ich; /* so that the increment below sets it to 0 again */ - } - - else - buffer[ich] = (char)ch; - } while (++ich < sizeof buffer); - - if (ich) - { - buffer[32] = 0; - buffer[4095] = 0; - fprintf(stderr, "%s...%s: file name too long\n", buffer, - buffer+(4096-32)); - exit(99); - } - } - - else if (!test_one_file(arg, &formats, opts, stride_extra, log_pass)) - retval = 1; - } - } - - if (opts & ACCUMULATE) - { - unsigned int in; - - printf("static png_uint_16 gpc_error[16/*in*/][16/*out*/][4/*a*/] =\n"); - printf("{\n"); - for (in=0; in<16; ++in) - { - unsigned int out; - printf(" { /* input: %s */\n ", format_names[in]); - for (out=0; out<16; ++out) - { - unsigned int alpha; - printf(" {"); - for (alpha=0; alpha<4; ++alpha) - { - printf(" %d", gpc_error[in][out][alpha]); - if (alpha < 3) putchar(','); - } - printf(" }"); - if (out < 15) - { - putchar(','); - if (out % 4 == 3) printf("\n "); - } - } - printf("\n }"); - - if (in < 15) - putchar(','); - else - putchar('\n'); - } - printf("};\n"); - - printf("static png_uint_16 gpc_error_via_linear[16][4/*out*/][4] =\n"); - printf("{\n"); - for (in=0; in<16; ++in) - { - unsigned int out; - printf(" { /* input: %s */\n ", format_names[in]); - for (out=0; out<4; ++out) - { - unsigned int alpha; - printf(" {"); - for (alpha=0; alpha<4; ++alpha) - { - printf(" %d", gpc_error_via_linear[in][out][alpha]); - if (alpha < 3) putchar(','); - } - printf(" }"); - if (out < 3) - putchar(','); - } - printf("\n }"); - - if (in < 15) - putchar(','); - else - putchar('\n'); - } - printf("};\n"); - - printf("static png_uint_16 gpc_error_to_colormap[8/*i*/][8/*o*/][4] =\n"); - printf("{\n"); - for (in=0; in<8; ++in) - { - unsigned int out; - printf(" { /* input: %s */\n ", format_names[in]); - for (out=0; out<8; ++out) - { - unsigned int alpha; - printf(" {"); - for (alpha=0; alpha<4; ++alpha) - { - printf(" %d", gpc_error_to_colormap[in][out][alpha]); - if (alpha < 3) putchar(','); - } - printf(" }"); - if (out < 7) - { - putchar(','); - if (out % 4 == 3) printf("\n "); - } - } - printf("\n }"); - - if (in < 7) - putchar(','); - else - putchar('\n'); - } - printf("};\n"); - } - - if (retval == 0 && touch != NULL) - { - FILE *fsuccess = fopen(touch, "wt"); - - if (fsuccess != NULL) - { - int error = 0; - fprintf(fsuccess, "PNG simple API tests succeeded\n"); - fflush(fsuccess); - error = ferror(fsuccess); - - if (fclose(fsuccess) || error) - { - fflush(stdout); - fprintf(stderr, "%s: write failed\n", touch); - exit(99); - } - } - - else - { - fflush(stdout); - fprintf(stderr, "%s: open failed\n", touch); - exit(99); - } - } - - return retval; -} - -#else /* !PNG_SIMPLIFIED_READ_SUPPORTED */ -int main(void) -{ - fprintf(stderr, "pngstest: no read support in libpng, test skipped\n"); - /* So the test is skipped: */ - return 77; -} -#endif /* PNG_SIMPLIFIED_READ_SUPPORTED */ diff --git a/libpng16/contrib/libtests/pngunknown.c b/libpng16/contrib/libtests/pngunknown.c deleted file mode 100644 index a21c9d7..0000000 --- a/libpng16/contrib/libtests/pngunknown.c +++ /dev/null @@ -1,1245 +0,0 @@ - -/* pngunknown.c - test the read side unknown chunk handling - * - * Last changed in libpng 1.6.0 [February 14, 2013] - * Copyright (c) 2013 Glenn Randers-Pehrson - * Written by John Cunningham Bowler - * - * This code is released under the libpng license. - * For conditions of distribution and use, see the disclaimer - * and license in png.h - * - * NOTES: - * This is a C program that is intended to be linked against libpng. It - * allows the libpng unknown handling code to be tested by interpreting - * arguments to save or discard combinations of chunks. The program is - * currently just a minimal validation for the built-in libpng facilities. - */ - -#include -#include -#include -#include - -/* Define the following to use this test against your installed libpng, rather - * than the one being built here: - */ -#ifdef PNG_FREESTANDING_TESTS -# include -#else -# include "../../png.h" -#endif - -/* Since this program tests the ability to change the unknown chunk handling - * these must be defined: - */ -#if defined(PNG_SET_UNKNOWN_CHUNKS_SUPPORTED) &&\ - defined(PNG_READ_SUPPORTED) - -/* One of these must be defined to allow us to find out what happened. It is - * still useful to set unknown chunk handling without either of these in order - * to cause *known* chunks to be discarded. This can be a significant - * efficiency gain, but it can't really be tested here. - */ -#if defined(PNG_READ_USER_CHUNKS_SUPPORTED) ||\ - defined(PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED) - -#if PNG_LIBPNG_VER < 10500 -/* This deliberately lacks the PNG_CONST. */ -typedef png_byte *png_const_bytep; - -/* This is copied from 1.5.1 png.h: */ -#define PNG_INTERLACE_ADAM7_PASSES 7 -#define PNG_PASS_START_ROW(pass) (((1U&~(pass))<<(3-((pass)>>1)))&7) -#define PNG_PASS_START_COL(pass) (((1U& (pass))<<(3-(((pass)+1)>>1)))&7) -#define PNG_PASS_ROW_SHIFT(pass) ((pass)>2?(8-(pass))>>1:3) -#define PNG_PASS_COL_SHIFT(pass) ((pass)>1?(7-(pass))>>1:3) -#define PNG_PASS_ROWS(height, pass) (((height)+(((1<>PNG_PASS_ROW_SHIFT(pass)) -#define PNG_PASS_COLS(width, pass) (((width)+(((1<>PNG_PASS_COL_SHIFT(pass)) -#define PNG_ROW_FROM_PASS_ROW(yIn, pass) \ - (((yIn)<>(((7-(off))-(pass))<<2)) & 0xFU) | \ - ((0x01145AF0U>>(((7-(off))-(pass))<<2)) & 0xF0U)) -#define PNG_ROW_IN_INTERLACE_PASS(y, pass) \ - ((PNG_PASS_MASK(pass,0) >> ((y)&7)) & 1) -#define PNG_COL_IN_INTERLACE_PASS(x, pass) \ - ((PNG_PASS_MASK(pass,1) >> ((x)&7)) & 1) - -/* These are needed too for the default build: */ -#define PNG_WRITE_16BIT_SUPPORTED -#define PNG_READ_16BIT_SUPPORTED - -/* This comes from pnglibconf.h afer 1.5: */ -#define PNG_FP_1 100000 -#define PNG_GAMMA_THRESHOLD_FIXED\ - ((png_fixed_point)(PNG_GAMMA_THRESHOLD * PNG_FP_1)) -#endif - -#if PNG_LIBPNG_VER < 10600 - /* 1.6.0 constifies many APIs. The following exists to allow pngvalid to be - * compiled against earlier versions. - */ -# define png_const_structp png_structp -#endif - -#if PNG_LIBPNG_VER < 10700 - /* Copied from libpng 1.7.0 png.h */ -#define PNG_u2(b1, b2) (((unsigned int)(b1) << 8) + (b2)) - -#define PNG_U16(b1, b2) ((png_uint_16)PNG_u2(b1, b2)) -#define PNG_U32(b1, b2, b3, b4)\ - (((png_uint_32)PNG_u2(b1, b2) << 16) + PNG_u2(b3, b4)) - -/* Constants for known chunk types. - */ -#define png_IDAT PNG_U32( 73, 68, 65, 84) -#define png_IEND PNG_U32( 73, 69, 78, 68) -#define png_IHDR PNG_U32( 73, 72, 68, 82) -#define png_PLTE PNG_U32( 80, 76, 84, 69) -#define png_bKGD PNG_U32( 98, 75, 71, 68) -#define png_cHRM PNG_U32( 99, 72, 82, 77) -#define png_fRAc PNG_U32(102, 82, 65, 99) /* registered, not defined */ -#define png_gAMA PNG_U32(103, 65, 77, 65) -#define png_gIFg PNG_U32(103, 73, 70, 103) -#define png_gIFt PNG_U32(103, 73, 70, 116) /* deprecated */ -#define png_gIFx PNG_U32(103, 73, 70, 120) -#define png_hIST PNG_U32(104, 73, 83, 84) -#define png_iCCP PNG_U32(105, 67, 67, 80) -#define png_iTXt PNG_U32(105, 84, 88, 116) -#define png_oFFs PNG_U32(111, 70, 70, 115) -#define png_pCAL PNG_U32(112, 67, 65, 76) -#define png_pHYs PNG_U32(112, 72, 89, 115) -#define png_sBIT PNG_U32(115, 66, 73, 84) -#define png_sCAL PNG_U32(115, 67, 65, 76) -#define png_sPLT PNG_U32(115, 80, 76, 84) -#define png_sRGB PNG_U32(115, 82, 71, 66) -#define png_sTER PNG_U32(115, 84, 69, 82) -#define png_tEXt PNG_U32(116, 69, 88, 116) -#define png_tIME PNG_U32(116, 73, 77, 69) -#define png_tRNS PNG_U32(116, 82, 78, 83) -#define png_zTXt PNG_U32(122, 84, 88, 116) - -/* Test on flag values as defined in the spec (section 5.4): */ -#define PNG_CHUNK_ANCILLARY(c) (1 & ((c) >> 29)) -#define PNG_CHUNK_CRITICAL(c) (!PNG_CHUNK_ANCILLARY(c)) -#define PNG_CHUNK_PRIVATE(c) (1 & ((c) >> 21)) -#define PNG_CHUNK_RESERVED(c) (1 & ((c) >> 13)) -#define PNG_CHUNK_SAFE_TO_COPY(c) (1 & ((c) >> 5)) - -#endif /* PNG_LIBPNG_VER < 10700 */ - -#ifdef __cplusplus -# define this not_the_cpp_this -# define new not_the_cpp_new -# define voidcast(type, value) static_cast(value) -#else -# define voidcast(type, value) (value) -#endif /* __cplusplus */ - -/* Unused formal parameter errors are removed using the following macro which is - * expected to have no bad effects on performance. - */ -#ifndef UNUSED -# if defined(__GNUC__) || defined(_MSC_VER) -# define UNUSED(param) (void)param; -# else -# define UNUSED(param) -# endif -#endif - -/* Types of chunks not known to libpng */ -#define png_vpAg PNG_U32(118, 112, 65, 103) - -/* Chunk information */ -#define PNG_INFO_tEXt 0x10000000U -#define PNG_INFO_iTXt 0x20000000U -#define PNG_INFO_zTXt 0x40000000U - -#define PNG_INFO_sTER 0x01000000U -#define PNG_INFO_vpAg 0x02000000U - -#define ABSENT 0 -#define START 1 -#define END 2 - -static struct -{ - char name[5]; - png_uint_32 flag; - png_uint_32 tag; - int unknown; /* Chunk not known to libpng */ - int all; /* Chunk set by the '-1' option */ - int position; /* position in pngtest.png */ - int keep; /* unknown handling setting */ -} chunk_info[] = { - /* Critical chunks */ - { "IDAT", PNG_INFO_IDAT, png_IDAT, 0, 0, START, 0 }, /* must be [0] */ - { "PLTE", PNG_INFO_PLTE, png_PLTE, 0, 0, ABSENT, 0 }, - - /* Non-critical chunks that libpng handles */ - /* This is a mess but it seems to be the only way to do it - there is no way - * to check for a definition outside a #if. - */ - { "bKGD", PNG_INFO_bKGD, png_bKGD, -# ifdef PNG_READ_bKGD_SUPPORTED - 0, -# else - 1, -# endif - 1, START, 0 }, - { "cHRM", PNG_INFO_cHRM, png_cHRM, -# ifdef PNG_READ_cHRM_SUPPORTED - 0, -# else - 1, -# endif - 1, START, 0 }, - { "gAMA", PNG_INFO_gAMA, png_gAMA, -# ifdef PNG_READ_gAMA_SUPPORTED - 0, -# else - 1, -# endif - 1, START, 0 }, - { "hIST", PNG_INFO_hIST, png_hIST, -# ifdef PNG_READ_hIST_SUPPORTED - 0, -# else - 1, -# endif - 1, ABSENT, 0 }, - { "iCCP", PNG_INFO_iCCP, png_iCCP, -# ifdef PNG_READ_iCCP_SUPPORTED - 0, -# else - 1, -# endif - 1, ABSENT, 0 }, - { "iTXt", PNG_INFO_iTXt, png_iTXt, -# ifdef PNG_READ_iTXt_SUPPORTED - 0, -# else - 1, -# endif - 1, ABSENT, 0 }, - { "oFFs", PNG_INFO_oFFs, png_oFFs, -# ifdef PNG_READ_oFFs_SUPPORTED - 0, -# else - 1, -# endif - 1, START, 0 }, - { "pCAL", PNG_INFO_pCAL, png_pCAL, -# ifdef PNG_READ_pCAL_SUPPORTED - 0, -# else - 1, -# endif - 1, START, 0 }, - { "pHYs", PNG_INFO_pHYs, png_pHYs, -# ifdef PNG_READ_pHYs_SUPPORTED - 0, -# else - 1, -# endif - 1, START, 0 }, - { "sBIT", PNG_INFO_sBIT, png_sBIT, -# ifdef PNG_READ_sBIT_SUPPORTED - 0, -# else - 1, -# endif - 1, START, 0 }, - { "sCAL", PNG_INFO_sCAL, png_sCAL, -# ifdef PNG_READ_sCAL_SUPPORTED - 0, -# else - 1, -# endif - 1, START, 0 }, - { "sPLT", PNG_INFO_sPLT, png_sPLT, -# ifdef PNG_READ_sPLT_SUPPORTED - 0, -# else - 1, -# endif - 1, ABSENT, 0 }, - { "sRGB", PNG_INFO_sRGB, png_sRGB, -# ifdef PNG_READ_sRGB_SUPPORTED - 0, -# else - 1, -# endif - 1, START, 0 }, - { "tEXt", PNG_INFO_tEXt, png_tEXt, -# ifdef PNG_READ_tEXt_SUPPORTED - 0, -# else - 1, -# endif - 1, START, 0 }, - { "tIME", PNG_INFO_tIME, png_tIME, -# ifdef PNG_READ_tIME_SUPPORTED - 0, -# else - 1, -# endif - 1, START, 0 }, - { "tRNS", PNG_INFO_tRNS, png_tRNS, -# ifdef PNG_READ_tRNS_SUPPORTED - 0, -# else - 1, -# endif - 0, ABSENT, 0 }, - { "zTXt", PNG_INFO_zTXt, png_zTXt, -# ifdef PNG_READ_zTXt_SUPPORTED - 0, -# else - 1, -# endif - 1, END, 0 }, - - /* No libpng handling */ - { "sTER", PNG_INFO_sTER, png_sTER, 1, 1, START, 0 }, - { "vpAg", PNG_INFO_vpAg, png_vpAg, 1, 0, START, 0 }, -}; - -#define NINFO ((int)((sizeof chunk_info)/(sizeof chunk_info[0]))) - -static void -clear_keep(void) -{ - int i = NINFO; - while (--i >= 0) - chunk_info[i].keep = 0; -} - -static int -find(const char *name) -{ - int i = NINFO; - while (--i >= 0) - { - if (memcmp(chunk_info[i].name, name, 4) == 0) - break; - } - - return i; -} - -static int -findb(const png_byte *name) -{ - int i = NINFO; - while (--i >= 0) - { - if (memcmp(chunk_info[i].name, name, 4) == 0) - break; - } - - return i; -} - -static int -find_by_flag(png_uint_32 flag) -{ - int i = NINFO; - - while (--i >= 0) if (chunk_info[i].flag == flag) return i; - - fprintf(stderr, "pngunknown: internal error\n"); - exit(4); -} - -static int -ancillary(const char *name) -{ - return PNG_CHUNK_ANCILLARY(PNG_U32(name[0], name[1], name[2], name[3])); -} - -#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED -static int -ancillaryb(const png_byte *name) -{ - return PNG_CHUNK_ANCILLARY(PNG_U32(name[0], name[1], name[2], name[3])); -} -#endif - -/* Type of an error_ptr */ -typedef struct -{ - jmp_buf error_return; - png_structp png_ptr; - png_infop info_ptr, end_ptr; - png_uint_32 before_IDAT; - png_uint_32 after_IDAT; - int error_count; - int warning_count; - int keep; /* the default value */ - const char *program; - const char *file; - const char *test; -} display; - -static const char init[] = "initialization"; -static const char cmd[] = "command line"; - -static void -init_display(display *d, const char *program) -{ - memset(d, 0, sizeof *d); - d->png_ptr = NULL; - d->info_ptr = d->end_ptr = NULL; - d->error_count = d->warning_count = 0; - d->program = program; - d->file = program; - d->test = init; -} - -static void -clean_display(display *d) -{ - png_destroy_read_struct(&d->png_ptr, &d->info_ptr, &d->end_ptr); - - /* This must not happen - it might cause an app crash */ - if (d->png_ptr != NULL || d->info_ptr != NULL || d->end_ptr != NULL) - { - fprintf(stderr, "%s(%s): png_destroy_read_struct error\n", d->file, - d->test); - exit(1); - } -} - -PNG_FUNCTION(void, display_exit, (display *d), static PNG_NORETURN) -{ - ++(d->error_count); - - if (d->png_ptr != NULL) - clean_display(d); - - /* During initialization and if this is a single command line argument set - * exit now - there is only one test, otherwise longjmp to do the next test. - */ - if (d->test == init || d->test == cmd) - exit(1); - - longjmp(d->error_return, 1); -} - -static int -display_rc(const display *d, int strict) -{ - return d->error_count + (strict ? d->warning_count : 0); -} - -/* libpng error and warning callbacks */ -PNG_FUNCTION(void, error, (png_structp png_ptr, const char *message), - static PNG_NORETURN) -{ - display *d = (display*)png_get_error_ptr(png_ptr); - - fprintf(stderr, "%s(%s): libpng error: %s\n", d->file, d->test, message); - display_exit(d); -} - -static void -warning(png_structp png_ptr, const char *message) -{ - display *d = (display*)png_get_error_ptr(png_ptr); - - fprintf(stderr, "%s(%s): libpng warning: %s\n", d->file, d->test, message); - ++(d->warning_count); -} - -static png_uint_32 -get_valid(display *d, png_infop info_ptr) -{ - png_uint_32 flags = png_get_valid(d->png_ptr, info_ptr, (png_uint_32)~0); - - /* Map the text chunks back into the flags */ - { - png_textp text; - png_uint_32 ntext = png_get_text(d->png_ptr, info_ptr, &text, NULL); - - while (ntext-- > 0) switch (text[ntext].compression) - { - case -1: - flags |= PNG_INFO_tEXt; - break; - case 0: - flags |= PNG_INFO_zTXt; - break; - case 1: - case 2: - flags |= PNG_INFO_iTXt; - break; - default: - fprintf(stderr, "%s(%s): unknown text compression %d\n", d->file, - d->test, text[ntext].compression); - display_exit(d); - } - } - - return flags; -} - -#ifdef PNG_READ_USER_CHUNKS_SUPPORTED -static int -read_callback(png_structp pp, png_unknown_chunkp pc) -{ - /* This function mimics the behavior of png_set_keep_unknown_chunks by - * returning '0' to keep the chunk and '1' to discard it. - */ - display *d = voidcast(display*, png_get_user_chunk_ptr(pp)); - int chunk = findb(pc->name); - int keep, discard; - - if (chunk < 0) /* not one in our list, so not a known chunk */ - keep = d->keep; - - else - { - keep = chunk_info[chunk].keep; - if (keep == PNG_HANDLE_CHUNK_AS_DEFAULT) - { - /* See the comments in png.h - use the default for unknown chunks, - * do not keep known chunks. - */ - if (chunk_info[chunk].unknown) - keep = d->keep; - - else - keep = PNG_HANDLE_CHUNK_NEVER; - } - } - - switch (keep) - { - default: - fprintf(stderr, "%s(%s): %d: unrecognized chunk option\n", d->file, - d->test, chunk_info[chunk].keep); - display_exit(d); - - case PNG_HANDLE_CHUNK_AS_DEFAULT: - case PNG_HANDLE_CHUNK_NEVER: - discard = 1/*handled; discard*/; - break; - - case PNG_HANDLE_CHUNK_IF_SAFE: - case PNG_HANDLE_CHUNK_ALWAYS: - discard = 0/*not handled; keep*/; - break; - } - - /* Also store information about this chunk in the display, the relevant flag - * is set if the chunk is to be kept ('not handled'.) - */ - if (chunk >= 0) if (!discard) /* stupidity to stop a GCC warning */ - { - png_uint_32 flag = chunk_info[chunk].flag; - - if (pc->location & PNG_AFTER_IDAT) - d->after_IDAT |= flag; - - else - d->before_IDAT |= flag; - } - - /* However if there is no support to store unknown chunks don't ask libpng to - * do it; there will be an png_error. - */ -# ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED - return discard; -# else - return 1; /*handled; discard*/ -# endif -} -#endif /* READ_USER_CHUNKS_SUPPORTED */ - -#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED -static png_uint_32 -get_unknown(display *d, png_infop info_ptr, int after_IDAT) -{ - /* Create corresponding 'unknown' flags */ - png_uint_32 flags = 0; - - UNUSED(after_IDAT) - - { - png_unknown_chunkp unknown; - int num_unknown = png_get_unknown_chunks(d->png_ptr, info_ptr, &unknown); - - while (--num_unknown >= 0) - { - int chunk = findb(unknown[num_unknown].name); - - /* Chunks not known to pngunknown must be validated here; since they - * must also be unknown to libpng the 'display->keep' behavior should - * have been used. - */ - if (chunk < 0) switch (d->keep) - { - default: /* impossible */ - case PNG_HANDLE_CHUNK_AS_DEFAULT: - case PNG_HANDLE_CHUNK_NEVER: - fprintf(stderr, "%s(%s): %s: %s: unknown chunk saved\n", - d->file, d->test, d->keep ? "discard" : "default", - unknown[num_unknown].name); - ++(d->error_count); - break; - - case PNG_HANDLE_CHUNK_IF_SAFE: - if (!ancillaryb(unknown[num_unknown].name)) - { - fprintf(stderr, - "%s(%s): if-safe: %s: unknown critical chunk saved\n", - d->file, d->test, unknown[num_unknown].name); - ++(d->error_count); - break; - } - /* FALL THROUGH (safe) */ - case PNG_HANDLE_CHUNK_ALWAYS: - break; - } - - else - flags |= chunk_info[chunk].flag; - } - } - - return flags; -} -#else -static png_uint_32 -get_unknown(display *d, png_infop info_ptr, int after_IDAT) - /* Otherwise this will return the cached values set by any user callback */ -{ - UNUSED(info_ptr); - - if (after_IDAT) - return d->after_IDAT; - - else - return d->before_IDAT; -} - -# ifndef PNG_READ_USER_CHUNKS_SUPPORTED - /* The #defines above should mean this is never reached, it's just here as - * a check to ensure the logic is correct. - */ -# error No store support and no user chunk support, this will not work -# endif -#endif - -static int -check(FILE *fp, int argc, const char **argv, png_uint_32p flags/*out*/, - display *d, int set_callback) -{ - int i, npasses, ipass; - png_uint_32 height; - - d->keep = PNG_HANDLE_CHUNK_AS_DEFAULT; - d->before_IDAT = 0; - d->after_IDAT = 0; - - /* Some of these errors are permanently fatal and cause an exit here, others - * are per-test and cause an error return. - */ - d->png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, d, error, - warning); - if (d->png_ptr == NULL) - { - fprintf(stderr, "%s(%s): could not allocate png struct\n", d->file, - d->test); - /* Terminate here, this error is not test specific. */ - exit(1); - } - - d->info_ptr = png_create_info_struct(d->png_ptr); - d->end_ptr = png_create_info_struct(d->png_ptr); - if (d->info_ptr == NULL || d->end_ptr == NULL) - { - fprintf(stderr, "%s(%s): could not allocate png info\n", d->file, - d->test); - clean_display(d); - exit(1); - } - - png_init_io(d->png_ptr, fp); - -# ifdef PNG_READ_USER_CHUNKS_SUPPORTED - /* This is only done if requested by the caller; it interferes with the - * standard store/save mechanism. - */ - if (set_callback) - png_set_read_user_chunk_fn(d->png_ptr, d, read_callback); -# else - UNUSED(set_callback) -# endif - - /* Handle each argument in turn; multiple settings are possible for the same - * chunk and multiple calls will occur (the last one should override all - * preceding ones). - */ - for (i=0; ipng_ptr, option, name, 1); - chunk_info[chunk].keep = option; - continue; - } - - break; - - case 7: /* default */ - if (memcmp(argv[i], "default", 7) == 0) - { - png_set_keep_unknown_chunks(d->png_ptr, option, NULL, 0); - d->keep = option; - continue; - } - - break; - - case 3: /* all */ - if (memcmp(argv[i], "all", 3) == 0) - { - png_set_keep_unknown_chunks(d->png_ptr, option, NULL, -1); - d->keep = option; - - for (chunk = 0; chunk < NINFO; ++chunk) - if (chunk_info[chunk].all) - chunk_info[chunk].keep = option; - continue; - } - - break; - - default: /* some misplaced = */ - - break; - } - } - - fprintf(stderr, "%s(%s): %s: unrecognized chunk argument\n", d->file, - d->test, argv[i]); - display_exit(d); - } - - png_read_info(d->png_ptr, d->info_ptr); - - switch (png_get_interlace_type(d->png_ptr, d->info_ptr)) - { - case PNG_INTERLACE_NONE: - npasses = 1; - break; - - case PNG_INTERLACE_ADAM7: - npasses = PNG_INTERLACE_ADAM7_PASSES; - break; - - default: - /* Hard error because it is not test specific */ - fprintf(stderr, "%s(%s): invalid interlace type\n", d->file, d->test); - clean_display(d); - exit(1); - } - - /* Skip the image data, if IDAT is not being handled then don't do this - * because it will cause a CRC error. - */ - if (chunk_info[0/*IDAT*/].keep == PNG_HANDLE_CHUNK_AS_DEFAULT) - { - png_start_read_image(d->png_ptr); - height = png_get_image_height(d->png_ptr, d->info_ptr); - - if (npasses > 1) - { - png_uint_32 width = png_get_image_width(d->png_ptr, d->info_ptr); - - for (ipass=0; ipass 0) - { - png_uint_32 y; - - for (y=0; ypng_ptr, NULL, NULL); - } - } - } /* interlaced */ - - else /* not interlaced */ - { - png_uint_32 y; - - for (y=0; ypng_ptr, NULL, NULL); - } - } - - png_read_end(d->png_ptr, d->end_ptr); - - flags[0] = get_valid(d, d->info_ptr); - flags[1] = get_unknown(d, d->info_ptr, 0/*before IDAT*/); - - /* Only png_read_png sets PNG_INFO_IDAT! */ - flags[chunk_info[0/*IDAT*/].keep != PNG_HANDLE_CHUNK_AS_DEFAULT] |= - PNG_INFO_IDAT; - - flags[2] = get_valid(d, d->end_ptr); - flags[3] = get_unknown(d, d->end_ptr, 1/*after IDAT*/); - - clean_display(d); - - return d->keep; -} - -static void -check_error(display *d, png_uint_32 flags, const char *message) -{ - while (flags) - { - png_uint_32 flag = flags & -(png_int_32)flags; - int i = find_by_flag(flag); - - fprintf(stderr, "%s(%s): chunk %s: %s\n", d->file, d->test, - chunk_info[i].name, message); - ++(d->error_count); - - flags &= ~flag; - } -} - -static void -check_handling(display *d, int def, png_uint_32 chunks, png_uint_32 known, - png_uint_32 unknown, const char *position, int set_callback) -{ - while (chunks) - { - png_uint_32 flag = chunks & -(png_int_32)chunks; - int i = find_by_flag(flag); - int keep = chunk_info[i].keep; - const char *type; - const char *errorx = NULL; - - if (chunk_info[i].unknown) - { - if (keep == PNG_HANDLE_CHUNK_AS_DEFAULT) - { - type = "UNKNOWN (default)"; - keep = def; - } - - else - type = "UNKNOWN (specified)"; - - if (flag & known) - errorx = "chunk processed"; - - else switch (keep) - { - case PNG_HANDLE_CHUNK_AS_DEFAULT: - if (flag & unknown) - errorx = "DEFAULT: unknown chunk saved"; - break; - - case PNG_HANDLE_CHUNK_NEVER: - if (flag & unknown) - errorx = "DISCARD: unknown chunk saved"; - break; - - case PNG_HANDLE_CHUNK_IF_SAFE: - if (ancillary(chunk_info[i].name)) - { - if (!(flag & unknown)) - errorx = "IF-SAFE: unknown ancillary chunk lost"; - } - - else if (flag & unknown) - errorx = "IF-SAFE: unknown critical chunk saved"; - break; - - case PNG_HANDLE_CHUNK_ALWAYS: - if (!(flag & unknown)) - errorx = "SAVE: unknown chunk lost"; - break; - - default: - errorx = "internal error: bad keep"; - break; - } - } /* unknown chunk */ - - else /* known chunk */ - { - type = "KNOWN"; - - if (flag & known) - { - /* chunk was processed, it won't have been saved because that is - * caught below when checking for inconsistent processing. - */ - if (keep != PNG_HANDLE_CHUNK_AS_DEFAULT) - errorx = "!DEFAULT: known chunk processed"; - } - - else /* not processed */ switch (keep) - { - case PNG_HANDLE_CHUNK_AS_DEFAULT: - errorx = "DEFAULT: known chunk not processed"; - break; - - case PNG_HANDLE_CHUNK_NEVER: - if (flag & unknown) - errorx = "DISCARD: known chunk saved"; - break; - - case PNG_HANDLE_CHUNK_IF_SAFE: - if (ancillary(chunk_info[i].name)) - { - if (!(flag & unknown)) - errorx = "IF-SAFE: known ancillary chunk lost"; - } - - else if (flag & unknown) - errorx = "IF-SAFE: known critical chunk saved"; - break; - - case PNG_HANDLE_CHUNK_ALWAYS: - if (!(flag & unknown)) - errorx = "SAVE: known chunk lost"; - break; - - default: - errorx = "internal error: bad keep (2)"; - break; - } - } - - if (errorx != NULL) - { - ++(d->error_count); - fprintf(stderr, "%s(%s%s): %s %s %s: %s\n", d->file, d->test, - set_callback ? ",callback" : "", - type, chunk_info[i].name, position, errorx); - } - - chunks &= ~flag; - } -} - -static void -perform_one_test(FILE *fp, int argc, const char **argv, - png_uint_32 *default_flags, display *d, int set_callback) -{ - int def; - png_uint_32 flags[2][4]; - - rewind(fp); - clear_keep(); - memcpy(flags[0], default_flags, sizeof flags[0]); - - def = check(fp, argc, argv, flags[1], d, set_callback); - - /* Chunks should either be known or unknown, never both and this should apply - * whether the chunk is before or after the IDAT (actually, the app can - * probably change this by swapping the handling after the image, but this - * test does not do that.) - */ - check_error(d, (flags[0][0]|flags[0][2]) & (flags[0][1]|flags[0][3]), - "chunk handled inconsistently in count tests"); - check_error(d, (flags[1][0]|flags[1][2]) & (flags[1][1]|flags[1][3]), - "chunk handled inconsistently in option tests"); - - /* Now find out what happened to each chunk before and after the IDAT and - * determine if the behavior was correct. First some basic sanity checks, - * any known chunk should be known in the original count, any unknown chunk - * should be either known or unknown in the original. - */ - { - png_uint_32 test; - - test = flags[1][0] & ~flags[0][0]; - check_error(d, test, "new known chunk before IDAT"); - test = flags[1][1] & ~(flags[0][0] | flags[0][1]); - check_error(d, test, "new unknown chunk before IDAT"); - test = flags[1][2] & ~flags[0][2]; - check_error(d, test, "new known chunk after IDAT"); - test = flags[1][3] & ~(flags[0][2] | flags[0][3]); - check_error(d, test, "new unknown chunk after IDAT"); - } - - /* Now each chunk in the original list should have been handled according to - * the options set for that chunk, regardless of whether libpng knows about - * it or not. - */ - check_handling(d, def, flags[0][0] | flags[0][1], flags[1][0], flags[1][1], - "before IDAT", set_callback); - check_handling(d, def, flags[0][2] | flags[0][3], flags[1][2], flags[1][3], - "after IDAT", set_callback); -} - -static void -perform_one_test_safe(FILE *fp, int argc, const char **argv, - png_uint_32 *default_flags, display *d, const char *test) -{ - if (setjmp(d->error_return) == 0) - { - d->test = test; /* allow use of d->error_return */ -# ifdef PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED - perform_one_test(fp, argc, argv, default_flags, d, 0); -# endif -# ifdef PNG_READ_USER_CHUNKS_SUPPORTED - perform_one_test(fp, argc, argv, default_flags, d, 1); -# endif - d->test = init; /* prevent use of d->error_return */ - } -} - -static const char *standard_tests[] = -{ - "discard", "default=discard", 0, - "save", "default=save", 0, - "if-safe", "default=if-safe", 0, - "vpAg", "vpAg=if-safe", 0, - "sTER", "sTER=if-safe", 0, - "IDAT", "default=discard", "IDAT=save", 0, - "sAPI", "bKGD=save", "cHRM=save", "gAMA=save", "all=discard", "iCCP=save", - "sBIT=save", "sRGB=save", 0, - 0/*end*/ -}; - -static PNG_NORETURN void -usage(const char *program, const char *reason) -{ - fprintf(stderr, "pngunknown: %s: usage:\n %s [--strict] " - "--default|{(CHNK|default|all)=(default|discard|if-safe|save)} " - "testfile.png\n", reason, program); - exit(99); -} - -int -main(int argc, const char **argv) -{ - FILE *fp; - png_uint_32 default_flags[4/*valid,unknown{before,after}*/]; - int strict = 0, default_tests = 0; - const char *count_argv = "default=save"; - const char *touch_file = NULL; - display d; - - init_display(&d, argv[0]); - - while (++argv, --argc > 0) - { - if (strcmp(*argv, "--strict") == 0) - strict = 1; - - else if (strcmp(*argv, "--default") == 0) - default_tests = 1; - - else if (strcmp(*argv, "--touch") == 0) - { - if (argc > 1) - touch_file = *++argv, --argc; - - else - usage(d.program, "--touch: missing file name"); - } - - else - break; - } - - /* A file name is required, but there should be no other arguments if - * --default was specified. - */ - if (argc <= 0) - usage(d.program, "missing test file"); - - /* GCC BUG: if (default_tests && argc != 1) triggers some weird GCC argc - * optimization which causes warnings with -Wstrict-overflow! - */ - else if (default_tests) if (argc != 1) - usage(d.program, "extra arguments"); - - /* The name of the test file is the last argument; remove it. */ - d.file = argv[--argc]; - - fp = fopen(d.file, "rb"); - if (fp == NULL) - { - perror(d.file); - exit(99); - } - - /* First find all the chunks, known and unknown, in the test file, a failure - * here aborts the whole test. - * - * If 'save' is supported then the normal saving method should happen, - * otherwise if 'read' is supported then the read callback will do the - * same thing. If both are supported the 'read' callback won't be - * instantiated by default. If 'save' is *not* supported then a user - * callback is required even though we can call png_get_unknown_chunks. - */ - if (check(fp, 1, &count_argv, default_flags, &d, -# ifdef PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED - 0 -# else - 1 -# endif - ) != PNG_HANDLE_CHUNK_ALWAYS) - { - fprintf(stderr, "%s: %s: internal error\n", d.program, d.file); - exit(99); - } - - /* Now find what the various supplied options cause to change: */ - if (!default_tests) - { - d.test = cmd; /* acts as a flag to say exit, do not longjmp */ -# ifdef PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED - perform_one_test(fp, argc, argv, default_flags, &d, 0); -# endif -# ifdef PNG_READ_USER_CHUNKS_SUPPORTED - perform_one_test(fp, argc, argv, default_flags, &d, 1); -# endif - d.test = init; - } - - else - { - const char **test = standard_tests; - - /* Set the exit_test pointer here so we can continue after a libpng error. - * NOTE: this leaks memory because the png_struct data from the failing - * test is never freed. - */ - while (*test) - { - const char *this_test = *test++; - const char **next = test; - int count = display_rc(&d, strict), new_count; - const char *result; - int arg_count = 0; - - while (*next) ++next, ++arg_count; - - perform_one_test_safe(fp, arg_count, test, default_flags, &d, - this_test); - - new_count = display_rc(&d, strict); - - if (new_count == count) - result = "PASS"; - - else - result = "FAIL"; - - printf("%s: %s %s\n", result, d.program, this_test); - - test = next+1; - } - } - - fclose(fp); - - if (display_rc(&d, strict) == 0) - { - /* Success, touch the success file if appropriate */ - if (touch_file != NULL) - { - FILE *fsuccess = fopen(touch_file, "wt"); - - if (fsuccess != NULL) - { - int err = 0; - fprintf(fsuccess, "PNG unknown tests succeeded\n"); - fflush(fsuccess); - err = ferror(fsuccess); - - if (fclose(fsuccess) || err) - { - fprintf(stderr, "%s: write failed\n", touch_file); - exit(99); - } - } - - else - { - fprintf(stderr, "%s: open failed\n", touch_file); - exit(99); - } - } - - return 0; - } - - return 1; -} - -#else /* !(READ_USER_CHUNKS || SAVE_UNKNOWN_CHUNKS) */ -int -main(void) -{ - fprintf(stderr, - " test ignored: no support to find out about unknown chunks\n"); - /* So the test is skipped: */ - return 77; -} -#endif /* READ_USER_CHUNKS || SAVE_UNKNOWN_CHUNKS */ - -#else /* !(SET_UNKNOWN_CHUNKS && READ) */ -int -main(void) -{ - fprintf(stderr, - " test ignored: no support to modify unknown chunk handling\n"); - /* So the test is skipped: */ - return 77; -} -#endif /* SET_UNKNOWN_CHUNKS && READ*/ diff --git a/libpng16/contrib/libtests/pngvalid.c b/libpng16/contrib/libtests/pngvalid.c deleted file mode 100644 index c106b2b..0000000 --- a/libpng16/contrib/libtests/pngvalid.c +++ /dev/null @@ -1,10281 +0,0 @@ - -/* pngvalid.c - validate libpng by constructing then reading png files. - * - * Last changed in libpng 1.6.8 [(PENDING RELEASE)] - * Copyright (c) 2013 Glenn Randers-Pehrson - * Written by John Cunningham Bowler - * - * This code is released under the libpng license. - * For conditions of distribution and use, see the disclaimer - * and license in png.h - * - * NOTES: - * This is a C program that is intended to be linked against libpng. It - * generates bitmaps internally, stores them as PNG files (using the - * sequential write code) then reads them back (using the sequential - * read code) and validates that the result has the correct data. - * - * The program can be modified and extended to test the correctness of - * transformations performed by libpng. - */ - -#define _POSIX_SOURCE 1 -#define _ISOC99_SOURCE 1 /* For floating point */ -#define _GNU_SOURCE 1 /* For the floating point exception extension */ - -#include -#include - -#if defined(HAVE_CONFIG_H) && !defined(PNG_NO_CONFIG_H) -# include -#endif - -#ifdef HAVE_FEENABLEEXCEPT /* from config.h, if included */ -# include -#endif - -/* Define the following to use this test against your installed libpng, rather - * than the one being built here: - */ -#ifdef PNG_FREESTANDING_TESTS -# include -#else -# include "../../png.h" -#endif - -/* pngvalid requires write support and one of the fixed or floating point APIs. - */ -#if defined(PNG_WRITE_SUPPORTED) &&\ - (defined(PNG_FIXED_POINT_SUPPORTED) || defined(PNG_FLOATING_POINT_SUPPORTED)) - -#if PNG_LIBPNG_VER < 10500 -/* This deliberately lacks the PNG_CONST. */ -typedef png_byte *png_const_bytep; - -/* This is copied from 1.5.1 png.h: */ -#define PNG_INTERLACE_ADAM7_PASSES 7 -#define PNG_PASS_START_ROW(pass) (((1U&~(pass))<<(3-((pass)>>1)))&7) -#define PNG_PASS_START_COL(pass) (((1U& (pass))<<(3-(((pass)+1)>>1)))&7) -#define PNG_PASS_ROW_SHIFT(pass) ((pass)>2?(8-(pass))>>1:3) -#define PNG_PASS_COL_SHIFT(pass) ((pass)>1?(7-(pass))>>1:3) -#define PNG_PASS_ROWS(height, pass) (((height)+(((1<>PNG_PASS_ROW_SHIFT(pass)) -#define PNG_PASS_COLS(width, pass) (((width)+(((1<>PNG_PASS_COL_SHIFT(pass)) -#define PNG_ROW_FROM_PASS_ROW(yIn, pass) \ - (((yIn)<>(((7-(off))-(pass))<<2)) & 0xFU) | \ - ((0x01145AF0U>>(((7-(off))-(pass))<<2)) & 0xF0U)) -#define PNG_ROW_IN_INTERLACE_PASS(y, pass) \ - ((PNG_PASS_MASK(pass,0) >> ((y)&7)) & 1) -#define PNG_COL_IN_INTERLACE_PASS(x, pass) \ - ((PNG_PASS_MASK(pass,1) >> ((x)&7)) & 1) - -/* These are needed too for the default build: */ -#define PNG_WRITE_16BIT_SUPPORTED -#define PNG_READ_16BIT_SUPPORTED - -/* This comes from pnglibconf.h afer 1.5: */ -#define PNG_FP_1 100000 -#define PNG_GAMMA_THRESHOLD_FIXED\ - ((png_fixed_point)(PNG_GAMMA_THRESHOLD * PNG_FP_1)) -#endif - -#if PNG_LIBPNG_VER < 10600 - /* 1.6.0 constifies many APIs, the following exists to allow pngvalid to be - * compiled against earlier versions. - */ -# define png_const_structp png_structp -#endif - -#include /* For crc32 */ - -#include /* For floating point constants */ -#include /* For malloc */ -#include /* For memcpy, memset */ -#include /* For floor */ - -/* Unused formal parameter errors are removed using the following macro which is - * expected to have no bad effects on performance. - */ -#ifndef UNUSED -# if defined(__GNUC__) || defined(_MSC_VER) -# define UNUSED(param) (void)param; -# else -# define UNUSED(param) -# endif -#endif - -/* Fixups for various minimal builds */ -#ifndef PNG_ERROR_TEXT_SUPPORTED -# define png_error(a,b) png_err(a) -#endif - -/***************************** EXCEPTION HANDLING *****************************/ -#ifdef PNG_FREESTANDING_TESTS -# include -#else -# include "../visupng/cexcept.h" -#endif - -#ifdef __cplusplus -# define this not_the_cpp_this -# define new not_the_cpp_new -# define voidcast(type, value) static_cast(value) -#else -# define voidcast(type, value) (value) -#endif /* __cplusplus */ - -struct png_store; -define_exception_type(struct png_store*); - -/* The following are macros to reduce typing everywhere where the well known - * name 'the_exception_context' must be defined. - */ -#define anon_context(ps) struct exception_context *the_exception_context = \ - &(ps)->exception_context -#define context(ps,fault) anon_context(ps); png_store *fault - -/******************************* UTILITIES ************************************/ -/* Error handling is particularly problematic in production code - error - * handlers often themselves have bugs which lead to programs that detect - * minor errors crashing. The following functions deal with one very - * common class of errors in error handlers - attempting to format error or - * warning messages into buffers that are too small. - */ -static size_t safecat(char *buffer, size_t bufsize, size_t pos, - PNG_CONST char *cat) -{ - while (pos < bufsize && cat != NULL && *cat != 0) - buffer[pos++] = *cat++; - - if (pos >= bufsize) - pos = bufsize-1; - - buffer[pos] = 0; - return pos; -} - -static size_t safecatn(char *buffer, size_t bufsize, size_t pos, int n) -{ - char number[64]; - sprintf(number, "%d", n); - return safecat(buffer, bufsize, pos, number); -} - -#ifdef PNG_READ_TRANSFORMS_SUPPORTED -static size_t safecatd(char *buffer, size_t bufsize, size_t pos, double d, - int precision) -{ - char number[64]; - sprintf(number, "%.*f", precision, d); - return safecat(buffer, bufsize, pos, number); -} -#endif - -static PNG_CONST char invalid[] = "invalid"; -static PNG_CONST char sep[] = ": "; - -static PNG_CONST char *colour_types[8] = -{ - "grayscale", invalid, "truecolour", "indexed-colour", - "grayscale with alpha", invalid, "truecolour with alpha", invalid -}; - -#ifdef PNG_READ_SUPPORTED -/* Convert a double precision value to fixed point. */ -static png_fixed_point -fix(double d) -{ - d = floor(d * PNG_FP_1 + .5); - return (png_fixed_point)d; -} -#endif /* PNG_READ_SUPPORTED */ - -/* Generate random bytes. This uses a boring repeatable algorithm and it - * is implemented here so that it gives the same set of numbers on every - * architecture. It's a linear congruential generator (Knuth or Sedgewick - * "Algorithms") but it comes from the 'feedback taps' table in Horowitz and - * Hill, "The Art of Electronics" (Pseudo-Random Bit Sequences and Noise - * Generation.) - */ -static void -make_random_bytes(png_uint_32* seed, void* pv, size_t size) -{ - png_uint_32 u0 = seed[0], u1 = seed[1]; - png_bytep bytes = voidcast(png_bytep, pv); - - /* There are thirty three bits, the next bit in the sequence is bit-33 XOR - * bit-20. The top 1 bit is in u1, the bottom 32 are in u0. - */ - size_t i; - for (i=0; i> (20-8)) ^ ((u1 << 7) | (u0 >> (32-7)))) & 0xff; - u1 <<= 8; - u1 |= u0 >> 24; - u0 <<= 8; - u0 |= u; - *bytes++ = (png_byte)u; - } - - seed[0] = u0; - seed[1] = u1; -} - -static void -make_four_random_bytes(png_uint_32* seed, png_bytep bytes) -{ - make_random_bytes(seed, bytes, 4); -} - -#ifdef PNG_READ_SUPPORTED -static void -randomize(void *pv, size_t size) -{ - static png_uint_32 random_seed[2] = {0x56789abc, 0xd}; - make_random_bytes(random_seed, pv, size); -} - -#define RANDOMIZE(this) randomize(&(this), sizeof (this)) - -static unsigned int -random_mod(unsigned int max) -{ - unsigned int x; - - RANDOMIZE(x); - - return x % max; /* 0 .. max-1 */ -} - -#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED -static int -random_choice(void) -{ - unsigned char x; - - RANDOMIZE(x); - - return x & 1; -} -#endif -#endif /* PNG_READ_SUPPORTED */ - -/* A numeric ID based on PNG file characteristics. The 'do_interlace' field - * simply records whether pngvalid did the interlace itself or whether it - * was done by libpng. Width and height must be less than 256. 'palette' is an - * index of the palette to use for formats with a palette (0 otherwise.) - */ -#define FILEID(col, depth, palette, interlace, width, height, do_interlace) \ - ((png_uint_32)((col) + ((depth)<<3) + ((palette)<<8) + ((interlace)<<13) + \ - (((do_interlace)!=0)<<15) + ((width)<<16) + ((height)<<24))) - -#define COL_FROM_ID(id) ((png_byte)((id)& 0x7U)) -#define DEPTH_FROM_ID(id) ((png_byte)(((id) >> 3) & 0x1fU)) -#define PALETTE_FROM_ID(id) (((id) >> 8) & 0x1f) -#define INTERLACE_FROM_ID(id) ((int)(((id) >> 13) & 0x3)) -#define DO_INTERLACE_FROM_ID(id) ((int)(((id)>>15) & 1)) -#define WIDTH_FROM_ID(id) (((id)>>16) & 0xff) -#define HEIGHT_FROM_ID(id) (((id)>>24) & 0xff) - -/* Utility to construct a standard name for a standard image. */ -static size_t -standard_name(char *buffer, size_t bufsize, size_t pos, png_byte colour_type, - int bit_depth, unsigned int npalette, int interlace_type, - png_uint_32 w, png_uint_32 h, int do_interlace) -{ - pos = safecat(buffer, bufsize, pos, colour_types[colour_type]); - if (npalette > 0) - { - pos = safecat(buffer, bufsize, pos, "["); - pos = safecatn(buffer, bufsize, pos, npalette); - pos = safecat(buffer, bufsize, pos, "]"); - } - pos = safecat(buffer, bufsize, pos, " "); - pos = safecatn(buffer, bufsize, pos, bit_depth); - pos = safecat(buffer, bufsize, pos, " bit"); - - if (interlace_type != PNG_INTERLACE_NONE) - { - pos = safecat(buffer, bufsize, pos, " interlaced"); - if (do_interlace) - pos = safecat(buffer, bufsize, pos, "(pngvalid)"); - else - pos = safecat(buffer, bufsize, pos, "(libpng)"); - } - - if (w > 0 || h > 0) - { - pos = safecat(buffer, bufsize, pos, " "); - pos = safecatn(buffer, bufsize, pos, w); - pos = safecat(buffer, bufsize, pos, "x"); - pos = safecatn(buffer, bufsize, pos, h); - } - - return pos; -} - -static size_t -standard_name_from_id(char *buffer, size_t bufsize, size_t pos, png_uint_32 id) -{ - return standard_name(buffer, bufsize, pos, COL_FROM_ID(id), - DEPTH_FROM_ID(id), PALETTE_FROM_ID(id), INTERLACE_FROM_ID(id), - WIDTH_FROM_ID(id), HEIGHT_FROM_ID(id), DO_INTERLACE_FROM_ID(id)); -} - -/* Convenience API and defines to list valid formats. Note that 16 bit read and - * write support is required to do 16 bit read tests (we must be able to make a - * 16 bit image to test!) - */ -#ifdef PNG_WRITE_16BIT_SUPPORTED -# define WRITE_BDHI 4 -# ifdef PNG_READ_16BIT_SUPPORTED -# define READ_BDHI 4 -# define DO_16BIT -# endif -#else -# define WRITE_BDHI 3 -#endif -#ifndef DO_16BIT -# define READ_BDHI 3 -#endif - -/* The following defines the number of different palettes to generate for - * each log bit depth of a colour type 3 standard image. - */ -#define PALETTE_COUNT(bit_depth) ((bit_depth) > 4 ? 1U : 16U) - -static int -next_format(png_bytep colour_type, png_bytep bit_depth, - unsigned int* palette_number) -{ - if (*bit_depth == 0) - { - *colour_type = 0, *bit_depth = 1, *palette_number = 0; - return 1; - } - - if (*colour_type == 3) - { - /* Add multiple palettes for colour type 3. */ - if (++*palette_number < PALETTE_COUNT(*bit_depth)) - return 1; - - *palette_number = 0; - } - - *bit_depth = (png_byte)(*bit_depth << 1); - - /* Palette images are restricted to 8 bit depth */ - if (*bit_depth <= 8 -# ifdef DO_16BIT - || (*colour_type != 3 && *bit_depth <= 16) -# endif - ) - return 1; - - /* Move to the next color type, or return 0 at the end. */ - switch (*colour_type) - { - case 0: - *colour_type = 2; - *bit_depth = 8; - return 1; - - case 2: - *colour_type = 3; - *bit_depth = 1; - return 1; - - case 3: - *colour_type = 4; - *bit_depth = 8; - return 1; - - case 4: - *colour_type = 6; - *bit_depth = 8; - return 1; - - default: - return 0; - } -} - -#ifdef PNG_READ_TRANSFORMS_SUPPORTED -static unsigned int -sample(png_const_bytep row, png_byte colour_type, png_byte bit_depth, - png_uint_32 x, unsigned int sample_index) -{ - png_uint_32 bit_index, result; - - /* Find a sample index for the desired sample: */ - x *= bit_depth; - bit_index = x; - - if ((colour_type & 1) == 0) /* !palette */ - { - if (colour_type & 2) - bit_index *= 3; - - if (colour_type & 4) - bit_index += x; /* Alpha channel */ - - /* Multiple channels; select one: */ - if (colour_type & (2+4)) - bit_index += sample_index * bit_depth; - } - - /* Return the sample from the row as an integer. */ - row += bit_index >> 3; - result = *row; - - if (bit_depth == 8) - return result; - - else if (bit_depth > 8) - return (result << 8) + *++row; - - /* Less than 8 bits per sample. */ - bit_index &= 7; - return (result >> (8-bit_index-bit_depth)) & ((1U<> 3] & ~destMask; - unsigned int sourceByte = fromBuffer[fromIndex >> 3]; - - /* Don't rely on << or >> supporting '0' here, just in case: */ - fromIndex &= 7; - if (fromIndex > 0) sourceByte <<= fromIndex; - if ((toIndex & 7) > 0) sourceByte >>= toIndex & 7; - - toBuffer[toIndex >> 3] = (png_byte)(destByte | (sourceByte & destMask)); - } - else /* One or more bytes */ - memmove(toBuffer+(toIndex>>3), fromBuffer+(fromIndex>>3), pixelSize>>3); -} - -#ifdef PNG_READ_SUPPORTED -/* Copy a complete row of pixels, taking into account potential partial - * bytes at the end. - */ -static void -row_copy(png_bytep toBuffer, png_const_bytep fromBuffer, unsigned int bitWidth) -{ - memcpy(toBuffer, fromBuffer, bitWidth >> 3); - - if ((bitWidth & 7) != 0) - { - unsigned int mask; - - toBuffer += bitWidth >> 3; - fromBuffer += bitWidth >> 3; - /* The remaining bits are in the top of the byte, the mask is the bits to - * retain. - */ - mask = 0xff >> (bitWidth & 7); - *toBuffer = (png_byte)((*toBuffer & mask) | (*fromBuffer & ~mask)); - } -} - -/* Compare pixels - they are assumed to start at the first byte in the - * given buffers. - */ -static int -pixel_cmp(png_const_bytep pa, png_const_bytep pb, png_uint_32 bit_width) -{ -#if PNG_LIBPNG_VER < 10506 - if (memcmp(pa, pb, bit_width>>3) == 0) - { - png_uint_32 p; - - if ((bit_width & 7) == 0) return 0; - - /* Ok, any differences? */ - p = pa[bit_width >> 3]; - p ^= pb[bit_width >> 3]; - - if (p == 0) return 0; - - /* There are, but they may not be significant, remove the bits - * after the end (the low order bits in PNG.) - */ - bit_width &= 7; - p >>= 8-bit_width; - - if (p == 0) return 0; - } -#else - /* From libpng-1.5.6 the overwrite should be fixed, so compare the trailing - * bits too: - */ - if (memcmp(pa, pb, (bit_width+7)>>3) == 0) - return 0; -#endif - - /* Return the index of the changed byte. */ - { - png_uint_32 where = 0; - - while (pa[where] == pb[where]) ++where; - return 1+where; - } -} -#endif /* PNG_READ_SUPPORTED */ - -/*************************** BASIC PNG FILE WRITING ***************************/ -/* A png_store takes data from the sequential writer or provides data - * to the sequential reader. It can also store the result of a PNG - * write for later retrieval. - */ -#define STORE_BUFFER_SIZE 500 /* arbitrary */ -typedef struct png_store_buffer -{ - struct png_store_buffer* prev; /* NOTE: stored in reverse order */ - png_byte buffer[STORE_BUFFER_SIZE]; -} png_store_buffer; - -#define FILE_NAME_SIZE 64 - -typedef struct store_palette_entry /* record of a single palette entry */ -{ - png_byte red; - png_byte green; - png_byte blue; - png_byte alpha; -} store_palette_entry, store_palette[256]; - -typedef struct png_store_file -{ - struct png_store_file* next; /* as many as you like... */ - char name[FILE_NAME_SIZE]; - png_uint_32 id; /* must be correct (see FILEID) */ - png_size_t datacount; /* In this (the last) buffer */ - png_store_buffer data; /* Last buffer in file */ - int npalette; /* Number of entries in palette */ - store_palette_entry* palette; /* May be NULL */ -} png_store_file; - -/* The following is a pool of memory allocated by a single libpng read or write - * operation. - */ -typedef struct store_pool -{ - struct png_store *store; /* Back pointer */ - struct store_memory *list; /* List of allocated memory */ - png_byte mark[4]; /* Before and after data */ - - /* Statistics for this run. */ - png_alloc_size_t max; /* Maximum single allocation */ - png_alloc_size_t current; /* Current allocation */ - png_alloc_size_t limit; /* Highest current allocation */ - png_alloc_size_t total; /* Total allocation */ - - /* Overall statistics (retained across successive runs). */ - png_alloc_size_t max_max; - png_alloc_size_t max_limit; - png_alloc_size_t max_total; -} store_pool; - -typedef struct png_store -{ - /* For cexcept.h exception handling - simply store one of these; - * the context is a self pointer but it may point to a different - * png_store (in fact it never does in this program.) - */ - struct exception_context - exception_context; - - unsigned int verbose :1; - unsigned int treat_warnings_as_errors :1; - unsigned int expect_error :1; - unsigned int expect_warning :1; - unsigned int saw_warning :1; - unsigned int speed :1; - unsigned int progressive :1; /* use progressive read */ - unsigned int validated :1; /* used as a temporary flag */ - int nerrors; - int nwarnings; - int noptions; /* number of options below: */ - struct { - unsigned char option; /* option number, 0..30 */ - unsigned char setting; /* setting (unset,invalid,on,off) */ - } options[16]; - char test[128]; /* Name of test */ - char error[256]; - - /* Read fields */ - png_structp pread; /* Used to read a saved file */ - png_infop piread; - png_store_file* current; /* Set when reading */ - png_store_buffer* next; /* Set when reading */ - png_size_t readpos; /* Position in *next */ - png_byte* image; /* Buffer for reading interlaced images */ - png_size_t cb_image; /* Size of this buffer */ - png_size_t cb_row; /* Row size of the image(s) */ - png_uint_32 image_h; /* Number of rows in a single image */ - store_pool read_memory_pool; - - /* Write fields */ - png_store_file* saved; - png_structp pwrite; /* Used when writing a new file */ - png_infop piwrite; - png_size_t writepos; /* Position in .new */ - char wname[FILE_NAME_SIZE]; - png_store_buffer new; /* The end of the new PNG file being written. */ - store_pool write_memory_pool; - store_palette_entry* palette; - int npalette; -} png_store; - -/* Initialization and cleanup */ -static void -store_pool_mark(png_bytep mark) -{ - static png_uint_32 store_seed[2] = { 0x12345678, 1}; - - make_four_random_bytes(store_seed, mark); -} - -#ifdef PNG_READ_SUPPORTED -/* Use this for random 32 bit values; this function makes sure the result is - * non-zero. - */ -static png_uint_32 -random_32(void) -{ - - for(;;) - { - png_byte mark[4]; - png_uint_32 result; - - store_pool_mark(mark); - result = png_get_uint_32(mark); - - if (result != 0) - return result; - } -} -#endif /* PNG_READ_SUPPORTED */ - -static void -store_pool_init(png_store *ps, store_pool *pool) -{ - memset(pool, 0, sizeof *pool); - - pool->store = ps; - pool->list = NULL; - pool->max = pool->current = pool->limit = pool->total = 0; - pool->max_max = pool->max_limit = pool->max_total = 0; - store_pool_mark(pool->mark); -} - -static void -store_init(png_store* ps) -{ - memset(ps, 0, sizeof *ps); - init_exception_context(&ps->exception_context); - store_pool_init(ps, &ps->read_memory_pool); - store_pool_init(ps, &ps->write_memory_pool); - ps->verbose = 0; - ps->treat_warnings_as_errors = 0; - ps->expect_error = 0; - ps->expect_warning = 0; - ps->saw_warning = 0; - ps->speed = 0; - ps->progressive = 0; - ps->validated = 0; - ps->nerrors = ps->nwarnings = 0; - ps->pread = NULL; - ps->piread = NULL; - ps->saved = ps->current = NULL; - ps->next = NULL; - ps->readpos = 0; - ps->image = NULL; - ps->cb_image = 0; - ps->cb_row = 0; - ps->image_h = 0; - ps->pwrite = NULL; - ps->piwrite = NULL; - ps->writepos = 0; - ps->new.prev = NULL; - ps->palette = NULL; - ps->npalette = 0; - ps->noptions = 0; -} - -static void -store_freebuffer(png_store_buffer* psb) -{ - if (psb->prev) - { - store_freebuffer(psb->prev); - free(psb->prev); - psb->prev = NULL; - } -} - -static void -store_freenew(png_store *ps) -{ - store_freebuffer(&ps->new); - ps->writepos = 0; - if (ps->palette != NULL) - { - free(ps->palette); - ps->palette = NULL; - ps->npalette = 0; - } -} - -static void -store_storenew(png_store *ps) -{ - png_store_buffer *pb; - - if (ps->writepos != STORE_BUFFER_SIZE) - png_error(ps->pwrite, "invalid store call"); - - pb = voidcast(png_store_buffer*, malloc(sizeof *pb)); - - if (pb == NULL) - png_error(ps->pwrite, "store new: OOM"); - - *pb = ps->new; - ps->new.prev = pb; - ps->writepos = 0; -} - -static void -store_freefile(png_store_file **ppf) -{ - if (*ppf != NULL) - { - store_freefile(&(*ppf)->next); - - store_freebuffer(&(*ppf)->data); - (*ppf)->datacount = 0; - if ((*ppf)->palette != NULL) - { - free((*ppf)->palette); - (*ppf)->palette = NULL; - (*ppf)->npalette = 0; - } - free(*ppf); - *ppf = NULL; - } -} - -/* Main interface to file storeage, after writing a new PNG file (see the API - * below) call store_storefile to store the result with the given name and id. - */ -static void -store_storefile(png_store *ps, png_uint_32 id) -{ - png_store_file *pf = voidcast(png_store_file*, malloc(sizeof *pf)); - if (pf == NULL) - png_error(ps->pwrite, "storefile: OOM"); - safecat(pf->name, sizeof pf->name, 0, ps->wname); - pf->id = id; - pf->data = ps->new; - pf->datacount = ps->writepos; - ps->new.prev = NULL; - ps->writepos = 0; - pf->palette = ps->palette; - pf->npalette = ps->npalette; - ps->palette = 0; - ps->npalette = 0; - - /* And save it. */ - pf->next = ps->saved; - ps->saved = pf; -} - -/* Generate an error message (in the given buffer) */ -static size_t -store_message(png_store *ps, png_const_structp pp, char *buffer, size_t bufsize, - size_t pos, PNG_CONST char *msg) -{ - if (pp != NULL && pp == ps->pread) - { - /* Reading a file */ - pos = safecat(buffer, bufsize, pos, "read: "); - - if (ps->current != NULL) - { - pos = safecat(buffer, bufsize, pos, ps->current->name); - pos = safecat(buffer, bufsize, pos, sep); - } - } - - else if (pp != NULL && pp == ps->pwrite) - { - /* Writing a file */ - pos = safecat(buffer, bufsize, pos, "write: "); - pos = safecat(buffer, bufsize, pos, ps->wname); - pos = safecat(buffer, bufsize, pos, sep); - } - - else - { - /* Neither reading nor writing (or a memory error in struct delete) */ - pos = safecat(buffer, bufsize, pos, "pngvalid: "); - } - - if (ps->test[0] != 0) - { - pos = safecat(buffer, bufsize, pos, ps->test); - pos = safecat(buffer, bufsize, pos, sep); - } - pos = safecat(buffer, bufsize, pos, msg); - return pos; -} - -/* Verbose output to the error stream: */ -static void -store_verbose(png_store *ps, png_const_structp pp, png_const_charp prefix, - png_const_charp message) -{ - char buffer[512]; - - if (prefix) - fputs(prefix, stderr); - - (void)store_message(ps, pp, buffer, sizeof buffer, 0, message); - fputs(buffer, stderr); - fputc('\n', stderr); -} - -/* Log an error or warning - the relevant count is always incremented. */ -static void -store_log(png_store* ps, png_const_structp pp, png_const_charp message, - int is_error) -{ - /* The warning is copied to the error buffer if there are no errors and it is - * the first warning. The error is copied to the error buffer if it is the - * first error (overwriting any prior warnings). - */ - if (is_error ? (ps->nerrors)++ == 0 : - (ps->nwarnings)++ == 0 && ps->nerrors == 0) - store_message(ps, pp, ps->error, sizeof ps->error, 0, message); - - if (ps->verbose) - store_verbose(ps, pp, is_error ? "error: " : "warning: ", message); -} - -#ifdef PNG_READ_SUPPORTED -/* Internal error function, called with a png_store but no libpng stuff. */ -static void -internal_error(png_store *ps, png_const_charp message) -{ - store_log(ps, NULL, message, 1 /* error */); - - /* And finally throw an exception. */ - { - struct exception_context *the_exception_context = &ps->exception_context; - Throw ps; - } -} -#endif /* PNG_READ_SUPPORTED */ - -/* Functions to use as PNG callbacks. */ -static void -store_error(png_structp ppIn, png_const_charp message) /* PNG_NORETURN */ -{ - png_const_structp pp = ppIn; - png_store *ps = voidcast(png_store*, png_get_error_ptr(pp)); - - if (!ps->expect_error) - store_log(ps, pp, message, 1 /* error */); - - /* And finally throw an exception. */ - { - struct exception_context *the_exception_context = &ps->exception_context; - Throw ps; - } -} - -static void -store_warning(png_structp ppIn, png_const_charp message) -{ - png_const_structp pp = ppIn; - png_store *ps = voidcast(png_store*, png_get_error_ptr(pp)); - - if (!ps->expect_warning) - store_log(ps, pp, message, 0 /* warning */); - else - ps->saw_warning = 1; -} - -/* These somewhat odd functions are used when reading an image to ensure that - * the buffer is big enough, the png_structp is for errors. - */ -/* Return a single row from the correct image. */ -static png_bytep -store_image_row(PNG_CONST png_store* ps, png_const_structp pp, int nImage, - png_uint_32 y) -{ - png_size_t coffset = (nImage * ps->image_h + y) * (ps->cb_row + 5) + 2; - - if (ps->image == NULL) - png_error(pp, "no allocated image"); - - if (coffset + ps->cb_row + 3 > ps->cb_image) - png_error(pp, "image too small"); - - return ps->image + coffset; -} - -static void -store_image_free(png_store *ps, png_const_structp pp) -{ - if (ps->image != NULL) - { - png_bytep image = ps->image; - - if (image[-1] != 0xed || image[ps->cb_image] != 0xfe) - { - if (pp != NULL) - png_error(pp, "png_store image overwrite (1)"); - else - store_log(ps, NULL, "png_store image overwrite (2)", 1); - } - - ps->image = NULL; - ps->cb_image = 0; - --image; - free(image); - } -} - -static void -store_ensure_image(png_store *ps, png_const_structp pp, int nImages, - png_size_t cbRow, png_uint_32 cRows) -{ - png_size_t cb = nImages * cRows * (cbRow + 5); - - if (ps->cb_image < cb) - { - png_bytep image; - - store_image_free(ps, pp); - - /* The buffer is deliberately mis-aligned. */ - image = voidcast(png_bytep, malloc(cb+2)); - if (image == NULL) - { - /* Called from the startup - ignore the error for the moment. */ - if (pp == NULL) - return; - - png_error(pp, "OOM allocating image buffer"); - } - - /* These magic tags are used to detect overwrites above. */ - ++image; - image[-1] = 0xed; - image[cb] = 0xfe; - - ps->image = image; - ps->cb_image = cb; - } - - /* We have an adequate sized image; lay out the rows. There are 2 bytes at - * the start and three at the end of each (this ensures that the row - * alignment starts out odd - 2+1 and changes for larger images on each row.) - */ - ps->cb_row = cbRow; - ps->image_h = cRows; - - /* For error checking, the whole buffer is set to 10110010 (0xb2 - 178). - * This deliberately doesn't match the bits in the size test image which are - * outside the image; these are set to 0xff (all 1). To make the row - * comparison work in the 'size' test case the size rows are pre-initialized - * to the same value prior to calling 'standard_row'. - */ - memset(ps->image, 178, cb); - - /* Then put in the marks. */ - while (--nImages >= 0) - { - png_uint_32 y; - - for (y=0; yimage; - - if (image[-1] != 0xed || image[ps->cb_image] != 0xfe) - png_error(pp, "image overwrite"); - else - { - png_size_t cbRow = ps->cb_row; - png_uint_32 rows = ps->image_h; - - image += iImage * (cbRow+5) * ps->image_h; - - image += 2; /* skip image first row markers */ - - while (rows-- > 0) - { - if (image[-2] != 190 || image[-1] != 239) - png_error(pp, "row start overwritten"); - - if (image[cbRow] != 222 || image[cbRow+1] != 173 || - image[cbRow+2] != 17) - png_error(pp, "row end overwritten"); - - image += cbRow+5; - } - } -} -#endif /* PNG_READ_SUPPORTED */ - -static void -store_write(png_structp ppIn, png_bytep pb, png_size_t st) -{ - png_const_structp pp = ppIn; - png_store *ps = voidcast(png_store*, png_get_io_ptr(pp)); - - if (ps->pwrite != pp) - png_error(pp, "store state damaged"); - - while (st > 0) - { - size_t cb; - - if (ps->writepos >= STORE_BUFFER_SIZE) - store_storenew(ps); - - cb = st; - - if (cb > STORE_BUFFER_SIZE - ps->writepos) - cb = STORE_BUFFER_SIZE - ps->writepos; - - memcpy(ps->new.buffer + ps->writepos, pb, cb); - pb += cb; - st -= cb; - ps->writepos += cb; - } -} - -static void -store_flush(png_structp ppIn) -{ - UNUSED(ppIn) /*DOES NOTHING*/ -} - -#ifdef PNG_READ_SUPPORTED -static size_t -store_read_buffer_size(png_store *ps) -{ - /* Return the bytes available for read in the current buffer. */ - if (ps->next != &ps->current->data) - return STORE_BUFFER_SIZE; - - return ps->current->datacount; -} - -#ifdef PNG_READ_TRANSFORMS_SUPPORTED -/* Return total bytes available for read. */ -static size_t -store_read_buffer_avail(png_store *ps) -{ - if (ps->current != NULL && ps->next != NULL) - { - png_store_buffer *next = &ps->current->data; - size_t cbAvail = ps->current->datacount; - - while (next != ps->next && next != NULL) - { - next = next->prev; - cbAvail += STORE_BUFFER_SIZE; - } - - if (next != ps->next) - png_error(ps->pread, "buffer read error"); - - if (cbAvail > ps->readpos) - return cbAvail - ps->readpos; - } - - return 0; -} -#endif - -static int -store_read_buffer_next(png_store *ps) -{ - png_store_buffer *pbOld = ps->next; - png_store_buffer *pbNew = &ps->current->data; - if (pbOld != pbNew) - { - while (pbNew != NULL && pbNew->prev != pbOld) - pbNew = pbNew->prev; - - if (pbNew != NULL) - { - ps->next = pbNew; - ps->readpos = 0; - return 1; - } - - png_error(ps->pread, "buffer lost"); - } - - return 0; /* EOF or error */ -} - -/* Need separate implementation and callback to allow use of the same code - * during progressive read, where the io_ptr is set internally by libpng. - */ -static void -store_read_imp(png_store *ps, png_bytep pb, png_size_t st) -{ - if (ps->current == NULL || ps->next == NULL) - png_error(ps->pread, "store state damaged"); - - while (st > 0) - { - size_t cbAvail = store_read_buffer_size(ps) - ps->readpos; - - if (cbAvail > 0) - { - if (cbAvail > st) cbAvail = st; - memcpy(pb, ps->next->buffer + ps->readpos, cbAvail); - st -= cbAvail; - pb += cbAvail; - ps->readpos += cbAvail; - } - - else if (!store_read_buffer_next(ps)) - png_error(ps->pread, "read beyond end of file"); - } -} - -static void -store_read(png_structp ppIn, png_bytep pb, png_size_t st) -{ - png_const_structp pp = ppIn; - png_store *ps = voidcast(png_store*, png_get_io_ptr(pp)); - - if (ps == NULL || ps->pread != pp) - png_error(pp, "bad store read call"); - - store_read_imp(ps, pb, st); -} - -static void -store_progressive_read(png_store *ps, png_structp pp, png_infop pi) -{ - /* Notice that a call to store_read will cause this function to fail because - * readpos will be set. - */ - if (ps->pread != pp || ps->current == NULL || ps->next == NULL) - png_error(pp, "store state damaged (progressive)"); - - do - { - if (ps->readpos != 0) - png_error(pp, "store_read called during progressive read"); - - png_process_data(pp, pi, ps->next->buffer, store_read_buffer_size(ps)); - } - while (store_read_buffer_next(ps)); -} -#endif /* PNG_READ_SUPPORTED */ - -/* The caller must fill this in: */ -static store_palette_entry * -store_write_palette(png_store *ps, int npalette) -{ - if (ps->pwrite == NULL) - store_log(ps, NULL, "attempt to write palette without write stream", 1); - - if (ps->palette != NULL) - png_error(ps->pwrite, "multiple store_write_palette calls"); - - /* This function can only return NULL if called with '0'! */ - if (npalette > 0) - { - ps->palette = voidcast(store_palette_entry*, malloc(npalette * - sizeof *ps->palette)); - - if (ps->palette == NULL) - png_error(ps->pwrite, "store new palette: OOM"); - - ps->npalette = npalette; - } - - return ps->palette; -} - -#ifdef PNG_READ_SUPPORTED -static store_palette_entry * -store_current_palette(png_store *ps, int *npalette) -{ - /* This is an internal error (the call has been made outside a read - * operation.) - */ - if (ps->current == NULL) - store_log(ps, ps->pread, "no current stream for palette", 1); - - /* The result may be null if there is no palette. */ - *npalette = ps->current->npalette; - return ps->current->palette; -} -#endif /* PNG_READ_SUPPORTED */ - -/***************************** MEMORY MANAGEMENT*** ***************************/ -#ifdef PNG_USER_MEM_SUPPORTED -/* A store_memory is simply the header for an allocated block of memory. The - * pointer returned to libpng is just after the end of the header block, the - * allocated memory is followed by a second copy of the 'mark'. - */ -typedef struct store_memory -{ - store_pool *pool; /* Originating pool */ - struct store_memory *next; /* Singly linked list */ - png_alloc_size_t size; /* Size of memory allocated */ - png_byte mark[4]; /* ID marker */ -} store_memory; - -/* Handle a fatal error in memory allocation. This calls png_error if the - * libpng struct is non-NULL, else it outputs a message and returns. This means - * that a memory problem while libpng is running will abort (png_error) the - * handling of particular file while one in cleanup (after the destroy of the - * struct has returned) will simply keep going and free (or attempt to free) - * all the memory. - */ -static void -store_pool_error(png_store *ps, png_const_structp pp, PNG_CONST char *msg) -{ - if (pp != NULL) - png_error(pp, msg); - - /* Else we have to do it ourselves. png_error eventually calls store_log, - * above. store_log accepts a NULL png_structp - it just changes what gets - * output by store_message. - */ - store_log(ps, pp, msg, 1 /* error */); -} - -static void -store_memory_free(png_const_structp pp, store_pool *pool, store_memory *memory) -{ - /* Note that pp may be NULL (see store_pool_delete below), the caller has - * found 'memory' in pool->list *and* unlinked this entry, so this is a valid - * pointer (for sure), but the contents may have been trashed. - */ - if (memory->pool != pool) - store_pool_error(pool->store, pp, "memory corrupted (pool)"); - - else if (memcmp(memory->mark, pool->mark, sizeof memory->mark) != 0) - store_pool_error(pool->store, pp, "memory corrupted (start)"); - - /* It should be safe to read the size field now. */ - else - { - png_alloc_size_t cb = memory->size; - - if (cb > pool->max) - store_pool_error(pool->store, pp, "memory corrupted (size)"); - - else if (memcmp((png_bytep)(memory+1)+cb, pool->mark, sizeof pool->mark) - != 0) - store_pool_error(pool->store, pp, "memory corrupted (end)"); - - /* Finally give the library a chance to find problems too: */ - else - { - pool->current -= cb; - free(memory); - } - } -} - -static void -store_pool_delete(png_store *ps, store_pool *pool) -{ - if (pool->list != NULL) - { - fprintf(stderr, "%s: %s %s: memory lost (list follows):\n", ps->test, - pool == &ps->read_memory_pool ? "read" : "write", - pool == &ps->read_memory_pool ? (ps->current != NULL ? - ps->current->name : "unknown file") : ps->wname); - ++ps->nerrors; - - do - { - store_memory *next = pool->list; - pool->list = next->next; - next->next = NULL; - - fprintf(stderr, "\t%lu bytes @ %p\n", - (unsigned long)next->size, (PNG_CONST void*)(next+1)); - /* The NULL means this will always return, even if the memory is - * corrupted. - */ - store_memory_free(NULL, pool, next); - } - while (pool->list != NULL); - } - - /* And reset the other fields too for the next time. */ - if (pool->max > pool->max_max) pool->max_max = pool->max; - pool->max = 0; - if (pool->current != 0) /* unexpected internal error */ - fprintf(stderr, "%s: %s %s: memory counter mismatch (internal error)\n", - ps->test, pool == &ps->read_memory_pool ? "read" : "write", - pool == &ps->read_memory_pool ? (ps->current != NULL ? - ps->current->name : "unknown file") : ps->wname); - pool->current = 0; - - if (pool->limit > pool->max_limit) - pool->max_limit = pool->limit; - - pool->limit = 0; - - if (pool->total > pool->max_total) - pool->max_total = pool->total; - - pool->total = 0; - - /* Get a new mark too. */ - store_pool_mark(pool->mark); -} - -/* The memory callbacks: */ -static png_voidp -store_malloc(png_structp ppIn, png_alloc_size_t cb) -{ - png_const_structp pp = ppIn; - store_pool *pool = voidcast(store_pool*, png_get_mem_ptr(pp)); - store_memory *new = voidcast(store_memory*, malloc(cb + (sizeof *new) + - (sizeof pool->mark))); - - if (new != NULL) - { - if (cb > pool->max) - pool->max = cb; - - pool->current += cb; - - if (pool->current > pool->limit) - pool->limit = pool->current; - - pool->total += cb; - - new->size = cb; - memcpy(new->mark, pool->mark, sizeof new->mark); - memcpy((png_byte*)(new+1) + cb, pool->mark, sizeof pool->mark); - new->pool = pool; - new->next = pool->list; - pool->list = new; - ++new; - } - - else - { - /* NOTE: the PNG user malloc function cannot use the png_ptr it is passed - * other than to retrieve the allocation pointer! libpng calls the - * store_malloc callback in two basic cases: - * - * 1) From png_malloc; png_malloc will do a png_error itself if NULL is - * returned. - * 2) From png_struct or png_info structure creation; png_malloc is - * to return so cleanup can be performed. - * - * To handle this store_malloc can log a message, but can't do anything - * else. - */ - store_log(pool->store, pp, "out of memory", 1 /* is_error */); - } - - return new; -} - -static void -store_free(png_structp ppIn, png_voidp memory) -{ - png_const_structp pp = ppIn; - store_pool *pool = voidcast(store_pool*, png_get_mem_ptr(pp)); - store_memory *this = voidcast(store_memory*, memory), **test; - - /* Because libpng calls store_free with a dummy png_struct when deleting - * png_struct or png_info via png_destroy_struct_2 it is necessary to check - * the passed in png_structp to ensure it is valid, and not pass it to - * png_error if it is not. - */ - if (pp != pool->store->pread && pp != pool->store->pwrite) - pp = NULL; - - /* First check that this 'memory' really is valid memory - it must be in the - * pool list. If it is, use the shared memory_free function to free it. - */ - --this; - for (test = &pool->list; *test != this; test = &(*test)->next) - { - if (*test == NULL) - { - store_pool_error(pool->store, pp, "bad pointer to free"); - return; - } - } - - /* Unlink this entry, *test == this. */ - *test = this->next; - this->next = NULL; - store_memory_free(pp, pool, this); -} -#endif /* PNG_USER_MEM_SUPPORTED */ - -/* Setup functions. */ -/* Cleanup when aborting a write or after storing the new file. */ -static void -store_write_reset(png_store *ps) -{ - if (ps->pwrite != NULL) - { - anon_context(ps); - - Try - png_destroy_write_struct(&ps->pwrite, &ps->piwrite); - - Catch_anonymous - { - /* memory corruption: continue. */ - } - - ps->pwrite = NULL; - ps->piwrite = NULL; - } - - /* And make sure that all the memory has been freed - this will output - * spurious errors in the case of memory corruption above, but this is safe. - */ -# ifdef PNG_USER_MEM_SUPPORTED - store_pool_delete(ps, &ps->write_memory_pool); -# endif - - store_freenew(ps); -} - -/* The following is the main write function, it returns a png_struct and, - * optionally, a png_info suitable for writiing a new PNG file. Use - * store_storefile above to record this file after it has been written. The - * returned libpng structures as destroyed by store_write_reset above. - */ -static png_structp -set_store_for_write(png_store *ps, png_infopp ppi, - PNG_CONST char * volatile name) -{ - anon_context(ps); - - Try - { - if (ps->pwrite != NULL) - png_error(ps->pwrite, "write store already in use"); - - store_write_reset(ps); - safecat(ps->wname, sizeof ps->wname, 0, name); - - /* Don't do the slow memory checks if doing a speed test, also if user - * memory is not supported we can't do it anyway. - */ -# ifdef PNG_USER_MEM_SUPPORTED - if (!ps->speed) - ps->pwrite = png_create_write_struct_2(PNG_LIBPNG_VER_STRING, - ps, store_error, store_warning, &ps->write_memory_pool, - store_malloc, store_free); - - else -# endif - ps->pwrite = png_create_write_struct(PNG_LIBPNG_VER_STRING, - ps, store_error, store_warning); - - png_set_write_fn(ps->pwrite, ps, store_write, store_flush); - -# ifdef PNG_SET_OPTION_SUPPORTED - { - int opt; - for (opt=0; optnoptions; ++opt) - if (png_set_option(ps->pwrite, ps->options[opt].option, - ps->options[opt].setting) == PNG_OPTION_INVALID) - png_error(ps->pwrite, "png option invalid"); - } -# endif - - if (ppi != NULL) - *ppi = ps->piwrite = png_create_info_struct(ps->pwrite); - } - - Catch_anonymous - return NULL; - - return ps->pwrite; -} - -/* Cleanup when finished reading (either due to error or in the success case). - * This routine exists even when there is no read support to make the code - * tidier (avoid a mass of ifdefs) and so easier to maintain. - */ -static void -store_read_reset(png_store *ps) -{ -# ifdef PNG_READ_SUPPORTED - if (ps->pread != NULL) - { - anon_context(ps); - - Try - png_destroy_read_struct(&ps->pread, &ps->piread, NULL); - - Catch_anonymous - { - /* error already output: continue */ - } - - ps->pread = NULL; - ps->piread = NULL; - } -# endif - -# ifdef PNG_USER_MEM_SUPPORTED - /* Always do this to be safe. */ - store_pool_delete(ps, &ps->read_memory_pool); -# endif - - ps->current = NULL; - ps->next = NULL; - ps->readpos = 0; - ps->validated = 0; -} - -#ifdef PNG_READ_SUPPORTED -static void -store_read_set(png_store *ps, png_uint_32 id) -{ - png_store_file *pf = ps->saved; - - while (pf != NULL) - { - if (pf->id == id) - { - ps->current = pf; - ps->next = NULL; - store_read_buffer_next(ps); - return; - } - - pf = pf->next; - } - - { - size_t pos; - char msg[FILE_NAME_SIZE+64]; - - pos = standard_name_from_id(msg, sizeof msg, 0, id); - pos = safecat(msg, sizeof msg, pos, ": file not found"); - png_error(ps->pread, msg); - } -} - -/* The main interface for reading a saved file - pass the id number of the file - * to retrieve. Ids must be unique or the earlier file will be hidden. The API - * returns a png_struct and, optionally, a png_info. Both of these will be - * destroyed by store_read_reset above. - */ -static png_structp -set_store_for_read(png_store *ps, png_infopp ppi, png_uint_32 id, - PNG_CONST char *name) -{ - /* Set the name for png_error */ - safecat(ps->test, sizeof ps->test, 0, name); - - if (ps->pread != NULL) - png_error(ps->pread, "read store already in use"); - - store_read_reset(ps); - - /* Both the create APIs can return NULL if used in their default mode - * (because there is no other way of handling an error because the jmp_buf - * by default is stored in png_struct and that has not been allocated!) - * However, given that store_error works correctly in these circumstances - * we don't ever expect NULL in this program. - */ -# ifdef PNG_USER_MEM_SUPPORTED - if (!ps->speed) - ps->pread = png_create_read_struct_2(PNG_LIBPNG_VER_STRING, ps, - store_error, store_warning, &ps->read_memory_pool, store_malloc, - store_free); - - else -# endif - ps->pread = png_create_read_struct(PNG_LIBPNG_VER_STRING, ps, store_error, - store_warning); - - if (ps->pread == NULL) - { - struct exception_context *the_exception_context = &ps->exception_context; - - store_log(ps, NULL, "png_create_read_struct returned NULL (unexpected)", - 1 /*error*/); - - Throw ps; - } - -# ifdef PNG_SET_OPTION_SUPPORTED - { - int opt; - for (opt=0; optnoptions; ++opt) - if (png_set_option(ps->pread, ps->options[opt].option, - ps->options[opt].setting) == PNG_OPTION_INVALID) - png_error(ps->pread, "png option invalid"); - } -# endif - - store_read_set(ps, id); - - if (ppi != NULL) - *ppi = ps->piread = png_create_info_struct(ps->pread); - - return ps->pread; -} -#endif /* PNG_READ_SUPPORTED */ - -/* The overall cleanup of a store simply calls the above then removes all the - * saved files. This does not delete the store itself. - */ -static void -store_delete(png_store *ps) -{ - store_write_reset(ps); - store_read_reset(ps); - store_freefile(&ps->saved); - store_image_free(ps, NULL); -} - -/*********************** PNG FILE MODIFICATION ON READ ************************/ -/* Files may be modified on read. The following structure contains a complete - * png_store together with extra members to handle modification and a special - * read callback for libpng. To use this the 'modifications' field must be set - * to a list of png_modification structures that actually perform the - * modification, otherwise a png_modifier is functionally equivalent to a - * png_store. There is a special read function, set_modifier_for_read, which - * replaces set_store_for_read. - */ -typedef enum modifier_state -{ - modifier_start, /* Initial value */ - modifier_signature, /* Have a signature */ - modifier_IHDR /* Have an IHDR */ -} modifier_state; - -typedef struct CIE_color -{ - /* A single CIE tristimulus value, representing the unique response of a - * standard observer to a variety of light spectra. The observer recognizes - * all spectra that produce this response as the same color, therefore this - * is effectively a description of a color. - */ - double X, Y, Z; -} CIE_color; - -typedef struct color_encoding -{ - /* A description of an (R,G,B) encoding of color (as defined above); this - * includes the actual colors of the (R,G,B) triples (1,0,0), (0,1,0) and - * (0,0,1) plus an encoding value that is used to encode the linear - * components R, G and B to give the actual values R^gamma, G^gamma and - * B^gamma that are stored. - */ - double gamma; /* Encoding (file) gamma of space */ - CIE_color red, green, blue; /* End points */ -} color_encoding; - -#ifdef PNG_READ_SUPPORTED -static double -chromaticity_x(CIE_color c) -{ - return c.X / (c.X + c.Y + c.Z); -} - -static double -chromaticity_y(CIE_color c) -{ - return c.Y / (c.X + c.Y + c.Z); -} - -static CIE_color -white_point(PNG_CONST color_encoding *encoding) -{ - CIE_color white; - - white.X = encoding->red.X + encoding->green.X + encoding->blue.X; - white.Y = encoding->red.Y + encoding->green.Y + encoding->blue.Y; - white.Z = encoding->red.Z + encoding->green.Z + encoding->blue.Z; - - return white; -} - -#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED -static void -normalize_color_encoding(color_encoding *encoding) -{ - PNG_CONST double whiteY = encoding->red.Y + encoding->green.Y + - encoding->blue.Y; - - if (whiteY != 1) - { - encoding->red.X /= whiteY; - encoding->red.Y /= whiteY; - encoding->red.Z /= whiteY; - encoding->green.X /= whiteY; - encoding->green.Y /= whiteY; - encoding->green.Z /= whiteY; - encoding->blue.X /= whiteY; - encoding->blue.Y /= whiteY; - encoding->blue.Z /= whiteY; - } -} -#endif - -static size_t -safecat_color_encoding(char *buffer, size_t bufsize, size_t pos, - PNG_CONST color_encoding *e, double encoding_gamma) -{ - if (e != 0) - { - if (encoding_gamma != 0) - pos = safecat(buffer, bufsize, pos, "("); - pos = safecat(buffer, bufsize, pos, "R("); - pos = safecatd(buffer, bufsize, pos, e->red.X, 4); - pos = safecat(buffer, bufsize, pos, ","); - pos = safecatd(buffer, bufsize, pos, e->red.Y, 4); - pos = safecat(buffer, bufsize, pos, ","); - pos = safecatd(buffer, bufsize, pos, e->red.Z, 4); - pos = safecat(buffer, bufsize, pos, "),G("); - pos = safecatd(buffer, bufsize, pos, e->green.X, 4); - pos = safecat(buffer, bufsize, pos, ","); - pos = safecatd(buffer, bufsize, pos, e->green.Y, 4); - pos = safecat(buffer, bufsize, pos, ","); - pos = safecatd(buffer, bufsize, pos, e->green.Z, 4); - pos = safecat(buffer, bufsize, pos, "),B("); - pos = safecatd(buffer, bufsize, pos, e->blue.X, 4); - pos = safecat(buffer, bufsize, pos, ","); - pos = safecatd(buffer, bufsize, pos, e->blue.Y, 4); - pos = safecat(buffer, bufsize, pos, ","); - pos = safecatd(buffer, bufsize, pos, e->blue.Z, 4); - pos = safecat(buffer, bufsize, pos, ")"); - if (encoding_gamma != 0) - pos = safecat(buffer, bufsize, pos, ")"); - } - - if (encoding_gamma != 0) - { - pos = safecat(buffer, bufsize, pos, "^"); - pos = safecatd(buffer, bufsize, pos, encoding_gamma, 5); - } - - return pos; -} -#endif /* PNG_READ_SUPPORTED */ - -typedef struct png_modifier -{ - png_store this; /* I am a png_store */ - struct png_modification *modifications; /* Changes to make */ - - modifier_state state; /* My state */ - - /* Information from IHDR: */ - png_byte bit_depth; /* From IHDR */ - png_byte colour_type; /* From IHDR */ - - /* While handling PLTE, IDAT and IEND these chunks may be pended to allow - * other chunks to be inserted. - */ - png_uint_32 pending_len; - png_uint_32 pending_chunk; - - /* Test values */ - double *gammas; - unsigned int ngammas; - unsigned int ngamma_tests; /* Number of gamma tests to run*/ - double current_gamma; /* 0 if not set */ - PNG_CONST color_encoding *encodings; - unsigned int nencodings; - PNG_CONST color_encoding *current_encoding; /* If an encoding has been set */ - unsigned int encoding_counter; /* For iteration */ - int encoding_ignored; /* Something overwrote it */ - - /* Control variables used to iterate through possible encodings, the - * following must be set to 0 and tested by the function that uses the - * png_modifier because the modifier only sets it to 1 (true.) - */ - unsigned int repeat :1; /* Repeat this transform test. */ - unsigned int test_uses_encoding :1; - - /* Lowest sbit to test (libpng fails for sbit < 8) */ - png_byte sbitlow; - - /* Error control - these are the limits on errors accepted by the gamma tests - * below. - */ - double maxout8; /* Maximum output value error */ - double maxabs8; /* Absolute sample error 0..1 */ - double maxcalc8; /* Absolute sample error 0..1 */ - double maxpc8; /* Percentage sample error 0..100% */ - double maxout16; /* Maximum output value error */ - double maxabs16; /* Absolute sample error 0..1 */ - double maxcalc16;/* Absolute sample error 0..1 */ - double maxpc16; /* Percentage sample error 0..100% */ - - /* This is set by transforms that need to allow a higher limit, it is an - * internal check on pngvalid to ensure that the calculated error limits are - * not ridiculous; without this it is too easy to make a mistake in pngvalid - * that allows any value through. - */ - double limit; /* limit on error values, normally 4E-3 */ - - /* Log limits - values above this are logged, but not necessarily - * warned. - */ - double log8; /* Absolute error in 8 bits to log */ - double log16; /* Absolute error in 16 bits to log */ - - /* Logged 8 and 16 bit errors ('output' values): */ - double error_gray_2; - double error_gray_4; - double error_gray_8; - double error_gray_16; - double error_color_8; - double error_color_16; - double error_indexed; - - /* Flags: */ - /* Whether to call png_read_update_info, not png_read_start_image, and how - * many times to call it. - */ - int use_update_info; - - /* Whether or not to interlace. */ - int interlace_type :9; /* int, but must store '1' */ - - /* Run the standard tests? */ - unsigned int test_standard :1; - - /* Run the odd-sized image and interlace read/write tests? */ - unsigned int test_size :1; - - /* Run tests on reading with a combiniation of transforms, */ - unsigned int test_transform :1; - - /* When to use the use_input_precision option: */ - unsigned int use_input_precision :1; - unsigned int use_input_precision_sbit :1; - unsigned int use_input_precision_16to8 :1; - - /* If set assume that the calculation bit depth is set by the input - * precision, not the output precision. - */ - unsigned int calculations_use_input_precision :1; - - /* If set assume that the calculations are done in 16 bits even if both input - * and output are 8 bit or less. - */ - unsigned int assume_16_bit_calculations :1; - - /* Which gamma tests to run: */ - unsigned int test_gamma_threshold :1; - unsigned int test_gamma_transform :1; /* main tests */ - unsigned int test_gamma_sbit :1; - unsigned int test_gamma_scale16 :1; - unsigned int test_gamma_background :1; - unsigned int test_gamma_alpha_mode :1; - unsigned int test_gamma_expand16 :1; - unsigned int test_exhaustive :1; - - unsigned int log :1; /* Log max error */ - - /* Buffer information, the buffer size limits the size of the chunks that can - * be modified - they must fit (including header and CRC) into the buffer! - */ - size_t flush; /* Count of bytes to flush */ - size_t buffer_count; /* Bytes in buffer */ - size_t buffer_position; /* Position in buffer */ - png_byte buffer[1024]; -} png_modifier; - -/* This returns true if the test should be stopped now because it has already - * failed and it is running silently. - */ -static int fail(png_modifier *pm) -{ - return !pm->log && !pm->this.verbose && (pm->this.nerrors > 0 || - (pm->this.treat_warnings_as_errors && pm->this.nwarnings > 0)); -} - -static void -modifier_init(png_modifier *pm) -{ - memset(pm, 0, sizeof *pm); - store_init(&pm->this); - pm->modifications = NULL; - pm->state = modifier_start; - pm->sbitlow = 1U; - pm->ngammas = 0; - pm->ngamma_tests = 0; - pm->gammas = 0; - pm->current_gamma = 0; - pm->encodings = 0; - pm->nencodings = 0; - pm->current_encoding = 0; - pm->encoding_counter = 0; - pm->encoding_ignored = 0; - pm->repeat = 0; - pm->test_uses_encoding = 0; - pm->maxout8 = pm->maxpc8 = pm->maxabs8 = pm->maxcalc8 = 0; - pm->maxout16 = pm->maxpc16 = pm->maxabs16 = pm->maxcalc16 = 0; - pm->limit = 4E-3; - pm->log8 = pm->log16 = 0; /* Means 'off' */ - pm->error_gray_2 = pm->error_gray_4 = pm->error_gray_8 = 0; - pm->error_gray_16 = pm->error_color_8 = pm->error_color_16 = 0; - pm->error_indexed = 0; - pm->use_update_info = 0; - pm->interlace_type = PNG_INTERLACE_NONE; - pm->test_standard = 0; - pm->test_size = 0; - pm->test_transform = 0; - pm->use_input_precision = 0; - pm->use_input_precision_sbit = 0; - pm->use_input_precision_16to8 = 0; - pm->calculations_use_input_precision = 0; - pm->test_gamma_threshold = 0; - pm->test_gamma_transform = 0; - pm->test_gamma_sbit = 0; - pm->test_gamma_scale16 = 0; - pm->test_gamma_background = 0; - pm->test_gamma_alpha_mode = 0; - pm->test_gamma_expand16 = 0; - pm->test_exhaustive = 0; - pm->log = 0; - - /* Rely on the memset for all the other fields - there are no pointers */ -} - -#ifdef PNG_READ_TRANSFORMS_SUPPORTED -/* If pm->calculations_use_input_precision is set then operations will happen - * with only 8 bit precision unless both the input and output bit depth are 16. - * - * If pm->assume_16_bit_calculations is set then even 8 bit calculations use 16 - * bit precision. This only affects those of the following limits that pertain - * to a calculation - not a digitization operation - unless the following API is - * called directly. - */ -#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED -static double digitize(PNG_CONST png_modifier *pm, double value, - int sample_depth, int do_round) -{ - /* 'value' is in the range 0 to 1, the result is the same value rounded to a - * multiple of the digitization factor - 8 or 16 bits depending on both the - * sample depth and the 'assume' setting. Digitization is normally by - * rounding and 'do_round' should be 1, if it is 0 the digitized value will - * be truncated. - */ - PNG_CONST unsigned int digitization_factor = - (pm->assume_16_bit_calculations || sample_depth == 16) ? 65535 : 255; - - /* Limiting the range is done as a convenience to the caller - it's easier to - * do it once here than every time at the call site. - */ - if (value <= 0) - value = 0; - else if (value >= 1) - value = 1; - - value *= digitization_factor; - if (do_round) value += .5; - return floor(value)/digitization_factor; -} -#endif - -#if defined(PNG_READ_GAMMA_SUPPORTED) ||\ - defined(PNG_READ_RGB_TO_GRAY_SUPPORTED) -static double abserr(PNG_CONST png_modifier *pm, int in_depth, int out_depth) -{ - /* Absolute error permitted in linear values - affected by the bit depth of - * the calculations. - */ - if (pm->assume_16_bit_calculations || (out_depth == 16 && (in_depth == 16 || - !pm->calculations_use_input_precision))) - return pm->maxabs16; - else - return pm->maxabs8; -} -#endif - -#ifdef PNG_READ_GAMMA_SUPPORTED -static double calcerr(PNG_CONST png_modifier *pm, int in_depth, int out_depth) -{ - /* Error in the linear composition arithmetic - only relevant when - * composition actually happens (0 < alpha < 1). - */ - if (pm->assume_16_bit_calculations || (out_depth == 16 && (in_depth == 16 || - !pm->calculations_use_input_precision))) - return pm->maxcalc16; - else - return pm->maxcalc8; -} - -static double pcerr(PNG_CONST png_modifier *pm, int in_depth, int out_depth) -{ - /* Percentage error permitted in the linear values. Note that the specified - * value is a percentage but this routine returns a simple number. - */ - if (pm->assume_16_bit_calculations || (out_depth == 16 && (in_depth == 16 || - !pm->calculations_use_input_precision))) - return pm->maxpc16 * .01; - else - return pm->maxpc8 * .01; -} - -/* Output error - the error in the encoded value. This is determined by the - * digitization of the output so can be +/-0.5 in the actual output value. In - * the expand_16 case with the current code in libpng the expand happens after - * all the calculations are done in 8 bit arithmetic, so even though the output - * depth is 16 the output error is determined by the 8 bit calculation. - * - * This limit is not determined by the bit depth of internal calculations. - * - * The specified parameter does *not* include the base .5 digitization error but - * it is added here. - */ -static double outerr(PNG_CONST png_modifier *pm, int in_depth, int out_depth) -{ - /* There is a serious error in the 2 and 4 bit grayscale transform because - * the gamma table value (8 bits) is simply shifted, not rounded, so the - * error in 4 bit grayscale gamma is up to the value below. This is a hack - * to allow pngvalid to succeed: - * - * TODO: fix this in libpng - */ - if (out_depth == 2) - return .73182-.5; - - if (out_depth == 4) - return .90644-.5; - - if (out_depth == 16 && (in_depth == 16 || - !pm->calculations_use_input_precision)) - return pm->maxout16; - - /* This is the case where the value was calculated at 8-bit precision then - * scaled to 16 bits. - */ - else if (out_depth == 16) - return pm->maxout8 * 257; - - else - return pm->maxout8; -} - -/* This does the same thing as the above however it returns the value to log, - * rather than raising a warning. This is useful for debugging to track down - * exactly what set of parameters cause high error values. - */ -static double outlog(PNG_CONST png_modifier *pm, int in_depth, int out_depth) -{ - /* The command line parameters are either 8 bit (0..255) or 16 bit (0..65535) - * and so must be adjusted for low bit depth grayscale: - */ - if (out_depth <= 8) - { - if (pm->log8 == 0) /* switched off */ - return 256; - - if (out_depth < 8) - return pm->log8 / 255 * ((1<log8; - } - - if (out_depth == 16 && (in_depth == 16 || - !pm->calculations_use_input_precision)) - { - if (pm->log16 == 0) - return 65536; - - return pm->log16; - } - - /* This is the case where the value was calculated at 8-bit precision then - * scaled to 16 bits. - */ - if (pm->log8 == 0) - return 65536; - - return pm->log8 * 257; -} - -/* This complements the above by providing the appropriate quantization for the - * final value. Normally this would just be quantization to an integral value, - * but in the 8 bit calculation case it's actually quantization to a multiple of - * 257! - */ -static int output_quantization_factor(PNG_CONST png_modifier *pm, int in_depth, - int out_depth) -{ - if (out_depth == 16 && in_depth != 16 - && pm->calculations_use_input_precision) - return 257; - else - return 1; -} -#endif /* PNG_READ_GAMMA_SUPPORTED */ - -/* One modification structure must be provided for each chunk to be modified (in - * fact more than one can be provided if multiple separate changes are desired - * for a single chunk.) Modifications include adding a new chunk when a - * suitable chunk does not exist. - * - * The caller of modify_fn will reset the CRC of the chunk and record 'modified' - * or 'added' as appropriate if the modify_fn returns 1 (true). If the - * modify_fn is NULL the chunk is simply removed. - */ -typedef struct png_modification -{ - struct png_modification *next; - png_uint_32 chunk; - - /* If the following is NULL all matching chunks will be removed: */ - int (*modify_fn)(struct png_modifier *pm, - struct png_modification *me, int add); - - /* If the following is set to PLTE, IDAT or IEND and the chunk has not been - * found and modified (and there is a modify_fn) the modify_fn will be called - * to add the chunk before the relevant chunk. - */ - png_uint_32 add; - unsigned int modified :1; /* Chunk was modified */ - unsigned int added :1; /* Chunk was added */ - unsigned int removed :1; /* Chunk was removed */ -} png_modification; - -static void -modification_reset(png_modification *pmm) -{ - if (pmm != NULL) - { - pmm->modified = 0; - pmm->added = 0; - pmm->removed = 0; - modification_reset(pmm->next); - } -} - -static void -modification_init(png_modification *pmm) -{ - memset(pmm, 0, sizeof *pmm); - pmm->next = NULL; - pmm->chunk = 0; - pmm->modify_fn = NULL; - pmm->add = 0; - modification_reset(pmm); -} - -#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED -static void -modifier_current_encoding(PNG_CONST png_modifier *pm, color_encoding *ce) -{ - if (pm->current_encoding != 0) - *ce = *pm->current_encoding; - - else - memset(ce, 0, sizeof *ce); - - ce->gamma = pm->current_gamma; -} -#endif - -static size_t -safecat_current_encoding(char *buffer, size_t bufsize, size_t pos, - PNG_CONST png_modifier *pm) -{ - pos = safecat_color_encoding(buffer, bufsize, pos, pm->current_encoding, - pm->current_gamma); - - if (pm->encoding_ignored) - pos = safecat(buffer, bufsize, pos, "[overridden]"); - - return pos; -} - -/* Iterate through the usefully testable color encodings. An encoding is one - * of: - * - * 1) Nothing (no color space, no gamma). - * 2) Just a gamma value from the gamma array (including 1.0) - * 3) A color space from the encodings array with the corresponding gamma. - * 4) The same, but with gamma 1.0 (only really useful with 16 bit calculations) - * - * The iterator selects these in turn, the randomizer selects one at random, - * which is used depends on the setting of the 'test_exhaustive' flag. Notice - * that this function changes the colour space encoding so it must only be - * called on completion of the previous test. This is what 'modifier_reset' - * does, below. - * - * After the function has been called the 'repeat' flag will still be set; the - * caller of modifier_reset must reset it at the start of each run of the test! - */ -static unsigned int -modifier_total_encodings(PNG_CONST png_modifier *pm) -{ - return 1 + /* (1) nothing */ - pm->ngammas + /* (2) gamma values to test */ - pm->nencodings + /* (3) total number of encodings */ - /* The following test only works after the first time through the - * png_modifier code because 'bit_depth' is set when the IHDR is read. - * modifier_reset, below, preserves the setting until after it has called - * the iterate function (also below.) - * - * For this reason do not rely on this function outside a call to - * modifier_reset. - */ - ((pm->bit_depth == 16 || pm->assume_16_bit_calculations) ? - pm->nencodings : 0); /* (4) encodings with gamma == 1.0 */ -} - -static void -modifier_encoding_iterate(png_modifier *pm) -{ - if (!pm->repeat && /* Else something needs the current encoding again. */ - pm->test_uses_encoding) /* Some transform is encoding dependent */ - { - if (pm->test_exhaustive) - { - if (++pm->encoding_counter >= modifier_total_encodings(pm)) - pm->encoding_counter = 0; /* This will stop the repeat */ - } - - else - { - /* Not exhaustive - choose an encoding at random; generate a number in - * the range 1..(max-1), so the result is always non-zero: - */ - if (pm->encoding_counter == 0) - pm->encoding_counter = random_mod(modifier_total_encodings(pm)-1)+1; - else - pm->encoding_counter = 0; - } - - if (pm->encoding_counter > 0) - pm->repeat = 1; - } - - else if (!pm->repeat) - pm->encoding_counter = 0; -} - -static void -modifier_reset(png_modifier *pm) -{ - store_read_reset(&pm->this); - pm->limit = 4E-3; - pm->pending_len = pm->pending_chunk = 0; - pm->flush = pm->buffer_count = pm->buffer_position = 0; - pm->modifications = NULL; - pm->state = modifier_start; - modifier_encoding_iterate(pm); - /* The following must be set in the next run. In particular - * test_uses_encodings must be set in the _ini function of each transform - * that looks at the encodings. (Not the 'add' function!) - */ - pm->test_uses_encoding = 0; - pm->current_gamma = 0; - pm->current_encoding = 0; - pm->encoding_ignored = 0; - /* These only become value after IHDR is read: */ - pm->bit_depth = pm->colour_type = 0; -} - -/* The following must be called before anything else to get the encoding set up - * on the modifier. In particular it must be called before the transform init - * functions are called. - */ -static void -modifier_set_encoding(png_modifier *pm) -{ - /* Set the encoding to the one specified by the current encoding counter, - * first clear out all the settings - this corresponds to an encoding_counter - * of 0. - */ - pm->current_gamma = 0; - pm->current_encoding = 0; - pm->encoding_ignored = 0; /* not ignored yet - happens in _ini functions. */ - - /* Now, if required, set the gamma and encoding fields. */ - if (pm->encoding_counter > 0) - { - /* The gammas[] array is an array of screen gammas, not encoding gammas, - * so we need the inverse: - */ - if (pm->encoding_counter <= pm->ngammas) - pm->current_gamma = 1/pm->gammas[pm->encoding_counter-1]; - - else - { - unsigned int i = pm->encoding_counter - pm->ngammas; - - if (i >= pm->nencodings) - { - i %= pm->nencodings; - pm->current_gamma = 1; /* Linear, only in the 16 bit case */ - } - - else - pm->current_gamma = pm->encodings[i].gamma; - - pm->current_encoding = pm->encodings + i; - } - } -} - -/* Enquiry functions to find out what is set. Notice that there is an implicit - * assumption below that the first encoding in the list is the one for sRGB. - */ -static int -modifier_color_encoding_is_sRGB(PNG_CONST png_modifier *pm) -{ - return pm->current_encoding != 0 && pm->current_encoding == pm->encodings && - pm->current_encoding->gamma == pm->current_gamma; -} - -static int -modifier_color_encoding_is_set(PNG_CONST png_modifier *pm) -{ - return pm->current_gamma != 0; -} - -/* Convenience macros. */ -#define CHUNK(a,b,c,d) (((a)<<24)+((b)<<16)+((c)<<8)+(d)) -#define CHUNK_IHDR CHUNK(73,72,68,82) -#define CHUNK_PLTE CHUNK(80,76,84,69) -#define CHUNK_IDAT CHUNK(73,68,65,84) -#define CHUNK_IEND CHUNK(73,69,78,68) -#define CHUNK_cHRM CHUNK(99,72,82,77) -#define CHUNK_gAMA CHUNK(103,65,77,65) -#define CHUNK_sBIT CHUNK(115,66,73,84) -#define CHUNK_sRGB CHUNK(115,82,71,66) - -/* The guts of modification are performed during a read. */ -static void -modifier_crc(png_bytep buffer) -{ - /* Recalculate the chunk CRC - a complete chunk must be in - * the buffer, at the start. - */ - uInt datalen = png_get_uint_32(buffer); - uLong crc = crc32(0, buffer+4, datalen+4); - /* The cast to png_uint_32 is safe because a crc32 is always a 32 bit value. - */ - png_save_uint_32(buffer+datalen+8, (png_uint_32)crc); -} - -static void -modifier_setbuffer(png_modifier *pm) -{ - modifier_crc(pm->buffer); - pm->buffer_count = png_get_uint_32(pm->buffer)+12; - pm->buffer_position = 0; -} - -/* Separate the callback into the actual implementation (which is passed the - * png_modifier explicitly) and the callback, which gets the modifier from the - * png_struct. - */ -static void -modifier_read_imp(png_modifier *pm, png_bytep pb, png_size_t st) -{ - while (st > 0) - { - size_t cb; - png_uint_32 len, chunk; - png_modification *mod; - - if (pm->buffer_position >= pm->buffer_count) switch (pm->state) - { - static png_byte sign[8] = { 137, 80, 78, 71, 13, 10, 26, 10 }; - case modifier_start: - store_read_imp(&pm->this, pm->buffer, 8); /* size of signature. */ - pm->buffer_count = 8; - pm->buffer_position = 0; - - if (memcmp(pm->buffer, sign, 8) != 0) - png_error(pm->this.pread, "invalid PNG file signature"); - pm->state = modifier_signature; - break; - - case modifier_signature: - store_read_imp(&pm->this, pm->buffer, 13+12); /* size of IHDR */ - pm->buffer_count = 13+12; - pm->buffer_position = 0; - - if (png_get_uint_32(pm->buffer) != 13 || - png_get_uint_32(pm->buffer+4) != CHUNK_IHDR) - png_error(pm->this.pread, "invalid IHDR"); - - /* Check the list of modifiers for modifications to the IHDR. */ - mod = pm->modifications; - while (mod != NULL) - { - if (mod->chunk == CHUNK_IHDR && mod->modify_fn && - (*mod->modify_fn)(pm, mod, 0)) - { - mod->modified = 1; - modifier_setbuffer(pm); - } - - /* Ignore removal or add if IHDR! */ - mod = mod->next; - } - - /* Cache information from the IHDR (the modified one.) */ - pm->bit_depth = pm->buffer[8+8]; - pm->colour_type = pm->buffer[8+8+1]; - - pm->state = modifier_IHDR; - pm->flush = 0; - break; - - case modifier_IHDR: - default: - /* Read a new chunk and process it until we see PLTE, IDAT or - * IEND. 'flush' indicates that there is still some data to - * output from the preceding chunk. - */ - if ((cb = pm->flush) > 0) - { - if (cb > st) cb = st; - pm->flush -= cb; - store_read_imp(&pm->this, pb, cb); - pb += cb; - st -= cb; - if (st == 0) return; - } - - /* No more bytes to flush, read a header, or handle a pending - * chunk. - */ - if (pm->pending_chunk != 0) - { - png_save_uint_32(pm->buffer, pm->pending_len); - png_save_uint_32(pm->buffer+4, pm->pending_chunk); - pm->pending_len = 0; - pm->pending_chunk = 0; - } - else - store_read_imp(&pm->this, pm->buffer, 8); - - pm->buffer_count = 8; - pm->buffer_position = 0; - - /* Check for something to modify or a terminator chunk. */ - len = png_get_uint_32(pm->buffer); - chunk = png_get_uint_32(pm->buffer+4); - - /* Terminators first, they may have to be delayed for added - * chunks - */ - if (chunk == CHUNK_PLTE || chunk == CHUNK_IDAT || - chunk == CHUNK_IEND) - { - mod = pm->modifications; - - while (mod != NULL) - { - if ((mod->add == chunk || - (mod->add == CHUNK_PLTE && chunk == CHUNK_IDAT)) && - mod->modify_fn != NULL && !mod->modified && !mod->added) - { - /* Regardless of what the modify function does do not run - * this again. - */ - mod->added = 1; - - if ((*mod->modify_fn)(pm, mod, 1 /*add*/)) - { - /* Reset the CRC on a new chunk */ - if (pm->buffer_count > 0) - modifier_setbuffer(pm); - - else - { - pm->buffer_position = 0; - mod->removed = 1; - } - - /* The buffer has been filled with something (we assume) - * so output this. Pend the current chunk. - */ - pm->pending_len = len; - pm->pending_chunk = chunk; - break; /* out of while */ - } - } - - mod = mod->next; - } - - /* Don't do any further processing if the buffer was modified - - * otherwise the code will end up modifying a chunk that was - * just added. - */ - if (mod != NULL) - break; /* out of switch */ - } - - /* If we get to here then this chunk may need to be modified. To - * do this it must be less than 1024 bytes in total size, otherwise - * it just gets flushed. - */ - if (len+12 <= sizeof pm->buffer) - { - store_read_imp(&pm->this, pm->buffer+pm->buffer_count, - len+12-pm->buffer_count); - pm->buffer_count = len+12; - - /* Check for a modification, else leave it be. */ - mod = pm->modifications; - while (mod != NULL) - { - if (mod->chunk == chunk) - { - if (mod->modify_fn == NULL) - { - /* Remove this chunk */ - pm->buffer_count = pm->buffer_position = 0; - mod->removed = 1; - break; /* Terminate the while loop */ - } - - else if ((*mod->modify_fn)(pm, mod, 0)) - { - mod->modified = 1; - /* The chunk may have been removed: */ - if (pm->buffer_count == 0) - { - pm->buffer_position = 0; - break; - } - modifier_setbuffer(pm); - } - } - - mod = mod->next; - } - } - - else - pm->flush = len+12 - pm->buffer_count; /* data + crc */ - - /* Take the data from the buffer (if there is any). */ - break; - } - - /* Here to read from the modifier buffer (not directly from - * the store, as in the flush case above.) - */ - cb = pm->buffer_count - pm->buffer_position; - - if (cb > st) - cb = st; - - memcpy(pb, pm->buffer + pm->buffer_position, cb); - st -= cb; - pb += cb; - pm->buffer_position += cb; - } -} - -/* The callback: */ -static void -modifier_read(png_structp ppIn, png_bytep pb, png_size_t st) -{ - png_const_structp pp = ppIn; - png_modifier *pm = voidcast(png_modifier*, png_get_io_ptr(pp)); - - if (pm == NULL || pm->this.pread != pp) - png_error(pp, "bad modifier_read call"); - - modifier_read_imp(pm, pb, st); -} - -/* Like store_progressive_read but the data is getting changed as we go so we - * need a local buffer. - */ -static void -modifier_progressive_read(png_modifier *pm, png_structp pp, png_infop pi) -{ - if (pm->this.pread != pp || pm->this.current == NULL || - pm->this.next == NULL) - png_error(pp, "store state damaged (progressive)"); - - /* This is another Horowitz and Hill random noise generator. In this case - * the aim is to stress the progressive reader with truly horrible variable - * buffer sizes in the range 1..500, so a sequence of 9 bit random numbers - * is generated. We could probably just count from 1 to 32767 and get as - * good a result. - */ - for (;;) - { - static png_uint_32 noise = 1; - png_size_t cb, cbAvail; - png_byte buffer[512]; - - /* Generate 15 more bits of stuff: */ - noise = (noise << 9) | ((noise ^ (noise >> (9-5))) & 0x1ff); - cb = noise & 0x1ff; - - /* Check that this number of bytes are available (in the current buffer.) - * (This doesn't quite work - the modifier might delete a chunk; unlikely - * but possible, it doesn't happen at present because the modifier only - * adds chunks to standard images.) - */ - cbAvail = store_read_buffer_avail(&pm->this); - if (pm->buffer_count > pm->buffer_position) - cbAvail += pm->buffer_count - pm->buffer_position; - - if (cb > cbAvail) - { - /* Check for EOF: */ - if (cbAvail == 0) - break; - - cb = cbAvail; - } - - modifier_read_imp(pm, buffer, cb); - png_process_data(pp, pi, buffer, cb); - } - - /* Check the invariants at the end (if this fails it's a problem in this - * file!) - */ - if (pm->buffer_count > pm->buffer_position || - pm->this.next != &pm->this.current->data || - pm->this.readpos < pm->this.current->datacount) - png_error(pp, "progressive read implementation error"); -} - -/* Set up a modifier. */ -static png_structp -set_modifier_for_read(png_modifier *pm, png_infopp ppi, png_uint_32 id, - PNG_CONST char *name) -{ - /* Do this first so that the modifier fields are cleared even if an error - * happens allocating the png_struct. No allocation is done here so no - * cleanup is required. - */ - pm->state = modifier_start; - pm->bit_depth = 0; - pm->colour_type = 255; - - pm->pending_len = 0; - pm->pending_chunk = 0; - pm->flush = 0; - pm->buffer_count = 0; - pm->buffer_position = 0; - - return set_store_for_read(&pm->this, ppi, id, name); -} - - -/******************************** MODIFICATIONS *******************************/ -/* Standard modifications to add chunks. These do not require the _SUPPORTED - * macros because the chunks can be there regardless of whether this specific - * libpng supports them. - */ -typedef struct gama_modification -{ - png_modification this; - png_fixed_point gamma; -} gama_modification; - -static int -gama_modify(png_modifier *pm, png_modification *me, int add) -{ - UNUSED(add) - /* This simply dumps the given gamma value into the buffer. */ - png_save_uint_32(pm->buffer, 4); - png_save_uint_32(pm->buffer+4, CHUNK_gAMA); - png_save_uint_32(pm->buffer+8, ((gama_modification*)me)->gamma); - return 1; -} - -static void -gama_modification_init(gama_modification *me, png_modifier *pm, double gammad) -{ - double g; - - modification_init(&me->this); - me->this.chunk = CHUNK_gAMA; - me->this.modify_fn = gama_modify; - me->this.add = CHUNK_PLTE; - g = fix(gammad); - me->gamma = (png_fixed_point)g; - me->this.next = pm->modifications; - pm->modifications = &me->this; -} - -typedef struct chrm_modification -{ - png_modification this; - PNG_CONST color_encoding *encoding; - png_fixed_point wx, wy, rx, ry, gx, gy, bx, by; -} chrm_modification; - -static int -chrm_modify(png_modifier *pm, png_modification *me, int add) -{ - UNUSED(add) - /* As with gAMA this just adds the required cHRM chunk to the buffer. */ - png_save_uint_32(pm->buffer , 32); - png_save_uint_32(pm->buffer+ 4, CHUNK_cHRM); - png_save_uint_32(pm->buffer+ 8, ((chrm_modification*)me)->wx); - png_save_uint_32(pm->buffer+12, ((chrm_modification*)me)->wy); - png_save_uint_32(pm->buffer+16, ((chrm_modification*)me)->rx); - png_save_uint_32(pm->buffer+20, ((chrm_modification*)me)->ry); - png_save_uint_32(pm->buffer+24, ((chrm_modification*)me)->gx); - png_save_uint_32(pm->buffer+28, ((chrm_modification*)me)->gy); - png_save_uint_32(pm->buffer+32, ((chrm_modification*)me)->bx); - png_save_uint_32(pm->buffer+36, ((chrm_modification*)me)->by); - return 1; -} - -static void -chrm_modification_init(chrm_modification *me, png_modifier *pm, - PNG_CONST color_encoding *encoding) -{ - CIE_color white = white_point(encoding); - - /* Original end points: */ - me->encoding = encoding; - - /* Chromaticities (in fixed point): */ - me->wx = fix(chromaticity_x(white)); - me->wy = fix(chromaticity_y(white)); - - me->rx = fix(chromaticity_x(encoding->red)); - me->ry = fix(chromaticity_y(encoding->red)); - me->gx = fix(chromaticity_x(encoding->green)); - me->gy = fix(chromaticity_y(encoding->green)); - me->bx = fix(chromaticity_x(encoding->blue)); - me->by = fix(chromaticity_y(encoding->blue)); - - modification_init(&me->this); - me->this.chunk = CHUNK_cHRM; - me->this.modify_fn = chrm_modify; - me->this.add = CHUNK_PLTE; - me->this.next = pm->modifications; - pm->modifications = &me->this; -} - -typedef struct srgb_modification -{ - png_modification this; - png_byte intent; -} srgb_modification; - -static int -srgb_modify(png_modifier *pm, png_modification *me, int add) -{ - UNUSED(add) - /* As above, ignore add and just make a new chunk */ - png_save_uint_32(pm->buffer, 1); - png_save_uint_32(pm->buffer+4, CHUNK_sRGB); - pm->buffer[8] = ((srgb_modification*)me)->intent; - return 1; -} - -static void -srgb_modification_init(srgb_modification *me, png_modifier *pm, png_byte intent) -{ - modification_init(&me->this); - me->this.chunk = CHUNK_sBIT; - - if (intent <= 3) /* if valid, else *delete* sRGB chunks */ - { - me->this.modify_fn = srgb_modify; - me->this.add = CHUNK_PLTE; - me->intent = intent; - } - - else - { - me->this.modify_fn = 0; - me->this.add = 0; - me->intent = 0; - } - - me->this.next = pm->modifications; - pm->modifications = &me->this; -} - -#ifdef PNG_READ_GAMMA_SUPPORTED -typedef struct sbit_modification -{ - png_modification this; - png_byte sbit; -} sbit_modification; - -static int -sbit_modify(png_modifier *pm, png_modification *me, int add) -{ - png_byte sbit = ((sbit_modification*)me)->sbit; - if (pm->bit_depth > sbit) - { - int cb = 0; - switch (pm->colour_type) - { - case 0: - cb = 1; - break; - - case 2: - case 3: - cb = 3; - break; - - case 4: - cb = 2; - break; - - case 6: - cb = 4; - break; - - default: - png_error(pm->this.pread, - "unexpected colour type in sBIT modification"); - } - - png_save_uint_32(pm->buffer, cb); - png_save_uint_32(pm->buffer+4, CHUNK_sBIT); - - while (cb > 0) - (pm->buffer+8)[--cb] = sbit; - - return 1; - } - else if (!add) - { - /* Remove the sBIT chunk */ - pm->buffer_count = pm->buffer_position = 0; - return 1; - } - else - return 0; /* do nothing */ -} - -static void -sbit_modification_init(sbit_modification *me, png_modifier *pm, png_byte sbit) -{ - modification_init(&me->this); - me->this.chunk = CHUNK_sBIT; - me->this.modify_fn = sbit_modify; - me->this.add = CHUNK_PLTE; - me->sbit = sbit; - me->this.next = pm->modifications; - pm->modifications = &me->this; -} -#endif /* PNG_READ_GAMMA_SUPPORTED */ -#endif /* PNG_READ_TRANSFORMS_SUPPORTED */ - -/***************************** STANDARD PNG FILES *****************************/ -/* Standard files - write and save standard files. */ -/* There are two basic forms of standard images. Those which attempt to have - * all the possible pixel values (not possible for 16bpp images, but a range of - * values are produced) and those which have a range of image sizes. The former - * are used for testing transforms, in particular gamma correction and bit - * reduction and increase. The latter are reserved for testing the behavior of - * libpng with respect to 'odd' image sizes - particularly small images where - * rows become 1 byte and interlace passes disappear. - * - * The first, most useful, set are the 'transform' images, the second set of - * small images are the 'size' images. - * - * The transform files are constructed with rows which fit into a 1024 byte row - * buffer. This makes allocation easier below. Further regardless of the file - * format every row has 128 pixels (giving 1024 bytes for 64bpp formats). - * - * Files are stored with no gAMA or sBIT chunks, with a PLTE only when needed - * and with an ID derived from the colour type, bit depth and interlace type - * as above (FILEID). The width (128) and height (variable) are not stored in - * the FILEID - instead the fields are set to 0, indicating a transform file. - * - * The size files ar constructed with rows a maximum of 128 bytes wide, allowing - * a maximum width of 16 pixels (for the 64bpp case.) They also have a maximum - * height of 16 rows. The width and height are stored in the FILEID and, being - * non-zero, indicate a size file. - * - * Because the PNG filter code is typically the largest CPU consumer within - * libpng itself there is a tendency to attempt to optimize it. This results in - * special case code which needs to be validated. To cause this to happen the - * 'size' images are made to use each possible filter, in so far as this is - * possible for smaller images. - * - * For palette image (colour type 3) multiple transform images are stored with - * the same bit depth to allow testing of more colour combinations - - * particularly important for testing the gamma code because libpng uses a - * different code path for palette images. For size images a single palette is - * used. - */ - -/* Make a 'standard' palette. Because there are only 256 entries in a palette - * (maximum) this actually makes a random palette in the hope that enough tests - * will catch enough errors. (Note that the same palette isn't produced every - * time for the same test - it depends on what previous tests have been run - - * but a given set of arguments to pngvalid will always produce the same palette - * at the same test! This is why pseudo-random number generators are useful for - * testing.) - * - * The store must be open for write when this is called, otherwise an internal - * error will occur. This routine contains its own magic number seed, so the - * palettes generated don't change if there are intervening errors (changing the - * calls to the store_mark seed.) - */ -static store_palette_entry * -make_standard_palette(png_store* ps, int npalette, int do_tRNS) -{ - static png_uint_32 palette_seed[2] = { 0x87654321, 9 }; - - int i = 0; - png_byte values[256][4]; - - /* Always put in black and white plus the six primary and secondary colors. - */ - for (; i<8; ++i) - { - values[i][1] = (png_byte)((i&1) ? 255U : 0U); - values[i][2] = (png_byte)((i&2) ? 255U : 0U); - values[i][3] = (png_byte)((i&4) ? 255U : 0U); - } - - /* Then add 62 grays (one quarter of the remaining 256 slots). */ - { - int j = 0; - png_byte random_bytes[4]; - png_byte need[256]; - - need[0] = 0; /*got black*/ - memset(need+1, 1, (sizeof need)-2); /*need these*/ - need[255] = 0; /*but not white*/ - - while (i<70) - { - png_byte b; - - if (j==0) - { - make_four_random_bytes(palette_seed, random_bytes); - j = 4; - } - - b = random_bytes[--j]; - if (need[b]) - { - values[i][1] = b; - values[i][2] = b; - values[i++][3] = b; - } - } - } - - /* Finally add 192 colors at random - don't worry about matches to things we - * already have, chance is less than 1/65536. Don't worry about grays, - * chance is the same, so we get a duplicate or extra gray less than 1 time - * in 170. - */ - for (; i<256; ++i) - make_four_random_bytes(palette_seed, values[i]); - - /* Fill in the alpha values in the first byte. Just use all possible values - * (0..255) in an apparently random order: - */ - { - store_palette_entry *palette; - png_byte selector[4]; - - make_four_random_bytes(palette_seed, selector); - - if (do_tRNS) - for (i=0; i<256; ++i) - values[i][0] = (png_byte)(i ^ selector[0]); - - else - for (i=0; i<256; ++i) - values[i][0] = 255; /* no transparency/tRNS chunk */ - - /* 'values' contains 256 ARGB values, but we only need 'npalette'. - * 'npalette' will always be a power of 2: 2, 4, 16 or 256. In the low - * bit depth cases select colors at random, else it is difficult to have - * a set of low bit depth palette test with any chance of a reasonable - * range of colors. Do this by randomly permuting values into the low - * 'npalette' entries using an XOR mask generated here. This also - * permutes the npalette == 256 case in a potentially useful way (there is - * no relationship between palette index and the color value therein!) - */ - palette = store_write_palette(ps, npalette); - - for (i=0; i 0) - png_set_tRNS(pp, pi, tRNS, j, 0/*color*/); -# endif - } -} - -/* The number of passes is related to the interlace type. There was no libpng - * API to determine this prior to 1.5, so we need an inquiry function: - */ -static int -npasses_from_interlace_type(png_const_structp pp, int interlace_type) -{ - switch (interlace_type) - { - default: - png_error(pp, "invalid interlace type"); - - case PNG_INTERLACE_NONE: - return 1; - - case PNG_INTERLACE_ADAM7: - return PNG_INTERLACE_ADAM7_PASSES; - } -} - -static unsigned int -bit_size(png_const_structp pp, png_byte colour_type, png_byte bit_depth) -{ - switch (colour_type) - { - default: png_error(pp, "invalid color type"); - - case 0: return bit_depth; - - case 2: return 3*bit_depth; - - case 3: return bit_depth; - - case 4: return 2*bit_depth; - - case 6: return 4*bit_depth; - } -} - -#define TRANSFORM_WIDTH 128U -#define TRANSFORM_ROWMAX (TRANSFORM_WIDTH*8U) -#define SIZE_ROWMAX (16*8U) /* 16 pixels, max 8 bytes each - 128 bytes */ -#define STANDARD_ROWMAX TRANSFORM_ROWMAX /* The larger of the two */ -#define SIZE_HEIGHTMAX 16 /* Maximum range of size images */ - -static size_t -transform_rowsize(png_const_structp pp, png_byte colour_type, - png_byte bit_depth) -{ - return (TRANSFORM_WIDTH * bit_size(pp, colour_type, bit_depth)) / 8; -} - -/* transform_width(pp, colour_type, bit_depth) current returns the same number - * every time, so just use a macro: - */ -#define transform_width(pp, colour_type, bit_depth) TRANSFORM_WIDTH - -static png_uint_32 -transform_height(png_const_structp pp, png_byte colour_type, png_byte bit_depth) -{ - switch (bit_size(pp, colour_type, bit_depth)) - { - case 1: - case 2: - case 4: - return 1; /* Total of 128 pixels */ - - case 8: - return 2; /* Total of 256 pixels/bytes */ - - case 16: - return 512; /* Total of 65536 pixels */ - - case 24: - case 32: - return 512; /* 65536 pixels */ - - case 48: - case 64: - return 2048;/* 4 x 65536 pixels. */ -# define TRANSFORM_HEIGHTMAX 2048 - - default: - return 0; /* Error, will be caught later */ - } -} - -#ifdef PNG_READ_SUPPORTED -/* The following can only be defined here, now we have the definitions - * of the transform image sizes. - */ -static png_uint_32 -standard_width(png_const_structp pp, png_uint_32 id) -{ - png_uint_32 width = WIDTH_FROM_ID(id); - UNUSED(pp) - - if (width == 0) - width = transform_width(pp, COL_FROM_ID(id), DEPTH_FROM_ID(id)); - - return width; -} - -static png_uint_32 -standard_height(png_const_structp pp, png_uint_32 id) -{ - png_uint_32 height = HEIGHT_FROM_ID(id); - - if (height == 0) - height = transform_height(pp, COL_FROM_ID(id), DEPTH_FROM_ID(id)); - - return height; -} - -static png_uint_32 -standard_rowsize(png_const_structp pp, png_uint_32 id) -{ - png_uint_32 width = standard_width(pp, id); - - /* This won't overflow: */ - width *= bit_size(pp, COL_FROM_ID(id), DEPTH_FROM_ID(id)); - return (width + 7) / 8; -} -#endif /* PNG_READ_SUPPORTED */ - -static void -transform_row(png_const_structp pp, png_byte buffer[TRANSFORM_ROWMAX], - png_byte colour_type, png_byte bit_depth, png_uint_32 y) -{ - png_uint_32 v = y << 7; - png_uint_32 i = 0; - - switch (bit_size(pp, colour_type, bit_depth)) - { - case 1: - while (i<128/8) buffer[i] = (png_byte)(v & 0xff), v += 17, ++i; - return; - - case 2: - while (i<128/4) buffer[i] = (png_byte)(v & 0xff), v += 33, ++i; - return; - - case 4: - while (i<128/2) buffer[i] = (png_byte)(v & 0xff), v += 65, ++i; - return; - - case 8: - /* 256 bytes total, 128 bytes in each row set as follows: */ - while (i<128) buffer[i] = (png_byte)(v & 0xff), ++v, ++i; - return; - - case 16: - /* Generate all 65536 pixel values in order, which includes the 8 bit - * GA case as well as the 16 bit G case. - */ - while (i<128) - { - buffer[2*i] = (png_byte)((v>>8) & 0xff); - buffer[2*i+1] = (png_byte)(v & 0xff); - ++v; - ++i; - } - - return; - - case 24: - /* 65535 pixels, but rotate the values. */ - while (i<128) - { - /* Three bytes per pixel, r, g, b, make b by r^g */ - buffer[3*i+0] = (png_byte)((v >> 8) & 0xff); - buffer[3*i+1] = (png_byte)(v & 0xff); - buffer[3*i+2] = (png_byte)(((v >> 8) ^ v) & 0xff); - ++v; - ++i; - } - - return; - - case 32: - /* 65535 pixels, r, g, b, a; just replicate */ - while (i<128) - { - buffer[4*i+0] = (png_byte)((v >> 8) & 0xff); - buffer[4*i+1] = (png_byte)(v & 0xff); - buffer[4*i+2] = (png_byte)((v >> 8) & 0xff); - buffer[4*i+3] = (png_byte)(v & 0xff); - ++v; - ++i; - } - - return; - - case 48: - /* y is maximum 2047, giving 4x65536 pixels, make 'r' increase by 1 at - * each pixel, g increase by 257 (0x101) and 'b' by 0x1111: - */ - while (i<128) - { - png_uint_32 t = v++; - buffer[6*i+0] = (png_byte)((t >> 8) & 0xff); - buffer[6*i+1] = (png_byte)(t & 0xff); - t *= 257; - buffer[6*i+2] = (png_byte)((t >> 8) & 0xff); - buffer[6*i+3] = (png_byte)(t & 0xff); - t *= 17; - buffer[6*i+4] = (png_byte)((t >> 8) & 0xff); - buffer[6*i+5] = (png_byte)(t & 0xff); - ++i; - } - - return; - - case 64: - /* As above in the 32 bit case. */ - while (i<128) - { - png_uint_32 t = v++; - buffer[8*i+0] = (png_byte)((t >> 8) & 0xff); - buffer[8*i+1] = (png_byte)(t & 0xff); - buffer[8*i+4] = (png_byte)((t >> 8) & 0xff); - buffer[8*i+5] = (png_byte)(t & 0xff); - t *= 257; - buffer[8*i+2] = (png_byte)((t >> 8) & 0xff); - buffer[8*i+3] = (png_byte)(t & 0xff); - buffer[8*i+6] = (png_byte)((t >> 8) & 0xff); - buffer[8*i+7] = (png_byte)(t & 0xff); - ++i; - } - return; - - default: - break; - } - - png_error(pp, "internal error"); -} - -/* This is just to do the right cast - could be changed to a function to check - * 'bd' but there isn't much point. - */ -#define DEPTH(bd) ((png_byte)(1U << (bd))) - -/* This is just a helper for compiling on minimal systems with no write - * interlacing support. - */ -#ifndef PNG_WRITE_INTERLACING_SUPPORTED -# define png_set_interlace_handling(a) (1) -#endif - -/* Make a standardized image given a an image colour type, bit depth and - * interlace type. The standard images have a very restricted range of - * rows and heights and are used for testing transforms rather than image - * layout details. See make_size_images below for a way to make images - * that test odd sizes along with the libpng interlace handling. - */ -static void -make_transform_image(png_store* PNG_CONST ps, png_byte PNG_CONST colour_type, - png_byte PNG_CONST bit_depth, unsigned int palette_number, - int interlace_type, png_const_charp name) -{ - context(ps, fault); - - Try - { - png_infop pi; - png_structp pp = set_store_for_write(ps, &pi, name); - png_uint_32 h; - - /* In the event of a problem return control to the Catch statement below - * to do the clean up - it is not possible to 'return' directly from a Try - * block. - */ - if (pp == NULL) - Throw ps; - - h = transform_height(pp, colour_type, bit_depth); - - png_set_IHDR(pp, pi, transform_width(pp, colour_type, bit_depth), h, - bit_depth, colour_type, interlace_type, - PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - -#ifdef PNG_TEXT_SUPPORTED -# if defined(PNG_READ_zTXt_SUPPORTED) && defined(PNG_WRITE_zTXt_SUPPORTED) -# define TEXT_COMPRESSION PNG_TEXT_COMPRESSION_zTXt -# else -# define TEXT_COMPRESSION PNG_TEXT_COMPRESSION_NONE -# endif - { - static char key[] = "image name"; /* must be writeable */ - size_t pos; - png_text text; - char copy[FILE_NAME_SIZE]; - - /* Use a compressed text string to test the correct interaction of text - * compression and IDAT compression. - */ - text.compression = TEXT_COMPRESSION; - text.key = key; - /* Yuck: the text must be writable! */ - pos = safecat(copy, sizeof copy, 0, ps->wname); - text.text = copy; - text.text_length = pos; - text.itxt_length = 0; - text.lang = 0; - text.lang_key = 0; - - png_set_text(pp, pi, &text, 1); - } -#endif - - if (colour_type == 3) /* palette */ - init_standard_palette(ps, pp, pi, 1U << bit_depth, 1/*do tRNS*/); - - png_write_info(pp, pi); - - if (png_get_rowbytes(pp, pi) != - transform_rowsize(pp, colour_type, bit_depth)) - png_error(pp, "row size incorrect"); - - else - { - /* Somewhat confusingly this must be called *after* png_write_info - * because if it is called before, the information in *pp has not been - * updated to reflect the interlaced image. - */ - int npasses = png_set_interlace_handling(pp); - int pass; - - if (npasses != npasses_from_interlace_type(pp, interlace_type)) - png_error(pp, "write: png_set_interlace_handling failed"); - - for (pass=0; passtest, sizeof ps->test, 0, "make standard images"); - - /* Use next_format to enumerate all the combinations we test, including - * generating multiple low bit depth palette images. - */ - while (next_format(&colour_type, &bit_depth, &palette_number)) - { - int interlace_type; - -# ifdef PNG_WRITE_INTERLACING_SUPPORTED - for (interlace_type = PNG_INTERLACE_NONE; - interlace_type < PNG_INTERLACE_LAST; ++interlace_type) -# else - interlace_type = PNG_INTERLACE_NONE; -# endif - { - char name[FILE_NAME_SIZE]; - - standard_name(name, sizeof name, 0, colour_type, bit_depth, - palette_number, interlace_type, 0, 0, 0); - make_transform_image(ps, colour_type, bit_depth, palette_number, - interlace_type, name); - } - } -} - -/* The following two routines use the PNG interlace support macros from - * png.h to interlace or deinterlace rows. - */ -static void -interlace_row(png_bytep buffer, png_const_bytep imageRow, - unsigned int pixel_size, png_uint_32 w, int pass) -{ - png_uint_32 xin, xout, xstep; - - /* Note that this can, trivially, be optimized to a memcpy on pass 7, the - * code is presented this way to make it easier to understand. In practice - * consult the code in the libpng source to see other ways of doing this. - */ - xin = PNG_PASS_START_COL(pass); - xstep = 1U<= 8) - *buffer++ = (png_byte)y++, bit_width -= 8; - - /* There may be up to 7 remaining bits, these go in the most significant - * bits of the byte. - */ - if (bit_width > 0) - { - png_uint_32 mask = (1U<<(8-bit_width))-1; - *buffer = (png_byte)((*buffer & mask) | (y & ~mask)); - } -} - -static void -make_size_image(png_store* PNG_CONST ps, png_byte PNG_CONST colour_type, - png_byte PNG_CONST bit_depth, int PNG_CONST interlace_type, - png_uint_32 PNG_CONST w, png_uint_32 PNG_CONST h, - int PNG_CONST do_interlace) -{ - context(ps, fault); - - Try - { - png_infop pi; - png_structp pp; - unsigned int pixel_size; - - /* Make a name and get an appropriate id for the store: */ - char name[FILE_NAME_SIZE]; - PNG_CONST png_uint_32 id = FILEID(colour_type, bit_depth, 0/*palette*/, - interlace_type, w, h, do_interlace); - - standard_name_from_id(name, sizeof name, 0, id); - pp = set_store_for_write(ps, &pi, name); - - /* In the event of a problem return control to the Catch statement below - * to do the clean up - it is not possible to 'return' directly from a Try - * block. - */ - if (pp == NULL) - Throw ps; - - png_set_IHDR(pp, pi, w, h, bit_depth, colour_type, interlace_type, - PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - -#ifdef PNG_TEXT_SUPPORTED - { - static char key[] = "image name"; /* must be writeable */ - size_t pos; - png_text text; - char copy[FILE_NAME_SIZE]; - - /* Use a compressed text string to test the correct interaction of text - * compression and IDAT compression. - */ - text.compression = TEXT_COMPRESSION; - text.key = key; - /* Yuck: the text must be writable! */ - pos = safecat(copy, sizeof copy, 0, ps->wname); - text.text = copy; - text.text_length = pos; - text.itxt_length = 0; - text.lang = 0; - text.lang_key = 0; - - png_set_text(pp, pi, &text, 1); - } -#endif - - if (colour_type == 3) /* palette */ - init_standard_palette(ps, pp, pi, 1U << bit_depth, 0/*do tRNS*/); - - png_write_info(pp, pi); - - /* Calculate the bit size, divide by 8 to get the byte size - this won't - * overflow because we know the w values are all small enough even for - * a system where 'unsigned int' is only 16 bits. - */ - pixel_size = bit_size(pp, colour_type, bit_depth); - if (png_get_rowbytes(pp, pi) != ((w * pixel_size) + 7) / 8) - png_error(pp, "row size incorrect"); - - else - { - int npasses = npasses_from_interlace_type(pp, interlace_type); - png_uint_32 y; - int pass; -# ifdef PNG_WRITE_FILTER_SUPPORTED - int nfilter = PNG_FILTER_VALUE_LAST; -# endif - png_byte image[16][SIZE_ROWMAX]; - - /* To help consistent error detection make the parts of this buffer - * that aren't set below all '1': - */ - memset(image, 0xff, sizeof image); - - if (!do_interlace && npasses != png_set_interlace_handling(pp)) - png_error(pp, "write: png_set_interlace_handling failed"); - - /* Prepare the whole image first to avoid making it 7 times: */ - for (y=0; y 0) - { - /* Set to all 1's for error detection (libpng tends to - * set unset things to 0). - */ - memset(tempRow, 0xff, sizeof tempRow); - interlace_row(tempRow, row, pixel_size, w, pass); - row = tempRow; - } - else - continue; - } - -# ifdef PNG_WRITE_FILTER_SUPPORTED - /* Only get to here if the row has some pixels in it, set the - * filters to 'all' for the very first row and thereafter to a - * single filter. It isn't well documented, but png_set_filter - * does accept a filter number (per the spec) as well as a bit - * mask. - * - * The apparent wackiness of decrementing nfilter rather than - * incrementing is so that Paeth gets used in all images bigger - * than 1 row - it's the tricky one. - */ - png_set_filter(pp, 0/*method*/, - nfilter >= PNG_FILTER_VALUE_LAST ? PNG_ALL_FILTERS : nfilter); - - if (nfilter-- == 0) - nfilter = PNG_FILTER_VALUE_LAST-1; -# endif - - png_write_row(pp, row); - } - } - } - -#ifdef PNG_TEXT_SUPPORTED - { - static char key[] = "end marker"; - static char comment[] = "end"; - png_text text; - - /* Use a compressed text string to test the correct interaction of text - * compression and IDAT compression. - */ - text.compression = TEXT_COMPRESSION; - text.key = key; - text.text = comment; - text.text_length = (sizeof comment)-1; - text.itxt_length = 0; - text.lang = 0; - text.lang_key = 0; - - png_set_text(pp, pi, &text, 1); - } -#endif - - png_write_end(pp, pi); - - /* And store this under the appropriate id, then clean up. */ - store_storefile(ps, id); - - store_write_reset(ps); - } - - Catch(fault) - { - /* Use the png_store returned by the exception. This may help the compiler - * because 'ps' is not used in this branch of the setjmp. Note that fault - * and ps will always be the same value. - */ - store_write_reset(fault); - } -} - -static void -make_size(png_store* PNG_CONST ps, png_byte PNG_CONST colour_type, int bdlo, - int PNG_CONST bdhi) -{ - for (; bdlo <= bdhi; ++bdlo) - { - png_uint_32 width; - - for (width = 1; width <= 16; ++width) - { - png_uint_32 height; - - for (height = 1; height <= 16; ++height) - { - /* The four combinations of DIY interlace and interlace or not - - * no interlace + DIY should be identical to no interlace with - * libpng doing it. - */ - make_size_image(ps, colour_type, DEPTH(bdlo), PNG_INTERLACE_NONE, - width, height, 0); - make_size_image(ps, colour_type, DEPTH(bdlo), PNG_INTERLACE_NONE, - width, height, 1); -# ifdef PNG_WRITE_INTERLACING_SUPPORTED - make_size_image(ps, colour_type, DEPTH(bdlo), PNG_INTERLACE_ADAM7, - width, height, 0); -# endif - make_size_image(ps, colour_type, DEPTH(bdlo), PNG_INTERLACE_ADAM7, - width, height, 1); - } - } - } -} - -static void -make_size_images(png_store *ps) -{ - /* This is in case of errors. */ - safecat(ps->test, sizeof ps->test, 0, "make size images"); - - /* Arguments are colour_type, low bit depth, high bit depth - */ - make_size(ps, 0, 0, WRITE_BDHI); - make_size(ps, 2, 3, WRITE_BDHI); - make_size(ps, 3, 0, 3 /*palette: max 8 bits*/); - make_size(ps, 4, 3, WRITE_BDHI); - make_size(ps, 6, 3, WRITE_BDHI); -} - -#ifdef PNG_READ_SUPPORTED -/* Return a row based on image id and 'y' for checking: */ -static void -standard_row(png_const_structp pp, png_byte std[STANDARD_ROWMAX], - png_uint_32 id, png_uint_32 y) -{ - if (WIDTH_FROM_ID(id) == 0) - transform_row(pp, std, COL_FROM_ID(id), DEPTH_FROM_ID(id), y); - else - size_row(std, WIDTH_FROM_ID(id) * bit_size(pp, COL_FROM_ID(id), - DEPTH_FROM_ID(id)), y); -} -#endif /* PNG_READ_SUPPORTED */ - -/* Tests - individual test cases */ -/* Like 'make_standard' but errors are deliberately introduced into the calls - * to ensure that they get detected - it should not be possible to write an - * invalid image with libpng! - */ -/* TODO: the 'set' functions can probably all be made to take a - * png_const_structp rather than a modifiable one. - */ -#ifdef PNG_WARNINGS_SUPPORTED -static void -sBIT0_error_fn(png_structp pp, png_infop pi) -{ - /* 0 is invalid... */ - png_color_8 bad; - bad.red = bad.green = bad.blue = bad.gray = bad.alpha = 0; - png_set_sBIT(pp, pi, &bad); -} - -static void -sBIT_error_fn(png_structp pp, png_infop pi) -{ - png_byte bit_depth; - png_color_8 bad; - - if (png_get_color_type(pp, pi) == PNG_COLOR_TYPE_PALETTE) - bit_depth = 8; - - else - bit_depth = png_get_bit_depth(pp, pi); - - /* Now we know the bit depth we can easily generate an invalid sBIT entry */ - bad.red = bad.green = bad.blue = bad.gray = bad.alpha = - (png_byte)(bit_depth+1); - png_set_sBIT(pp, pi, &bad); -} - -static PNG_CONST struct -{ - void (*fn)(png_structp, png_infop); - PNG_CONST char *msg; - unsigned int warning :1; /* the error is a warning... */ -} error_test[] = - { - /* no warnings makes these errors undetectable. */ - { sBIT0_error_fn, "sBIT(0): failed to detect error", 1 }, - { sBIT_error_fn, "sBIT(too big): failed to detect error", 1 }, - }; - -static void -make_error(png_store* volatile psIn, png_byte PNG_CONST colour_type, - png_byte bit_depth, int interlace_type, int test, png_const_charp name) -{ - png_store * volatile ps = psIn; - - context(ps, fault); - - Try - { - png_structp pp; - png_infop pi; - - pp = set_store_for_write(ps, &pi, name); - - if (pp == NULL) - Throw ps; - - png_set_IHDR(pp, pi, transform_width(pp, colour_type, bit_depth), - transform_height(pp, colour_type, bit_depth), bit_depth, colour_type, - interlace_type, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - - if (colour_type == 3) /* palette */ - init_standard_palette(ps, pp, pi, 1U << bit_depth, 0/*do tRNS*/); - - /* Time for a few errors; these are in various optional chunks, the - * standard tests test the standard chunks pretty well. - */ -# define exception__prev exception_prev_1 -# define exception__env exception_env_1 - Try - { - /* Expect this to throw: */ - ps->expect_error = !error_test[test].warning; - ps->expect_warning = error_test[test].warning; - ps->saw_warning = 0; - error_test[test].fn(pp, pi); - - /* Normally the error is only detected here: */ - png_write_info(pp, pi); - - /* And handle the case where it was only a warning: */ - if (ps->expect_warning && ps->saw_warning) - Throw ps; - - /* If we get here there is a problem, we have success - no error or - * no warning - when we shouldn't have success. Log an error. - */ - store_log(ps, pp, error_test[test].msg, 1 /*error*/); - } - - Catch (fault) - ps = fault; /* expected exit, make sure ps is not clobbered */ -#undef exception__prev -#undef exception__env - - /* And clear these flags */ - ps->expect_error = 0; - ps->expect_warning = 0; - - /* Now write the whole image, just to make sure that the detected, or - * undetected, errro has not created problems inside libpng. - */ - if (png_get_rowbytes(pp, pi) != - transform_rowsize(pp, colour_type, bit_depth)) - png_error(pp, "row size incorrect"); - - else - { - png_uint_32 h = transform_height(pp, colour_type, bit_depth); - int npasses = png_set_interlace_handling(pp); - int pass; - - if (npasses != npasses_from_interlace_type(pp, interlace_type)) - png_error(pp, "write: png_set_interlace_handling failed"); - - for (pass=0; passthis, colour_type, DEPTH(bdlo), interlace_type, - test, name); - - if (fail(pm)) - return 0; - } - } - } - - return 1; /* keep going */ -} -#endif /* PNG_WARNINGS_SUPPORTED */ - -static void -perform_error_test(png_modifier *pm) -{ -#ifdef PNG_WARNINGS_SUPPORTED /* else there are no cases that work! */ - /* Need to do this here because we just write in this test. */ - safecat(pm->this.test, sizeof pm->this.test, 0, "error test"); - - if (!make_errors(pm, 0, 0, WRITE_BDHI)) - return; - - if (!make_errors(pm, 2, 3, WRITE_BDHI)) - return; - - if (!make_errors(pm, 3, 0, 3)) - return; - - if (!make_errors(pm, 4, 3, WRITE_BDHI)) - return; - - if (!make_errors(pm, 6, 3, WRITE_BDHI)) - return; -#else - UNUSED(pm) -#endif -} - -/* This is just to validate the internal PNG formatting code - if this fails - * then the warning messages the library outputs will probably be garbage. - */ -static void -perform_formatting_test(png_store *volatile ps) -{ -#ifdef PNG_TIME_RFC1123_SUPPORTED - /* The handle into the formatting code is the RFC1123 support; this test does - * nothing if that is compiled out. - */ - context(ps, fault); - - Try - { - png_const_charp correct = "29 Aug 2079 13:53:60 +0000"; - png_const_charp result; -# if PNG_LIBPNG_VER >= 10600 - char timestring[29]; -# endif - png_structp pp; - png_time pt; - - pp = set_store_for_write(ps, NULL, "libpng formatting test"); - - if (pp == NULL) - Throw ps; - - - /* Arbitrary settings: */ - pt.year = 2079; - pt.month = 8; - pt.day = 29; - pt.hour = 13; - pt.minute = 53; - pt.second = 60; /* a leap second */ - -# if PNG_LIBPNG_VER < 10600 - result = png_convert_to_rfc1123(pp, &pt); -# else - if (png_convert_to_rfc1123_buffer(timestring, &pt)) - result = timestring; - - else - result = NULL; -# endif - - if (result == NULL) - png_error(pp, "png_convert_to_rfc1123 failed"); - - if (strcmp(result, correct) != 0) - { - size_t pos = 0; - char msg[128]; - - pos = safecat(msg, sizeof msg, pos, "png_convert_to_rfc1123("); - pos = safecat(msg, sizeof msg, pos, correct); - pos = safecat(msg, sizeof msg, pos, ") returned: '"); - pos = safecat(msg, sizeof msg, pos, result); - pos = safecat(msg, sizeof msg, pos, "'"); - - png_error(pp, msg); - } - - store_write_reset(ps); - } - - Catch(fault) - { - store_write_reset(fault); - } -#else - UNUSED(ps) -#endif -} - -#ifdef PNG_READ_SUPPORTED -/* Because we want to use the same code in both the progressive reader and the - * sequential reader it is necessary to deal with the fact that the progressive - * reader callbacks only have one parameter (png_get_progressive_ptr()), so this - * must contain all the test parameters and all the local variables directly - * accessible to the sequential reader implementation. - * - * The technique adopted is to reinvent part of what Dijkstra termed a - * 'display'; an array of pointers to the stack frames of enclosing functions so - * that a nested function definition can access the local (C auto) variables of - * the functions that contain its definition. In fact C provides the first - * pointer (the local variables - the stack frame pointer) and the last (the - * global variables - the BCPL global vector typically implemented as global - * addresses), this code requires one more pointer to make the display - the - * local variables (and function call parameters) of the function that actually - * invokes either the progressive or sequential reader. - * - * Perhaps confusingly this technique is confounded with classes - the - * 'standard_display' defined here is sub-classed as the 'gamma_display' below. - * A gamma_display is a standard_display, taking advantage of the ANSI-C - * requirement that the pointer to the first member of a structure must be the - * same as the pointer to the structure. This allows us to reuse standard_ - * functions in the gamma test code; something that could not be done with - * nested functions! - */ -typedef struct standard_display -{ - png_store* ps; /* Test parameters (passed to the function) */ - png_byte colour_type; - png_byte bit_depth; - png_byte red_sBIT; /* Input data sBIT values. */ - png_byte green_sBIT; - png_byte blue_sBIT; - png_byte alpha_sBIT; - int interlace_type; - png_uint_32 id; /* Calculated file ID */ - png_uint_32 w; /* Width of image */ - png_uint_32 h; /* Height of image */ - int npasses; /* Number of interlaced passes */ - png_uint_32 pixel_size; /* Width of one pixel in bits */ - png_uint_32 bit_width; /* Width of output row in bits */ - size_t cbRow; /* Bytes in a row of the output image */ - int do_interlace; /* Do interlacing internally */ - int is_transparent; /* Transparency information was present. */ - int speed; /* Doing a speed test */ - int use_update_info;/* Call update_info, not start_image */ - struct - { - png_uint_16 red; - png_uint_16 green; - png_uint_16 blue; - } transparent; /* The transparent color, if set. */ - int npalette; /* Number of entries in the palette. */ - store_palette - palette; -} standard_display; - -static void -standard_display_init(standard_display *dp, png_store* ps, png_uint_32 id, - int do_interlace, int use_update_info) -{ - memset(dp, 0, sizeof *dp); - - dp->ps = ps; - dp->colour_type = COL_FROM_ID(id); - dp->bit_depth = DEPTH_FROM_ID(id); - if (dp->bit_depth < 1 || dp->bit_depth > 16) - internal_error(ps, "internal: bad bit depth"); - if (dp->colour_type == 3) - dp->red_sBIT = dp->blue_sBIT = dp->green_sBIT = dp->alpha_sBIT = 8; - else - dp->red_sBIT = dp->blue_sBIT = dp->green_sBIT = dp->alpha_sBIT = - dp->bit_depth; - dp->interlace_type = INTERLACE_FROM_ID(id); - dp->id = id; - /* All the rest are filled in after the read_info: */ - dp->w = 0; - dp->h = 0; - dp->npasses = 0; - dp->pixel_size = 0; - dp->bit_width = 0; - dp->cbRow = 0; - dp->do_interlace = do_interlace; - dp->is_transparent = 0; - dp->speed = ps->speed; - dp->use_update_info = use_update_info; - dp->npalette = 0; - /* Preset the transparent color to black: */ - memset(&dp->transparent, 0, sizeof dp->transparent); - /* Preset the palette to full intensity/opaque througout: */ - memset(dp->palette, 0xff, sizeof dp->palette); -} - -/* Initialize the palette fields - this must be done later because the palette - * comes from the particular png_store_file that is selected. - */ -static void -standard_palette_init(standard_display *dp) -{ - store_palette_entry *palette = store_current_palette(dp->ps, &dp->npalette); - - /* The remaining entries remain white/opaque. */ - if (dp->npalette > 0) - { - int i = dp->npalette; - memcpy(dp->palette, palette, i * sizeof *palette); - - /* Check for a non-opaque palette entry: */ - while (--i >= 0) - if (palette[i].alpha < 255) - break; - -# ifdef __GNUC__ - /* GCC can't handle the more obviously optimizable version. */ - if (i >= 0) - dp->is_transparent = 1; - else - dp->is_transparent = 0; -# else - dp->is_transparent = (i >= 0); -# endif - } -} - -/* Utility to read the palette from the PNG file and convert it into - * store_palette format. This returns 1 if there is any transparency in the - * palette (it does not check for a transparent colour in the non-palette case.) - */ -static int -read_palette(store_palette palette, int *npalette, png_const_structp pp, - png_infop pi) -{ - png_colorp pal; - png_bytep trans_alpha; - int num; - - pal = 0; - *npalette = -1; - - if (png_get_PLTE(pp, pi, &pal, npalette) & PNG_INFO_PLTE) - { - int i = *npalette; - - if (i <= 0 || i > 256) - png_error(pp, "validate: invalid PLTE count"); - - while (--i >= 0) - { - palette[i].red = pal[i].red; - palette[i].green = pal[i].green; - palette[i].blue = pal[i].blue; - } - - /* Mark the remainder of the entries with a flag value (other than - * white/opaque which is the flag value stored above.) - */ - memset(palette + *npalette, 126, (256-*npalette) * sizeof *palette); - } - - else /* !png_get_PLTE */ - { - if (*npalette != (-1)) - png_error(pp, "validate: invalid PLTE result"); - /* But there is no palette, so record this: */ - *npalette = 0; - memset(palette, 113, sizeof (store_palette)); - } - - trans_alpha = 0; - num = 2; /* force error below */ - if ((png_get_tRNS(pp, pi, &trans_alpha, &num, 0) & PNG_INFO_tRNS) != 0 && - (trans_alpha != NULL || num != 1/*returns 1 for a transparent color*/) && - /* Oops, if a palette tRNS gets expanded png_read_update_info (at least so - * far as 1.5.4) does not remove the trans_alpha pointer, only num_trans, - * so in the above call we get a success, we get a pointer (who knows what - * to) and we get num_trans == 0: - */ - !(trans_alpha != NULL && num == 0)) /* TODO: fix this in libpng. */ - { - int i; - - /* Any of these are crash-worthy - given the implementation of - * png_get_tRNS up to 1.5 an app won't crash if it just checks the - * result above and fails to check that the variables it passed have - * actually been filled in! Note that if the app were to pass the - * last, png_color_16p, variable too it couldn't rely on this. - */ - if (trans_alpha == NULL || num <= 0 || num > 256 || num > *npalette) - png_error(pp, "validate: unexpected png_get_tRNS (palette) result"); - - for (i=0; iis_transparent) - png_error(pp, "validate: palette transparency changed"); - - if (npalette != dp->npalette) - { - size_t pos = 0; - char msg[64]; - - pos = safecat(msg, sizeof msg, pos, "validate: palette size changed: "); - pos = safecatn(msg, sizeof msg, pos, dp->npalette); - pos = safecat(msg, sizeof msg, pos, " -> "); - pos = safecatn(msg, sizeof msg, pos, npalette); - png_error(pp, msg); - } - - { - int i = npalette; /* npalette is aliased */ - - while (--i >= 0) - if (palette[i].red != dp->palette[i].red || - palette[i].green != dp->palette[i].green || - palette[i].blue != dp->palette[i].blue || - palette[i].alpha != dp->palette[i].alpha) - png_error(pp, "validate: PLTE or tRNS chunk changed"); - } -} - -/* By passing a 'standard_display' the progressive callbacks can be used - * directly by the sequential code, the functions suffixed "_imp" are the - * implementations, the functions without the suffix are the callbacks. - * - * The code for the info callback is split into two because this callback calls - * png_read_update_info or png_start_read_image and what gets called depends on - * whether the info needs updating (we want to test both calls in pngvalid.) - */ -static void -standard_info_part1(standard_display *dp, png_structp pp, png_infop pi) -{ - if (png_get_bit_depth(pp, pi) != dp->bit_depth) - png_error(pp, "validate: bit depth changed"); - - if (png_get_color_type(pp, pi) != dp->colour_type) - png_error(pp, "validate: color type changed"); - - if (png_get_filter_type(pp, pi) != PNG_FILTER_TYPE_BASE) - png_error(pp, "validate: filter type changed"); - - if (png_get_interlace_type(pp, pi) != dp->interlace_type) - png_error(pp, "validate: interlacing changed"); - - if (png_get_compression_type(pp, pi) != PNG_COMPRESSION_TYPE_BASE) - png_error(pp, "validate: compression type changed"); - - dp->w = png_get_image_width(pp, pi); - - if (dp->w != standard_width(pp, dp->id)) - png_error(pp, "validate: image width changed"); - - dp->h = png_get_image_height(pp, pi); - - if (dp->h != standard_height(pp, dp->id)) - png_error(pp, "validate: image height changed"); - - /* Record (but don't check at present) the input sBIT according to the colour - * type information. - */ - { - png_color_8p sBIT = 0; - - if (png_get_sBIT(pp, pi, &sBIT) & PNG_INFO_sBIT) - { - int sBIT_invalid = 0; - - if (sBIT == 0) - png_error(pp, "validate: unexpected png_get_sBIT result"); - - if (dp->colour_type & PNG_COLOR_MASK_COLOR) - { - if (sBIT->red == 0 || sBIT->red > dp->bit_depth) - sBIT_invalid = 1; - else - dp->red_sBIT = sBIT->red; - - if (sBIT->green == 0 || sBIT->green > dp->bit_depth) - sBIT_invalid = 1; - else - dp->green_sBIT = sBIT->green; - - if (sBIT->blue == 0 || sBIT->blue > dp->bit_depth) - sBIT_invalid = 1; - else - dp->blue_sBIT = sBIT->blue; - } - - else /* !COLOR */ - { - if (sBIT->gray == 0 || sBIT->gray > dp->bit_depth) - sBIT_invalid = 1; - else - dp->blue_sBIT = dp->green_sBIT = dp->red_sBIT = sBIT->gray; - } - - /* All 8 bits in tRNS for a palette image are significant - see the - * spec. - */ - if (dp->colour_type & PNG_COLOR_MASK_ALPHA) - { - if (sBIT->alpha == 0 || sBIT->alpha > dp->bit_depth) - sBIT_invalid = 1; - else - dp->alpha_sBIT = sBIT->alpha; - } - - if (sBIT_invalid) - png_error(pp, "validate: sBIT value out of range"); - } - } - - /* Important: this is validating the value *before* any transforms have been - * put in place. It doesn't matter for the standard tests, where there are - * no transforms, but it does for other tests where rowbytes may change after - * png_read_update_info. - */ - if (png_get_rowbytes(pp, pi) != standard_rowsize(pp, dp->id)) - png_error(pp, "validate: row size changed"); - - /* Validate the colour type 3 palette (this can be present on other color - * types.) - */ - standard_palette_validate(dp, pp, pi); - - /* In any case always check for a tranparent color (notice that the - * colour type 3 case must not give a successful return on the get_tRNS call - * with these arguments!) - */ - { - png_color_16p trans_color = 0; - - if (png_get_tRNS(pp, pi, 0, 0, &trans_color) & PNG_INFO_tRNS) - { - if (trans_color == 0) - png_error(pp, "validate: unexpected png_get_tRNS (color) result"); - - switch (dp->colour_type) - { - case 0: - dp->transparent.red = dp->transparent.green = dp->transparent.blue = - trans_color->gray; - dp->is_transparent = 1; - break; - - case 2: - dp->transparent.red = trans_color->red; - dp->transparent.green = trans_color->green; - dp->transparent.blue = trans_color->blue; - dp->is_transparent = 1; - break; - - case 3: - /* Not expected because it should result in the array case - * above. - */ - png_error(pp, "validate: unexpected png_get_tRNS result"); - break; - - default: - png_error(pp, "validate: invalid tRNS chunk with alpha image"); - } - } - } - - /* Read the number of passes - expected to match the value used when - * creating the image (interlaced or not). This has the side effect of - * turning on interlace handling (if do_interlace is not set.) - */ - dp->npasses = npasses_from_interlace_type(pp, dp->interlace_type); - if (!dp->do_interlace && dp->npasses != png_set_interlace_handling(pp)) - png_error(pp, "validate: file changed interlace type"); - - /* Caller calls png_read_update_info or png_start_read_image now, then calls - * part2. - */ -} - -/* This must be called *after* the png_read_update_info call to get the correct - * 'rowbytes' value, otherwise png_get_rowbytes will refer to the untransformed - * image. - */ -static void -standard_info_part2(standard_display *dp, png_const_structp pp, - png_const_infop pi, int nImages) -{ - /* Record cbRow now that it can be found. */ - dp->pixel_size = bit_size(pp, png_get_color_type(pp, pi), - png_get_bit_depth(pp, pi)); - dp->bit_width = png_get_image_width(pp, pi) * dp->pixel_size; - dp->cbRow = png_get_rowbytes(pp, pi); - - /* Validate the rowbytes here again. */ - if (dp->cbRow != (dp->bit_width+7)/8) - png_error(pp, "bad png_get_rowbytes calculation"); - - /* Then ensure there is enough space for the output image(s). */ - store_ensure_image(dp->ps, pp, nImages, dp->cbRow, dp->h); -} - -static void -standard_info_imp(standard_display *dp, png_structp pp, png_infop pi, - int nImages) -{ - /* Note that the validation routine has the side effect of turning on - * interlace handling in the subsequent code. - */ - standard_info_part1(dp, pp, pi); - - /* And the info callback has to call this (or png_read_update_info - see - * below in the png_modifier code for that variant. - */ - if (dp->use_update_info) - { - /* For debugging the effect of multiple calls: */ - int i = dp->use_update_info; - while (i-- > 0) - png_read_update_info(pp, pi); - } - - else - png_start_read_image(pp); - - /* Validate the height, width and rowbytes plus ensure that sufficient buffer - * exists for decoding the image. - */ - standard_info_part2(dp, pp, pi, nImages); -} - -static void -standard_info(png_structp pp, png_infop pi) -{ - standard_display *dp = voidcast(standard_display*, - png_get_progressive_ptr(pp)); - - /* Call with nImages==1 because the progressive reader can only produce one - * image. - */ - standard_info_imp(dp, pp, pi, 1 /*only one image*/); -} - -static void -progressive_row(png_structp ppIn, png_bytep new_row, png_uint_32 y, int pass) -{ - png_const_structp pp = ppIn; - PNG_CONST standard_display *dp = voidcast(standard_display*, - png_get_progressive_ptr(pp)); - - /* When handling interlacing some rows will be absent in each pass, the - * callback still gets called, but with a NULL pointer. This is checked - * in the 'else' clause below. We need our own 'cbRow', but we can't call - * png_get_rowbytes because we got no info structure. - */ - if (new_row != NULL) - { - png_bytep row; - - /* In the case where the reader doesn't do the interlace it gives - * us the y in the sub-image: - */ - if (dp->do_interlace && dp->interlace_type == PNG_INTERLACE_ADAM7) - { -#ifdef PNG_USER_TRANSFORM_INFO_SUPPORTED - /* Use this opportunity to validate the png 'current' APIs: */ - if (y != png_get_current_row_number(pp)) - png_error(pp, "png_get_current_row_number is broken"); - - if (pass != png_get_current_pass_number(pp)) - png_error(pp, "png_get_current_pass_number is broken"); -#endif - - y = PNG_ROW_FROM_PASS_ROW(y, pass); - } - - /* Validate this just in case. */ - if (y >= dp->h) - png_error(pp, "invalid y to progressive row callback"); - - row = store_image_row(dp->ps, pp, 0, y); - -#ifdef PNG_READ_INTERLACING_SUPPORTED - /* Combine the new row into the old: */ - if (dp->do_interlace) - { - if (dp->interlace_type == PNG_INTERLACE_ADAM7) - deinterlace_row(row, new_row, dp->pixel_size, dp->w, pass); - else - row_copy(row, new_row, dp->pixel_size * dp->w); - } - else - png_progressive_combine_row(pp, row, new_row); -#endif /* PNG_READ_INTERLACING_SUPPORTED */ - } - -#ifdef PNG_READ_INTERLACING_SUPPORTED - else if (dp->interlace_type == PNG_INTERLACE_ADAM7 && - PNG_ROW_IN_INTERLACE_PASS(y, pass) && - PNG_PASS_COLS(dp->w, pass) > 0) - png_error(pp, "missing row in progressive de-interlacing"); -#endif /* PNG_READ_INTERLACING_SUPPORTED */ -} - -static void -sequential_row(standard_display *dp, png_structp pp, png_infop pi, - PNG_CONST int iImage, PNG_CONST int iDisplay) -{ - PNG_CONST int npasses = dp->npasses; - PNG_CONST int do_interlace = dp->do_interlace && - dp->interlace_type == PNG_INTERLACE_ADAM7; - PNG_CONST png_uint_32 height = standard_height(pp, dp->id); - PNG_CONST png_uint_32 width = standard_width(pp, dp->id); - PNG_CONST png_store* ps = dp->ps; - int pass; - - for (pass=0; pass 0 && PNG_ROW_IN_INTERLACE_PASS(y, pass)) - { - /* Read the row into a pair of temporary buffers, then do the - * merge here into the output rows. - */ - png_byte row[STANDARD_ROWMAX], display[STANDARD_ROWMAX]; - - /* The following aids (to some extent) error detection - we can - * see where png_read_row wrote. Use opposite values in row and - * display to make this easier. Don't use 0xff (which is used in - * the image write code to fill unused bits) or 0 (which is a - * likely value to overwrite unused bits with). - */ - memset(row, 0xc5, sizeof row); - memset(display, 0x5c, sizeof display); - - png_read_row(pp, row, display); - - if (iImage >= 0) - deinterlace_row(store_image_row(ps, pp, iImage, y), row, - dp->pixel_size, dp->w, pass); - - if (iDisplay >= 0) - deinterlace_row(store_image_row(ps, pp, iDisplay, y), display, - dp->pixel_size, dp->w, pass); - } - } - else - png_read_row(pp, - iImage >= 0 ? store_image_row(ps, pp, iImage, y) : NULL, - iDisplay >= 0 ? store_image_row(ps, pp, iDisplay, y) : NULL); - } - } - - /* And finish the read operation (only really necessary if the caller wants - * to find additional data in png_info from chunks after the last IDAT.) - */ - png_read_end(pp, pi); -} - -#ifdef PNG_TEXT_SUPPORTED -static void -standard_check_text(png_const_structp pp, png_const_textp tp, - png_const_charp keyword, png_const_charp text) -{ - char msg[1024]; - size_t pos = safecat(msg, sizeof msg, 0, "text: "); - size_t ok; - - pos = safecat(msg, sizeof msg, pos, keyword); - pos = safecat(msg, sizeof msg, pos, ": "); - ok = pos; - - if (tp->compression != TEXT_COMPRESSION) - { - char buf[64]; - - sprintf(buf, "compression [%d->%d], ", TEXT_COMPRESSION, - tp->compression); - pos = safecat(msg, sizeof msg, pos, buf); - } - - if (tp->key == NULL || strcmp(tp->key, keyword) != 0) - { - pos = safecat(msg, sizeof msg, pos, "keyword \""); - if (tp->key != NULL) - { - pos = safecat(msg, sizeof msg, pos, tp->key); - pos = safecat(msg, sizeof msg, pos, "\", "); - } - - else - pos = safecat(msg, sizeof msg, pos, "null, "); - } - - if (tp->text == NULL) - pos = safecat(msg, sizeof msg, pos, "text lost, "); - - else - { - if (tp->text_length != strlen(text)) - { - char buf[64]; - sprintf(buf, "text length changed[%lu->%lu], ", - (unsigned long)strlen(text), (unsigned long)tp->text_length); - pos = safecat(msg, sizeof msg, pos, buf); - } - - if (strcmp(tp->text, text) != 0) - { - pos = safecat(msg, sizeof msg, pos, "text becomes \""); - pos = safecat(msg, sizeof msg, pos, tp->text); - pos = safecat(msg, sizeof msg, pos, "\" (was \""); - pos = safecat(msg, sizeof msg, pos, text); - pos = safecat(msg, sizeof msg, pos, "\"), "); - } - } - - if (tp->itxt_length != 0) - pos = safecat(msg, sizeof msg, pos, "iTXt length set, "); - - if (tp->lang != NULL) - { - pos = safecat(msg, sizeof msg, pos, "iTXt language \""); - pos = safecat(msg, sizeof msg, pos, tp->lang); - pos = safecat(msg, sizeof msg, pos, "\", "); - } - - if (tp->lang_key != NULL) - { - pos = safecat(msg, sizeof msg, pos, "iTXt keyword \""); - pos = safecat(msg, sizeof msg, pos, tp->lang_key); - pos = safecat(msg, sizeof msg, pos, "\", "); - } - - if (pos > ok) - { - msg[pos-2] = '\0'; /* Remove the ", " at the end */ - png_error(pp, msg); - } -} - -static void -standard_text_validate(standard_display *dp, png_const_structp pp, - png_infop pi) -{ - png_textp tp = NULL; - png_uint_32 num_text = png_get_text(pp, pi, &tp, NULL); - - if (num_text == 2 && tp != NULL) - { - standard_check_text(pp, tp, "image name", dp->ps->current->name); - standard_check_text(pp, tp+1, "end marker", "end"); - } - - else - { - char msg[64]; - - sprintf(msg, "expected two text items, got %lu", - (unsigned long)num_text); - png_error(pp, msg); - } -} -#else -# define standard_text_validate(dp,pp,pi) ((void)0) -#endif - -static void -standard_row_validate(standard_display *dp, png_const_structp pp, - int iImage, int iDisplay, png_uint_32 y) -{ - int where; - png_byte std[STANDARD_ROWMAX]; - - /* The row must be pre-initialized to the magic number here for the size - * tests to pass: - */ - memset(std, 178, sizeof std); - standard_row(pp, std, dp->id, y); - - /* At the end both the 'row' and 'display' arrays should end up identical. - * In earlier passes 'row' will be partially filled in, with only the pixels - * that have been read so far, but 'display' will have those pixels - * replicated to fill the unread pixels while reading an interlaced image. -#if PNG_LIBPNG_VER < 10506 - * The side effect inside the libpng sequential reader is that the 'row' - * array retains the correct values for unwritten pixels within the row - * bytes, while the 'display' array gets bits off the end of the image (in - * the last byte) trashed. Unfortunately in the progressive reader the - * row bytes are always trashed, so we always do a pixel_cmp here even though - * a memcmp of all cbRow bytes will succeed for the sequential reader. -#endif - */ - if (iImage >= 0 && - (where = pixel_cmp(std, store_image_row(dp->ps, pp, iImage, y), - dp->bit_width)) != 0) - { - char msg[64]; - sprintf(msg, "PNG image row[%lu][%d] changed from %.2x to %.2x", - (unsigned long)y, where-1, std[where-1], - store_image_row(dp->ps, pp, iImage, y)[where-1]); - png_error(pp, msg); - } - -#if PNG_LIBPNG_VER < 10506 - /* In this case use pixel_cmp because we need to compare a partial - * byte at the end of the row if the row is not an exact multiple - * of 8 bits wide. (This is fixed in libpng-1.5.6 and pixel_cmp is - * changed to match!) - */ -#endif - if (iDisplay >= 0 && - (where = pixel_cmp(std, store_image_row(dp->ps, pp, iDisplay, y), - dp->bit_width)) != 0) - { - char msg[64]; - sprintf(msg, "display row[%lu][%d] changed from %.2x to %.2x", - (unsigned long)y, where-1, std[where-1], - store_image_row(dp->ps, pp, iDisplay, y)[where-1]); - png_error(pp, msg); - } -} - -static void -standard_image_validate(standard_display *dp, png_const_structp pp, int iImage, - int iDisplay) -{ - png_uint_32 y; - - if (iImage >= 0) - store_image_check(dp->ps, pp, iImage); - - if (iDisplay >= 0) - store_image_check(dp->ps, pp, iDisplay); - - for (y=0; yh; ++y) - standard_row_validate(dp, pp, iImage, iDisplay, y); - - /* This avoids false positives if the validation code is never called! */ - dp->ps->validated = 1; -} - -static void -standard_end(png_structp ppIn, png_infop pi) -{ - png_const_structp pp = ppIn; - standard_display *dp = voidcast(standard_display*, - png_get_progressive_ptr(pp)); - - UNUSED(pi) - - /* Validate the image - progressive reading only produces one variant for - * interlaced images. - */ - standard_text_validate(dp, pp, pi); - standard_image_validate(dp, pp, 0, -1); -} - -/* A single test run checking the standard image to ensure it is not damaged. */ -static void -standard_test(png_store* PNG_CONST psIn, png_uint_32 PNG_CONST id, - int do_interlace, int use_update_info) -{ - standard_display d; - context(psIn, fault); - - /* Set up the display (stack frame) variables from the arguments to the - * function and initialize the locals that are filled in later. - */ - standard_display_init(&d, psIn, id, do_interlace, use_update_info); - - /* Everything is protected by a Try/Catch. The functions called also - * typically have local Try/Catch blocks. - */ - Try - { - png_structp pp; - png_infop pi; - - /* Get a png_struct for reading the image. This will throw an error if it - * fails, so we don't need to check the result. - */ - pp = set_store_for_read(d.ps, &pi, d.id, - d.do_interlace ? (d.ps->progressive ? - "pngvalid progressive deinterlacer" : - "pngvalid sequential deinterlacer") : (d.ps->progressive ? - "progressive reader" : "sequential reader")); - - /* Initialize the palette correctly from the png_store_file. */ - standard_palette_init(&d); - - /* Introduce the correct read function. */ - if (d.ps->progressive) - { - png_set_progressive_read_fn(pp, &d, standard_info, progressive_row, - standard_end); - - /* Now feed data into the reader until we reach the end: */ - store_progressive_read(d.ps, pp, pi); - } - else - { - /* Note that this takes the store, not the display. */ - png_set_read_fn(pp, d.ps, store_read); - - /* Check the header values: */ - png_read_info(pp, pi); - - /* The code tests both versions of the images that the sequential - * reader can produce. - */ - standard_info_imp(&d, pp, pi, 2 /*images*/); - - /* Need the total bytes in the image below; we can't get to this point - * unless the PNG file values have been checked against the expected - * values. - */ - { - sequential_row(&d, pp, pi, 0, 1); - - /* After the last pass loop over the rows again to check that the - * image is correct. - */ - if (!d.speed) - { - standard_text_validate(&d, pp, pi); - standard_image_validate(&d, pp, 0, 1); - } - else - d.ps->validated = 1; - } - } - - /* Check for validation. */ - if (!d.ps->validated) - png_error(pp, "image read failed silently"); - - /* Successful completion. */ - } - - Catch(fault) - d.ps = fault; /* make sure this hasn't been clobbered. */ - - /* In either case clean up the store. */ - store_read_reset(d.ps); -} - -static int -test_standard(png_modifier* PNG_CONST pm, png_byte PNG_CONST colour_type, - int bdlo, int PNG_CONST bdhi) -{ - for (; bdlo <= bdhi; ++bdlo) - { - int interlace_type; - - for (interlace_type = PNG_INTERLACE_NONE; - interlace_type < PNG_INTERLACE_LAST; ++interlace_type) - { - standard_test(&pm->this, FILEID(colour_type, DEPTH(bdlo), 0/*palette*/, - interlace_type, 0, 0, 0), 0/*do_interlace*/, pm->use_update_info); - - if (fail(pm)) - return 0; - } - } - - return 1; /* keep going */ -} - -static void -perform_standard_test(png_modifier *pm) -{ - /* Test each colour type over the valid range of bit depths (expressed as - * log2(bit_depth) in turn, stop as soon as any error is detected. - */ - if (!test_standard(pm, 0, 0, READ_BDHI)) - return; - - if (!test_standard(pm, 2, 3, READ_BDHI)) - return; - - if (!test_standard(pm, 3, 0, 3)) - return; - - if (!test_standard(pm, 4, 3, READ_BDHI)) - return; - - if (!test_standard(pm, 6, 3, READ_BDHI)) - return; -} - - -/********************************** SIZE TESTS ********************************/ -static int -test_size(png_modifier* PNG_CONST pm, png_byte PNG_CONST colour_type, - int bdlo, int PNG_CONST bdhi) -{ - /* Run the tests on each combination. - * - * NOTE: on my 32 bit x86 each of the following blocks takes - * a total of 3.5 seconds if done across every combo of bit depth - * width and height. This is a waste of time in practice, hence the - * hinc and winc stuff: - */ - static PNG_CONST png_byte hinc[] = {1, 3, 11, 1, 5}; - static PNG_CONST png_byte winc[] = {1, 9, 5, 7, 1}; - for (; bdlo <= bdhi; ++bdlo) - { - png_uint_32 h, w; - - for (h=1; h<=16; h+=hinc[bdlo]) for (w=1; w<=16; w+=winc[bdlo]) - { - /* First test all the 'size' images against the sequential - * reader using libpng to deinterlace (where required.) This - * validates the write side of libpng. There are four possibilities - * to validate. - */ - standard_test(&pm->this, FILEID(colour_type, DEPTH(bdlo), 0/*palette*/, - PNG_INTERLACE_NONE, w, h, 0), 0/*do_interlace*/, - pm->use_update_info); - - if (fail(pm)) - return 0; - - standard_test(&pm->this, FILEID(colour_type, DEPTH(bdlo), 0/*palette*/, - PNG_INTERLACE_NONE, w, h, 1), 0/*do_interlace*/, - pm->use_update_info); - - if (fail(pm)) - return 0; - - standard_test(&pm->this, FILEID(colour_type, DEPTH(bdlo), 0/*palette*/, - PNG_INTERLACE_ADAM7, w, h, 0), 0/*do_interlace*/, - pm->use_update_info); - - if (fail(pm)) - return 0; - - standard_test(&pm->this, FILEID(colour_type, DEPTH(bdlo), 0/*palette*/, - PNG_INTERLACE_ADAM7, w, h, 1), 0/*do_interlace*/, - pm->use_update_info); - - if (fail(pm)) - return 0; - - /* Now validate the interlaced read side - do_interlace true, - * in the progressive case this does actually make a difference - * to the code used in the non-interlaced case too. - */ - standard_test(&pm->this, FILEID(colour_type, DEPTH(bdlo), 0/*palette*/, - PNG_INTERLACE_NONE, w, h, 0), 1/*do_interlace*/, - pm->use_update_info); - - if (fail(pm)) - return 0; - - standard_test(&pm->this, FILEID(colour_type, DEPTH(bdlo), 0/*palette*/, - PNG_INTERLACE_ADAM7, w, h, 0), 1/*do_interlace*/, - pm->use_update_info); - - if (fail(pm)) - return 0; - } - } - - return 1; /* keep going */ -} - -static void -perform_size_test(png_modifier *pm) -{ - /* Test each colour type over the valid range of bit depths (expressed as - * log2(bit_depth) in turn, stop as soon as any error is detected. - */ - if (!test_size(pm, 0, 0, READ_BDHI)) - return; - - if (!test_size(pm, 2, 3, READ_BDHI)) - return; - - /* For the moment don't do the palette test - it's a waste of time when - * compared to the grayscale test. - */ -#if 0 - if (!test_size(pm, 3, 0, 3)) - return; -#endif - - if (!test_size(pm, 4, 3, READ_BDHI)) - return; - - if (!test_size(pm, 6, 3, READ_BDHI)) - return; -} - - -/******************************* TRANSFORM TESTS ******************************/ -#ifdef PNG_READ_TRANSFORMS_SUPPORTED -/* A set of tests to validate libpng image transforms. The possibilities here - * are legion because the transforms can be combined in a combinatorial - * fashion. To deal with this some measure of restraint is required, otherwise - * the tests would take forever. - */ -typedef struct image_pixel -{ - /* A local (pngvalid) representation of a PNG pixel, in all its - * various forms. - */ - unsigned int red, green, blue, alpha; /* For non-palette images. */ - unsigned int palette_index; /* For a palette image. */ - png_byte colour_type; /* As in the spec. */ - png_byte bit_depth; /* Defines bit size in row */ - png_byte sample_depth; /* Scale of samples */ - int have_tRNS; /* tRNS chunk may need processing */ - - /* For checking the code calculates double precision floating point values - * along with an error value, accumulated from the transforms. Because an - * sBIT setting allows larger error bounds (indeed, by the spec, apparently - * up to just less than +/-1 in the scaled value) the *lowest* sBIT for each - * channel is stored. This sBIT value is folded in to the stored error value - * at the end of the application of the transforms to the pixel. - */ - double redf, greenf, bluef, alphaf; - double rede, greene, bluee, alphae; - png_byte red_sBIT, green_sBIT, blue_sBIT, alpha_sBIT; -} image_pixel; - -/* Shared utility function, see below. */ -static void -image_pixel_setf(image_pixel *this, unsigned int max) -{ - this->redf = this->red / (double)max; - this->greenf = this->green / (double)max; - this->bluef = this->blue / (double)max; - this->alphaf = this->alpha / (double)max; - - if (this->red < max) - this->rede = this->redf * DBL_EPSILON; - else - this->rede = 0; - if (this->green < max) - this->greene = this->greenf * DBL_EPSILON; - else - this->greene = 0; - if (this->blue < max) - this->bluee = this->bluef * DBL_EPSILON; - else - this->bluee = 0; - if (this->alpha < max) - this->alphae = this->alphaf * DBL_EPSILON; - else - this->alphae = 0; -} - -/* Initialize the structure for the next pixel - call this before doing any - * transforms and call it for each pixel since all the fields may need to be - * reset. - */ -static void -image_pixel_init(image_pixel *this, png_const_bytep row, png_byte colour_type, - png_byte bit_depth, png_uint_32 x, store_palette palette) -{ - PNG_CONST png_byte sample_depth = (png_byte)(colour_type == - PNG_COLOR_TYPE_PALETTE ? 8 : bit_depth); - PNG_CONST unsigned int max = (1U<palette_index = this->red = this->green = this->blue = - sample(row, colour_type, bit_depth, x, 0); - this->alpha = max; - this->red_sBIT = this->green_sBIT = this->blue_sBIT = this->alpha_sBIT = - sample_depth; - - /* Then override as appropriate: */ - if (colour_type == 3) /* palette */ - { - /* This permits the caller to default to the sample value. */ - if (palette != 0) - { - PNG_CONST unsigned int i = this->palette_index; - - this->red = palette[i].red; - this->green = palette[i].green; - this->blue = palette[i].blue; - this->alpha = palette[i].alpha; - } - } - - else /* not palette */ - { - unsigned int i = 0; - - if (colour_type & 2) - { - this->green = sample(row, colour_type, bit_depth, x, 1); - this->blue = sample(row, colour_type, bit_depth, x, 2); - i = 2; - } - if (colour_type & 4) - this->alpha = sample(row, colour_type, bit_depth, x, ++i); - } - - /* Calculate the scaled values, these are simply the values divided by - * 'max' and the error is initialized to the double precision epsilon value - * from the header file. - */ - image_pixel_setf(this, max); - - /* Store the input information for use in the transforms - these will - * modify the information. - */ - this->colour_type = colour_type; - this->bit_depth = bit_depth; - this->sample_depth = sample_depth; - this->have_tRNS = 0; -} - -/* Convert a palette image to an rgb image. This necessarily converts the tRNS - * chunk at the same time, because the tRNS will be in palette form. The way - * palette validation works means that the original palette is never updated, - * instead the image_pixel value from the row contains the RGB of the - * corresponding palette entry and *this* is updated. Consequently this routine - * only needs to change the colour type information. - */ -static void -image_pixel_convert_PLTE(image_pixel *this) -{ - if (this->colour_type == PNG_COLOR_TYPE_PALETTE) - { - if (this->have_tRNS) - { - this->colour_type = PNG_COLOR_TYPE_RGB_ALPHA; - this->have_tRNS = 0; - } - else - this->colour_type = PNG_COLOR_TYPE_RGB; - - /* The bit depth of the row changes at this point too (notice that this is - * the row format, not the sample depth, which is separate.) - */ - this->bit_depth = 8; - } -} - -/* Add an alpha channel; this will import the tRNS information because tRNS is - * not valid in an alpha image. The bit depth will invariably be set to at - * least 8. Palette images will be converted to alpha (using the above API). - */ -static void -image_pixel_add_alpha(image_pixel *this, PNG_CONST standard_display *display) -{ - if (this->colour_type == PNG_COLOR_TYPE_PALETTE) - image_pixel_convert_PLTE(this); - - if ((this->colour_type & PNG_COLOR_MASK_ALPHA) == 0) - { - if (this->colour_type == PNG_COLOR_TYPE_GRAY) - { - if (this->bit_depth < 8) - this->bit_depth = 8; - - if (this->have_tRNS) - { - this->have_tRNS = 0; - - /* Check the input, original, channel value here against the - * original tRNS gray chunk valie. - */ - if (this->red == display->transparent.red) - this->alphaf = 0; - else - this->alphaf = 1; - } - else - this->alphaf = 1; - - this->colour_type = PNG_COLOR_TYPE_GRAY_ALPHA; - } - - else if (this->colour_type == PNG_COLOR_TYPE_RGB) - { - if (this->have_tRNS) - { - this->have_tRNS = 0; - - /* Again, check the exact input values, not the current transformed - * value! - */ - if (this->red == display->transparent.red && - this->green == display->transparent.green && - this->blue == display->transparent.blue) - this->alphaf = 0; - else - this->alphaf = 1; - - this->colour_type = PNG_COLOR_TYPE_RGB_ALPHA; - } - } - - /* The error in the alpha is zero and the sBIT value comes from the - * original sBIT data (actually it will always be the original bit depth). - */ - this->alphae = 0; - this->alpha_sBIT = display->alpha_sBIT; - } -} - -struct transform_display; -typedef struct image_transform -{ - /* The name of this transform: a string. */ - PNG_CONST char *name; - - /* Each transform can be disabled from the command line: */ - int enable; - - /* The global list of transforms; read only. */ - struct image_transform *PNG_CONST list; - - /* The global count of the number of times this transform has been set on an - * image. - */ - unsigned int global_use; - - /* The local count of the number of times this transform has been set. */ - unsigned int local_use; - - /* The next transform in the list, each transform must call its own next - * transform after it has processed the pixel successfully. - */ - PNG_CONST struct image_transform *next; - - /* A single transform for the image, expressed as a series of function - * callbacks and some space for values. - * - * First a callback to add any required modifications to the png_modifier; - * this gets called just before the modifier is set up for read. - */ - void (*ini)(PNG_CONST struct image_transform *this, - struct transform_display *that); - - /* And a callback to set the transform on the current png_read_struct: - */ - void (*set)(PNG_CONST struct image_transform *this, - struct transform_display *that, png_structp pp, png_infop pi); - - /* Then a transform that takes an input pixel in one PNG format or another - * and modifies it by a pngvalid implementation of the transform (thus - * duplicating the libpng intent without, we hope, duplicating the bugs - * in the libpng implementation!) The png_structp is solely to allow error - * reporting via png_error and png_warning. - */ - void (*mod)(PNG_CONST struct image_transform *this, image_pixel *that, - png_const_structp pp, PNG_CONST struct transform_display *display); - - /* Add this transform to the list and return true if the transform is - * meaningful for this colour type and bit depth - if false then the - * transform should have no effect on the image so there's not a lot of - * point running it. - */ - int (*add)(struct image_transform *this, - PNG_CONST struct image_transform **that, png_byte colour_type, - png_byte bit_depth); -} image_transform; - -typedef struct transform_display -{ - standard_display this; - - /* Parameters */ - png_modifier* pm; - PNG_CONST image_transform* transform_list; - - /* Local variables */ - png_byte output_colour_type; - png_byte output_bit_depth; - - /* Modifications (not necessarily used.) */ - gama_modification gama_mod; - chrm_modification chrm_mod; - srgb_modification srgb_mod; -} transform_display; - -/* Set sRGB, cHRM and gAMA transforms as required by the current encoding. */ -static void -transform_set_encoding(transform_display *this) -{ - /* Set up the png_modifier '_current' fields then use these to determine how - * to add appropriate chunks. - */ - png_modifier *pm = this->pm; - - modifier_set_encoding(pm); - - if (modifier_color_encoding_is_set(pm)) - { - if (modifier_color_encoding_is_sRGB(pm)) - srgb_modification_init(&this->srgb_mod, pm, PNG_sRGB_INTENT_ABSOLUTE); - - else - { - /* Set gAMA and cHRM separately. */ - gama_modification_init(&this->gama_mod, pm, pm->current_gamma); - - if (pm->current_encoding != 0) - chrm_modification_init(&this->chrm_mod, pm, pm->current_encoding); - } - } -} - -/* Three functions to end the list: */ -static void -image_transform_ini_end(PNG_CONST image_transform *this, - transform_display *that) -{ - UNUSED(this) - UNUSED(that) -} - -static void -image_transform_set_end(PNG_CONST image_transform *this, - transform_display *that, png_structp pp, png_infop pi) -{ - UNUSED(this) - UNUSED(that) - UNUSED(pp) - UNUSED(pi) -} - -/* At the end of the list recalculate the output image pixel value from the - * double precision values set up by the preceding 'mod' calls: - */ -static unsigned int -sample_scale(double sample_value, unsigned int scale) -{ - sample_value = floor(sample_value * scale + .5); - - /* Return NaN as 0: */ - if (!(sample_value > 0)) - sample_value = 0; - else if (sample_value > scale) - sample_value = scale; - - return (unsigned int)sample_value; -} - -static void -image_transform_mod_end(PNG_CONST image_transform *this, image_pixel *that, - png_const_structp pp, PNG_CONST transform_display *display) -{ - PNG_CONST unsigned int scale = (1U<sample_depth)-1; - - UNUSED(this) - UNUSED(pp) - UNUSED(display) - - /* At the end recalculate the digitized red green and blue values according - * to the current sample_depth of the pixel. - * - * The sample value is simply scaled to the maximum, checking for over - * and underflow (which can both happen for some image transforms, - * including simple size scaling, though libpng doesn't do that at present. - */ - that->red = sample_scale(that->redf, scale); - - /* The error value is increased, at the end, according to the lowest sBIT - * value seen. Common sense tells us that the intermediate integer - * representations are no more accurate than +/- 0.5 in the integral values, - * the sBIT allows the implementation to be worse than this. In addition the - * PNG specification actually permits any error within the range (-1..+1), - * but that is ignored here. Instead the final digitized value is compared, - * below to the digitized value of the error limits - this has the net effect - * of allowing (almost) +/-1 in the output value. It's difficult to see how - * any algorithm that digitizes intermediate results can be more accurate. - */ - that->rede += 1./(2*((1U<red_sBIT)-1)); - - if (that->colour_type & PNG_COLOR_MASK_COLOR) - { - that->green = sample_scale(that->greenf, scale); - that->blue = sample_scale(that->bluef, scale); - that->greene += 1./(2*((1U<green_sBIT)-1)); - that->bluee += 1./(2*((1U<blue_sBIT)-1)); - } - else - { - that->blue = that->green = that->red; - that->bluef = that->greenf = that->redf; - that->bluee = that->greene = that->rede; - } - - if ((that->colour_type & PNG_COLOR_MASK_ALPHA) || - that->colour_type == PNG_COLOR_TYPE_PALETTE) - { - that->alpha = sample_scale(that->alphaf, scale); - that->alphae += 1./(2*((1U<alpha_sBIT)-1)); - } - else - { - that->alpha = scale; /* opaque */ - that->alpha = 1; /* Override this. */ - that->alphae = 0; /* It's exact ;-) */ - } -} - -/* Static 'end' structure: */ -static image_transform image_transform_end = -{ - "(end)", /* name */ - 1, /* enable */ - 0, /* list */ - 0, /* global_use */ - 0, /* local_use */ - 0, /* next */ - image_transform_ini_end, - image_transform_set_end, - image_transform_mod_end, - 0 /* never called, I want it to crash if it is! */ -}; - -/* Reader callbacks and implementations, where they differ from the standard - * ones. - */ -static void -transform_display_init(transform_display *dp, png_modifier *pm, png_uint_32 id, - PNG_CONST image_transform *transform_list) -{ - memset(dp, 0, sizeof *dp); - - /* Standard fields */ - standard_display_init(&dp->this, &pm->this, id, 0/*do_interlace*/, - pm->use_update_info); - - /* Parameter fields */ - dp->pm = pm; - dp->transform_list = transform_list; - - /* Local variable fields */ - dp->output_colour_type = 255; /* invalid */ - dp->output_bit_depth = 255; /* invalid */ -} - -static void -transform_info_imp(transform_display *dp, png_structp pp, png_infop pi) -{ - /* Reuse the standard stuff as appropriate. */ - standard_info_part1(&dp->this, pp, pi); - - /* Now set the list of transforms. */ - dp->transform_list->set(dp->transform_list, dp, pp, pi); - - /* Update the info structure for these transforms: */ - { - int i = dp->this.use_update_info; - /* Always do one call, even if use_update_info is 0. */ - do - png_read_update_info(pp, pi); - while (--i > 0); - } - - /* And get the output information into the standard_display */ - standard_info_part2(&dp->this, pp, pi, 1/*images*/); - - /* Plus the extra stuff we need for the transform tests: */ - dp->output_colour_type = png_get_color_type(pp, pi); - dp->output_bit_depth = png_get_bit_depth(pp, pi); - - /* Validate the combination of colour type and bit depth that we are getting - * out of libpng; the semantics of something not in the PNG spec are, at - * best, unclear. - */ - switch (dp->output_colour_type) - { - case PNG_COLOR_TYPE_PALETTE: - if (dp->output_bit_depth > 8) goto error; - /*FALL THROUGH*/ - case PNG_COLOR_TYPE_GRAY: - if (dp->output_bit_depth == 1 || dp->output_bit_depth == 2 || - dp->output_bit_depth == 4) - break; - /*FALL THROUGH*/ - default: - if (dp->output_bit_depth == 8 || dp->output_bit_depth == 16) - break; - /*FALL THROUGH*/ - error: - { - char message[128]; - size_t pos; - - pos = safecat(message, sizeof message, 0, - "invalid final bit depth: colour type("); - pos = safecatn(message, sizeof message, pos, dp->output_colour_type); - pos = safecat(message, sizeof message, pos, ") with bit depth: "); - pos = safecatn(message, sizeof message, pos, dp->output_bit_depth); - - png_error(pp, message); - } - } - - /* Use a test pixel to check that the output agrees with what we expect - - * this avoids running the whole test if the output is unexpected. - */ - { - image_pixel test_pixel; - - memset(&test_pixel, 0, sizeof test_pixel); - test_pixel.colour_type = dp->this.colour_type; /* input */ - test_pixel.bit_depth = dp->this.bit_depth; - if (test_pixel.colour_type == PNG_COLOR_TYPE_PALETTE) - test_pixel.sample_depth = 8; - else - test_pixel.sample_depth = test_pixel.bit_depth; - /* Don't need sBIT here, but it must be set to non-zero to avoid - * arithmetic overflows. - */ - test_pixel.have_tRNS = dp->this.is_transparent; - test_pixel.red_sBIT = test_pixel.green_sBIT = test_pixel.blue_sBIT = - test_pixel.alpha_sBIT = test_pixel.sample_depth; - - dp->transform_list->mod(dp->transform_list, &test_pixel, pp, dp); - - if (test_pixel.colour_type != dp->output_colour_type) - { - char message[128]; - size_t pos = safecat(message, sizeof message, 0, "colour type "); - - pos = safecatn(message, sizeof message, pos, dp->output_colour_type); - pos = safecat(message, sizeof message, pos, " expected "); - pos = safecatn(message, sizeof message, pos, test_pixel.colour_type); - - png_error(pp, message); - } - - if (test_pixel.bit_depth != dp->output_bit_depth) - { - char message[128]; - size_t pos = safecat(message, sizeof message, 0, "bit depth "); - - pos = safecatn(message, sizeof message, pos, dp->output_bit_depth); - pos = safecat(message, sizeof message, pos, " expected "); - pos = safecatn(message, sizeof message, pos, test_pixel.bit_depth); - - png_error(pp, message); - } - - /* If both bit depth and colour type are correct check the sample depth. - * I believe these are both internal errors. - */ - if (test_pixel.colour_type == PNG_COLOR_TYPE_PALETTE) - { - if (test_pixel.sample_depth != 8) /* oops - internal error! */ - png_error(pp, "pngvalid: internal: palette sample depth not 8"); - } - else if (test_pixel.sample_depth != dp->output_bit_depth) - { - char message[128]; - size_t pos = safecat(message, sizeof message, 0, - "internal: sample depth "); - - pos = safecatn(message, sizeof message, pos, dp->output_bit_depth); - pos = safecat(message, sizeof message, pos, " expected "); - pos = safecatn(message, sizeof message, pos, test_pixel.sample_depth); - - png_error(pp, message); - } - } -} - -static void -transform_info(png_structp pp, png_infop pi) -{ - transform_info_imp(voidcast(transform_display*, png_get_progressive_ptr(pp)), - pp, pi); -} - -static void -transform_range_check(png_const_structp pp, unsigned int r, unsigned int g, - unsigned int b, unsigned int a, unsigned int in_digitized, double in, - unsigned int out, png_byte sample_depth, double err, double limit, - PNG_CONST char *name, double digitization_error) -{ - /* Compare the scaled, digitzed, values of our local calculation (in+-err) - * with the digitized values libpng produced; 'sample_depth' is the actual - * digitization depth of the libpng output colors (the bit depth except for - * palette images where it is always 8.) The check on 'err' is to detect - * internal errors in pngvalid itself. - */ - unsigned int max = (1U< limit || !(out >= in_min && out <= in_max)) - { - char message[256]; - size_t pos; - - pos = safecat(message, sizeof message, 0, name); - pos = safecat(message, sizeof message, pos, " output value error: rgba("); - pos = safecatn(message, sizeof message, pos, r); - pos = safecat(message, sizeof message, pos, ","); - pos = safecatn(message, sizeof message, pos, g); - pos = safecat(message, sizeof message, pos, ","); - pos = safecatn(message, sizeof message, pos, b); - pos = safecat(message, sizeof message, pos, ","); - pos = safecatn(message, sizeof message, pos, a); - pos = safecat(message, sizeof message, pos, "): "); - pos = safecatn(message, sizeof message, pos, out); - pos = safecat(message, sizeof message, pos, " expected: "); - pos = safecatn(message, sizeof message, pos, in_digitized); - pos = safecat(message, sizeof message, pos, " ("); - pos = safecatd(message, sizeof message, pos, (in-err)*max, 3); - pos = safecat(message, sizeof message, pos, ".."); - pos = safecatd(message, sizeof message, pos, (in+err)*max, 3); - pos = safecat(message, sizeof message, pos, ")"); - - png_error(pp, message); - } -} - -static void -transform_image_validate(transform_display *dp, png_const_structp pp, - png_infop pi) -{ - /* Constants for the loop below: */ - PNG_CONST png_store* PNG_CONST ps = dp->this.ps; - PNG_CONST png_byte in_ct = dp->this.colour_type; - PNG_CONST png_byte in_bd = dp->this.bit_depth; - PNG_CONST png_uint_32 w = dp->this.w; - PNG_CONST png_uint_32 h = dp->this.h; - PNG_CONST png_byte out_ct = dp->output_colour_type; - PNG_CONST png_byte out_bd = dp->output_bit_depth; - PNG_CONST png_byte sample_depth = (png_byte)(out_ct == - PNG_COLOR_TYPE_PALETTE ? 8 : out_bd); - PNG_CONST png_byte red_sBIT = dp->this.red_sBIT; - PNG_CONST png_byte green_sBIT = dp->this.green_sBIT; - PNG_CONST png_byte blue_sBIT = dp->this.blue_sBIT; - PNG_CONST png_byte alpha_sBIT = dp->this.alpha_sBIT; - PNG_CONST int have_tRNS = dp->this.is_transparent; - double digitization_error; - - store_palette out_palette; - png_uint_32 y; - - UNUSED(pi) - - /* Check for row overwrite errors */ - store_image_check(dp->this.ps, pp, 0); - - /* Read the palette corresponding to the output if the output colour type - * indicates a palette, othewise set out_palette to garbage. - */ - if (out_ct == PNG_COLOR_TYPE_PALETTE) - { - /* Validate that the palette count itself has not changed - this is not - * expected. - */ - int npalette = (-1); - - (void)read_palette(out_palette, &npalette, pp, pi); - if (npalette != dp->this.npalette) - png_error(pp, "unexpected change in palette size"); - - digitization_error = .5; - } - else - { - png_byte in_sample_depth; - - memset(out_palette, 0x5e, sizeof out_palette); - - /* assume-8-bit-calculations means assume that if the input has 8 bit - * (or less) samples and the output has 16 bit samples the calculations - * will be done with 8 bit precision, not 16. - * - * TODO: fix this in libpng; png_set_expand_16 should cause 16 bit - * calculations to be used throughout. - */ - if (in_ct == PNG_COLOR_TYPE_PALETTE || in_bd < 16) - in_sample_depth = 8; - else - in_sample_depth = in_bd; - - if (sample_depth != 16 || in_sample_depth > 8 || - !dp->pm->calculations_use_input_precision) - digitization_error = .5; - - /* Else errors are at 8 bit precision, scale .5 in 8 bits to the 16 bits: - */ - else - digitization_error = .5 * 257; - } - - for (y=0; ythis.palette); - - in_pixel.red_sBIT = red_sBIT; - in_pixel.green_sBIT = green_sBIT; - in_pixel.blue_sBIT = blue_sBIT; - in_pixel.alpha_sBIT = alpha_sBIT; - in_pixel.have_tRNS = have_tRNS; - - /* For error detection, below. */ - r = in_pixel.red; - g = in_pixel.green; - b = in_pixel.blue; - a = in_pixel.alpha; - - dp->transform_list->mod(dp->transform_list, &in_pixel, pp, dp); - - /* Read the output pixel and compare it to what we got, we don't - * use the error field here, so no need to update sBIT. - */ - image_pixel_init(&out_pixel, pRow, out_ct, out_bd, x, out_palette); - - /* We don't expect changes to the index here even if the bit depth is - * changed. - */ - if (in_ct == PNG_COLOR_TYPE_PALETTE && - out_ct == PNG_COLOR_TYPE_PALETTE) - { - if (in_pixel.palette_index != out_pixel.palette_index) - png_error(pp, "unexpected transformed palette index"); - } - - /* Check the colours for palette images too - in fact the palette could - * be separately verified itself in most cases. - */ - if (in_pixel.red != out_pixel.red) - transform_range_check(pp, r, g, b, a, in_pixel.red, in_pixel.redf, - out_pixel.red, sample_depth, in_pixel.rede, - dp->pm->limit + 1./(2*((1U<pm->limit + 1./(2*((1U<pm->limit + 1./(2*((1U<pm->limit + 1./(2*((1U<this.ps->validated = 1; -} - -static void -transform_end(png_structp ppIn, png_infop pi) -{ - png_const_structp pp = ppIn; - transform_display *dp = voidcast(transform_display*, - png_get_progressive_ptr(pp)); - - if (!dp->this.speed) - transform_image_validate(dp, pp, pi); - else - dp->this.ps->validated = 1; -} - -/* A single test run. */ -static void -transform_test(png_modifier *pmIn, PNG_CONST png_uint_32 idIn, - PNG_CONST image_transform* transform_listIn, PNG_CONST char * volatile name) -{ - transform_display d; - context(&pmIn->this, fault); - - transform_display_init(&d, pmIn, idIn, transform_listIn); - - Try - { - size_t pos = 0; - png_structp pp; - png_infop pi; - char full_name[256]; - - /* Make sure the encoding fields are correct and enter the required - * modifications. - */ - transform_set_encoding(&d); - - /* Add any modifications required by the transform list. */ - d.transform_list->ini(d.transform_list, &d); - - /* Add the color space information, if any, to the name. */ - pos = safecat(full_name, sizeof full_name, pos, name); - pos = safecat_current_encoding(full_name, sizeof full_name, pos, d.pm); - - /* Get a png_struct for reading the image. */ - pp = set_modifier_for_read(d.pm, &pi, d.this.id, full_name); - standard_palette_init(&d.this); - -# if 0 - /* Logging (debugging only) */ - { - char buffer[256]; - - (void)store_message(&d.pm->this, pp, buffer, sizeof buffer, 0, - "running test"); - - fprintf(stderr, "%s\n", buffer); - } -# endif - - /* Introduce the correct read function. */ - if (d.pm->this.progressive) - { - /* Share the row function with the standard implementation. */ - png_set_progressive_read_fn(pp, &d, transform_info, progressive_row, - transform_end); - - /* Now feed data into the reader until we reach the end: */ - modifier_progressive_read(d.pm, pp, pi); - } - else - { - /* modifier_read expects a png_modifier* */ - png_set_read_fn(pp, d.pm, modifier_read); - - /* Check the header values: */ - png_read_info(pp, pi); - - /* Process the 'info' requirements. Only one image is generated */ - transform_info_imp(&d, pp, pi); - - sequential_row(&d.this, pp, pi, -1, 0); - - if (!d.this.speed) - transform_image_validate(&d, pp, pi); - else - d.this.ps->validated = 1; - } - - modifier_reset(d.pm); - } - - Catch(fault) - { - modifier_reset(voidcast(png_modifier*,(void*)fault)); - } -} - -/* The transforms: */ -#define ITSTRUCT(name) image_transform_##name -#define ITDATA(name) image_transform_data_##name -#define image_transform_ini image_transform_default_ini -#define IT(name)\ -static image_transform ITSTRUCT(name) =\ -{\ - #name,\ - 1, /*enable*/\ - &PT, /*list*/\ - 0, /*global_use*/\ - 0, /*local_use*/\ - 0, /*next*/\ - image_transform_ini,\ - image_transform_png_set_##name##_set,\ - image_transform_png_set_##name##_mod,\ - image_transform_png_set_##name##_add\ -} -#define PT ITSTRUCT(end) /* stores the previous transform */ - -/* To save code: */ -static void -image_transform_default_ini(PNG_CONST image_transform *this, - transform_display *that) -{ - this->next->ini(this->next, that); -} - -#ifdef PNG_READ_BACKGROUND_SUPPORTED -static int -image_transform_default_add(image_transform *this, - PNG_CONST image_transform **that, png_byte colour_type, png_byte bit_depth) -{ - UNUSED(colour_type) - UNUSED(bit_depth) - - this->next = *that; - *that = this; - - return 1; -} -#endif - -#ifdef PNG_READ_EXPAND_SUPPORTED -/* png_set_palette_to_rgb */ -static void -image_transform_png_set_palette_to_rgb_set(PNG_CONST image_transform *this, - transform_display *that, png_structp pp, png_infop pi) -{ - png_set_palette_to_rgb(pp); - this->next->set(this->next, that, pp, pi); -} - -static void -image_transform_png_set_palette_to_rgb_mod(PNG_CONST image_transform *this, - image_pixel *that, png_const_structp pp, - PNG_CONST transform_display *display) -{ - if (that->colour_type == PNG_COLOR_TYPE_PALETTE) - image_pixel_convert_PLTE(that); - - this->next->mod(this->next, that, pp, display); -} - -static int -image_transform_png_set_palette_to_rgb_add(image_transform *this, - PNG_CONST image_transform **that, png_byte colour_type, png_byte bit_depth) -{ - UNUSED(bit_depth) - - this->next = *that; - *that = this; - - return colour_type == PNG_COLOR_TYPE_PALETTE; -} - -IT(palette_to_rgb); -#undef PT -#define PT ITSTRUCT(palette_to_rgb) -#endif /* PNG_READ_EXPAND_SUPPORTED */ - -#ifdef PNG_READ_EXPAND_SUPPORTED -/* png_set_tRNS_to_alpha */ -static void -image_transform_png_set_tRNS_to_alpha_set(PNG_CONST image_transform *this, - transform_display *that, png_structp pp, png_infop pi) -{ - png_set_tRNS_to_alpha(pp); - this->next->set(this->next, that, pp, pi); -} - -static void -image_transform_png_set_tRNS_to_alpha_mod(PNG_CONST image_transform *this, - image_pixel *that, png_const_structp pp, - PNG_CONST transform_display *display) -{ - /* LIBPNG BUG: this always forces palette images to RGB. */ - if (that->colour_type == PNG_COLOR_TYPE_PALETTE) - image_pixel_convert_PLTE(that); - - /* This effectively does an 'expand' only if there is some transparency to - * convert to an alpha channel. - */ - if (that->have_tRNS) - image_pixel_add_alpha(that, &display->this); - - /* LIBPNG BUG: otherwise libpng still expands to 8 bits! */ - else - { - if (that->bit_depth < 8) - that->bit_depth =8; - if (that->sample_depth < 8) - that->sample_depth = 8; - } - - this->next->mod(this->next, that, pp, display); -} - -static int -image_transform_png_set_tRNS_to_alpha_add(image_transform *this, - PNG_CONST image_transform **that, png_byte colour_type, png_byte bit_depth) -{ - UNUSED(bit_depth) - - this->next = *that; - *that = this; - - /* We don't know yet whether there will be a tRNS chunk, but we know that - * this transformation should do nothing if there already is an alpha - * channel. - */ - return (colour_type & PNG_COLOR_MASK_ALPHA) == 0; -} - -IT(tRNS_to_alpha); -#undef PT -#define PT ITSTRUCT(tRNS_to_alpha) -#endif /* PNG_READ_EXPAND_SUPPORTED */ - -#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED -/* png_set_gray_to_rgb */ -static void -image_transform_png_set_gray_to_rgb_set(PNG_CONST image_transform *this, - transform_display *that, png_structp pp, png_infop pi) -{ - png_set_gray_to_rgb(pp); - this->next->set(this->next, that, pp, pi); -} - -static void -image_transform_png_set_gray_to_rgb_mod(PNG_CONST image_transform *this, - image_pixel *that, png_const_structp pp, - PNG_CONST transform_display *display) -{ - /* NOTE: we can actually pend the tRNS processing at this point because we - * can correctly recognize the original pixel value even though we have - * mapped the one gray channel to the three RGB ones, but in fact libpng - * doesn't do this, so we don't either. - */ - if ((that->colour_type & PNG_COLOR_MASK_COLOR) == 0 && that->have_tRNS) - image_pixel_add_alpha(that, &display->this); - - /* Simply expand the bit depth and alter the colour type as required. */ - if (that->colour_type == PNG_COLOR_TYPE_GRAY) - { - /* RGB images have a bit depth at least equal to '8' */ - if (that->bit_depth < 8) - that->sample_depth = that->bit_depth = 8; - - /* And just changing the colour type works here because the green and blue - * channels are being maintained in lock-step with the red/gray: - */ - that->colour_type = PNG_COLOR_TYPE_RGB; - } - - else if (that->colour_type == PNG_COLOR_TYPE_GRAY_ALPHA) - that->colour_type = PNG_COLOR_TYPE_RGB_ALPHA; - - this->next->mod(this->next, that, pp, display); -} - -static int -image_transform_png_set_gray_to_rgb_add(image_transform *this, - PNG_CONST image_transform **that, png_byte colour_type, png_byte bit_depth) -{ - UNUSED(bit_depth) - - this->next = *that; - *that = this; - - return (colour_type & PNG_COLOR_MASK_COLOR) == 0; -} - -IT(gray_to_rgb); -#undef PT -#define PT ITSTRUCT(gray_to_rgb) -#endif /* PNG_READ_GRAY_TO_RGB_SUPPORTED */ - -#ifdef PNG_READ_EXPAND_SUPPORTED -/* png_set_expand */ -static void -image_transform_png_set_expand_set(PNG_CONST image_transform *this, - transform_display *that, png_structp pp, png_infop pi) -{ - png_set_expand(pp); - this->next->set(this->next, that, pp, pi); -} - -static void -image_transform_png_set_expand_mod(PNG_CONST image_transform *this, - image_pixel *that, png_const_structp pp, - PNG_CONST transform_display *display) -{ - /* The general expand case depends on what the colour type is: */ - if (that->colour_type == PNG_COLOR_TYPE_PALETTE) - image_pixel_convert_PLTE(that); - else if (that->bit_depth < 8) /* grayscale */ - that->sample_depth = that->bit_depth = 8; - - if (that->have_tRNS) - image_pixel_add_alpha(that, &display->this); - - this->next->mod(this->next, that, pp, display); -} - -static int -image_transform_png_set_expand_add(image_transform *this, - PNG_CONST image_transform **that, png_byte colour_type, png_byte bit_depth) -{ - UNUSED(bit_depth) - - this->next = *that; - *that = this; - - /* 'expand' should do nothing for RGBA or GA input - no tRNS and the bit - * depth is at least 8 already. - */ - return (colour_type & PNG_COLOR_MASK_ALPHA) == 0; -} - -IT(expand); -#undef PT -#define PT ITSTRUCT(expand) -#endif /* PNG_READ_EXPAND_SUPPORTED */ - -#ifdef PNG_READ_EXPAND_SUPPORTED -/* png_set_expand_gray_1_2_4_to_8 - * LIBPNG BUG: this just does an 'expand' - */ -static void -image_transform_png_set_expand_gray_1_2_4_to_8_set( - PNG_CONST image_transform *this, transform_display *that, png_structp pp, - png_infop pi) -{ - png_set_expand_gray_1_2_4_to_8(pp); - this->next->set(this->next, that, pp, pi); -} - -static void -image_transform_png_set_expand_gray_1_2_4_to_8_mod( - PNG_CONST image_transform *this, image_pixel *that, png_const_structp pp, - PNG_CONST transform_display *display) -{ - image_transform_png_set_expand_mod(this, that, pp, display); -} - -static int -image_transform_png_set_expand_gray_1_2_4_to_8_add(image_transform *this, - PNG_CONST image_transform **that, png_byte colour_type, png_byte bit_depth) -{ - return image_transform_png_set_expand_add(this, that, colour_type, - bit_depth); -} - -IT(expand_gray_1_2_4_to_8); -#undef PT -#define PT ITSTRUCT(expand_gray_1_2_4_to_8) -#endif /* PNG_READ_EXPAND_SUPPORTED */ - -#ifdef PNG_READ_EXPAND_16_SUPPORTED -/* png_set_expand_16 */ -static void -image_transform_png_set_expand_16_set(PNG_CONST image_transform *this, - transform_display *that, png_structp pp, png_infop pi) -{ - png_set_expand_16(pp); - this->next->set(this->next, that, pp, pi); -} - -static void -image_transform_png_set_expand_16_mod(PNG_CONST image_transform *this, - image_pixel *that, png_const_structp pp, - PNG_CONST transform_display *display) -{ - /* Expect expand_16 to expand everything to 16 bits as a result of also - * causing 'expand' to happen. - */ - if (that->colour_type == PNG_COLOR_TYPE_PALETTE) - image_pixel_convert_PLTE(that); - - if (that->have_tRNS) - image_pixel_add_alpha(that, &display->this); - - if (that->bit_depth < 16) - that->sample_depth = that->bit_depth = 16; - - this->next->mod(this->next, that, pp, display); -} - -static int -image_transform_png_set_expand_16_add(image_transform *this, - PNG_CONST image_transform **that, png_byte colour_type, png_byte bit_depth) -{ - UNUSED(colour_type) - - this->next = *that; - *that = this; - - /* expand_16 does something unless the bit depth is already 16. */ - return bit_depth < 16; -} - -IT(expand_16); -#undef PT -#define PT ITSTRUCT(expand_16) -#endif /* PNG_READ_EXPAND_16_SUPPORTED */ - -#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED /* API added in 1.5.4 */ -/* png_set_scale_16 */ -static void -image_transform_png_set_scale_16_set(PNG_CONST image_transform *this, - transform_display *that, png_structp pp, png_infop pi) -{ - png_set_scale_16(pp); - this->next->set(this->next, that, pp, pi); -} - -static void -image_transform_png_set_scale_16_mod(PNG_CONST image_transform *this, - image_pixel *that, png_const_structp pp, - PNG_CONST transform_display *display) -{ - if (that->bit_depth == 16) - { - that->sample_depth = that->bit_depth = 8; - if (that->red_sBIT > 8) that->red_sBIT = 8; - if (that->green_sBIT > 8) that->green_sBIT = 8; - if (that->blue_sBIT > 8) that->blue_sBIT = 8; - if (that->alpha_sBIT > 8) that->alpha_sBIT = 8; - } - - this->next->mod(this->next, that, pp, display); -} - -static int -image_transform_png_set_scale_16_add(image_transform *this, - PNG_CONST image_transform **that, png_byte colour_type, png_byte bit_depth) -{ - UNUSED(colour_type) - - this->next = *that; - *that = this; - - return bit_depth > 8; -} - -IT(scale_16); -#undef PT -#define PT ITSTRUCT(scale_16) -#endif /* PNG_READ_SCALE_16_TO_8_SUPPORTED (1.5.4 on) */ - -#ifdef PNG_READ_16_TO_8_SUPPORTED /* the default before 1.5.4 */ -/* png_set_strip_16 */ -static void -image_transform_png_set_strip_16_set(PNG_CONST image_transform *this, - transform_display *that, png_structp pp, png_infop pi) -{ - png_set_strip_16(pp); - this->next->set(this->next, that, pp, pi); -} - -static void -image_transform_png_set_strip_16_mod(PNG_CONST image_transform *this, - image_pixel *that, png_const_structp pp, - PNG_CONST transform_display *display) -{ - if (that->bit_depth == 16) - { - that->sample_depth = that->bit_depth = 8; - if (that->red_sBIT > 8) that->red_sBIT = 8; - if (that->green_sBIT > 8) that->green_sBIT = 8; - if (that->blue_sBIT > 8) that->blue_sBIT = 8; - if (that->alpha_sBIT > 8) that->alpha_sBIT = 8; - - /* Prior to 1.5.4 png_set_strip_16 would use an 'accurate' method if this - * configuration option is set. From 1.5.4 the flag is never set and the - * 'scale' API (above) must be used. - */ -# ifdef PNG_READ_ACCURATE_SCALE_SUPPORTED -# if PNG_LIBPNG_VER >= 10504 -# error PNG_READ_ACCURATE_SCALE should not be set -# endif - - /* The strip 16 algorithm drops the low 8 bits rather than calculating - * 1/257, so we need to adjust the permitted errors appropriately: - * Notice that this is only relevant prior to the addition of the - * png_set_scale_16 API in 1.5.4 (but 1.5.4+ always defines the above!) - */ - { - PNG_CONST double d = (255-128.5)/65535; - that->rede += d; - that->greene += d; - that->bluee += d; - that->alphae += d; - } -# endif - } - - this->next->mod(this->next, that, pp, display); -} - -static int -image_transform_png_set_strip_16_add(image_transform *this, - PNG_CONST image_transform **that, png_byte colour_type, png_byte bit_depth) -{ - UNUSED(colour_type) - - this->next = *that; - *that = this; - - return bit_depth > 8; -} - -IT(strip_16); -#undef PT -#define PT ITSTRUCT(strip_16) -#endif /* PNG_READ_16_TO_8_SUPPORTED */ - -#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED -/* png_set_strip_alpha */ -static void -image_transform_png_set_strip_alpha_set(PNG_CONST image_transform *this, - transform_display *that, png_structp pp, png_infop pi) -{ - png_set_strip_alpha(pp); - this->next->set(this->next, that, pp, pi); -} - -static void -image_transform_png_set_strip_alpha_mod(PNG_CONST image_transform *this, - image_pixel *that, png_const_structp pp, - PNG_CONST transform_display *display) -{ - if (that->colour_type == PNG_COLOR_TYPE_GRAY_ALPHA) - that->colour_type = PNG_COLOR_TYPE_GRAY; - else if (that->colour_type == PNG_COLOR_TYPE_RGB_ALPHA) - that->colour_type = PNG_COLOR_TYPE_RGB; - - that->have_tRNS = 0; - that->alphaf = 1; - - this->next->mod(this->next, that, pp, display); -} - -static int -image_transform_png_set_strip_alpha_add(image_transform *this, - PNG_CONST image_transform **that, png_byte colour_type, png_byte bit_depth) -{ - UNUSED(bit_depth) - - this->next = *that; - *that = this; - - return (colour_type & PNG_COLOR_MASK_ALPHA) != 0; -} - -IT(strip_alpha); -#undef PT -#define PT ITSTRUCT(strip_alpha) -#endif /* PNG_READ_STRIP_ALPHA_SUPPORTED */ - -#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED -/* png_set_rgb_to_gray(png_structp, int err_action, double red, double green) - * png_set_rgb_to_gray_fixed(png_structp, int err_action, png_fixed_point red, - * png_fixed_point green) - * png_get_rgb_to_gray_status - * - * The 'default' test here uses values known to be used inside libpng: - * - * red: 6968 - * green: 23434 - * blue: 2366 - * - * These values are being retained for compatibility, along with the somewhat - * broken truncation calculation in the fast-and-inaccurate code path. Older - * versions of libpng will fail the accuracy tests below because they use the - * truncation algorithm everywhere. - */ -#define data ITDATA(rgb_to_gray) -static struct -{ - double gamma; /* File gamma to use in processing */ - - /* The following are the parameters for png_set_rgb_to_gray: */ -# ifdef PNG_FLOATING_POINT_SUPPORTED - double red_to_set; - double green_to_set; -# else - png_fixed_point red_to_set; - png_fixed_point green_to_set; -# endif - - /* The actual coefficients: */ - double red_coefficient; - double green_coefficient; - double blue_coefficient; - - /* Set if the coeefficients have been overridden. */ - int coefficients_overridden; -} data; - -#undef image_transform_ini -#define image_transform_ini image_transform_png_set_rgb_to_gray_ini -static void -image_transform_png_set_rgb_to_gray_ini(PNG_CONST image_transform *this, - transform_display *that) -{ - png_modifier *pm = that->pm; - PNG_CONST color_encoding *e = pm->current_encoding; - - UNUSED(this) - - /* Since we check the encoding this flag must be set: */ - pm->test_uses_encoding = 1; - - /* If 'e' is not NULL chromaticity information is present and either a cHRM - * or an sRGB chunk will be inserted. - */ - if (e != 0) - { - /* Coefficients come from the encoding, but may need to be normalized to a - * white point Y of 1.0 - */ - PNG_CONST double whiteY = e->red.Y + e->green.Y + e->blue.Y; - - data.red_coefficient = e->red.Y; - data.green_coefficient = e->green.Y; - data.blue_coefficient = e->blue.Y; - - if (whiteY != 1) - { - data.red_coefficient /= whiteY; - data.green_coefficient /= whiteY; - data.blue_coefficient /= whiteY; - } - } - - else - { - /* The default (built in) coeffcients, as above: */ - data.red_coefficient = 6968 / 32768.; - data.green_coefficient = 23434 / 32768.; - data.blue_coefficient = 2366 / 32768.; - } - - data.gamma = pm->current_gamma; - - /* If not set then the calculations assume linear encoding (implicitly): */ - if (data.gamma == 0) - data.gamma = 1; - - /* The arguments to png_set_rgb_to_gray can override the coefficients implied - * by the color space encoding. If doing exhaustive checks do the override - * in each case, otherwise do it randomly. - */ - if (pm->test_exhaustive) - { - /* First time in coefficients_overridden is 0, the following sets it to 1, - * so repeat if it is set. If a test fails this may mean we subsequently - * skip a non-override test, ignore that. - */ - data.coefficients_overridden = !data.coefficients_overridden; - pm->repeat = data.coefficients_overridden != 0; - } - - else - data.coefficients_overridden = random_choice(); - - if (data.coefficients_overridden) - { - /* These values override the color encoding defaults, simply use random - * numbers. - */ - png_uint_32 ru; - double total; - - RANDOMIZE(ru); - data.green_coefficient = total = (ru & 0xffff) / 65535.; - ru >>= 16; - data.red_coefficient = (1 - total) * (ru & 0xffff) / 65535.; - total += data.red_coefficient; - data.blue_coefficient = 1 - total; - -# ifdef PNG_FLOATING_POINT_SUPPORTED - data.red_to_set = data.red_coefficient; - data.green_to_set = data.green_coefficient; -# else - data.red_to_set = fix(data.red_coefficient); - data.green_to_set = fix(data.green_coefficient); -# endif - - /* The following just changes the error messages: */ - pm->encoding_ignored = 1; - } - - else - { - data.red_to_set = -1; - data.green_to_set = -1; - } - - /* Adjust the error limit in the png_modifier because of the larger errors - * produced in the digitization during the gamma handling. - */ - if (data.gamma != 1) /* Use gamma tables */ - { - if (that->this.bit_depth == 16 || pm->assume_16_bit_calculations) - { - /* The 16 bit case ends up producing a maximum error of about - * +/-5 in 65535, allow for +/-8 with the given gamma. - */ - that->pm->limit += pow(8./65535, data.gamma); - } - - else - { - /* Rounding to 8 bits in the linear space causes massive errors which - * will trigger the error check in transform_range_check. Fix that - * here by taking the gamma encoding into account. - */ - that->pm->limit += pow(1./255, data.gamma); - } - } - - else - { - /* With no gamma correction a large error comes from the truncation of the - * calculation in the 8 bit case, allow for that here. - */ - if (that->this.bit_depth != 16) - that->pm->limit += 4E-3; - } -} - -static void -image_transform_png_set_rgb_to_gray_set(PNG_CONST image_transform *this, - transform_display *that, png_structp pp, png_infop pi) -{ - PNG_CONST int error_action = 1; /* no error, no defines in png.h */ - -# ifdef PNG_FLOATING_POINT_SUPPORTED - png_set_rgb_to_gray(pp, error_action, data.red_to_set, data.green_to_set); -# else - png_set_rgb_to_gray_fixed(pp, error_action, data.red_to_set, - data.green_to_set); -# endif - -# ifdef PNG_READ_cHRM_SUPPORTED - if (that->pm->current_encoding != 0) - { - /* We have an encoding so a cHRM chunk may have been set; if so then - * check that the libpng APIs give the correct (X,Y,Z) values within - * some margin of error for the round trip through the chromaticity - * form. - */ -# ifdef PNG_FLOATING_POINT_SUPPORTED -# define API_function png_get_cHRM_XYZ -# define API_form "FP" -# define API_type double -# define API_cvt(x) (x) -# else -# define API_function png_get_cHRM_XYZ_fixed -# define API_form "fixed" -# define API_type png_fixed_point -# define API_cvt(x) ((double)(x)/PNG_FP_1) -# endif - - API_type rX, gX, bX; - API_type rY, gY, bY; - API_type rZ, gZ, bZ; - - if ((API_function(pp, pi, &rX, &rY, &rZ, &gX, &gY, &gZ, &bX, &bY, &bZ) - & PNG_INFO_cHRM) != 0) - { - double maxe; - PNG_CONST char *el; - color_encoding e, o; - - /* Expect libpng to return a normalized result, but the original - * color space encoding may not be normalized. - */ - modifier_current_encoding(that->pm, &o); - normalize_color_encoding(&o); - - /* Sanity check the pngvalid code - the coefficients should match - * the normalized Y values of the encoding unless they were - * overridden. - */ - if (data.red_to_set == -1 && data.green_to_set == -1 && - (fabs(o.red.Y - data.red_coefficient) > DBL_EPSILON || - fabs(o.green.Y - data.green_coefficient) > DBL_EPSILON || - fabs(o.blue.Y - data.blue_coefficient) > DBL_EPSILON)) - png_error(pp, "internal pngvalid cHRM coefficient error"); - - /* Generate a colour space encoding. */ - e.gamma = o.gamma; /* not used */ - e.red.X = API_cvt(rX); - e.red.Y = API_cvt(rY); - e.red.Z = API_cvt(rZ); - e.green.X = API_cvt(gX); - e.green.Y = API_cvt(gY); - e.green.Z = API_cvt(gZ); - e.blue.X = API_cvt(bX); - e.blue.Y = API_cvt(bY); - e.blue.Z = API_cvt(bZ); - - /* This should match the original one from the png_modifier, within - * the range permitted by the libpng fixed point representation. - */ - maxe = 0; - el = "-"; /* Set to element name with error */ - -# define CHECK(col,x)\ - {\ - double err = fabs(o.col.x - e.col.x);\ - if (err > maxe)\ - {\ - maxe = err;\ - el = #col "(" #x ")";\ - }\ - } - - CHECK(red,X) - CHECK(red,Y) - CHECK(red,Z) - CHECK(green,X) - CHECK(green,Y) - CHECK(green,Z) - CHECK(blue,X) - CHECK(blue,Y) - CHECK(blue,Z) - - /* Here in both fixed and floating cases to check the values read - * from the cHRm chunk. PNG uses fixed point in the cHRM chunk, so - * we can't expect better than +/-.5E-5 on the result, allow 1E-5. - */ - if (maxe >= 1E-5) - { - size_t pos = 0; - char buffer[256]; - - pos = safecat(buffer, sizeof buffer, pos, API_form); - pos = safecat(buffer, sizeof buffer, pos, " cHRM "); - pos = safecat(buffer, sizeof buffer, pos, el); - pos = safecat(buffer, sizeof buffer, pos, " error: "); - pos = safecatd(buffer, sizeof buffer, pos, maxe, 7); - pos = safecat(buffer, sizeof buffer, pos, " "); - /* Print the color space without the gamma value: */ - pos = safecat_color_encoding(buffer, sizeof buffer, pos, &o, 0); - pos = safecat(buffer, sizeof buffer, pos, " -> "); - pos = safecat_color_encoding(buffer, sizeof buffer, pos, &e, 0); - - png_error(pp, buffer); - } - } - } -# endif /* READ_cHRM */ - - this->next->set(this->next, that, pp, pi); -} - -static void -image_transform_png_set_rgb_to_gray_mod(PNG_CONST image_transform *this, - image_pixel *that, png_const_structp pp, - PNG_CONST transform_display *display) -{ - if ((that->colour_type & PNG_COLOR_MASK_COLOR) != 0) - { - double gray, err; - - if (that->colour_type == PNG_COLOR_TYPE_PALETTE) - image_pixel_convert_PLTE(that); - - /* Image now has RGB channels... */ - { - PNG_CONST png_modifier *pm = display->pm; - PNG_CONST unsigned int sample_depth = that->sample_depth; - int isgray; - double r, g, b; - double rlo, rhi, glo, ghi, blo, bhi, graylo, grayhi; - - /* Do this using interval arithmetic, otherwise it is too difficult to - * handle the errors correctly. - * - * To handle the gamma correction work out the upper and lower bounds - * of the digitized value. Assume rounding here - normally the values - * will be identical after this operation if there is only one - * transform, feel free to delete the png_error checks on this below in - * the future (this is just me trying to ensure it works!) - */ - r = rlo = rhi = that->redf; - rlo -= that->rede; - rlo = digitize(pm, rlo, sample_depth, 1/*round*/); - rhi += that->rede; - rhi = digitize(pm, rhi, sample_depth, 1/*round*/); - - g = glo = ghi = that->greenf; - glo -= that->greene; - glo = digitize(pm, glo, sample_depth, 1/*round*/); - ghi += that->greene; - ghi = digitize(pm, ghi, sample_depth, 1/*round*/); - - b = blo = bhi = that->bluef; - blo -= that->bluee; - blo = digitize(pm, blo, sample_depth, 1/*round*/); - bhi += that->greene; - bhi = digitize(pm, bhi, sample_depth, 1/*round*/); - - isgray = r==g && g==b; - - if (data.gamma != 1) - { - PNG_CONST double power = 1/data.gamma; - PNG_CONST double abse = abserr(pm, sample_depth, sample_depth); - - /* 'abse' is the absolute error permitted in linear calculations. It - * is used here to capture the error permitted in the handling - * (undoing) of the gamma encoding. Once again digitization occurs - * to handle the upper and lower bounds of the values. This is - * where the real errors are introduced. - */ - r = pow(r, power); - rlo = digitize(pm, pow(rlo, power)-abse, sample_depth, 1); - rhi = digitize(pm, pow(rhi, power)+abse, sample_depth, 1); - - g = pow(g, power); - glo = digitize(pm, pow(glo, power)-abse, sample_depth, 1); - ghi = digitize(pm, pow(ghi, power)+abse, sample_depth, 1); - - b = pow(b, power); - blo = digitize(pm, pow(blo, power)-abse, sample_depth, 1); - bhi = digitize(pm, pow(bhi, power)+abse, sample_depth, 1); - } - - /* Now calculate the actual gray values. Although the error in the - * coefficients depends on whether they were specified on the command - * line (in which case truncation to 15 bits happened) or not (rounding - * was used) the maxium error in an individual coefficient is always - * 1/32768, because even in the rounding case the requirement that - * coefficients add up to 32768 can cause a larger rounding error. - * - * The only time when rounding doesn't occur in 1.5.5 and later is when - * the non-gamma code path is used for less than 16 bit data. - */ - gray = r * data.red_coefficient + g * data.green_coefficient + - b * data.blue_coefficient; - - { - PNG_CONST int do_round = data.gamma != 1 || sample_depth == 16; - PNG_CONST double ce = 1. / 32768; - - graylo = digitize(pm, rlo * (data.red_coefficient-ce) + - glo * (data.green_coefficient-ce) + - blo * (data.blue_coefficient-ce), sample_depth, do_round); - if (graylo <= 0) - graylo = 0; - - grayhi = digitize(pm, rhi * (data.red_coefficient+ce) + - ghi * (data.green_coefficient+ce) + - bhi * (data.blue_coefficient+ce), sample_depth, do_round); - if (grayhi >= 1) - grayhi = 1; - } - - /* And invert the gamma. */ - if (data.gamma != 1) - { - PNG_CONST double power = data.gamma; - - gray = pow(gray, power); - graylo = digitize(pm, pow(graylo, power), sample_depth, 1); - grayhi = digitize(pm, pow(grayhi, power), sample_depth, 1); - } - - /* Now the error can be calculated. - * - * If r==g==b because there is no overall gamma correction libpng - * currently preserves the original value. - */ - if (isgray) - err = (that->rede + that->greene + that->bluee)/3; - - else - { - err = fabs(grayhi-gray); - if (fabs(gray - graylo) > err) - err = fabs(graylo-gray); - - /* Check that this worked: */ - if (err > display->pm->limit) - { - size_t pos = 0; - char buffer[128]; - - pos = safecat(buffer, sizeof buffer, pos, "rgb_to_gray error "); - pos = safecatd(buffer, sizeof buffer, pos, err, 6); - pos = safecat(buffer, sizeof buffer, pos, " exceeds limit "); - pos = safecatd(buffer, sizeof buffer, pos, - display->pm->limit, 6); - png_error(pp, buffer); - } - } - } - - that->bluef = that->greenf = that->redf = gray; - that->bluee = that->greene = that->rede = err; - - /* The sBIT is the minium of the three colour channel sBITs. */ - if (that->red_sBIT > that->green_sBIT) - that->red_sBIT = that->green_sBIT; - if (that->red_sBIT > that->blue_sBIT) - that->red_sBIT = that->blue_sBIT; - that->blue_sBIT = that->green_sBIT = that->red_sBIT; - - /* And remove the colour bit in the type: */ - if (that->colour_type == PNG_COLOR_TYPE_RGB) - that->colour_type = PNG_COLOR_TYPE_GRAY; - else if (that->colour_type == PNG_COLOR_TYPE_RGB_ALPHA) - that->colour_type = PNG_COLOR_TYPE_GRAY_ALPHA; - } - - this->next->mod(this->next, that, pp, display); -} - -static int -image_transform_png_set_rgb_to_gray_add(image_transform *this, - PNG_CONST image_transform **that, png_byte colour_type, png_byte bit_depth) -{ - UNUSED(bit_depth) - - this->next = *that; - *that = this; - - return (colour_type & PNG_COLOR_MASK_COLOR) != 0; -} - -#undef data -IT(rgb_to_gray); -#undef PT -#define PT ITSTRUCT(rgb_to_gray) -#undef image_transform_ini -#define image_transform_ini image_transform_default_ini -#endif /* PNG_READ_RGB_TO_GRAY_SUPPORTED */ - -#ifdef PNG_READ_BACKGROUND_SUPPORTED -/* png_set_background(png_structp, png_const_color_16p background_color, - * int background_gamma_code, int need_expand, double background_gamma) - * png_set_background_fixed(png_structp, png_const_color_16p background_color, - * int background_gamma_code, int need_expand, - * png_fixed_point background_gamma) - * - * As with rgb_to_gray this ignores the gamma (at present.) -*/ -#define data ITDATA(background) -static image_pixel data; - -static void -image_transform_png_set_background_set(PNG_CONST image_transform *this, - transform_display *that, png_structp pp, png_infop pi) -{ - png_byte colour_type, bit_depth; - png_byte random_bytes[8]; /* 8 bytes - 64 bits - the biggest pixel */ - png_color_16 back; - - /* We need a background colour, because we don't know exactly what transforms - * have been set we have to supply the colour in the original file format and - * so we need to know what that is! The background colour is stored in the - * transform_display. - */ - RANDOMIZE(random_bytes); - - /* Read the random value, for colour type 3 the background colour is actually - * expressed as a 24bit rgb, not an index. - */ - colour_type = that->this.colour_type; - if (colour_type == 3) - { - colour_type = PNG_COLOR_TYPE_RGB; - bit_depth = 8; - } - - else - bit_depth = that->this.bit_depth; - - image_pixel_init(&data, random_bytes, colour_type, - bit_depth, 0/*x*/, 0/*unused: palette*/); - - /* Extract the background colour from this image_pixel, but make sure the - * unused fields of 'back' are garbage. - */ - RANDOMIZE(back); - - if (colour_type & PNG_COLOR_MASK_COLOR) - { - back.red = (png_uint_16)data.red; - back.green = (png_uint_16)data.green; - back.blue = (png_uint_16)data.blue; - } - - else - back.gray = (png_uint_16)data.red; - -# ifdef PNG_FLOATING_POINT_SUPPORTED - png_set_background(pp, &back, PNG_BACKGROUND_GAMMA_FILE, 1/*need expand*/, - 0); -# else - png_set_background_fixed(pp, &back, PNG_BACKGROUND_GAMMA_FILE, - 1/*need expand*/, 0); -# endif - - this->next->set(this->next, that, pp, pi); -} - -static void -image_transform_png_set_background_mod(PNG_CONST image_transform *this, - image_pixel *that, png_const_structp pp, - PNG_CONST transform_display *display) -{ - /* Check for tRNS first: */ - if (that->have_tRNS && that->colour_type != PNG_COLOR_TYPE_PALETTE) - image_pixel_add_alpha(that, &display->this); - - /* This is only necessary if the alpha value is less than 1. */ - if (that->alphaf < 1) - { - /* Now we do the background calculation without any gamma correction. */ - if (that->alphaf <= 0) - { - that->redf = data.redf; - that->greenf = data.greenf; - that->bluef = data.bluef; - - that->rede = data.rede; - that->greene = data.greene; - that->bluee = data.bluee; - - that->red_sBIT= data.red_sBIT; - that->green_sBIT= data.green_sBIT; - that->blue_sBIT= data.blue_sBIT; - } - - else /* 0 < alpha < 1 */ - { - double alf = 1 - that->alphaf; - - that->redf = that->redf * that->alphaf + data.redf * alf; - that->rede = that->rede * that->alphaf + data.rede * alf + - DBL_EPSILON; - that->greenf = that->greenf * that->alphaf + data.greenf * alf; - that->greene = that->greene * that->alphaf + data.greene * alf + - DBL_EPSILON; - that->bluef = that->bluef * that->alphaf + data.bluef * alf; - that->bluee = that->bluee * that->alphaf + data.bluee * alf + - DBL_EPSILON; - } - - /* Remove the alpha type and set the alpha (not in that order.) */ - that->alphaf = 1; - that->alphae = 0; - - if (that->colour_type == PNG_COLOR_TYPE_RGB_ALPHA) - that->colour_type = PNG_COLOR_TYPE_RGB; - else if (that->colour_type == PNG_COLOR_TYPE_GRAY_ALPHA) - that->colour_type = PNG_COLOR_TYPE_GRAY; - /* PNG_COLOR_TYPE_PALETTE is not changed */ - } - - this->next->mod(this->next, that, pp, display); -} - -#define image_transform_png_set_background_add image_transform_default_add - -#undef data -IT(background); -#undef PT -#define PT ITSTRUCT(background) -#endif /* PNG_READ_BACKGROUND_SUPPORTED */ - -/* This may just be 'end' if all the transforms are disabled! */ -static image_transform *PNG_CONST image_transform_first = &PT; - -static void -transform_enable(PNG_CONST char *name) -{ - /* Everything starts out enabled, so if we see an 'enable' disabled - * everything else the first time round. - */ - static int all_disabled = 0; - int found_it = 0; - image_transform *list = image_transform_first; - - while (list != &image_transform_end) - { - if (strcmp(list->name, name) == 0) - { - list->enable = 1; - found_it = 1; - } - else if (!all_disabled) - list->enable = 0; - - list = list->list; - } - - all_disabled = 1; - - if (!found_it) - { - fprintf(stderr, "pngvalid: --transform-enable=%s: unknown transform\n", - name); - exit(99); - } -} - -static void -transform_disable(PNG_CONST char *name) -{ - image_transform *list = image_transform_first; - - while (list != &image_transform_end) - { - if (strcmp(list->name, name) == 0) - { - list->enable = 0; - return; - } - - list = list->list; - } - - fprintf(stderr, "pngvalid: --transform-disable=%s: unknown transform\n", - name); - exit(99); -} - -static void -image_transform_reset_count(void) -{ - image_transform *next = image_transform_first; - int count = 0; - - while (next != &image_transform_end) - { - next->local_use = 0; - next->next = 0; - next = next->list; - ++count; - } - - /* This can only happen if we every have more than 32 transforms (excluding - * the end) in the list. - */ - if (count > 32) abort(); -} - -static int -image_transform_test_counter(png_uint_32 counter, unsigned int max) -{ - /* Test the list to see if there is any point contining, given a current - * counter and a 'max' value. - */ - image_transform *next = image_transform_first; - - while (next != &image_transform_end) - { - /* For max 0 or 1 continue until the counter overflows: */ - counter >>= 1; - - /* Continue if any entry hasn't reacked the max. */ - if (max > 1 && next->local_use < max) - return 1; - next = next->list; - } - - return max <= 1 && counter == 0; -} - -static png_uint_32 -image_transform_add(PNG_CONST image_transform **this, unsigned int max, - png_uint_32 counter, char *name, size_t sizeof_name, size_t *pos, - png_byte colour_type, png_byte bit_depth) -{ - for (;;) /* until we manage to add something */ - { - png_uint_32 mask; - image_transform *list; - - /* Find the next counter value, if the counter is zero this is the start - * of the list. This routine always returns the current counter (not the - * next) so it returns 0 at the end and expects 0 at the beginning. - */ - if (counter == 0) /* first time */ - { - image_transform_reset_count(); - if (max <= 1) - counter = 1; - else - counter = random_32(); - } - else /* advance the counter */ - { - switch (max) - { - case 0: ++counter; break; - case 1: counter <<= 1; break; - default: counter = random_32(); break; - } - } - - /* Now add all these items, if possible */ - *this = &image_transform_end; - list = image_transform_first; - mask = 1; - - /* Go through the whole list adding anything that the counter selects: */ - while (list != &image_transform_end) - { - if ((counter & mask) != 0 && list->enable && - (max == 0 || list->local_use < max)) - { - /* Candidate to add: */ - if (list->add(list, this, colour_type, bit_depth) || max == 0) - { - /* Added, so add to the name too. */ - *pos = safecat(name, sizeof_name, *pos, " +"); - *pos = safecat(name, sizeof_name, *pos, list->name); - } - - else - { - /* Not useful and max>0, so remove it from *this: */ - *this = list->next; - list->next = 0; - - /* And, since we know it isn't useful, stop it being added again - * in this run: - */ - list->local_use = max; - } - } - - mask <<= 1; - list = list->list; - } - - /* Now if anything was added we have something to do. */ - if (*this != &image_transform_end) - return counter; - - /* Nothing added, but was there anything in there to add? */ - if (!image_transform_test_counter(counter, max)) - return 0; - } -} - -#ifdef THIS_IS_THE_PROFORMA -static void -image_transform_png_set_@_set(PNG_CONST image_transform *this, - transform_display *that, png_structp pp, png_infop pi) -{ - png_set_@(pp); - this->next->set(this->next, that, pp, pi); -} - -static void -image_transform_png_set_@_mod(PNG_CONST image_transform *this, - image_pixel *that, png_const_structp pp, - PNG_CONST transform_display *display) -{ - this->next->mod(this->next, that, pp, display); -} - -static int -image_transform_png_set_@_add(image_transform *this, - PNG_CONST image_transform **that, char *name, size_t sizeof_name, - size_t *pos, png_byte colour_type, png_byte bit_depth) -{ - this->next = *that; - *that = this; - - *pos = safecat(name, sizeof_name, *pos, " +@"); - - return 1; -} - -IT(@); -#endif - -/* png_set_quantize(png_structp, png_colorp palette, int num_palette, - * int maximum_colors, png_const_uint_16p histogram, int full_quantize) - * - * Very difficult to validate this! - */ -/*NOTE: TBD NYI */ - -/* The data layout transforms are handled by swapping our own channel data, - * necessarily these need to happen at the end of the transform list because the - * semantic of the channels changes after these are executed. Some of these, - * like set_shift and set_packing, can't be done at present because they change - * the layout of the data at the sub-sample level so sample() won't get the - * right answer. - */ -/* png_set_invert_alpha */ -/*NOTE: TBD NYI */ - -/* png_set_bgr */ -/*NOTE: TBD NYI */ - -/* png_set_swap_alpha */ -/*NOTE: TBD NYI */ - -/* png_set_swap */ -/*NOTE: TBD NYI */ - -/* png_set_filler, (png_structp png_ptr, png_uint_32 filler, int flags)); */ -/*NOTE: TBD NYI */ - -/* png_set_add_alpha, (png_structp png_ptr, png_uint_32 filler, int flags)); */ -/*NOTE: TBD NYI */ - -/* png_set_packing */ -/*NOTE: TBD NYI */ - -/* png_set_packswap */ -/*NOTE: TBD NYI */ - -/* png_set_invert_mono */ -/*NOTE: TBD NYI */ - -/* png_set_shift(png_structp, png_const_color_8p true_bits) */ -/*NOTE: TBD NYI */ - -static void -perform_transform_test(png_modifier *pm) -{ - png_byte colour_type = 0; - png_byte bit_depth = 0; - unsigned int palette_number = 0; - - while (next_format(&colour_type, &bit_depth, &palette_number)) - { - png_uint_32 counter = 0; - size_t base_pos; - char name[64]; - - base_pos = safecat(name, sizeof name, 0, "transform:"); - - for (;;) - { - size_t pos = base_pos; - PNG_CONST image_transform *list = 0; - - /* 'max' is currently hardwired to '1'; this should be settable on the - * command line. - */ - counter = image_transform_add(&list, 1/*max*/, counter, - name, sizeof name, &pos, colour_type, bit_depth); - - if (counter == 0) - break; - - /* The command line can change this to checking interlaced images. */ - do - { - pm->repeat = 0; - transform_test(pm, FILEID(colour_type, bit_depth, palette_number, - pm->interlace_type, 0, 0, 0), list, name); - - if (fail(pm)) - return; - } - while (pm->repeat); - } - } -} -#endif /* PNG_READ_TRANSFORMS_SUPPORTED */ - -/********************************* GAMMA TESTS ********************************/ -#ifdef PNG_READ_GAMMA_SUPPORTED -/* Reader callbacks and implementations, where they differ from the standard - * ones. - */ -typedef struct gamma_display -{ - standard_display this; - - /* Parameters */ - png_modifier* pm; - double file_gamma; - double screen_gamma; - double background_gamma; - png_byte sbit; - int threshold_test; - int use_input_precision; - int scale16; - int expand16; - int do_background; - png_color_16 background_color; - - /* Local variables */ - double maxerrout; - double maxerrpc; - double maxerrabs; -} gamma_display; - -#define ALPHA_MODE_OFFSET 4 - -static void -gamma_display_init(gamma_display *dp, png_modifier *pm, png_uint_32 id, - double file_gamma, double screen_gamma, png_byte sbit, int threshold_test, - int use_input_precision, int scale16, int expand16, - int do_background, PNG_CONST png_color_16 *pointer_to_the_background_color, - double background_gamma) -{ - /* Standard fields */ - standard_display_init(&dp->this, &pm->this, id, 0/*do_interlace*/, - pm->use_update_info); - - /* Parameter fields */ - dp->pm = pm; - dp->file_gamma = file_gamma; - dp->screen_gamma = screen_gamma; - dp->background_gamma = background_gamma; - dp->sbit = sbit; - dp->threshold_test = threshold_test; - dp->use_input_precision = use_input_precision; - dp->scale16 = scale16; - dp->expand16 = expand16; - dp->do_background = do_background; - if (do_background && pointer_to_the_background_color != 0) - dp->background_color = *pointer_to_the_background_color; - else - memset(&dp->background_color, 0, sizeof dp->background_color); - - /* Local variable fields */ - dp->maxerrout = dp->maxerrpc = dp->maxerrabs = 0; -} - -static void -gamma_info_imp(gamma_display *dp, png_structp pp, png_infop pi) -{ - /* Reuse the standard stuff as appropriate. */ - standard_info_part1(&dp->this, pp, pi); - - /* If requested strip 16 to 8 bits - this is handled automagically below - * because the output bit depth is read from the library. Note that there - * are interactions with sBIT but, internally, libpng makes sbit at most - * PNG_MAX_GAMMA_8 when doing the following. - */ - if (dp->scale16) -# ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED - png_set_scale_16(pp); -# else - /* The following works both in 1.5.4 and earlier versions: */ -# ifdef PNG_READ_16_TO_8_SUPPORTED - png_set_strip_16(pp); -# else - png_error(pp, "scale16 (16 to 8 bit conversion) not supported"); -# endif -# endif - - if (dp->expand16) -# ifdef PNG_READ_EXPAND_16_SUPPORTED - png_set_expand_16(pp); -# else - png_error(pp, "expand16 (8 to 16 bit conversion) not supported"); -# endif - - if (dp->do_background >= ALPHA_MODE_OFFSET) - { -# ifdef PNG_READ_ALPHA_MODE_SUPPORTED - { - /* This tests the alpha mode handling, if supported. */ - int mode = dp->do_background - ALPHA_MODE_OFFSET; - - /* The gamma value is the output gamma, and is in the standard, - * non-inverted, represenation. It provides a default for the PNG file - * gamma, but since the file has a gAMA chunk this does not matter. - */ - PNG_CONST double sg = dp->screen_gamma; -# ifndef PNG_FLOATING_POINT_SUPPORTED - PNG_CONST png_fixed_point g = fix(sg); -# endif - -# ifdef PNG_FLOATING_POINT_SUPPORTED - png_set_alpha_mode(pp, mode, sg); -# else - png_set_alpha_mode_fixed(pp, mode, g); -# endif - - /* However, for the standard Porter-Duff algorithm the output defaults - * to be linear, so if the test requires non-linear output it must be - * corrected here. - */ - if (mode == PNG_ALPHA_STANDARD && sg != 1) - { -# ifdef PNG_FLOATING_POINT_SUPPORTED - png_set_gamma(pp, sg, dp->file_gamma); -# else - png_fixed_point f = fix(dp->file_gamma); - png_set_gamma_fixed(pp, g, f); -# endif - } - } -# else - png_error(pp, "alpha mode handling not supported"); -# endif - } - - else - { - /* Set up gamma processing. */ -# ifdef PNG_FLOATING_POINT_SUPPORTED - png_set_gamma(pp, dp->screen_gamma, dp->file_gamma); -# else - { - png_fixed_point s = fix(dp->screen_gamma); - png_fixed_point f = fix(dp->file_gamma); - png_set_gamma_fixed(pp, s, f); - } -# endif - - if (dp->do_background) - { -# ifdef PNG_READ_BACKGROUND_SUPPORTED - /* NOTE: this assumes the caller provided the correct background gamma! - */ - PNG_CONST double bg = dp->background_gamma; -# ifndef PNG_FLOATING_POINT_SUPPORTED - PNG_CONST png_fixed_point g = fix(bg); -# endif - -# ifdef PNG_FLOATING_POINT_SUPPORTED - png_set_background(pp, &dp->background_color, dp->do_background, - 0/*need_expand*/, bg); -# else - png_set_background_fixed(pp, &dp->background_color, - dp->do_background, 0/*need_expand*/, g); -# endif -# else - png_error(pp, "png_set_background not supported"); -# endif - } - } - - { - int i = dp->this.use_update_info; - /* Always do one call, even if use_update_info is 0. */ - do - png_read_update_info(pp, pi); - while (--i > 0); - } - - /* Now we may get a different cbRow: */ - standard_info_part2(&dp->this, pp, pi, 1 /*images*/); -} - -static void -gamma_info(png_structp pp, png_infop pi) -{ - gamma_info_imp(voidcast(gamma_display*, png_get_progressive_ptr(pp)), pp, - pi); -} - -/* Validate a single component value - the routine gets the input and output - * sample values as unscaled PNG component values along with a cache of all the - * information required to validate the values. - */ -typedef struct validate_info -{ - png_const_structp pp; - gamma_display *dp; - png_byte sbit; - int use_input_precision; - int do_background; - int scale16; - unsigned int sbit_max; - unsigned int isbit_shift; - unsigned int outmax; - - double gamma_correction; /* Overall correction required. */ - double file_inverse; /* Inverse of file gamma. */ - double screen_gamma; - double screen_inverse; /* Inverse of screen gamma. */ - - double background_red; /* Linear background value, red or gray. */ - double background_green; - double background_blue; - - double maxabs; - double maxpc; - double maxcalc; - double maxout; - double maxout_total; /* Total including quantization error */ - double outlog; - int outquant; -} -validate_info; - -static void -init_validate_info(validate_info *vi, gamma_display *dp, png_const_structp pp, - int in_depth, int out_depth) -{ - PNG_CONST unsigned int outmax = (1U<pp = pp; - vi->dp = dp; - - if (dp->sbit > 0 && dp->sbit < in_depth) - { - vi->sbit = dp->sbit; - vi->isbit_shift = in_depth - dp->sbit; - } - - else - { - vi->sbit = (png_byte)in_depth; - vi->isbit_shift = 0; - } - - vi->sbit_max = (1U << vi->sbit)-1; - - /* This mimics the libpng threshold test, '0' is used to prevent gamma - * correction in the validation test. - */ - vi->screen_gamma = dp->screen_gamma; - if (fabs(vi->screen_gamma-1) < PNG_GAMMA_THRESHOLD) - vi->screen_gamma = vi->screen_inverse = 0; - else - vi->screen_inverse = 1/vi->screen_gamma; - - vi->use_input_precision = dp->use_input_precision; - vi->outmax = outmax; - vi->maxabs = abserr(dp->pm, in_depth, out_depth); - vi->maxpc = pcerr(dp->pm, in_depth, out_depth); - vi->maxcalc = calcerr(dp->pm, in_depth, out_depth); - vi->maxout = outerr(dp->pm, in_depth, out_depth); - vi->outquant = output_quantization_factor(dp->pm, in_depth, out_depth); - vi->maxout_total = vi->maxout + vi->outquant * .5; - vi->outlog = outlog(dp->pm, in_depth, out_depth); - - if ((dp->this.colour_type & PNG_COLOR_MASK_ALPHA) != 0 || - (dp->this.colour_type == 3 && dp->this.is_transparent)) - { - vi->do_background = dp->do_background; - - if (vi->do_background != 0) - { - PNG_CONST double bg_inverse = 1/dp->background_gamma; - double r, g, b; - - /* Caller must at least put the gray value into the red channel */ - r = dp->background_color.red; r /= outmax; - g = dp->background_color.green; g /= outmax; - b = dp->background_color.blue; b /= outmax; - -# if 0 - /* libpng doesn't do this optimization, if we do pngvalid will fail. - */ - if (fabs(bg_inverse-1) >= PNG_GAMMA_THRESHOLD) -# endif - { - r = pow(r, bg_inverse); - g = pow(g, bg_inverse); - b = pow(b, bg_inverse); - } - - vi->background_red = r; - vi->background_green = g; - vi->background_blue = b; - } - } - else - vi->do_background = 0; - - if (vi->do_background == 0) - vi->background_red = vi->background_green = vi->background_blue = 0; - - vi->gamma_correction = 1/(dp->file_gamma*dp->screen_gamma); - if (fabs(vi->gamma_correction-1) < PNG_GAMMA_THRESHOLD) - vi->gamma_correction = 0; - - vi->file_inverse = 1/dp->file_gamma; - if (fabs(vi->file_inverse-1) < PNG_GAMMA_THRESHOLD) - vi->file_inverse = 0; - - vi->scale16 = dp->scale16; -} - -/* This function handles composition of a single non-alpha component. The - * argument is the input sample value, in the range 0..1, and the alpha value. - * The result is the composed, linear, input sample. If alpha is less than zero - * this is the alpha component and the function should not be called! - */ -static double -gamma_component_compose(int do_background, double input_sample, double alpha, - double background, int *compose) -{ - switch (do_background) - { -#ifdef PNG_READ_BACKGROUND_SUPPORTED - case PNG_BACKGROUND_GAMMA_SCREEN: - case PNG_BACKGROUND_GAMMA_FILE: - case PNG_BACKGROUND_GAMMA_UNIQUE: - /* Standard PNG background processing. */ - if (alpha < 1) - { - if (alpha > 0) - { - input_sample = input_sample * alpha + background * (1-alpha); - if (compose != NULL) - *compose = 1; - } - - else - input_sample = background; - } - break; -#endif - -#ifdef PNG_READ_ALPHA_MODE_SUPPORTED - case ALPHA_MODE_OFFSET + PNG_ALPHA_STANDARD: - case ALPHA_MODE_OFFSET + PNG_ALPHA_BROKEN: - /* The components are premultiplied in either case and the output is - * gamma encoded (to get standard Porter-Duff we expect the output - * gamma to be set to 1.0!) - */ - case ALPHA_MODE_OFFSET + PNG_ALPHA_OPTIMIZED: - /* The optimization is that the partial-alpha entries are linear - * while the opaque pixels are gamma encoded, but this only affects the - * output encoding. - */ - if (alpha < 1) - { - if (alpha > 0) - { - input_sample *= alpha; - if (compose != NULL) - *compose = 1; - } - - else - input_sample = 0; - } - break; -#endif - - default: - /* Standard cases where no compositing is done (so the component - * value is already correct.) - */ - UNUSED(alpha) - UNUSED(background) - UNUSED(compose) - break; - } - - return input_sample; -} - -/* This API returns the encoded *input* component, in the range 0..1 */ -static double -gamma_component_validate(PNG_CONST char *name, PNG_CONST validate_info *vi, - PNG_CONST unsigned int id, PNG_CONST unsigned int od, - PNG_CONST double alpha /* <0 for the alpha channel itself */, - PNG_CONST double background /* component background value */) -{ - PNG_CONST unsigned int isbit = id >> vi->isbit_shift; - PNG_CONST unsigned int sbit_max = vi->sbit_max; - PNG_CONST unsigned int outmax = vi->outmax; - PNG_CONST int do_background = vi->do_background; - - double i; - - /* First check on the 'perfect' result obtained from the digitized input - * value, id, and compare this against the actual digitized result, 'od'. - * 'i' is the input result in the range 0..1: - */ - i = isbit; i /= sbit_max; - - /* Check for the fast route: if we don't do any background composition or if - * this is the alpha channel ('alpha' < 0) or if the pixel is opaque then - * just use the gamma_correction field to correct to the final output gamma. - */ - if (alpha == 1 /* opaque pixel component */ || !do_background -#ifdef PNG_READ_ALPHA_MODE_SUPPORTED - || do_background == ALPHA_MODE_OFFSET + PNG_ALPHA_PNG -#endif - || (alpha < 0 /* alpha channel */ -#ifdef PNG_READ_ALPHA_MODE_SUPPORTED - && do_background != ALPHA_MODE_OFFSET + PNG_ALPHA_BROKEN -#endif - )) - { - /* Then get the gamma corrected version of 'i' and compare to 'od', any - * error less than .5 is insignificant - just quantization of the output - * value to the nearest digital value (nevertheless the error is still - * recorded - it's interesting ;-) - */ - double encoded_sample = i; - double encoded_error; - - /* alpha less than 0 indicates the alpha channel, which is always linear - */ - if (alpha >= 0 && vi->gamma_correction > 0) - encoded_sample = pow(encoded_sample, vi->gamma_correction); - encoded_sample *= outmax; - - encoded_error = fabs(od-encoded_sample); - - if (encoded_error > vi->dp->maxerrout) - vi->dp->maxerrout = encoded_error; - - if (encoded_error < vi->maxout_total && encoded_error < vi->outlog) - return i; - } - - /* The slow route - attempt to do linear calculations. */ - /* There may be an error, or background processing is required, so calculate - * the actual sample values - unencoded light intensity values. Note that in - * practice these are not completely unencoded because they include a - * 'viewing correction' to decrease or (normally) increase the perceptual - * contrast of the image. There's nothing we can do about this - we don't - * know what it is - so assume the unencoded value is perceptually linear. - */ - { - double input_sample = i; /* In range 0..1 */ - double output, error, encoded_sample, encoded_error; - double es_lo, es_hi; - int compose = 0; /* Set to one if composition done */ - int output_is_encoded; /* Set if encoded to screen gamma */ - int log_max_error = 1; /* Check maximum error values */ - png_const_charp pass = 0; /* Reason test passes (or 0 for fail) */ - - /* Convert to linear light (with the above caveat.) The alpha channel is - * already linear. - */ - if (alpha >= 0) - { - int tcompose; - - if (vi->file_inverse > 0) - input_sample = pow(input_sample, vi->file_inverse); - - /* Handle the compose processing: */ - tcompose = 0; - input_sample = gamma_component_compose(do_background, input_sample, - alpha, background, &tcompose); - - if (tcompose) - compose = 1; - } - - /* And similarly for the output value, but we need to check the background - * handling to linearize it correctly. - */ - output = od; - output /= outmax; - - output_is_encoded = vi->screen_gamma > 0; - - if (alpha < 0) /* The alpha channel */ - { -#ifdef PNG_READ_ALPHA_MODE_SUPPORTED - if (do_background != ALPHA_MODE_OFFSET + PNG_ALPHA_BROKEN) -#endif - { - /* In all other cases the output alpha channel is linear already, - * don't log errors here, they are much larger in linear data. - */ - output_is_encoded = 0; - log_max_error = 0; - } - } - -#ifdef PNG_READ_ALPHA_MODE_SUPPORTED - else /* A component */ - { - if (do_background == ALPHA_MODE_OFFSET + PNG_ALPHA_OPTIMIZED && - alpha < 1) /* the optimized case - linear output */ - { - if (alpha > 0) log_max_error = 0; - output_is_encoded = 0; - } - } -#endif - - if (output_is_encoded) - output = pow(output, vi->screen_gamma); - - /* Calculate (or recalculate) the encoded_sample value and repeat the - * check above (unnecessary if we took the fast route, but harmless.) - */ - encoded_sample = input_sample; - if (output_is_encoded) - encoded_sample = pow(encoded_sample, vi->screen_inverse); - encoded_sample *= outmax; - - encoded_error = fabs(od-encoded_sample); - - /* Don't log errors in the alpha channel, or the 'optimized' case, - * neither are significant to the overall perception. - */ - if (log_max_error && encoded_error > vi->dp->maxerrout) - vi->dp->maxerrout = encoded_error; - - if (encoded_error < vi->maxout_total) - { - if (encoded_error < vi->outlog) - return i; - - /* Test passed but error is bigger than the log limit, record why the - * test passed: - */ - pass = "less than maxout:\n"; - } - - /* i: the original input value in the range 0..1 - * - * pngvalid calculations: - * input_sample: linear result; i linearized and composed, range 0..1 - * encoded_sample: encoded result; input_sample scaled to ouput bit depth - * - * libpng calculations: - * output: linear result; od scaled to 0..1 and linearized - * od: encoded result from libpng - */ - - /* Now we have the numbers for real errors, both absolute values as as a - * percentage of the correct value (output): - */ - error = fabs(input_sample-output); - - if (log_max_error && error > vi->dp->maxerrabs) - vi->dp->maxerrabs = error; - - /* The following is an attempt to ignore the tendency of quantization to - * dominate the percentage errors for lower result values: - */ - if (log_max_error && input_sample > .5) - { - double percentage_error = error/input_sample; - if (percentage_error > vi->dp->maxerrpc) - vi->dp->maxerrpc = percentage_error; - } - - /* Now calculate the digitization limits for 'encoded_sample' using the - * 'max' values. Note that maxout is in the encoded space but maxpc and - * maxabs are in linear light space. - * - * First find the maximum error in linear light space, range 0..1: - */ - { - double tmp = input_sample * vi->maxpc; - if (tmp < vi->maxabs) tmp = vi->maxabs; - /* If 'compose' is true the composition was done in linear space using - * integer arithmetic. This introduces an extra error of +/- 0.5 (at - * least) in the integer space used. 'maxcalc' records this, taking - * into account the possibility that even for 16 bit output 8 bit space - * may have been used. - */ - if (compose && tmp < vi->maxcalc) tmp = vi->maxcalc; - - /* The 'maxout' value refers to the encoded result, to compare with - * this encode input_sample adjusted by the maximum error (tmp) above. - */ - es_lo = encoded_sample - vi->maxout; - - if (es_lo > 0 && input_sample-tmp > 0) - { - double low_value = input_sample-tmp; - if (output_is_encoded) - low_value = pow(low_value, vi->screen_inverse); - low_value *= outmax; - if (low_value < es_lo) es_lo = low_value; - - /* Quantize this appropriately: */ - es_lo = ceil(es_lo / vi->outquant - .5) * vi->outquant; - } - - else - es_lo = 0; - - es_hi = encoded_sample + vi->maxout; - - if (es_hi < outmax && input_sample+tmp < 1) - { - double high_value = input_sample+tmp; - if (output_is_encoded) - high_value = pow(high_value, vi->screen_inverse); - high_value *= outmax; - if (high_value > es_hi) es_hi = high_value; - - es_hi = floor(es_hi / vi->outquant + .5) * vi->outquant; - } - - else - es_hi = outmax; - } - - /* The primary test is that the final encoded value returned by the - * library should be between the two limits (inclusive) that were - * calculated above. - */ - if (od >= es_lo && od <= es_hi) - { - /* The value passes, but we may need to log the information anyway. */ - if (encoded_error < vi->outlog) - return i; - - if (pass == 0) - pass = "within digitization limits:\n"; - } - - { - /* There has been an error in processing, or we need to log this - * value. - */ - double is_lo, is_hi; - - /* pass is set at this point if either of the tests above would have - * passed. Don't do these additional tests here - just log the - * original [es_lo..es_hi] values. - */ - if (pass == 0 && vi->use_input_precision) - { - /* Ok, something is wrong - this actually happens in current libpng - * 16-to-8 processing. Assume that the input value (id, adjusted - * for sbit) can be anywhere between value-.5 and value+.5 - quite a - * large range if sbit is low. - */ - double tmp = (isbit - .5)/sbit_max; - - if (tmp <= 0) - tmp = 0; - - else if (alpha >= 0 && vi->file_inverse > 0 && tmp < 1) - tmp = pow(tmp, vi->file_inverse); - - tmp = gamma_component_compose(do_background, tmp, alpha, background, - NULL); - - if (output_is_encoded && tmp > 0 && tmp < 1) - tmp = pow(tmp, vi->screen_inverse); - - is_lo = ceil(outmax * tmp - vi->maxout_total); - - if (is_lo < 0) - is_lo = 0; - - tmp = (isbit + .5)/sbit_max; - - if (tmp <= 0) - tmp = 0; - - else if (alpha >= 0 && vi->file_inverse > 0 && tmp < 1) - tmp = pow(tmp, vi->file_inverse); - - tmp = gamma_component_compose(do_background, tmp, alpha, background, - NULL); - - if (output_is_encoded && tmp > 0 && tmp < 1) - tmp = pow(tmp, vi->screen_inverse); - - is_hi = floor(outmax * tmp + vi->maxout_total); - - if (is_hi > outmax) - is_hi = outmax; - - if (!(od < is_lo || od > is_hi)) - { - if (encoded_error < vi->outlog) - return i; - - pass = "within input precision limits:\n"; - } - - /* One last chance. If this is an alpha channel and the 16to8 - * option has been used and 'inaccurate' scaling is used then the - * bit reduction is obtained by simply using the top 8 bits of the - * value. - * - * This is only done for older libpng versions when the 'inaccurate' - * (chop) method of scaling was used. - */ -# ifndef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED -# if PNG_LIBPNG_VER < 10504 - /* This may be required for other components in the future, - * but at present the presence of gamma correction effectively - * prevents the errors in the component scaling (I don't quite - * understand why, but since it's better this way I care not - * to ask, JB 20110419.) - */ - if (pass == 0 && alpha < 0 && vi->scale16 && vi->sbit > 8 && - vi->sbit + vi->isbit_shift == 16) - { - tmp = ((id >> 8) - .5)/255; - - if (tmp > 0) - { - is_lo = ceil(outmax * tmp - vi->maxout_total); - if (is_lo < 0) is_lo = 0; - } - - else - is_lo = 0; - - tmp = ((id >> 8) + .5)/255; - - if (tmp < 1) - { - is_hi = floor(outmax * tmp + vi->maxout_total); - if (is_hi > outmax) is_hi = outmax; - } - - else - is_hi = outmax; - - if (!(od < is_lo || od > is_hi)) - { - if (encoded_error < vi->outlog) - return i; - - pass = "within 8 bit limits:\n"; - } - } -# endif -# endif - } - else /* !use_input_precision */ - is_lo = es_lo, is_hi = es_hi; - - /* Attempt to output a meaningful error/warning message: the message - * output depends on the background/composite operation being performed - * because this changes what parameters were actually used above. - */ - { - size_t pos = 0; - /* Need either 1/255 or 1/65535 precision here; 3 or 6 decimal - * places. Just use outmax to work out which. - */ - int precision = (outmax >= 1000 ? 6 : 3); - int use_input=1, use_background=0, do_compose=0; - char msg[256]; - - if (pass != 0) - pos = safecat(msg, sizeof msg, pos, "\n\t"); - - /* Set up the various flags, the output_is_encoded flag above - * is also used below. do_compose is just a double check. - */ - switch (do_background) - { -# ifdef PNG_READ_BACKGROUND_SUPPORTED - case PNG_BACKGROUND_GAMMA_SCREEN: - case PNG_BACKGROUND_GAMMA_FILE: - case PNG_BACKGROUND_GAMMA_UNIQUE: - use_background = (alpha >= 0 && alpha < 1); - /*FALL THROUGH*/ -# endif -# ifdef PNG_READ_ALPHA_MODE_SUPPORTED - case ALPHA_MODE_OFFSET + PNG_ALPHA_STANDARD: - case ALPHA_MODE_OFFSET + PNG_ALPHA_BROKEN: - case ALPHA_MODE_OFFSET + PNG_ALPHA_OPTIMIZED: -# endif /* ALPHA_MODE_SUPPORTED */ - do_compose = (alpha > 0 && alpha < 1); - use_input = (alpha != 0); - break; - - default: - break; - } - - /* Check the 'compose' flag */ - if (compose != do_compose) - png_error(vi->pp, "internal error (compose)"); - - /* 'name' is the component name */ - pos = safecat(msg, sizeof msg, pos, name); - pos = safecat(msg, sizeof msg, pos, "("); - pos = safecatn(msg, sizeof msg, pos, id); - if (use_input || pass != 0/*logging*/) - { - if (isbit != id) - { - /* sBIT has reduced the precision of the input: */ - pos = safecat(msg, sizeof msg, pos, ", sbit("); - pos = safecatn(msg, sizeof msg, pos, vi->sbit); - pos = safecat(msg, sizeof msg, pos, "): "); - pos = safecatn(msg, sizeof msg, pos, isbit); - } - pos = safecat(msg, sizeof msg, pos, "/"); - /* The output is either "id/max" or "id sbit(sbit): isbit/max" */ - pos = safecatn(msg, sizeof msg, pos, vi->sbit_max); - } - pos = safecat(msg, sizeof msg, pos, ")"); - - /* A component may have been multiplied (in linear space) by the - * alpha value, 'compose' says whether this is relevant. - */ - if (compose || pass != 0) - { - /* If any form of composition is being done report our - * calculated linear value here (the code above doesn't record - * the input value before composition is performed, so what - * gets reported is the value after composition.) - */ - if (use_input || pass != 0) - { - if (vi->file_inverse > 0) - { - pos = safecat(msg, sizeof msg, pos, "^"); - pos = safecatd(msg, sizeof msg, pos, vi->file_inverse, 2); - } - - else - pos = safecat(msg, sizeof msg, pos, "[linear]"); - - pos = safecat(msg, sizeof msg, pos, "*(alpha)"); - pos = safecatd(msg, sizeof msg, pos, alpha, precision); - } - - /* Now record the *linear* background value if it was used - * (this function is not passed the original, non-linear, - * value but it is contained in the test name.) - */ - if (use_background) - { - pos = safecat(msg, sizeof msg, pos, use_input ? "+" : " "); - pos = safecat(msg, sizeof msg, pos, "(background)"); - pos = safecatd(msg, sizeof msg, pos, background, precision); - pos = safecat(msg, sizeof msg, pos, "*"); - pos = safecatd(msg, sizeof msg, pos, 1-alpha, precision); - } - } - - /* Report the calculated value (input_sample) and the linearized - * libpng value (output) unless this is just a component gamma - * correction. - */ - if (compose || alpha < 0 || pass != 0) - { - pos = safecat(msg, sizeof msg, pos, - pass != 0 ? " =\n\t" : " = "); - pos = safecatd(msg, sizeof msg, pos, input_sample, precision); - pos = safecat(msg, sizeof msg, pos, " (libpng: "); - pos = safecatd(msg, sizeof msg, pos, output, precision); - pos = safecat(msg, sizeof msg, pos, ")"); - - /* Finally report the output gamma encoding, if any. */ - if (output_is_encoded) - { - pos = safecat(msg, sizeof msg, pos, " ^"); - pos = safecatd(msg, sizeof msg, pos, vi->screen_inverse, 2); - pos = safecat(msg, sizeof msg, pos, "(to screen) ="); - } - - else - pos = safecat(msg, sizeof msg, pos, " [screen is linear] ="); - } - - if ((!compose && alpha >= 0) || pass != 0) - { - if (pass != 0) /* logging */ - pos = safecat(msg, sizeof msg, pos, "\n\t[overall:"); - - /* This is the non-composition case, the internal linear - * values are irrelevant (though the log below will reveal - * them.) Output a much shorter warning/error message and report - * the overall gamma correction. - */ - if (vi->gamma_correction > 0) - { - pos = safecat(msg, sizeof msg, pos, " ^"); - pos = safecatd(msg, sizeof msg, pos, vi->gamma_correction, 2); - pos = safecat(msg, sizeof msg, pos, "(gamma correction) ="); - } - - else - pos = safecat(msg, sizeof msg, pos, - " [no gamma correction] ="); - - if (pass != 0) - pos = safecat(msg, sizeof msg, pos, "]"); - } - - /* This is our calculated encoded_sample which should (but does - * not) match od: - */ - pos = safecat(msg, sizeof msg, pos, pass != 0 ? "\n\t" : " "); - pos = safecatd(msg, sizeof msg, pos, is_lo, 1); - pos = safecat(msg, sizeof msg, pos, " < "); - pos = safecatd(msg, sizeof msg, pos, encoded_sample, 1); - pos = safecat(msg, sizeof msg, pos, " (libpng: "); - pos = safecatn(msg, sizeof msg, pos, od); - pos = safecat(msg, sizeof msg, pos, ")"); - pos = safecat(msg, sizeof msg, pos, "/"); - pos = safecatn(msg, sizeof msg, pos, outmax); - pos = safecat(msg, sizeof msg, pos, " < "); - pos = safecatd(msg, sizeof msg, pos, is_hi, 1); - - if (pass == 0) /* The error condition */ - { -# ifdef PNG_WARNINGS_SUPPORTED - png_warning(vi->pp, msg); -# else - store_warning(vi->pp, msg); -# endif - } - - else /* logging this value */ - store_verbose(&vi->dp->pm->this, vi->pp, pass, msg); - } - } - } - - return i; -} - -static void -gamma_image_validate(gamma_display *dp, png_const_structp pp, - png_infop pi) -{ - /* Get some constants derived from the input and output file formats: */ - PNG_CONST png_store* PNG_CONST ps = dp->this.ps; - PNG_CONST png_byte in_ct = dp->this.colour_type; - PNG_CONST png_byte in_bd = dp->this.bit_depth; - PNG_CONST png_uint_32 w = dp->this.w; - PNG_CONST png_uint_32 h = dp->this.h; - PNG_CONST size_t cbRow = dp->this.cbRow; - PNG_CONST png_byte out_ct = png_get_color_type(pp, pi); - PNG_CONST png_byte out_bd = png_get_bit_depth(pp, pi); - - /* There are three sources of error, firstly the quantization in the - * file encoding, determined by sbit and/or the file depth, secondly - * the output (screen) gamma and thirdly the output file encoding. - * - * Since this API receives the screen and file gamma in double - * precision it is possible to calculate an exact answer given an input - * pixel value. Therefore we assume that the *input* value is exact - - * sample/maxsample - calculate the corresponding gamma corrected - * output to the limits of double precision arithmetic and compare with - * what libpng returns. - * - * Since the library must quantize the output to 8 or 16 bits there is - * a fundamental limit on the accuracy of the output of +/-.5 - this - * quantization limit is included in addition to the other limits - * specified by the paramaters to the API. (Effectively, add .5 - * everywhere.) - * - * The behavior of the 'sbit' paramter is defined by section 12.5 - * (sample depth scaling) of the PNG spec. That section forces the - * decoder to assume that the PNG values have been scaled if sBIT is - * present: - * - * png-sample = floor( input-sample * (max-out/max-in) + .5); - * - * This means that only a subset of the possible PNG values should - * appear in the input. However, the spec allows the encoder to use a - * variety of approximations to the above and doesn't require any - * restriction of the values produced. - * - * Nevertheless the spec requires that the upper 'sBIT' bits of the - * value stored in a PNG file be the original sample bits. - * Consequently the code below simply scales the top sbit bits by - * (1<this.palette; - PNG_CONST int in_is_transparent = dp->this.is_transparent; - int out_npalette = -1; - int out_is_transparent = 0; /* Just refers to the palette case */ - store_palette out_palette; - validate_info vi; - - /* Check for row overwrite errors */ - store_image_check(dp->this.ps, pp, 0); - - /* Supply the input and output sample depths here - 8 for an indexed image, - * otherwise the bit depth. - */ - init_validate_info(&vi, dp, pp, in_ct==3?8:in_bd, out_ct==3?8:out_bd); - - processing = (vi.gamma_correction > 0 && !dp->threshold_test) - || in_bd != out_bd || in_ct != out_ct || vi.do_background; - - /* TODO: FIX THIS: MAJOR BUG! If the transformations all happen inside - * the palette there is no way of finding out, because libpng fails to - * update the palette on png_read_update_info. Indeed, libpng doesn't - * even do the required work until much later, when it doesn't have any - * info pointer. Oops. For the moment 'processing' is turned off if - * out_ct is palette. - */ - if (in_ct == 3 && out_ct == 3) - processing = 0; - - if (processing && out_ct == 3) - out_is_transparent = read_palette(out_palette, &out_npalette, pp, pi); - - for (y=0; ythis.palette[in_index].alpha : - sample(std, in_ct, in_bd, x, samples_per_pixel); - - unsigned int output_alpha = 65536 /* as a flag value */; - - if (out_ct == 3) - { - if (out_is_transparent) - output_alpha = out_palette[out_index].alpha; - } - - else if ((out_ct & PNG_COLOR_MASK_ALPHA) != 0) - output_alpha = sample(pRow, out_ct, out_bd, x, - samples_per_pixel); - - if (output_alpha != 65536) - alpha = gamma_component_validate("alpha", &vi, input_alpha, - output_alpha, -1/*alpha*/, 0/*background*/); - - else /* no alpha in output */ - { - /* This is a copy of the calculation of 'i' above in order to - * have the alpha value to use in the background calculation. - */ - alpha = input_alpha >> vi.isbit_shift; - alpha /= vi.sbit_max; - } - } - - /* Handle grayscale or RGB components. */ - if ((in_ct & PNG_COLOR_MASK_COLOR) == 0) /* grayscale */ - (void)gamma_component_validate("gray", &vi, - sample(std, in_ct, in_bd, x, 0), - sample(pRow, out_ct, out_bd, x, 0), alpha/*component*/, - vi.background_red); - else /* RGB or palette */ - { - (void)gamma_component_validate("red", &vi, - in_ct == 3 ? in_palette[in_index].red : - sample(std, in_ct, in_bd, x, 0), - out_ct == 3 ? out_palette[out_index].red : - sample(pRow, out_ct, out_bd, x, 0), - alpha/*component*/, vi.background_red); - - (void)gamma_component_validate("green", &vi, - in_ct == 3 ? in_palette[in_index].green : - sample(std, in_ct, in_bd, x, 1), - out_ct == 3 ? out_palette[out_index].green : - sample(pRow, out_ct, out_bd, x, 1), - alpha/*component*/, vi.background_green); - - (void)gamma_component_validate("blue", &vi, - in_ct == 3 ? in_palette[in_index].blue : - sample(std, in_ct, in_bd, x, 2), - out_ct == 3 ? out_palette[out_index].blue : - sample(pRow, out_ct, out_bd, x, 2), - alpha/*component*/, vi.background_blue); - } - } - } - - else if (memcmp(std, pRow, cbRow) != 0) - { - char msg[64]; - - /* No transform is expected on the threshold tests. */ - sprintf(msg, "gamma: below threshold row %lu changed", - (unsigned long)y); - - png_error(pp, msg); - } - } /* row (y) loop */ - - dp->this.ps->validated = 1; -} - -static void -gamma_end(png_structp ppIn, png_infop pi) -{ - png_const_structp pp = ppIn; - gamma_display *dp = voidcast(gamma_display*, png_get_progressive_ptr(pp)); - - if (!dp->this.speed) - gamma_image_validate(dp, pp, pi); - else - dp->this.ps->validated = 1; -} - -/* A single test run checking a gamma transformation. - * - * maxabs: maximum absolute error as a fraction - * maxout: maximum output error in the output units - * maxpc: maximum percentage error (as a percentage) - */ -static void -gamma_test(png_modifier *pmIn, PNG_CONST png_byte colour_typeIn, - PNG_CONST png_byte bit_depthIn, PNG_CONST int palette_numberIn, - PNG_CONST int interlace_typeIn, - PNG_CONST double file_gammaIn, PNG_CONST double screen_gammaIn, - PNG_CONST png_byte sbitIn, PNG_CONST int threshold_testIn, - PNG_CONST char *name, - PNG_CONST int use_input_precisionIn, PNG_CONST int scale16In, - PNG_CONST int expand16In, PNG_CONST int do_backgroundIn, - PNG_CONST png_color_16 *bkgd_colorIn, double bkgd_gammaIn) -{ - gamma_display d; - context(&pmIn->this, fault); - - gamma_display_init(&d, pmIn, FILEID(colour_typeIn, bit_depthIn, - palette_numberIn, interlace_typeIn, 0, 0, 0), - file_gammaIn, screen_gammaIn, sbitIn, - threshold_testIn, use_input_precisionIn, scale16In, - expand16In, do_backgroundIn, bkgd_colorIn, bkgd_gammaIn); - - Try - { - png_structp pp; - png_infop pi; - gama_modification gama_mod; - srgb_modification srgb_mod; - sbit_modification sbit_mod; - - /* For the moment don't use the png_modifier support here. */ - d.pm->encoding_counter = 0; - modifier_set_encoding(d.pm); /* Just resets everything */ - d.pm->current_gamma = d.file_gamma; - - /* Make an appropriate modifier to set the PNG file gamma to the - * given gamma value and the sBIT chunk to the given precision. - */ - d.pm->modifications = NULL; - gama_modification_init(&gama_mod, d.pm, d.file_gamma); - srgb_modification_init(&srgb_mod, d.pm, 127 /*delete*/); - if (d.sbit > 0) - sbit_modification_init(&sbit_mod, d.pm, d.sbit); - - modification_reset(d.pm->modifications); - - /* Get a png_struct for writing the image. */ - pp = set_modifier_for_read(d.pm, &pi, d.this.id, name); - standard_palette_init(&d.this); - - /* Introduce the correct read function. */ - if (d.pm->this.progressive) - { - /* Share the row function with the standard implementation. */ - png_set_progressive_read_fn(pp, &d, gamma_info, progressive_row, - gamma_end); - - /* Now feed data into the reader until we reach the end: */ - modifier_progressive_read(d.pm, pp, pi); - } - else - { - /* modifier_read expects a png_modifier* */ - png_set_read_fn(pp, d.pm, modifier_read); - - /* Check the header values: */ - png_read_info(pp, pi); - - /* Process the 'info' requirements. Only one image is generated */ - gamma_info_imp(&d, pp, pi); - - sequential_row(&d.this, pp, pi, -1, 0); - - if (!d.this.speed) - gamma_image_validate(&d, pp, pi); - else - d.this.ps->validated = 1; - } - - modifier_reset(d.pm); - - if (d.pm->log && !d.threshold_test && !d.this.speed) - fprintf(stderr, "%d bit %s %s: max error %f (%.2g, %2g%%)\n", - d.this.bit_depth, colour_types[d.this.colour_type], name, - d.maxerrout, d.maxerrabs, 100*d.maxerrpc); - - /* Log the summary values too. */ - if (d.this.colour_type == 0 || d.this.colour_type == 4) - { - switch (d.this.bit_depth) - { - case 1: - break; - - case 2: - if (d.maxerrout > d.pm->error_gray_2) - d.pm->error_gray_2 = d.maxerrout; - - break; - - case 4: - if (d.maxerrout > d.pm->error_gray_4) - d.pm->error_gray_4 = d.maxerrout; - - break; - - case 8: - if (d.maxerrout > d.pm->error_gray_8) - d.pm->error_gray_8 = d.maxerrout; - - break; - - case 16: - if (d.maxerrout > d.pm->error_gray_16) - d.pm->error_gray_16 = d.maxerrout; - - break; - - default: - png_error(pp, "bad bit depth (internal: 1)"); - } - } - - else if (d.this.colour_type == 2 || d.this.colour_type == 6) - { - switch (d.this.bit_depth) - { - case 8: - - if (d.maxerrout > d.pm->error_color_8) - d.pm->error_color_8 = d.maxerrout; - - break; - - case 16: - - if (d.maxerrout > d.pm->error_color_16) - d.pm->error_color_16 = d.maxerrout; - - break; - - default: - png_error(pp, "bad bit depth (internal: 2)"); - } - } - - else if (d.this.colour_type == 3) - { - if (d.maxerrout > d.pm->error_indexed) - d.pm->error_indexed = d.maxerrout; - } - } - - Catch(fault) - modifier_reset(voidcast(png_modifier*,(void*)fault)); -} - -static void gamma_threshold_test(png_modifier *pm, png_byte colour_type, - png_byte bit_depth, int interlace_type, double file_gamma, - double screen_gamma) -{ - size_t pos = 0; - char name[64]; - pos = safecat(name, sizeof name, pos, "threshold "); - pos = safecatd(name, sizeof name, pos, file_gamma, 3); - pos = safecat(name, sizeof name, pos, "/"); - pos = safecatd(name, sizeof name, pos, screen_gamma, 3); - - (void)gamma_test(pm, colour_type, bit_depth, 0/*palette*/, interlace_type, - file_gamma, screen_gamma, 0/*sBIT*/, 1/*threshold test*/, name, - 0 /*no input precision*/, - 0 /*no scale16*/, 0 /*no expand16*/, 0 /*no background*/, 0 /*hence*/, - 0 /*no background gamma*/); -} - -static void -perform_gamma_threshold_tests(png_modifier *pm) -{ - png_byte colour_type = 0; - png_byte bit_depth = 0; - unsigned int palette_number = 0; - - /* Don't test more than one instance of each palette - it's pointless, in - * fact this test is somewhat excessive since libpng doesn't make this - * decision based on colour type or bit depth! - */ - while (next_format(&colour_type, &bit_depth, &palette_number)) - if (palette_number == 0) - { - double test_gamma = 1.0; - while (test_gamma >= .4) - { - /* There's little point testing the interlacing vs non-interlacing, - * but this can be set from the command line. - */ - gamma_threshold_test(pm, colour_type, bit_depth, pm->interlace_type, - test_gamma, 1/test_gamma); - test_gamma *= .95; - } - - /* And a special test for sRGB */ - gamma_threshold_test(pm, colour_type, bit_depth, pm->interlace_type, - .45455, 2.2); - - if (fail(pm)) - return; - } -} - -static void gamma_transform_test(png_modifier *pm, - PNG_CONST png_byte colour_type, PNG_CONST png_byte bit_depth, - PNG_CONST int palette_number, - PNG_CONST int interlace_type, PNG_CONST double file_gamma, - PNG_CONST double screen_gamma, PNG_CONST png_byte sbit, - PNG_CONST int use_input_precision, PNG_CONST int scale16) -{ - size_t pos = 0; - char name[64]; - - if (sbit != bit_depth && sbit != 0) - { - pos = safecat(name, sizeof name, pos, "sbit("); - pos = safecatn(name, sizeof name, pos, sbit); - pos = safecat(name, sizeof name, pos, ") "); - } - - else - pos = safecat(name, sizeof name, pos, "gamma "); - - if (scale16) - pos = safecat(name, sizeof name, pos, "16to8 "); - - pos = safecatd(name, sizeof name, pos, file_gamma, 3); - pos = safecat(name, sizeof name, pos, "->"); - pos = safecatd(name, sizeof name, pos, screen_gamma, 3); - - gamma_test(pm, colour_type, bit_depth, palette_number, interlace_type, - file_gamma, screen_gamma, sbit, 0, name, use_input_precision, - scale16, pm->test_gamma_expand16, 0 , 0, 0); -} - -static void perform_gamma_transform_tests(png_modifier *pm) -{ - png_byte colour_type = 0; - png_byte bit_depth = 0; - unsigned int palette_number = 0; - - while (next_format(&colour_type, &bit_depth, &palette_number)) - { - unsigned int i, j; - - for (i=0; ingamma_tests; ++i) for (j=0; jngamma_tests; ++j) - if (i != j) - { - gamma_transform_test(pm, colour_type, bit_depth, palette_number, - pm->interlace_type, 1/pm->gammas[i], pm->gammas[j], 0/*sBIT*/, - pm->use_input_precision, 0 /*do not scale16*/); - - if (fail(pm)) - return; - } - } -} - -static void perform_gamma_sbit_tests(png_modifier *pm) -{ - png_byte sbit; - - /* The only interesting cases are colour and grayscale, alpha is ignored here - * for overall speed. Only bit depths where sbit is less than the bit depth - * are tested. - */ - for (sbit=pm->sbitlow; sbit<(1<ngamma_tests; ++i) - { - unsigned int j; - - for (j=0; jngamma_tests; ++j) if (i != j) - { - gamma_transform_test(pm, colour_type, bit_depth, npalette, - pm->interlace_type, 1/pm->gammas[i], pm->gammas[j], - sbit, pm->use_input_precision_sbit, 0 /*scale16*/); - - if (fail(pm)) - return; - } - } - } - } -} - -/* Note that this requires a 16 bit source image but produces 8 bit output, so - * we only need the 16bit write support, but the 16 bit images are only - * generated if DO_16BIT is defined. - */ -#ifdef DO_16BIT -static void perform_gamma_scale16_tests(png_modifier *pm) -{ -# ifndef PNG_MAX_GAMMA_8 -# define PNG_MAX_GAMMA_8 11 -# endif - /* Include the alpha cases here. Note that sbit matches the internal value - * used by the library - otherwise we will get spurious errors from the - * internal sbit style approximation. - * - * The threshold test is here because otherwise the 16 to 8 conversion will - * proceed *without* gamma correction, and the tests above will fail (but not - * by much) - this could be fixed, it only appears with the -g option. - */ - unsigned int i, j; - for (i=0; ingamma_tests; ++i) - { - for (j=0; jngamma_tests; ++j) - { - if (i != j && - fabs(pm->gammas[j]/pm->gammas[i]-1) >= PNG_GAMMA_THRESHOLD) - { - gamma_transform_test(pm, 0, 16, 0, pm->interlace_type, - 1/pm->gammas[i], pm->gammas[j], PNG_MAX_GAMMA_8, - pm->use_input_precision_16to8, 1 /*scale16*/); - - if (fail(pm)) - return; - - gamma_transform_test(pm, 2, 16, 0, pm->interlace_type, - 1/pm->gammas[i], pm->gammas[j], PNG_MAX_GAMMA_8, - pm->use_input_precision_16to8, 1 /*scale16*/); - - if (fail(pm)) - return; - - gamma_transform_test(pm, 4, 16, 0, pm->interlace_type, - 1/pm->gammas[i], pm->gammas[j], PNG_MAX_GAMMA_8, - pm->use_input_precision_16to8, 1 /*scale16*/); - - if (fail(pm)) - return; - - gamma_transform_test(pm, 6, 16, 0, pm->interlace_type, - 1/pm->gammas[i], pm->gammas[j], PNG_MAX_GAMMA_8, - pm->use_input_precision_16to8, 1 /*scale16*/); - - if (fail(pm)) - return; - } - } - } -} -#endif /* 16 to 8 bit conversion */ - -#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\ - defined(PNG_READ_ALPHA_MODE_SUPPORTED) -static void gamma_composition_test(png_modifier *pm, - PNG_CONST png_byte colour_type, PNG_CONST png_byte bit_depth, - PNG_CONST int palette_number, - PNG_CONST int interlace_type, PNG_CONST double file_gamma, - PNG_CONST double screen_gamma, - PNG_CONST int use_input_precision, PNG_CONST int do_background, - PNG_CONST int expand_16) -{ - size_t pos = 0; - png_const_charp base; - double bg; - char name[128]; - png_color_16 background; - - /* Make up a name and get an appropriate background gamma value. */ - switch (do_background) - { - default: - base = ""; - bg = 4; /* should not be used */ - break; - case PNG_BACKGROUND_GAMMA_SCREEN: - base = " bckg(Screen):"; - bg = 1/screen_gamma; - break; - case PNG_BACKGROUND_GAMMA_FILE: - base = " bckg(File):"; - bg = file_gamma; - break; - case PNG_BACKGROUND_GAMMA_UNIQUE: - base = " bckg(Unique):"; - /* This tests the handling of a unique value, the math is such that the - * value tends to be <1, but is neither screen nor file (even if they - * match!) - */ - bg = (file_gamma + screen_gamma) / 3; - break; -#ifdef PNG_READ_ALPHA_MODE_SUPPORTED - case ALPHA_MODE_OFFSET + PNG_ALPHA_PNG: - base = " alpha(PNG)"; - bg = 4; /* should not be used */ - break; - case ALPHA_MODE_OFFSET + PNG_ALPHA_STANDARD: - base = " alpha(Porter-Duff)"; - bg = 4; /* should not be used */ - break; - case ALPHA_MODE_OFFSET + PNG_ALPHA_OPTIMIZED: - base = " alpha(Optimized)"; - bg = 4; /* should not be used */ - break; - case ALPHA_MODE_OFFSET + PNG_ALPHA_BROKEN: - base = " alpha(Broken)"; - bg = 4; /* should not be used */ - break; -#endif - } - - /* Use random background values - the background is always presented in the - * output space (8 or 16 bit components). - */ - if (expand_16 || bit_depth == 16) - { - png_uint_32 r = random_32(); - - background.red = (png_uint_16)r; - background.green = (png_uint_16)(r >> 16); - r = random_32(); - background.blue = (png_uint_16)r; - background.gray = (png_uint_16)(r >> 16); - } - - else /* 8 bit colors */ - { - png_uint_32 r = random_32(); - - background.red = (png_byte)r; - background.green = (png_byte)(r >> 8); - background.blue = (png_byte)(r >> 16); - background.gray = (png_byte)(r >> 24); - } - - background.index = 193; /* rgb(193,193,193) to detect errors */ - if (!(colour_type & PNG_COLOR_MASK_COLOR)) - { - /* Grayscale input, we do not convert to RGB (TBD), so we must set the - * background to gray - else libpng seems to fail. - */ - background.red = background.green = background.blue = background.gray; - } - - pos = safecat(name, sizeof name, pos, "gamma "); - pos = safecatd(name, sizeof name, pos, file_gamma, 3); - pos = safecat(name, sizeof name, pos, "->"); - pos = safecatd(name, sizeof name, pos, screen_gamma, 3); - - pos = safecat(name, sizeof name, pos, base); - if (do_background < ALPHA_MODE_OFFSET) - { - /* Include the background color and gamma in the name: */ - pos = safecat(name, sizeof name, pos, "("); - /* This assumes no expand gray->rgb - the current code won't handle that! - */ - if (colour_type & PNG_COLOR_MASK_COLOR) - { - pos = safecatn(name, sizeof name, pos, background.red); - pos = safecat(name, sizeof name, pos, ","); - pos = safecatn(name, sizeof name, pos, background.green); - pos = safecat(name, sizeof name, pos, ","); - pos = safecatn(name, sizeof name, pos, background.blue); - } - else - pos = safecatn(name, sizeof name, pos, background.gray); - pos = safecat(name, sizeof name, pos, ")^"); - pos = safecatd(name, sizeof name, pos, bg, 3); - } - - gamma_test(pm, colour_type, bit_depth, palette_number, interlace_type, - file_gamma, screen_gamma, 0/*sBIT*/, 0, name, use_input_precision, - 0/*strip 16*/, expand_16, do_background, &background, bg); -} - - -static void -perform_gamma_composition_tests(png_modifier *pm, int do_background, - int expand_16) -{ - png_byte colour_type = 0; - png_byte bit_depth = 0; - unsigned int palette_number = 0; - - /* Skip the non-alpha cases - there is no setting of a transparency colour at - * present. - */ - while (next_format(&colour_type, &bit_depth, &palette_number)) - if ((colour_type & PNG_COLOR_MASK_ALPHA) != 0) - { - unsigned int i, j; - - /* Don't skip the i==j case here - it's relevant. */ - for (i=0; ingamma_tests; ++i) for (j=0; jngamma_tests; ++j) - { - gamma_composition_test(pm, colour_type, bit_depth, palette_number, - pm->interlace_type, 1/pm->gammas[i], pm->gammas[j], - pm->use_input_precision, do_background, expand_16); - - if (fail(pm)) - return; - } - } -} -#endif /* READ_BACKGROUND || READ_ALPHA_MODE */ - -static void -init_gamma_errors(png_modifier *pm) -{ - pm->error_gray_2 = pm->error_gray_4 = pm->error_gray_8 = 0; - pm->error_color_8 = 0; - pm->error_indexed = 0; - pm->error_gray_16 = pm->error_color_16 = 0; -} - -static void -summarize_gamma_errors(png_modifier *pm, png_const_charp who, int low_bit_depth) -{ - if (who) - printf("Gamma correction with %s:\n", who); - - if (low_bit_depth) - { - printf(" 2 bit gray: %.5f\n", pm->error_gray_2); - printf(" 4 bit gray: %.5f\n", pm->error_gray_4); - printf(" 8 bit gray: %.5f\n", pm->error_gray_8); - printf(" 8 bit color: %.5f\n", pm->error_color_8); - printf(" indexed: %.5f\n", pm->error_indexed); - } - -#ifdef DO_16BIT - printf(" 16 bit gray: %.5f\n", pm->error_gray_16); - printf(" 16 bit color: %.5f\n", pm->error_color_16); -#endif -} - -static void -perform_gamma_test(png_modifier *pm, int summary) -{ - /*TODO: remove this*/ - /* Save certain values for the temporary overrides below. */ - unsigned int calculations_use_input_precision = - pm->calculations_use_input_precision; -# ifdef PNG_READ_BACKGROUND_SUPPORTED - double maxout8 = pm->maxout8; -# endif - - /* First some arbitrary no-transform tests: */ - if (!pm->this.speed && pm->test_gamma_threshold) - { - perform_gamma_threshold_tests(pm); - - if (fail(pm)) - return; - } - - /* Now some real transforms. */ - if (pm->test_gamma_transform) - { - init_gamma_errors(pm); - /*TODO: remove this. Necessary because the current libpng - * implementation works in 8 bits: - */ - if (pm->test_gamma_expand16) - pm->calculations_use_input_precision = 1; - perform_gamma_transform_tests(pm); - if (!calculations_use_input_precision) - pm->calculations_use_input_precision = 0; - - if (summary) - { - printf("Gamma correction error summary\n\n"); - printf("The printed value is the maximum error in the pixel values\n"); - printf("calculated by the libpng gamma correction code. The error\n"); - printf("is calculated as the difference between the output pixel\n"); - printf("value (always an integer) and the ideal value from the\n"); - printf("libpng specification (typically not an integer).\n\n"); - - printf("Expect this value to be less than .5 for 8 bit formats,\n"); - printf("less than 1 for formats with fewer than 8 bits and a small\n"); - printf("number (typically less than 5) for the 16 bit formats.\n"); - printf("For performance reasons the value for 16 bit formats\n"); - printf("increases when the image file includes an sBIT chunk.\n\n"); - - summarize_gamma_errors(pm, 0/*who*/, 1); - } - } - - /* The sbit tests produce much larger errors: */ - if (pm->test_gamma_sbit) - { - init_gamma_errors(pm); - perform_gamma_sbit_tests(pm); - - if (summary) - summarize_gamma_errors(pm, "sBIT", pm->sbitlow < 8U); - } - -#ifdef DO_16BIT /* Should be READ_16BIT_SUPPORTED */ - if (pm->test_gamma_scale16) - { - /* The 16 to 8 bit strip operations: */ - init_gamma_errors(pm); - perform_gamma_scale16_tests(pm); - - if (summary) - { - printf("Gamma correction with 16 to 8 bit reduction:\n"); - printf(" 16 bit gray: %.5f\n", pm->error_gray_16); - printf(" 16 bit color: %.5f\n", pm->error_color_16); - } - } -#endif - -#ifdef PNG_READ_BACKGROUND_SUPPORTED - if (pm->test_gamma_background) - { - init_gamma_errors(pm); - - /*TODO: remove this. Necessary because the current libpng - * implementation works in 8 bits: - */ - if (pm->test_gamma_expand16) - { - pm->calculations_use_input_precision = 1; - pm->maxout8 = .499; /* because the 16 bit background is smashed */ - } - perform_gamma_composition_tests(pm, PNG_BACKGROUND_GAMMA_UNIQUE, - pm->test_gamma_expand16); - if (!calculations_use_input_precision) - pm->calculations_use_input_precision = 0; - pm->maxout8 = maxout8; - - if (summary) - summarize_gamma_errors(pm, "background", 1); - } -#endif - -#ifdef PNG_READ_ALPHA_MODE_SUPPORTED - if (pm->test_gamma_alpha_mode) - { - int do_background; - - init_gamma_errors(pm); - - /*TODO: remove this. Necessary because the current libpng - * implementation works in 8 bits: - */ - if (pm->test_gamma_expand16) - pm->calculations_use_input_precision = 1; - for (do_background = ALPHA_MODE_OFFSET + PNG_ALPHA_STANDARD; - do_background <= ALPHA_MODE_OFFSET + PNG_ALPHA_BROKEN && !fail(pm); - ++do_background) - perform_gamma_composition_tests(pm, do_background, - pm->test_gamma_expand16); - if (!calculations_use_input_precision) - pm->calculations_use_input_precision = 0; - - if (summary) - summarize_gamma_errors(pm, "alpha mode", 1); - } -#endif -} -#endif /* PNG_READ_GAMMA_SUPPORTED */ -#endif /* PNG_READ_SUPPORTED */ - -/* INTERLACE MACRO VALIDATION */ -/* This is copied verbatim from the specification, it is simply the pass - * number in which each pixel in each 8x8 tile appears. The array must - * be indexed adam7[y][x] and notice that the pass numbers are based at - * 1, not 0 - the base libpng uses. - */ -static PNG_CONST -png_byte adam7[8][8] = -{ - { 1,6,4,6,2,6,4,6 }, - { 7,7,7,7,7,7,7,7 }, - { 5,6,5,6,5,6,5,6 }, - { 7,7,7,7,7,7,7,7 }, - { 3,6,4,6,3,6,4,6 }, - { 7,7,7,7,7,7,7,7 }, - { 5,6,5,6,5,6,5,6 }, - { 7,7,7,7,7,7,7,7 } -}; - -/* This routine validates all the interlace support macros in png.h for - * a variety of valid PNG widths and heights. It uses a number of similarly - * named internal routines that feed off the above array. - */ -static png_uint_32 -png_pass_start_row(int pass) -{ - int x, y; - ++pass; - for (y=0; y<8; ++y) for (x=0; x<8; ++x) if (adam7[y][x] == pass) - return y; - return 0xf; -} - -static png_uint_32 -png_pass_start_col(int pass) -{ - int x, y; - ++pass; - for (x=0; x<8; ++x) for (y=0; y<8; ++y) if (adam7[y][x] == pass) - return x; - return 0xf; -} - -static int -png_pass_row_shift(int pass) -{ - int x, y, base=(-1), inc=8; - ++pass; - for (y=0; y<8; ++y) for (x=0; x<8; ++x) if (adam7[y][x] == pass) - { - if (base == (-1)) - base = y; - else if (base == y) - {} - else if (inc == y-base) - base=y; - else if (inc == 8) - inc = y-base, base=y; - else if (inc != y-base) - return 0xff; /* error - more than one 'inc' value! */ - } - - if (base == (-1)) return 0xfe; /* error - no row in pass! */ - - /* The shift is always 1, 2 or 3 - no pass has all the rows! */ - switch (inc) - { -case 2: return 1; -case 4: return 2; -case 8: return 3; -default: break; - } - - /* error - unrecognized 'inc' */ - return (inc << 8) + 0xfd; -} - -static int -png_pass_col_shift(int pass) -{ - int x, y, base=(-1), inc=8; - ++pass; - for (x=0; x<8; ++x) for (y=0; y<8; ++y) if (adam7[y][x] == pass) - { - if (base == (-1)) - base = x; - else if (base == x) - {} - else if (inc == x-base) - base=x; - else if (inc == 8) - inc = x-base, base=x; - else if (inc != x-base) - return 0xff; /* error - more than one 'inc' value! */ - } - - if (base == (-1)) return 0xfe; /* error - no row in pass! */ - - /* The shift is always 1, 2 or 3 - no pass has all the rows! */ - switch (inc) - { -case 1: return 0; /* pass 7 has all the columns */ -case 2: return 1; -case 4: return 2; -case 8: return 3; -default: break; - } - - /* error - unrecognized 'inc' */ - return (inc << 8) + 0xfd; -} - -static png_uint_32 -png_row_from_pass_row(png_uint_32 yIn, int pass) -{ - /* By examination of the array: */ - switch (pass) - { -case 0: return yIn * 8; -case 1: return yIn * 8; -case 2: return yIn * 8 + 4; -case 3: return yIn * 4; -case 4: return yIn * 4 + 2; -case 5: return yIn * 2; -case 6: return yIn * 2 + 1; -default: break; - } - - return 0xff; /* bad pass number */ -} - -static png_uint_32 -png_col_from_pass_col(png_uint_32 xIn, int pass) -{ - /* By examination of the array: */ - switch (pass) - { -case 0: return xIn * 8; -case 1: return xIn * 8 + 4; -case 2: return xIn * 4; -case 3: return xIn * 4 + 2; -case 4: return xIn * 2; -case 5: return xIn * 2 + 1; -case 6: return xIn; -default: break; - } - - return 0xff; /* bad pass number */ -} - -static int -png_row_in_interlace_pass(png_uint_32 y, int pass) -{ - /* Is row 'y' in pass 'pass'? */ - int x; - y &= 7; - ++pass; - for (x=0; x<8; ++x) if (adam7[y][x] == pass) - return 1; - - return 0; -} - -static int -png_col_in_interlace_pass(png_uint_32 x, int pass) -{ - /* Is column 'x' in pass 'pass'? */ - int y; - x &= 7; - ++pass; - for (y=0; y<8; ++y) if (adam7[y][x] == pass) - return 1; - - return 0; -} - -static png_uint_32 -png_pass_rows(png_uint_32 height, int pass) -{ - png_uint_32 tiles = height>>3; - png_uint_32 rows = 0; - unsigned int x, y; - - height &= 7; - ++pass; - for (y=0; y<8; ++y) for (x=0; x<8; ++x) if (adam7[y][x] == pass) - { - rows += tiles; - if (y < height) ++rows; - break; /* i.e. break the 'x', column, loop. */ - } - - return rows; -} - -static png_uint_32 -png_pass_cols(png_uint_32 width, int pass) -{ - png_uint_32 tiles = width>>3; - png_uint_32 cols = 0; - unsigned int x, y; - - width &= 7; - ++pass; - for (x=0; x<8; ++x) for (y=0; y<8; ++y) if (adam7[y][x] == pass) - { - cols += tiles; - if (x < width) ++cols; - break; /* i.e. break the 'y', row, loop. */ - } - - return cols; -} - -static void -perform_interlace_macro_validation(void) -{ - /* The macros to validate, first those that depend only on pass: - * - * PNG_PASS_START_ROW(pass) - * PNG_PASS_START_COL(pass) - * PNG_PASS_ROW_SHIFT(pass) - * PNG_PASS_COL_SHIFT(pass) - */ - int pass; - - for (pass=0; pass<7; ++pass) - { - png_uint_32 m, f, v; - - m = PNG_PASS_START_ROW(pass); - f = png_pass_start_row(pass); - if (m != f) - { - fprintf(stderr, "PNG_PASS_START_ROW(%d) = %u != %x\n", pass, m, f); - exit(99); - } - - m = PNG_PASS_START_COL(pass); - f = png_pass_start_col(pass); - if (m != f) - { - fprintf(stderr, "PNG_PASS_START_COL(%d) = %u != %x\n", pass, m, f); - exit(99); - } - - m = PNG_PASS_ROW_SHIFT(pass); - f = png_pass_row_shift(pass); - if (m != f) - { - fprintf(stderr, "PNG_PASS_ROW_SHIFT(%d) = %u != %x\n", pass, m, f); - exit(99); - } - - m = PNG_PASS_COL_SHIFT(pass); - f = png_pass_col_shift(pass); - if (m != f) - { - fprintf(stderr, "PNG_PASS_COL_SHIFT(%d) = %u != %x\n", pass, m, f); - exit(99); - } - - /* Macros that depend on the image or sub-image height too: - * - * PNG_PASS_ROWS(height, pass) - * PNG_PASS_COLS(width, pass) - * PNG_ROW_FROM_PASS_ROW(yIn, pass) - * PNG_COL_FROM_PASS_COL(xIn, pass) - * PNG_ROW_IN_INTERLACE_PASS(y, pass) - * PNG_COL_IN_INTERLACE_PASS(x, pass) - */ - for (v=0;;) - { - /* First the base 0 stuff: */ - m = PNG_ROW_FROM_PASS_ROW(v, pass); - f = png_row_from_pass_row(v, pass); - if (m != f) - { - fprintf(stderr, "PNG_ROW_FROM_PASS_ROW(%u, %d) = %u != %x\n", - v, pass, m, f); - exit(99); - } - - m = PNG_COL_FROM_PASS_COL(v, pass); - f = png_col_from_pass_col(v, pass); - if (m != f) - { - fprintf(stderr, "PNG_COL_FROM_PASS_COL(%u, %d) = %u != %x\n", - v, pass, m, f); - exit(99); - } - - m = PNG_ROW_IN_INTERLACE_PASS(v, pass); - f = png_row_in_interlace_pass(v, pass); - if (m != f) - { - fprintf(stderr, "PNG_ROW_IN_INTERLACE_PASS(%u, %d) = %u != %x\n", - v, pass, m, f); - exit(99); - } - - m = PNG_COL_IN_INTERLACE_PASS(v, pass); - f = png_col_in_interlace_pass(v, pass); - if (m != f) - { - fprintf(stderr, "PNG_COL_IN_INTERLACE_PASS(%u, %d) = %u != %x\n", - v, pass, m, f); - exit(99); - } - - /* Then the base 1 stuff: */ - ++v; - m = PNG_PASS_ROWS(v, pass); - f = png_pass_rows(v, pass); - if (m != f) - { - fprintf(stderr, "PNG_PASS_ROWS(%u, %d) = %u != %x\n", - v, pass, m, f); - exit(99); - } - - m = PNG_PASS_COLS(v, pass); - f = png_pass_cols(v, pass); - if (m != f) - { - fprintf(stderr, "PNG_PASS_COLS(%u, %d) = %u != %x\n", - v, pass, m, f); - exit(99); - } - - /* Move to the next v - the stepping algorithm starts skipping - * values above 1024. - */ - if (v > 1024) - { - if (v == PNG_UINT_31_MAX) - break; - - v = (v << 1) ^ v; - if (v >= PNG_UINT_31_MAX) - v = PNG_UINT_31_MAX-1; - } - } - } -} - -/* Test color encodings. These values are back-calculated from the published - * chromaticities. The values are accurate to about 14 decimal places; 15 are - * given. These values are much more accurate than the ones given in the spec, - * which typically don't exceed 4 decimal places. This allows testing of the - * libpng code to its theoretical accuracy of 4 decimal places. (If pngvalid - * used the published errors the 'slack' permitted would have to be +/-.5E-4 or - * more.) - * - * The png_modifier code assumes that encodings[0] is sRGB and treats it - * specially: do not change the first entry in this list! - */ -static PNG_CONST color_encoding test_encodings[] = -{ -/* sRGB: must be first in this list! */ -/*gamma:*/ { 1/2.2, -/*red: */ { 0.412390799265959, 0.212639005871510, 0.019330818715592 }, -/*green:*/ { 0.357584339383878, 0.715168678767756, 0.119194779794626 }, -/*blue: */ { 0.180480788401834, 0.072192315360734, 0.950532152249660} }, -/* Kodak ProPhoto (wide gamut) */ -/*gamma:*/ { 1/1.6 /*approximate: uses 1.8 power law compared to sRGB 2.4*/, -/*red: */ { 0.797760489672303, 0.288071128229293, 0.000000000000000 }, -/*green:*/ { 0.135185837175740, 0.711843217810102, 0.000000000000000 }, -/*blue: */ { 0.031349349581525, 0.000085653960605, 0.825104602510460} }, -/* Adobe RGB (1998) */ -/*gamma:*/ { 1/(2+51./256), -/*red: */ { 0.576669042910131, 0.297344975250536, 0.027031361386412 }, -/*green:*/ { 0.185558237906546, 0.627363566255466, 0.070688852535827 }, -/*blue: */ { 0.188228646234995, 0.075291458493998, 0.991337536837639} }, -/* Adobe Wide Gamut RGB */ -/*gamma:*/ { 1/(2+51./256), -/*red: */ { 0.716500716779386, 0.258728243040113, 0.000000000000000 }, -/*green:*/ { 0.101020574397477, 0.724682314948566, 0.051211818965388 }, -/*blue: */ { 0.146774385252705, 0.016589442011321, 0.773892783545073} }, -}; - -/* signal handler - * - * This attempts to trap signals and escape without crashing. It needs a - * context pointer so that it can throw an exception (call longjmp) to recover - * from the condition; this is handled by making the png_modifier used by 'main' - * into a global variable. - */ -static png_modifier pm; - -static void signal_handler(int signum) -{ - - size_t pos = 0; - char msg[64]; - - pos = safecat(msg, sizeof msg, pos, "caught signal: "); - - switch (signum) - { - case SIGABRT: - pos = safecat(msg, sizeof msg, pos, "abort"); - break; - - case SIGFPE: - pos = safecat(msg, sizeof msg, pos, "floating point exception"); - break; - - case SIGILL: - pos = safecat(msg, sizeof msg, pos, "illegal instruction"); - break; - - case SIGINT: - pos = safecat(msg, sizeof msg, pos, "interrupt"); - break; - - case SIGSEGV: - pos = safecat(msg, sizeof msg, pos, "invalid memory access"); - break; - - case SIGTERM: - pos = safecat(msg, sizeof msg, pos, "termination request"); - break; - - default: - pos = safecat(msg, sizeof msg, pos, "unknown "); - pos = safecatn(msg, sizeof msg, pos, signum); - break; - } - - store_log(&pm.this, NULL/*png_structp*/, msg, 1/*error*/); - - /* And finally throw an exception so we can keep going, unless this is - * SIGTERM in which case stop now. - */ - if (signum != SIGTERM) - { - struct exception_context *the_exception_context = - &pm.this.exception_context; - - Throw &pm.this; - } - - else - exit(1); -} - -/* main program */ -int main(int argc, char **argv) -{ - volatile int summary = 1; /* Print the error summary at the end */ - volatile int memstats = 0; /* Print memory statistics at the end */ - - /* Create the given output file on success: */ - PNG_CONST char *volatile touch = NULL; - - /* This is an array of standard gamma values (believe it or not I've seen - * every one of these mentioned somewhere.) - * - * In the following list the most useful values are first! - */ - static double - gammas[]={2.2, 1.0, 2.2/1.45, 1.8, 1.5, 2.4, 2.5, 2.62, 2.9}; - - /* This records the command and arguments: */ - size_t cp = 0; - char command[1024]; - - anon_context(&pm.this); - - /* Add appropriate signal handlers, just the ANSI specified ones: */ - signal(SIGABRT, signal_handler); - signal(SIGFPE, signal_handler); - signal(SIGILL, signal_handler); - signal(SIGINT, signal_handler); - signal(SIGSEGV, signal_handler); - signal(SIGTERM, signal_handler); - -#ifdef HAVE_FEENABLEEXCEPT - /* Only required to enable FP exceptions on platforms where they start off - * disabled; this is not necessary but if it is not done pngvalid will likely - * end up ignoring FP conditions that other platforms fault. - */ - feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW); -#endif - - modifier_init(&pm); - - /* Preallocate the image buffer, because we know how big it needs to be, - * note that, for testing purposes, it is deliberately mis-aligned by tag - * bytes either side. All rows have an additional five bytes of padding for - * overwrite checking. - */ - store_ensure_image(&pm.this, NULL, 2, TRANSFORM_ROWMAX, TRANSFORM_HEIGHTMAX); - - /* Don't give argv[0], it's normally some horrible libtool string: */ - cp = safecat(command, sizeof command, cp, "pngvalid"); - - /* Default to error on warning: */ - pm.this.treat_warnings_as_errors = 1; - - /* Store the test gammas */ - pm.gammas = gammas; - pm.ngammas = (sizeof gammas) / (sizeof gammas[0]); - pm.ngamma_tests = 0; /* default to off */ - - /* And the test encodings */ - pm.encodings = test_encodings; - pm.nencodings = (sizeof test_encodings) / (sizeof test_encodings[0]); - - pm.sbitlow = 8U; /* because libpng doesn't do sBIT below 8! */ - /* The following allows results to pass if they correspond to anything in the - * transformed range [input-.5,input+.5]; this is is required because of the - * way libpng treates the 16_TO_8 flag when building the gamma tables. - * - * TODO: review this - */ - pm.use_input_precision_16to8 = 1U; - - /* Some default values (set the behavior for 'make check' here). - * These values simply control the maximum error permitted in the gamma - * transformations. The practial limits for human perception are described - * below (the setting for maxpc16), however for 8 bit encodings it isn't - * possible to meet the accepted capabilities of human vision - i.e. 8 bit - * images can never be good enough, regardless of encoding. - */ - pm.maxout8 = .1; /* Arithmetic error in *encoded* value */ - pm.maxabs8 = .00005; /* 1/20000 */ - pm.maxcalc8 = .004; /* +/-1 in 8 bits for compose errors */ - pm.maxpc8 = .499; /* I.e., .499% fractional error */ - pm.maxout16 = .499; /* Error in *encoded* value */ - pm.maxabs16 = .00005;/* 1/20000 */ - pm.maxcalc16 =.000015;/* +/-1 in 16 bits for compose errors */ - - /* NOTE: this is a reasonable perceptual limit. We assume that humans can - * perceive light level differences of 1% over a 100:1 range, so we need to - * maintain 1 in 10000 accuracy (in linear light space), which is what the - * following guarantees. It also allows significantly higher errors at - * higher 16 bit values, which is important for performance. The actual - * maximum 16 bit error is about +/-1.9 in the fixed point implementation but - * this is only allowed for values >38149 by the following: - */ - pm.maxpc16 = .005; /* I.e., 1/200% - 1/20000 */ - - /* Now parse the command line options. */ - while (--argc >= 1) - { - int catmore = 0; /* Set if the argument has an argument. */ - - /* Record each argument for posterity: */ - cp = safecat(command, sizeof command, cp, " "); - cp = safecat(command, sizeof command, cp, *++argv); - - if (strcmp(*argv, "-v") == 0) - pm.this.verbose = 1; - - else if (strcmp(*argv, "-l") == 0) - pm.log = 1; - - else if (strcmp(*argv, "-q") == 0) - summary = pm.this.verbose = pm.log = 0; - - else if (strcmp(*argv, "-w") == 0) - pm.this.treat_warnings_as_errors = 0; - - else if (strcmp(*argv, "--speed") == 0) - pm.this.speed = 1, pm.ngamma_tests = pm.ngammas, pm.test_standard = 0, - summary = 0; - - else if (strcmp(*argv, "--memory") == 0) - memstats = 1; - - else if (strcmp(*argv, "--size") == 0) - pm.test_size = 1; - - else if (strcmp(*argv, "--nosize") == 0) - pm.test_size = 0; - - else if (strcmp(*argv, "--standard") == 0) - pm.test_standard = 1; - - else if (strcmp(*argv, "--nostandard") == 0) - pm.test_standard = 0; - - else if (strcmp(*argv, "--transform") == 0) - pm.test_transform = 1; - - else if (strcmp(*argv, "--notransform") == 0) - pm.test_transform = 0; - -#ifdef PNG_READ_TRANSFORMS_SUPPORTED - else if (strncmp(*argv, "--transform-disable=", - sizeof "--transform-disable") == 0) - { - pm.test_transform = 1; - transform_disable(*argv + sizeof "--transform-disable"); - } - - else if (strncmp(*argv, "--transform-enable=", - sizeof "--transform-enable") == 0) - { - pm.test_transform = 1; - transform_enable(*argv + sizeof "--transform-enable"); - } -#endif /* PNG_READ_TRANSFORMS_SUPPORTED */ - - else if (strcmp(*argv, "--gamma") == 0) - { - /* Just do two gamma tests here (2.2 and linear) for speed: */ - pm.ngamma_tests = 2U; - pm.test_gamma_threshold = 1; - pm.test_gamma_transform = 1; - pm.test_gamma_sbit = 1; - pm.test_gamma_scale16 = 1; - pm.test_gamma_background = 1; - pm.test_gamma_alpha_mode = 1; - } - - else if (strcmp(*argv, "--nogamma") == 0) - pm.ngamma_tests = 0; - - else if (strcmp(*argv, "--gamma-threshold") == 0) - pm.ngamma_tests = 2U, pm.test_gamma_threshold = 1; - - else if (strcmp(*argv, "--nogamma-threshold") == 0) - pm.test_gamma_threshold = 0; - - else if (strcmp(*argv, "--gamma-transform") == 0) - pm.ngamma_tests = 2U, pm.test_gamma_transform = 1; - - else if (strcmp(*argv, "--nogamma-transform") == 0) - pm.test_gamma_transform = 0; - - else if (strcmp(*argv, "--gamma-sbit") == 0) - pm.ngamma_tests = 2U, pm.test_gamma_sbit = 1; - - else if (strcmp(*argv, "--nogamma-sbit") == 0) - pm.test_gamma_sbit = 0; - - else if (strcmp(*argv, "--gamma-16-to-8") == 0) - pm.ngamma_tests = 2U, pm.test_gamma_scale16 = 1; - - else if (strcmp(*argv, "--nogamma-16-to-8") == 0) - pm.test_gamma_scale16 = 0; - - else if (strcmp(*argv, "--gamma-background") == 0) - pm.ngamma_tests = 2U, pm.test_gamma_background = 1; - - else if (strcmp(*argv, "--nogamma-background") == 0) - pm.test_gamma_background = 0; - - else if (strcmp(*argv, "--gamma-alpha-mode") == 0) - pm.ngamma_tests = 2U, pm.test_gamma_alpha_mode = 1; - - else if (strcmp(*argv, "--nogamma-alpha-mode") == 0) - pm.test_gamma_alpha_mode = 0; - - else if (strcmp(*argv, "--expand16") == 0) - pm.test_gamma_expand16 = 1; - - else if (strcmp(*argv, "--noexpand16") == 0) - pm.test_gamma_expand16 = 0; - - else if (strcmp(*argv, "--more-gammas") == 0) - pm.ngamma_tests = 3U; - - else if (strcmp(*argv, "--all-gammas") == 0) - pm.ngamma_tests = pm.ngammas; - - else if (strcmp(*argv, "--progressive-read") == 0) - pm.this.progressive = 1; - - else if (strcmp(*argv, "--use-update-info") == 0) - ++pm.use_update_info; /* Can call multiple times */ - - else if (strcmp(*argv, "--interlace") == 0) - pm.interlace_type = PNG_INTERLACE_ADAM7; - - else if (strcmp(*argv, "--use-input-precision") == 0) - pm.use_input_precision = 1; - - else if (strcmp(*argv, "--calculations-use-input-precision") == 0) - pm.calculations_use_input_precision = 1; - - else if (strcmp(*argv, "--assume-16-bit-calculations") == 0) - pm.assume_16_bit_calculations = 1; - - else if (strcmp(*argv, "--calculations-follow-bit-depth") == 0) - pm.calculations_use_input_precision = - pm.assume_16_bit_calculations = 0; - - else if (strcmp(*argv, "--exhaustive") == 0) - pm.test_exhaustive = 1; - - else if (argc > 1 && strcmp(*argv, "--sbitlow") == 0) - --argc, pm.sbitlow = (png_byte)atoi(*++argv), catmore = 1; - - else if (argc > 1 && strcmp(*argv, "--touch") == 0) - --argc, touch = *++argv, catmore = 1; - - else if (argc > 1 && strncmp(*argv, "--max", 5) == 0) - { - --argc; - - if (strcmp(5+*argv, "abs8") == 0) - pm.maxabs8 = atof(*++argv); - - else if (strcmp(5+*argv, "abs16") == 0) - pm.maxabs16 = atof(*++argv); - - else if (strcmp(5+*argv, "calc8") == 0) - pm.maxcalc8 = atof(*++argv); - - else if (strcmp(5+*argv, "calc16") == 0) - pm.maxcalc16 = atof(*++argv); - - else if (strcmp(5+*argv, "out8") == 0) - pm.maxout8 = atof(*++argv); - - else if (strcmp(5+*argv, "out16") == 0) - pm.maxout16 = atof(*++argv); - - else if (strcmp(5+*argv, "pc8") == 0) - pm.maxpc8 = atof(*++argv); - - else if (strcmp(5+*argv, "pc16") == 0) - pm.maxpc16 = atof(*++argv); - - else - { - fprintf(stderr, "pngvalid: %s: unknown 'max' option\n", *argv); - exit(99); - } - - catmore = 1; - } - - else if (strcmp(*argv, "--log8") == 0) - --argc, pm.log8 = atof(*++argv), catmore = 1; - - else if (strcmp(*argv, "--log16") == 0) - --argc, pm.log16 = atof(*++argv), catmore = 1; - -#ifdef PNG_SET_OPTION_SUPPORTED - else if (strncmp(*argv, "--option=", 9) == 0) - { - /* Syntax of the argument is