From 5003f15f368f1ae0e925f78bf482c98fe06e68ba Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Sun, 29 Aug 2021 02:09:43 +0000 Subject: libgd 2.3.2 git-svn-id: svn://tug.org/texlive/trunk@60353 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/README | 2 +- Build/source/libs/gd/ChangeLog | 5 + Build/source/libs/gd/Makefile.am | 2 + Build/source/libs/gd/Makefile.in | 17 +- Build/source/libs/gd/README | 4 +- Build/source/libs/gd/TLpatches/ChangeLog | 7 + Build/source/libs/gd/TLpatches/TL-Changes | 2 +- Build/source/libs/gd/TLpatches/patch-01-win32 | 14 +- Build/source/libs/gd/TLpatches/patch-02-no-stdcall | 6 +- Build/source/libs/gd/configure | 20 +- Build/source/libs/gd/libgd-src/CHANGELOG.md | 13 + Build/source/libs/gd/libgd-src/CMakeLists.txt | 18 + Build/source/libs/gd/libgd-src/CONTRIBUTORS | 2 + Build/source/libs/gd/libgd-src/README.md | 3 + Build/source/libs/gd/libgd-src/bootstrap.sh | 4 +- Build/source/libs/gd/libgd-src/cmake/distclean.sh | 2 +- .../libs/gd/libgd-src/cmake/modules/FindHEIF.cmake | 82 +++ .../libs/gd/libgd-src/cmake/modules/FindWEBP.cmake | 2 +- .../libs/gd/libgd-src/cmake/modules/gd.cmake | 1 + Build/source/libs/gd/libgd-src/config/test-driver | 18 +- Build/source/libs/gd/libgd-src/configure.ac | 17 + Build/source/libs/gd/libgd-src/docs/README.CMAKE | 1 + .../docs/naturaldocs/html/files/gd-c.html | 6 +- .../docs/naturaldocs/html/files/gd-h.html | 58 +- .../docs/naturaldocs/html/files/gd_avif-c.html | 51 ++ .../docs/naturaldocs/html/files/gd_bmp-c.html | 4 +- .../naturaldocs/html/files/gd_color_map-c.html | 4 +- .../naturaldocs/html/files/gd_color_match-c.html | 4 +- .../docs/naturaldocs/html/files/gd_crop-c.html | 4 +- .../docs/naturaldocs/html/files/gd_filename-c.html | 8 +- .../docs/naturaldocs/html/files/gd_filter-c.html | 4 +- .../docs/naturaldocs/html/files/gd_gd-c.html | 6 +- .../docs/naturaldocs/html/files/gd_gd2-c.html | 4 +- .../docs/naturaldocs/html/files/gd_gif_in-c.html | 4 +- .../docs/naturaldocs/html/files/gd_gif_out-c.html | 4 +- .../docs/naturaldocs/html/files/gd_heif-c.html | 57 ++ .../naturaldocs/html/files/gd_interpolation-c.html | 6 +- .../docs/naturaldocs/html/files/gd_io-h.html | 6 +- .../docs/naturaldocs/html/files/gd_io_dp-c.html | 6 +- .../docs/naturaldocs/html/files/gd_io_file-c.html | 4 +- .../docs/naturaldocs/html/files/gd_io_ss-c.html | 4 +- .../docs/naturaldocs/html/files/gd_jpeg-c.html | 4 +- .../docs/naturaldocs/html/files/gd_matrix-c.html | 6 +- .../docs/naturaldocs/html/files/gd_nnquant-c.html | 4 +- .../docs/naturaldocs/html/files/gd_png-c.html | 4 +- .../docs/naturaldocs/html/files/gd_ss-c.html | 6 +- .../docs/naturaldocs/html/files/gd_tga-c.html | 4 +- .../docs/naturaldocs/html/files/gd_tiff-c.html | 4 +- .../docs/naturaldocs/html/files/gd_topal-c.html | 4 +- .../naturaldocs/html/files/gd_transform-c.html | 4 +- .../docs/naturaldocs/html/files/gd_version-c.html | 6 +- .../docs/naturaldocs/html/files/gd_wbmp-c.html | 4 +- .../docs/naturaldocs/html/files/gd_webp-c.html | 8 +- .../docs/naturaldocs/html/files/gd_xbm-c.html | 4 +- .../docs/naturaldocs/html/files/gdfontg-c.html | 4 +- .../docs/naturaldocs/html/files/gdfontl-c.html | 4 +- .../docs/naturaldocs/html/files/gdfontmb-c.html | 4 +- .../docs/naturaldocs/html/files/gdfonts-c.html | 4 +- .../docs/naturaldocs/html/files/gdfontt-c.html | 4 +- .../docs/naturaldocs/html/files/gdft-c.html | 4 +- .../docs/naturaldocs/html/files/gdfx-c.html | 6 +- .../docs/naturaldocs/html/files/gdhelpers-c.html | 4 +- .../docs/naturaldocs/html/files/gdxpm-c.html | 4 +- .../docs/naturaldocs/html/files/license-txt.html | 6 +- .../docs/naturaldocs/html/files/preamble-txt.html | 8 +- .../docs/naturaldocs/html/index/Constants.html | 8 +- .../docs/naturaldocs/html/index/Files.html | 36 +- .../docs/naturaldocs/html/index/Functions.html | 12 +- .../docs/naturaldocs/html/index/General.html | 20 +- .../docs/naturaldocs/html/index/General2.html | 8 +- .../docs/naturaldocs/html/index/General3.html | 26 +- .../docs/naturaldocs/html/index/Macros.html | 4 +- .../docs/naturaldocs/html/index/Types.html | 4 +- .../docs/naturaldocs/html/javascript/searchdata.js | 66 +- .../docs/naturaldocs/html/search/ConstantsG.html | 4 +- .../docs/naturaldocs/html/search/ConstantsS.html | 2 +- .../docs/naturaldocs/html/search/FilesA.html | 20 + .../docs/naturaldocs/html/search/FilesB.html | 2 +- .../docs/naturaldocs/html/search/FilesC.html | 2 +- .../docs/naturaldocs/html/search/FilesF.html | 2 +- .../docs/naturaldocs/html/search/FilesG.html | 2 +- .../docs/naturaldocs/html/search/FilesH.html | 20 + .../docs/naturaldocs/html/search/FilesI.html | 2 +- .../docs/naturaldocs/html/search/FilesJ.html | 2 +- .../docs/naturaldocs/html/search/FilesL.html | 2 +- .../docs/naturaldocs/html/search/FilesM.html | 2 +- .../docs/naturaldocs/html/search/FilesP.html | 2 +- .../docs/naturaldocs/html/search/FilesS.html | 2 +- .../docs/naturaldocs/html/search/FilesT.html | 2 +- .../docs/naturaldocs/html/search/FilesW.html | 2 +- .../docs/naturaldocs/html/search/FilesX.html | 2 +- .../docs/naturaldocs/html/search/FunctionsG.html | 4 +- .../naturaldocs/html/search/FunctionsSymbols.html | 20 + .../docs/naturaldocs/html/search/GeneralA.html | 4 +- .../docs/naturaldocs/html/search/GeneralB.html | 2 +- .../docs/naturaldocs/html/search/GeneralC.html | 2 +- .../docs/naturaldocs/html/search/GeneralE.html | 2 +- .../docs/naturaldocs/html/search/GeneralF.html | 4 +- .../docs/naturaldocs/html/search/GeneralG.html | 4 +- .../docs/naturaldocs/html/search/GeneralH.html | 20 + .../docs/naturaldocs/html/search/GeneralI.html | 2 +- .../docs/naturaldocs/html/search/GeneralJ.html | 2 +- .../docs/naturaldocs/html/search/GeneralL.html | 2 +- .../docs/naturaldocs/html/search/GeneralM.html | 2 +- .../naturaldocs/html/search/GeneralNumbers.html | 4 +- .../docs/naturaldocs/html/search/GeneralO.html | 2 +- .../docs/naturaldocs/html/search/GeneralP.html | 2 +- .../docs/naturaldocs/html/search/GeneralS.html | 2 +- .../naturaldocs/html/search/GeneralSymbols.html | 20 + .../docs/naturaldocs/html/search/GeneralT.html | 2 +- .../docs/naturaldocs/html/search/GeneralW.html | 2 +- .../docs/naturaldocs/html/search/GeneralX.html | 2 +- .../docs/naturaldocs/html/search/MacrosG.html | 2 +- .../docs/naturaldocs/html/search/NoResults.html | 2 +- .../docs/naturaldocs/html/search/TypesG.html | 2 +- .../naturaldocs/project/Data/ClassHierarchy.nd | Bin 7 -> 7 bytes .../naturaldocs/project/Data/ConfigFileInfo.nd | Bin 26 -> 26 bytes .../docs/naturaldocs/project/Data/FileInfo.nd | 193 +++--- .../docs/naturaldocs/project/Data/ImageFileInfo.nd | Bin 393 -> 273 bytes .../project/Data/ImageReferenceTable.nd | Bin 1098 -> 738 bytes .../docs/naturaldocs/project/Data/IndexInfo.nd | Bin 222 -> 222 bytes .../naturaldocs/project/Data/PreviousMenuState.nd | Bin 4174 -> 3072 bytes .../naturaldocs/project/Data/PreviousSettings.nd | Bin 170 -> 110 bytes .../docs/naturaldocs/project/Data/SymbolTable.nd | Bin 101636 -> 88353 bytes .../docs/naturaldocs/project/Languages.txt | 2 +- .../gd/libgd-src/docs/naturaldocs/project/Menu.txt | 2 + .../libgd-src/docs/naturaldocs/project/Topics.txt | 2 +- .../libs/gd/libgd-src/docs/naturaldocs/run_docs.sh | 21 +- .../CMakeFiles/CMakeDirectoryInformation.cmake | 16 - .../examples/CMakeFiles/gif.dir/DependInfo.cmake | 29 - .../examples/CMakeFiles/gif.dir/build.make | 114 ---- .../examples/CMakeFiles/gif.dir/cmake_clean.cmake | 10 - .../examples/CMakeFiles/gif.dir/depend.make | 2 - .../examples/CMakeFiles/gif.dir/flags.make | 10 - .../libgd-src/examples/CMakeFiles/gif.dir/link.txt | 1 - .../examples/CMakeFiles/gif.dir/progress.make | 3 - .../libgd-src/examples/CMakeFiles/progress.marks | 1 - Build/source/libs/gd/libgd-src/examples/Makefile | 254 -------- .../source/libs/gd/libgd-src/examples/avif2jpeg.c | 55 ++ .../libs/gd/libgd-src/examples/cmake_install.cmake | 39 -- .../source/libs/gd/libgd-src/examples/jpeg2avif.c | 57 ++ .../libs/gd/libgd-src/examples/jpeg2avifex.c | 98 +++ Build/source/libs/gd/libgd-src/examples/png2avif.c | 58 ++ Build/source/libs/gd/libgd-src/src/CMakeLists.txt | 9 +- Build/source/libs/gd/libgd-src/src/COPYING | 51 -- Build/source/libs/gd/libgd-src/src/Makefile.am | 3 +- Build/source/libs/gd/libgd-src/src/config.h.cmake | 12 + Build/source/libs/gd/libgd-src/src/config.hin | 6 + Build/source/libs/gd/libgd-src/src/gd.c | 6 - Build/source/libs/gd/libgd-src/src/gd.h | 66 +- Build/source/libs/gd/libgd-src/src/gd_avif.c | 679 +++++++++++++++++++++ Build/source/libs/gd/libgd-src/src/gd_filename.c | 22 +- Build/source/libs/gd/libgd-src/src/gd_filter.c | 2 - Build/source/libs/gd/libgd-src/src/gd_gif_in.c | 6 +- Build/source/libs/gd/libgd-src/src/gd_heif.c | 582 ++++++++++++++++++ Build/source/libs/gd/libgd-src/src/gd_intern.h | 8 +- .../libs/gd/libgd-src/src/gd_interpolation.c | 3 - Build/source/libs/gd/libgd-src/src/gd_tiff.c | 5 +- Build/source/libs/gd/libgd-src/src/gd_webp.c | 4 +- Build/source/libs/gd/libgd-src/src/gd_xbm.c | 4 - Build/source/libs/gd/libgd-src/src/gdfx.c | 4 +- Build/source/libs/gd/libgd-src/src/gdtestft.c | 4 +- Build/source/libs/gd/libgd-src/src/snprintf.c | 25 - .../source/libs/gd/libgd-src/tests/CMakeLists.txt | 2 + Build/source/libs/gd/libgd-src/tests/Makefile.am | 4 + .../libs/gd/libgd-src/tests/avif/CMakeLists.txt | 17 + .../libs/gd/libgd-src/tests/avif/Makemodule.am | 24 + .../gd/libgd-src/tests/avif/avif_ptr_double_free.c | 34 ++ .../libs/gd/libgd-src/tests/avif/baboon.avif | Bin 0 -> 16521 bytes .../source/libs/gd/libgd-src/tests/avif/baboon.png | Bin 0 -> 49030 bytes .../gd/libgd-src/tests/avif/compare_avif_to_png.c | 92 +++ .../gd/libgd-src/tests/avif/dice_with_alpha.avif | Bin 0 -> 6248 bytes .../gd/libgd-src/tests/avif/dice_with_alpha.png | Bin 0 -> 48210 bytes .../libgd-src/tests/avif/plum_blossom_12bit.avif | Bin 0 -> 5202 bytes .../gd/libgd-src/tests/avif/plum_blossom_12bit.png | Bin 0 -> 10185 bytes .../libs/gd/libgd-src/tests/avif/sunset.avif | Bin 0 -> 1174 bytes .../source/libs/gd/libgd-src/tests/avif/sunset.png | Bin 0 -> 47803 bytes .../libs/gd/libgd-src/tests/gif/CMakeLists.txt | 1 + .../libs/gd/libgd-src/tests/gif/Makemodule.am | 2 + .../libs/gd/libgd-src/tests/gif/gif_nocolormaps.c | 25 + .../gd/libgd-src/tests/gif/gif_nocolormaps.gif | Bin 0 -> 37 bytes .../libs/gd/libgd-src/tests/heif/CMakeLists.txt | 11 + .../libs/gd/libgd-src/tests/heif/Makemodule.am | 11 + .../gd/libgd-src/tests/heif/avif_ptr_double_free.c | 31 + .../libs/gd/libgd-src/tests/heif/heif_im2im.c | 54 ++ .../libs/gd/libgd-src/tests/heif/heif_null.c | 20 + .../gd/libgd-src/tests/heif/heif_ptr_double_free.c | 31 + .../libs/gd/libgd-src/tests/heif/heif_read.c | 28 + Build/source/libs/gd/libgd-src/windows/Makefile.vc | 16 +- .../libs/gd/libgd-src/windows/Makefiletest.vc | 5 + .../source/libs/gd/libgd-src/windows/msys/Makefile | 5 +- .../libs/gd/libgd-src/windows/msys/run_tests.sh | 67 +- Build/source/libs/gd/version.ac | 2 +- 193 files changed, 2888 insertions(+), 1030 deletions(-) create mode 100644 Build/source/libs/gd/libgd-src/cmake/modules/FindHEIF.cmake create mode 100644 Build/source/libs/gd/libgd-src/docs/naturaldocs/html/files/gd_avif-c.html create mode 100644 Build/source/libs/gd/libgd-src/docs/naturaldocs/html/files/gd_heif-c.html create mode 100644 Build/source/libs/gd/libgd-src/docs/naturaldocs/html/search/FilesA.html create mode 100644 Build/source/libs/gd/libgd-src/docs/naturaldocs/html/search/FilesH.html create mode 100644 Build/source/libs/gd/libgd-src/docs/naturaldocs/html/search/FunctionsSymbols.html create mode 100644 Build/source/libs/gd/libgd-src/docs/naturaldocs/html/search/GeneralH.html create mode 100644 Build/source/libs/gd/libgd-src/docs/naturaldocs/html/search/GeneralSymbols.html delete mode 100644 Build/source/libs/gd/libgd-src/examples/CMakeFiles/CMakeDirectoryInformation.cmake delete mode 100644 Build/source/libs/gd/libgd-src/examples/CMakeFiles/gif.dir/DependInfo.cmake delete mode 100644 Build/source/libs/gd/libgd-src/examples/CMakeFiles/gif.dir/build.make delete mode 100644 Build/source/libs/gd/libgd-src/examples/CMakeFiles/gif.dir/cmake_clean.cmake delete mode 100644 Build/source/libs/gd/libgd-src/examples/CMakeFiles/gif.dir/depend.make delete mode 100644 Build/source/libs/gd/libgd-src/examples/CMakeFiles/gif.dir/flags.make delete mode 100644 Build/source/libs/gd/libgd-src/examples/CMakeFiles/gif.dir/link.txt delete mode 100644 Build/source/libs/gd/libgd-src/examples/CMakeFiles/gif.dir/progress.make delete mode 100644 Build/source/libs/gd/libgd-src/examples/CMakeFiles/progress.marks delete mode 100644 Build/source/libs/gd/libgd-src/examples/Makefile create mode 100644 Build/source/libs/gd/libgd-src/examples/avif2jpeg.c delete mode 100644 Build/source/libs/gd/libgd-src/examples/cmake_install.cmake create mode 100644 Build/source/libs/gd/libgd-src/examples/jpeg2avif.c create mode 100644 Build/source/libs/gd/libgd-src/examples/jpeg2avifex.c create mode 100644 Build/source/libs/gd/libgd-src/examples/png2avif.c delete mode 100644 Build/source/libs/gd/libgd-src/src/COPYING create mode 100644 Build/source/libs/gd/libgd-src/src/gd_avif.c create mode 100644 Build/source/libs/gd/libgd-src/src/gd_heif.c delete mode 100644 Build/source/libs/gd/libgd-src/src/snprintf.c create mode 100644 Build/source/libs/gd/libgd-src/tests/avif/CMakeLists.txt create mode 100644 Build/source/libs/gd/libgd-src/tests/avif/Makemodule.am create mode 100644 Build/source/libs/gd/libgd-src/tests/avif/avif_ptr_double_free.c create mode 100644 Build/source/libs/gd/libgd-src/tests/avif/baboon.avif create mode 100644 Build/source/libs/gd/libgd-src/tests/avif/baboon.png create mode 100644 Build/source/libs/gd/libgd-src/tests/avif/compare_avif_to_png.c create mode 100644 Build/source/libs/gd/libgd-src/tests/avif/dice_with_alpha.avif create mode 100644 Build/source/libs/gd/libgd-src/tests/avif/dice_with_alpha.png create mode 100644 Build/source/libs/gd/libgd-src/tests/avif/plum_blossom_12bit.avif create mode 100644 Build/source/libs/gd/libgd-src/tests/avif/plum_blossom_12bit.png create mode 100644 Build/source/libs/gd/libgd-src/tests/avif/sunset.avif create mode 100644 Build/source/libs/gd/libgd-src/tests/avif/sunset.png create mode 100644 Build/source/libs/gd/libgd-src/tests/gif/gif_nocolormaps.c create mode 100644 Build/source/libs/gd/libgd-src/tests/gif/gif_nocolormaps.gif create mode 100644 Build/source/libs/gd/libgd-src/tests/heif/CMakeLists.txt create mode 100644 Build/source/libs/gd/libgd-src/tests/heif/Makemodule.am create mode 100644 Build/source/libs/gd/libgd-src/tests/heif/avif_ptr_double_free.c create mode 100644 Build/source/libs/gd/libgd-src/tests/heif/heif_im2im.c create mode 100644 Build/source/libs/gd/libgd-src/tests/heif/heif_null.c create mode 100644 Build/source/libs/gd/libgd-src/tests/heif/heif_ptr_double_free.c create mode 100644 Build/source/libs/gd/libgd-src/tests/heif/heif_read.c (limited to 'Build/source') diff --git a/Build/source/libs/README b/Build/source/libs/README index cdccb5683dc..47121a19e1c 100644 --- a/Build/source/libs/README +++ b/Build/source/libs/README @@ -15,7 +15,7 @@ cairo 1.16.0 - checked 20oct18 freetype2 2.10.4 - checked 21oct20 http://savannah.nongnu.org/download/freetype/ -gd 2.3.1 - checked 03feb21 +gd 2.3.2 - checked 28aug21 https://github.com/libgd/libgd/releases gmp 6.2.1 - checked 15nov20 diff --git a/Build/source/libs/gd/ChangeLog b/Build/source/libs/gd/ChangeLog index 457eb9821d0..d0b1a8d15bd 100644 --- a/Build/source/libs/gd/ChangeLog +++ b/Build/source/libs/gd/ChangeLog @@ -1,3 +1,8 @@ +2021-08-28 Akira Kakuto + + Import libgd-2.3.2. + * version.ac, Makefile.am: Adapted. + 2021-02-03 Akira Kakuto Import libgd-2.3.1. diff --git a/Build/source/libs/gd/Makefile.am b/Build/source/libs/gd/Makefile.am index 9894243908a..7f4024f6cf2 100644 --- a/Build/source/libs/gd/Makefile.am +++ b/Build/source/libs/gd/Makefile.am @@ -33,6 +33,7 @@ noinst_LIBRARIES=libgd.a libgd_a_SOURCES = \ @GD_TREE@/src/gd.c \ + @GD_TREE@/src/gd_avif.c \ @GD_TREE@/src/gd_bmp.c \ @GD_TREE@/src/gd_color.c \ @GD_TREE@/src/gd_color_map.c \ @@ -44,6 +45,7 @@ libgd_a_SOURCES = \ @GD_TREE@/src/gd_gd2.c \ @GD_TREE@/src/gd_gif_in.c \ @GD_TREE@/src/gd_gif_out.c \ + @GD_TREE@/src/gd_heif.c \ @GD_TREE@/src/gd_interpolation.c \ @GD_TREE@/src/gd_io.c \ @GD_TREE@/src/gd_io_dp.c \ diff --git a/Build/source/libs/gd/Makefile.in b/Build/source/libs/gd/Makefile.in index 251119cc154..dd774829250 100644 --- a/Build/source/libs/gd/Makefile.in +++ b/Build/source/libs/gd/Makefile.in @@ -121,7 +121,7 @@ libgd_a_AR = $(AR) $(ARFLAGS) libgd_a_LIBADD = am__dirstamp = $(am__leading_dot)dirstamp am_libgd_a_OBJECTS = @GD_TREE@/src/gd.$(OBJEXT) \ - @GD_TREE@/src/gd_bmp.$(OBJEXT) \ + @GD_TREE@/src/gd_avif.$(OBJEXT) @GD_TREE@/src/gd_bmp.$(OBJEXT) \ @GD_TREE@/src/gd_color.$(OBJEXT) \ @GD_TREE@/src/gd_color_map.$(OBJEXT) \ @GD_TREE@/src/gd_color_match.$(OBJEXT) \ @@ -131,6 +131,7 @@ am_libgd_a_OBJECTS = @GD_TREE@/src/gd.$(OBJEXT) \ @GD_TREE@/src/gd_gd.$(OBJEXT) @GD_TREE@/src/gd_gd2.$(OBJEXT) \ @GD_TREE@/src/gd_gif_in.$(OBJEXT) \ @GD_TREE@/src/gd_gif_out.$(OBJEXT) \ + @GD_TREE@/src/gd_heif.$(OBJEXT) \ @GD_TREE@/src/gd_interpolation.$(OBJEXT) \ @GD_TREE@/src/gd_io.$(OBJEXT) @GD_TREE@/src/gd_io_dp.$(OBJEXT) \ @GD_TREE@/src/gd_io_file.$(OBJEXT) \ @@ -181,6 +182,7 @@ depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp am__maybe_remake_depfiles = depfiles am__depfiles_remade = ./$(DEPDIR)/gdtest-gdtest.Po \ @GD_TREE@/src/$(DEPDIR)/gd.Po \ + @GD_TREE@/src/$(DEPDIR)/gd_avif.Po \ @GD_TREE@/src/$(DEPDIR)/gd_bmp.Po \ @GD_TREE@/src/$(DEPDIR)/gd_color.Po \ @GD_TREE@/src/$(DEPDIR)/gd_color_map.Po \ @@ -192,6 +194,7 @@ am__depfiles_remade = ./$(DEPDIR)/gdtest-gdtest.Po \ @GD_TREE@/src/$(DEPDIR)/gd_gd2.Po \ @GD_TREE@/src/$(DEPDIR)/gd_gif_in.Po \ @GD_TREE@/src/$(DEPDIR)/gd_gif_out.Po \ + @GD_TREE@/src/$(DEPDIR)/gd_heif.Po \ @GD_TREE@/src/$(DEPDIR)/gd_interpolation.Po \ @GD_TREE@/src/$(DEPDIR)/gd_io.Po \ @GD_TREE@/src/$(DEPDIR)/gd_io_dp.Po \ @@ -675,6 +678,7 @@ AM_CFLAGS = # $(WARNING_CFLAGS) noinst_LIBRARIES = libgd.a libgd_a_SOURCES = \ @GD_TREE@/src/gd.c \ + @GD_TREE@/src/gd_avif.c \ @GD_TREE@/src/gd_bmp.c \ @GD_TREE@/src/gd_color.c \ @GD_TREE@/src/gd_color_map.c \ @@ -686,6 +690,7 @@ libgd_a_SOURCES = \ @GD_TREE@/src/gd_gd2.c \ @GD_TREE@/src/gd_gif_in.c \ @GD_TREE@/src/gd_gif_out.c \ + @GD_TREE@/src/gd_heif.c \ @GD_TREE@/src/gd_interpolation.c \ @GD_TREE@/src/gd_io.c \ @GD_TREE@/src/gd_io_dp.c \ @@ -802,6 +807,8 @@ clean-noinstLIBRARIES: @: > @GD_TREE@/src/$(DEPDIR)/$(am__dirstamp) @GD_TREE@/src/gd.$(OBJEXT): @GD_TREE@/src/$(am__dirstamp) \ @GD_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GD_TREE@/src/gd_avif.$(OBJEXT): @GD_TREE@/src/$(am__dirstamp) \ + @GD_TREE@/src/$(DEPDIR)/$(am__dirstamp) @GD_TREE@/src/gd_bmp.$(OBJEXT): @GD_TREE@/src/$(am__dirstamp) \ @GD_TREE@/src/$(DEPDIR)/$(am__dirstamp) @GD_TREE@/src/gd_color.$(OBJEXT): @GD_TREE@/src/$(am__dirstamp) \ @@ -824,6 +831,8 @@ clean-noinstLIBRARIES: @GD_TREE@/src/$(DEPDIR)/$(am__dirstamp) @GD_TREE@/src/gd_gif_out.$(OBJEXT): @GD_TREE@/src/$(am__dirstamp) \ @GD_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@GD_TREE@/src/gd_heif.$(OBJEXT): @GD_TREE@/src/$(am__dirstamp) \ + @GD_TREE@/src/$(DEPDIR)/$(am__dirstamp) @GD_TREE@/src/gd_interpolation.$(OBJEXT): \ @GD_TREE@/src/$(am__dirstamp) \ @GD_TREE@/src/$(DEPDIR)/$(am__dirstamp) @@ -910,6 +919,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdtest-gdtest.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@@GD_TREE@/src/$(DEPDIR)/gd.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GD_TREE@/src/$(DEPDIR)/gd_avif.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@@GD_TREE@/src/$(DEPDIR)/gd_bmp.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@@GD_TREE@/src/$(DEPDIR)/gd_color.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@@GD_TREE@/src/$(DEPDIR)/gd_color_map.Po@am__quote@ # am--include-marker @@ -921,6 +931,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@@GD_TREE@/src/$(DEPDIR)/gd_gd2.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@@GD_TREE@/src/$(DEPDIR)/gd_gif_in.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@@GD_TREE@/src/$(DEPDIR)/gd_gif_out.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@@GD_TREE@/src/$(DEPDIR)/gd_heif.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@@GD_TREE@/src/$(DEPDIR)/gd_interpolation.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@@GD_TREE@/src/$(DEPDIR)/gd_io.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@@GD_TREE@/src/$(DEPDIR)/gd_io_dp.Po@am__quote@ # am--include-marker @@ -1506,6 +1517,7 @@ distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -f ./$(DEPDIR)/gdtest-gdtest.Po -rm -f @GD_TREE@/src/$(DEPDIR)/gd.Po + -rm -f @GD_TREE@/src/$(DEPDIR)/gd_avif.Po -rm -f @GD_TREE@/src/$(DEPDIR)/gd_bmp.Po -rm -f @GD_TREE@/src/$(DEPDIR)/gd_color.Po -rm -f @GD_TREE@/src/$(DEPDIR)/gd_color_map.Po @@ -1517,6 +1529,7 @@ distclean: distclean-recursive -rm -f @GD_TREE@/src/$(DEPDIR)/gd_gd2.Po -rm -f @GD_TREE@/src/$(DEPDIR)/gd_gif_in.Po -rm -f @GD_TREE@/src/$(DEPDIR)/gd_gif_out.Po + -rm -f @GD_TREE@/src/$(DEPDIR)/gd_heif.Po -rm -f @GD_TREE@/src/$(DEPDIR)/gd_interpolation.Po -rm -f @GD_TREE@/src/$(DEPDIR)/gd_io.Po -rm -f @GD_TREE@/src/$(DEPDIR)/gd_io_dp.Po @@ -1599,6 +1612,7 @@ maintainer-clean: maintainer-clean-recursive -rm -rf $(top_srcdir)/autom4te.cache -rm -f ./$(DEPDIR)/gdtest-gdtest.Po -rm -f @GD_TREE@/src/$(DEPDIR)/gd.Po + -rm -f @GD_TREE@/src/$(DEPDIR)/gd_avif.Po -rm -f @GD_TREE@/src/$(DEPDIR)/gd_bmp.Po -rm -f @GD_TREE@/src/$(DEPDIR)/gd_color.Po -rm -f @GD_TREE@/src/$(DEPDIR)/gd_color_map.Po @@ -1610,6 +1624,7 @@ maintainer-clean: maintainer-clean-recursive -rm -f @GD_TREE@/src/$(DEPDIR)/gd_gd2.Po -rm -f @GD_TREE@/src/$(DEPDIR)/gd_gif_in.Po -rm -f @GD_TREE@/src/$(DEPDIR)/gd_gif_out.Po + -rm -f @GD_TREE@/src/$(DEPDIR)/gd_heif.Po -rm -f @GD_TREE@/src/$(DEPDIR)/gd_interpolation.Po -rm -f @GD_TREE@/src/$(DEPDIR)/gd_io.Po -rm -f @GD_TREE@/src/$(DEPDIR)/gd_io_dp.Po diff --git a/Build/source/libs/gd/README b/Build/source/libs/gd/README index b6b02f014ab..a2edaad8d44 100644 --- a/Build/source/libs/gd/README +++ b/Build/source/libs/gd/README @@ -1,4 +1,4 @@ - Building libgd-2.3.1 as part of the TL tree + Building libgd-2.3.2 as part of the TL tree ========================================= This directory libs/gd/ uses a proxy Makefile.am to build the gd library @@ -11,4 +11,4 @@ been copied to libs/gd/configure.ac. ============================= 2013-06-26 Peter Breitenlohner -2021-02-03 Akira Kakuto +2021-08-28 Akira Kakuto diff --git a/Build/source/libs/gd/TLpatches/ChangeLog b/Build/source/libs/gd/TLpatches/ChangeLog index a140ecacca8..8beab5a7b8b 100644 --- a/Build/source/libs/gd/TLpatches/ChangeLog +++ b/Build/source/libs/gd/TLpatches/ChangeLog @@ -1,3 +1,10 @@ +2021-08-28 Akira Kakuto + + Import libgd-2.3.2 source tree from: + https://github.com/libgd/libgd/releases + * patch-01-win32: Adapted. + * patch-02-no-stdcall: Adapted. + 2021-02-03 Akira Kakuto Import libgd-2.3.1 source tree from: diff --git a/Build/source/libs/gd/TLpatches/TL-Changes b/Build/source/libs/gd/TLpatches/TL-Changes index d5bd85fac90..037ed9d11aa 100644 --- a/Build/source/libs/gd/TLpatches/TL-Changes +++ b/Build/source/libs/gd/TLpatches/TL-Changes @@ -1,4 +1,4 @@ -Changes applied to the libgd-2.3.1/ tree as obtained from: +Changes applied to the libgd-2.3.2/ tree as obtained from: https://github.com/libgd/libgd/releases Removed: diff --git a/Build/source/libs/gd/TLpatches/patch-01-win32 b/Build/source/libs/gd/TLpatches/patch-01-win32 index b2a276c4e67..14336180010 100644 --- a/Build/source/libs/gd/TLpatches/patch-01-win32 +++ b/Build/source/libs/gd/TLpatches/patch-01-win32 @@ -1,7 +1,7 @@ -diff -ur libgd-2.3.1/src/gd_interpolation.c libgd-src/src/gd_interpolation.c ---- libgd-2.3.1/src/gd_interpolation.c Sat Jan 30 18:30:01 2021 -+++ libgd-src/src/gd_interpolation.c Wed Feb 03 14:56:52 2021 -@@ -1992,9 +1992,9 @@ +diff -ur libgd-2.3.2/src/gd_interpolation.c libgd-src/src/gd_interpolation.c +--- libgd-2.3.2/src/gd_interpolation.c Wed Mar 03 16:15:02 2021 ++++ libgd-src/src/gd_interpolation.c Fri Aug 27 15:08:28 2021 +@@ -1989,9 +1989,9 @@ int i; b = (unsigned char)tcolor; @@ -14,9 +14,9 @@ diff -ur libgd-2.3.1/src/gd_interpolation.c libgd-src/src/gd_interpolation.c b = CLAMP(b, 0, 255); g = CLAMP(g, 0, 255); -diff -ur libgd-2.3.1/src/gdft.c libgd-src/src/gdft.c ---- libgd-2.3.1/src/gdft.c Sat Jan 30 18:30:01 2021 -+++ libgd-src/src/gdft.c Wed Feb 03 15:26:58 2021 +diff -ur libgd-2.3.2/src/gdft.c libgd-src/src/gdft.c +--- libgd-2.3.2/src/gdft.c Wed Mar 03 16:15:02 2021 ++++ libgd-src/src/gdft.c Fri Aug 27 15:12:43 2021 @@ -446,6 +446,11 @@ FT_Face face, gdFTStringExtraPtr strex, glyphInfo **glyph_info) diff --git a/Build/source/libs/gd/TLpatches/patch-02-no-stdcall b/Build/source/libs/gd/TLpatches/patch-02-no-stdcall index 3a77b0a791c..5c41f76ecc8 100644 --- a/Build/source/libs/gd/TLpatches/patch-02-no-stdcall +++ b/Build/source/libs/gd/TLpatches/patch-02-no-stdcall @@ -1,6 +1,6 @@ -diff -ur libgd-2.3.1/src/gd.h libgd-src/src/gd.h ---- libgd-2.3.1/src/gd.h Sat Jan 30 18:40:10 2021 -+++ libgd-src/src/gd.h Wed Feb 03 14:52:34 2021 +diff -ur libgd-2.3.2/src/gd.h libgd-src/src/gd.h +--- libgd-2.3.2/src/gd.h Sun Mar 07 03:21:36 2021 ++++ libgd-src/src/gd.h Fri Aug 27 15:13:24 2021 @@ -63,7 +63,7 @@ # define BGD_EXPORT_DATA_PROT __declspec(dllimport) # endif diff --git a/Build/source/libs/gd/configure b/Build/source/libs/gd/configure index d953895abad..79b0ce90bba 100755 --- a/Build/source/libs/gd/configure +++ b/Build/source/libs/gd/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for gd (TeX Live) 2.3.1. +# Generated by GNU Autoconf 2.71 for gd (TeX Live) 2.3.2. # # Report bugs to . # @@ -611,8 +611,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='gd (TeX Live)' PACKAGE_TARNAME='gd--tex-live-' -PACKAGE_VERSION='2.3.1' -PACKAGE_STRING='gd (TeX Live) 2.3.1' +PACKAGE_VERSION='2.3.2' +PACKAGE_STRING='gd (TeX Live) 2.3.2' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1343,7 +1343,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gd (TeX Live) 2.3.1 to adapt to many kinds of systems. +\`configure' configures gd (TeX Live) 2.3.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1414,7 +1414,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gd (TeX Live) 2.3.1:";; + short | recursive ) echo "Configuration of gd (TeX Live) 2.3.2:";; esac cat <<\_ACEOF @@ -1523,7 +1523,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gd (TeX Live) configure 2.3.1 +gd (TeX Live) configure 2.3.2 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1798,7 +1798,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gd (TeX Live) $as_me 2.3.1, which was +It was created by gd (TeX Live) $as_me 2.3.2, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -4341,7 +4341,7 @@ fi # Define the identity of the package. PACKAGE='gd--tex-live-' - VERSION='2.3.1' + VERSION='2.3.2' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -7241,7 +7241,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gd (TeX Live) $as_me 2.3.1, which was +This file was extended by gd (TeX Live) $as_me 2.3.2, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7309,7 +7309,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -gd (TeX Live) config.status 2.3.1 +gd (TeX Live) config.status 2.3.2 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/Build/source/libs/gd/libgd-src/CHANGELOG.md b/Build/source/libs/gd/libgd-src/CHANGELOG.md index 2b8f9bd7df4..75e72db2a86 100644 --- a/Build/source/libs/gd/libgd-src/CHANGELOG.md +++ b/Build/source/libs/gd/libgd-src/CHANGELOG.md @@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [2.3.2] - 2021-03-06 + +### Fixed + +- gif: allow decodin when both Global and Local Colormaps (#494) + +### Added + +- avif: Support for AVIF images via libavif (#557) +- heif: Support for HEIF/AVIF images via libheif (#395) (#557) +- webp: Drop ../deps/ search when building with cmake +- Windows: Remove unused snprintf fallback + ## [2.3.1] - 2021-01-30 ### Fixed diff --git a/Build/source/libs/gd/libgd-src/CMakeLists.txt b/Build/source/libs/gd/libgd-src/CMakeLists.txt index bf7836f35dd..57cd95d54be 100644 --- a/Build/source/libs/gd/libgd-src/CMakeLists.txt +++ b/Build/source/libs/gd/libgd-src/CMakeLists.txt @@ -19,6 +19,8 @@ OPTION(ENABLE_XPM "Enable XPM support" 0) OPTION(ENABLE_FREETYPE "Enable Freetype2 support" 0) OPTION(ENABLE_FONTCONFIG "Enable FontConfig support" 0) OPTION(ENABLE_WEBP "Enable WebP support" 0) +OPTION(ENABLE_HEIF "Enable HEIF support" 0) +OPTION(ENABLE_AVIF "Enable AVIF support" 0) OPTION(ENABLE_RAQM "Enable RAQM support" 0) if (BUILD_TEST) @@ -119,6 +121,17 @@ else (USE_EXT_GD) FIND_PACKAGE(WEBP REQUIRED) ENDIF (ENABLE_WEBP) + IF (ENABLE_HEIF) + FIND_PACKAGE(HEIF REQUIRED) + ENDIF (ENABLE_HEIF) + + IF (ENABLE_AVIF) + FIND_PACKAGE(libavif 0.8.2 REQUIRED CONFIG) + SET(HAVE_LIBAVIF 1) + SET(AVIF_LIBRARIES avif) + SET(AVIF_FOUND 1) + ENDIF (ENABLE_AVIF) + IF (ENABLE_LIQ) FIND_PACKAGE(LIQ REQUIRED) ENDIF (ENABLE_LIQ) @@ -171,6 +184,11 @@ else (USE_EXT_GD) SET(HAVE_LIBWEBP 1) ENDIF(WEBP_FOUND) + IF(HEIF_FOUND) + INCLUDE_DIRECTORIES(${HEIF_INCLUDE_DIR}) + SET(HAVE_LIBHEIF 1) + ENDIF(HEIF_FOUND) + IF(PNG_FOUND) INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) SET(HAVE_LIBPNG 1) diff --git a/Build/source/libs/gd/libgd-src/CONTRIBUTORS b/Build/source/libs/gd/libgd-src/CONTRIBUTORS index 8cf0bdd8297..cdb066a962d 100644 --- a/Build/source/libs/gd/libgd-src/CONTRIBUTORS +++ b/Build/source/libs/gd/libgd-src/CONTRIBUTORS @@ -1,3 +1,4 @@ +Ben Morss (morsssss) chapg Chen Pingping (Wilson) Chris Reuter @@ -11,6 +12,7 @@ Kornel LesiƄski kshepherd lhecking Marcin Wojdyr +Martin Reboredo (YakoYakoYokuYoku) mattias Mike Frysinger Mateusz Loskot (mloskot) diff --git a/Build/source/libs/gd/libgd-src/README.md b/Build/source/libs/gd/libgd-src/README.md index 44e7cdd8363..aa8fa3fc25c 100644 --- a/Build/source/libs/gd/libgd-src/README.md +++ b/Build/source/libs/gd/libgd-src/README.md @@ -39,6 +39,9 @@ GD has builtin support for: It also has optional support for more formats via external libraries: +* [AVIF](https://en.wikipedia.org/wiki/AV1#AV1_Image_File_Format_(AVIF)) via [libavif](https://github.com/AOMediaCodec/libavif) +* [HEIF](https://en.wikipedia.org/wiki/High_Efficiency_Image_File_Format) via [libheif](https://github.com/strukturag/libheif/) + * This includes [AVIF](https://en.wikipedia.org/wiki/AV1#AV1_Image_File_Format_%28AVIF%29) read support if your system's `libheif` has AV1 decoding. * [JPEG](https://en.wikipedia.org/wiki/JPEG) via [IJG/libjpeg](http://www.ijg.org/) or [libjpeg-turbo](http://libjpeg-turbo.virtualgl.org/) * Does not include [JPEG 2000](https://en.wikipedia.org/wiki/JPEG_2000) * [PNG](https://en.wikipedia.org/wiki/Portable_Network_Graphics) via [libpng](http://www.libpng.org/) diff --git a/Build/source/libs/gd/libgd-src/bootstrap.sh b/Build/source/libs/gd/libgd-src/bootstrap.sh index fe7dd0fd35b..19beb3626d8 100755 --- a/Build/source/libs/gd/libgd-src/bootstrap.sh +++ b/Build/source/libs/gd/libgd-src/bootstrap.sh @@ -9,7 +9,7 @@ v() { echo "$@"; "$@"; } # so that random hackers don't need it just to build the code. v docs/naturaldocs/run_docs.sh --nonfatal -if echo "${OSTYPE:-$(uname)}" | grep -q '^darwin' ; then +if uname | grep -qi '^darwin' ; then echo "Having trouble on OS X? Try: brew install autoconf libtool automake gettext pkg-config cmake" fi @@ -21,7 +21,7 @@ fi echo "/* Generated from config.hin via autoheader for cmake; see bootstrap.sh. */" sed -E \ -e '1d' \ - -e '/ENABLE_/{s:#undef:#define:;s:([^ ]*)$:\1 @\1@:;}' \ + -e '/ENABLE_/s:#undef:#cmakedefine01:' \ -e 's:#undef:#cmakedefine:' \ src/config.hin ) > src/config.h.cmake diff --git a/Build/source/libs/gd/libgd-src/cmake/distclean.sh b/Build/source/libs/gd/libgd-src/cmake/distclean.sh index 0124dd12e7c..c47a6be0b45 100755 --- a/Build/source/libs/gd/libgd-src/cmake/distclean.sh +++ b/Build/source/libs/gd/libgd-src/cmake/distclean.sh @@ -12,7 +12,7 @@ Clean all the cmake generated output files. Options: --automake Do not clean files autotools also creates EOF - exit ${1:-0} + exit "${1:-0}" } AUTOMAKE="false" diff --git a/Build/source/libs/gd/libgd-src/cmake/modules/FindHEIF.cmake b/Build/source/libs/gd/libgd-src/cmake/modules/FindHEIF.cmake new file mode 100644 index 00000000000..adc5cce3fe3 --- /dev/null +++ b/Build/source/libs/gd/libgd-src/cmake/modules/FindHEIF.cmake @@ -0,0 +1,82 @@ +# - Find the native HEIF includes and library +# + +# This module defines +# HEIF_INCLUDE_DIR, where to find heif.h, etc. +# HEIF_LIBRARIES, the libraries to link against to use HEIF. +# HEIF_FOUND, If false, do not try to use HEIF. +# Also defined, but not for general use are +# HEIF_LIBRARY, where to find the HEIF library. + +# Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# * The names of Kitware, Inc., the Insight Consortium, or the names of +# any consortium members, or of any contributors, may not be used to +# endorse or promote products derived from this software without +# specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS'' +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR +# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +SET(HEIF_FOUND "NO") + +# use pkg-config to get the directories and then use these values +# in the FIND_PATH() and FIND_LIBRARY() calls +if( NOT WIN32 ) + find_package(PkgConfig) + + pkg_check_modules(HEIF_PKG QUIET fontconfig) +endif( NOT WIN32 ) + +FIND_PATH(HEIF_INCLUDE_DIR NAMES libheif/heif.h + PATHS + /usr/local/include + /usr/include + HINTS + ${HEIF_PKG_INCLUDE_DIRS} # Generated by pkg-config +) + +SET(HEIF_NAMES ${HEIF_NAMES} heif ${HEIF_PKG_LIBRARY}) +FIND_LIBRARY(HEIF_LIBRARY + NAMES ${HEIF_NAMES} + PATH /usr/local/lib /usr/lib + PATH_SUFFIXES lib64 lib + HINTS ${HEIF_PKG_LIBRARY_DIRS} # Generated by pkg-config +) + +IF (HEIF_LIBRARY AND HEIF_INCLUDE_DIR) + SET(HEIF_FOUND "YES") + SET(HAVE_LIBHEIF 1) + SET(HEIF_LIBRARIES ${HEIF_LIBRARY}) +ENDIF (HEIF_LIBRARY AND HEIF_INCLUDE_DIR) + +IF (HEIF_FOUND) + IF (NOT HEIF_FIND_QUIETLY) + MESSAGE(STATUS "Find HEIF: ${HEIF_LIBRARY}") + ENDIF (NOT HEIF_FIND_QUIETLY) +ELSE (HEIF_FOUND) + IF (HEIF_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find HEIF library") + ENDIF (HEIF_FIND_REQUIRED) +ENDIF (HEIF_FOUND) + +MARK_AS_ADVANCED(HEIF_INCLUDE_DIR HEIF_LIBRARY) diff --git a/Build/source/libs/gd/libgd-src/cmake/modules/FindWEBP.cmake b/Build/source/libs/gd/libgd-src/cmake/modules/FindWEBP.cmake index 1fc8bf8e592..cc9355205f8 100644 --- a/Build/source/libs/gd/libgd-src/cmake/modules/FindWEBP.cmake +++ b/Build/source/libs/gd/libgd-src/cmake/modules/FindWEBP.cmake @@ -47,7 +47,7 @@ find_path(WEBP_INCLUDE_DIR decode.h set(WEBP_NAMES ${WEBP_NAMES} webp) find_library(WEBP_LIBRARY NAMES ${WEBP_NAMES} - PATHS "${PROJECT_SOURCE_DIR}/../deps/lib" /usr/lib64 /usr/lib /usr/local/lib + PATHS /usr/lib64 /usr/lib /usr/local/lib ) if (WEBP_LIBRARY AND WEBP_INCLUDE_DIR) diff --git a/Build/source/libs/gd/libgd-src/cmake/modules/gd.cmake b/Build/source/libs/gd/libgd-src/cmake/modules/gd.cmake index 963b4aeed59..831a7763208 100644 --- a/Build/source/libs/gd/libgd-src/cmake/modules/gd.cmake +++ b/Build/source/libs/gd/libgd-src/cmake/modules/gd.cmake @@ -13,5 +13,6 @@ MACRO(ADD_GD_TESTS) target_link_libraries (${test_prog_name} gdTest m ${ARGV0}) ENDIF(WIN32) add_test(NAME ${test_prog_name} COMMAND ${test_prog_name}) + SET_PROPERTY(TEST ${test_prog_name} PROPERTY SKIP_RETURN_CODE 77) ENDFOREACH(test_name) ENDMACRO(ADD_GD_TESTS) diff --git a/Build/source/libs/gd/libgd-src/config/test-driver b/Build/source/libs/gd/libgd-src/config/test-driver index 8e575b017d9..9759384aa72 100644 --- a/Build/source/libs/gd/libgd-src/config/test-driver +++ b/Build/source/libs/gd/libgd-src/config/test-driver @@ -1,9 +1,9 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2013-07-13.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2020 Free Software Foundation, Inc. # # 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 @@ -16,7 +16,7 @@ scriptversion=2013-07-13.22; # UTC # 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, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -42,11 +42,13 @@ print_usage () { cat <> $trs_file # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/Build/source/libs/gd/libgd-src/configure.ac b/Build/source/libs/gd/libgd-src/configure.ac index a2b6f18b0f8..535db68913e 100644 --- a/Build/source/libs/gd/libgd-src/configure.ac +++ b/Build/source/libs/gd/libgd-src/configure.ac @@ -285,6 +285,21 @@ GD_LIB_PKG_CHECK([LIBWEBP], [WEBP], [webp], [libwebp], [ ]) ]) +dnl Check for heif support. +GD_LIB_PKG_CHECK([LIBHEIF], [HEIF], [heif], [libheif >= 1.7.0], [ + AC_CHECK_LIB([heif], [heif_get_version], [dnl + AS_VAR_APPEND([LIBHEIF_LIBS], [" -lheif"]) + ]) +]) + +dnl Check for avif support. +GD_LIB_PKG_CHECK([LIBAVIF], [AVIF], [avif], [libavif >= 0.8.2], [ + AC_CHECK_LIB([avif], [avifVersion], [dnl + AS_VAR_APPEND([LIBAVIF_LIBS], [" -lavif"]) + gd_found_lib=yes + ]) +]) + gl_VISIBILITY() CFLAGS="$CFLAGS $CFLAG_VISIBILITY" @@ -314,6 +329,8 @@ AC_MSG_RESULT([ Support for PNG library: $gd_with_LIBPNG Support for JPEG library: $gd_with_LIBJPEG Support for WebP library: $gd_with_LIBWEBP + Support for HEIF library: $gd_with_LIBHEIF + Support for AVIF library: $gd_with_LIBAVIF Support for TIFF library: $gd_with_LIBTIFF Support for Freetype 2.x library: $gd_with_LIBFREETYPE Support for Fontconfig library: $gd_with_LIBFONTCONFIG diff --git a/Build/source/libs/gd/libgd-src/docs/README.CMAKE b/Build/source/libs/gd/libgd-src/docs/README.CMAKE index 2be204560df..c9356b2b12a 100644 --- a/Build/source/libs/gd/libgd-src/docs/README.CMAKE +++ b/Build/source/libs/gd/libgd-src/docs/README.CMAKE @@ -20,6 +20,7 @@ ENABLE_FREETYPE=1 ENABLE_FONTCONFIG=1 ENABLE_XPM=1 ENABLE_WEBP=1 +ENABLE_AVIF=1 ENABLE_RAQM=1 You can optionally run our tests suite using: diff --git a/Build/source/libs/gd/libgd-src/docs/naturaldocs/html/files/gd-c.html b/Build/source/libs/gd/libgd-src/docs/naturaldocs/html/files/gd-c.html index 6b2453ab8af..e85cc84c880 100644 --- a/Build/source/libs/gd/libgd-src/docs/naturaldocs/html/files/gd-c.html +++ b/Build/source/libs/gd/libgd-src/docs/naturaldocs/html/files/gd-c.html @@ -1,9 +1,9 @@ -/root/workspace/hanqiang/libgd_release_2.3.1/libgd/docs/naturaldocs/tmp/gd.c - + @@ -186,7 +186,7 @@ gdImageLine(im, 10,10, 20,20, gdAntiAliased);