GraphicsMagick: Upgraded libtiff to 4.5.0. CORE_tiff is compilab...
GraphicsMagick Commits <[email protected]>
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.33111.1671326794.1459.graphicsmagick-commit@lists.sourceforge.net> |
changeset 365e6b2d0954 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=365e6b2d0954 summary: Upgraded libtiff to 4.5.0. CORE_tiff is compilable fine. diffstat: ChangeLog | 1 + tiff/libtiff/CMakeLists.txt | 80 +- tiff/libtiff/Makefile.am | 10 +- tiff/libtiff/Makefile.in | 84 +- tiff/libtiff/Makefile.vc | 100 - tiff/libtiff/SConstruct | 71 - tiff/libtiff/libtiff.def | 13 +- tiff/libtiff/libtiff.map | 212 + tiff/libtiff/mkg3states.c | 499 +- tiff/libtiff/t4.h | 464 +- tiff/libtiff/tif_aux.c | 631 +- tiff/libtiff/tif_close.c | 161 +- tiff/libtiff/tif_codec.c | 136 +- tiff/libtiff/tif_color.c | 360 +- tiff/libtiff/tif_compress.c | 416 +- tiff/libtiff/tif_config.h-vms | 46 - tiff/libtiff/tif_config.h.cmake.in | 3 + tiff/libtiff/tif_config.h.in | 3 + tiff/libtiff/tif_config.vc.h | 137 - tiff/libtiff/tif_config.wince.h | 69 - tiff/libtiff/tif_dir.c | 3557 +++++---- tiff/libtiff/tif_dir.h | 463 +- tiff/libtiff/tif_dirinfo.c | 2451 +++-- tiff/libtiff/tif_dirread.c | 13205 ++++++++++++++++++---------------- tiff/libtiff/tif_dirwrite.c | 5892 +++++++-------- tiff/libtiff/tif_dumpmode.c | 151 +- tiff/libtiff/tif_error.c | 152 +- tiff/libtiff/tif_extension.c | 60 +- tiff/libtiff/tif_fax3.c | 2667 +++--- tiff/libtiff/tif_fax3.h | 901 +- tiff/libtiff/tif_fax3sm.c | 2 +- tiff/libtiff/tif_flush.c | 135 +- tiff/libtiff/tif_getimage.c | 4711 ++++++----- tiff/libtiff/tif_hash_set.c | 613 + tiff/libtiff/tif_hash_set.h | 100 + tiff/libtiff/tif_jbig.c | 304 +- tiff/libtiff/tif_jpeg.c | 3966 +++++---- tiff/libtiff/tif_jpeg_12.c | 57 +- tiff/libtiff/tif_lerc.c | 1841 ++-- tiff/libtiff/tif_luv.c | 2634 +++--- tiff/libtiff/tif_lzma.c | 745 +- tiff/libtiff/tif_lzw.c | 2211 +++-- tiff/libtiff/tif_next.c | 315 +- tiff/libtiff/tif_ojpeg.c | 4807 ++++++------ tiff/libtiff/tif_open.c | 1220 +- tiff/libtiff/tif_packbits.c | 510 +- tiff/libtiff/tif_pixarlog.c | 2486 +++--- tiff/libtiff/tif_predict.c | 1489 ++- tiff/libtiff/tif_predict.h | 55 +- tiff/libtiff/tif_print.c | 1287 +- tiff/libtiff/tif_read.c | 2456 +++--- tiff/libtiff/tif_stream.cxx | 586 +- tiff/libtiff/tif_strip.c | 484 +- tiff/libtiff/tif_swab.c | 445 +- tiff/libtiff/tif_thunder.c | 281 +- tiff/libtiff/tif_tile.c | 415 +- tiff/libtiff/tif_unix.c | 462 +- tiff/libtiff/tif_version.c | 29 +- tiff/libtiff/tif_warning.c | 125 +- tiff/libtiff/tif_webp.c | 1244 +- tiff/libtiff/tif_win32.c | 588 +- tiff/libtiff/tif_write.c | 1304 +- tiff/libtiff/tif_zip.c | 1023 +- tiff/libtiff/tif_zstd.c | 657 +- tiff/libtiff/tiff.h | 1425 ++- tiff/libtiff/tiffconf.vc.h | 152 - tiff/libtiff/tiffconf.wince.h | 110 - tiff/libtiff/tiffio.h | 827 +- tiff/libtiff/tiffio.hxx | 33 +- tiff/libtiff/tiffiop.h | 611 +- tiff/libtiff/tiffvers.h | 25 +- tiff/libtiff/uvcode.h | 269 +- 72 files changed, 39601 insertions(+), 36433 deletions(-) diffs (truncated from 85112 to 500 lines): diff -r 674f3e081026 -r 365e6b2d0954 ChangeLog --- a/ChangeLog Sun Dec 18 00:57:07 2022 +0100 +++ b/ChangeLog Sun Dec 18 02:25:40 2022 +0100 @@ -2,6 +2,7 @@ * tiff/port/libport_config.h Added missing file Documentation of libtiff upgraded. + Upgraded libtiff to 4.5.0. 2022-12-17 Bob Friesenhahn <[email protected]> diff -r 674f3e081026 -r 365e6b2d0954 tiff/libtiff/CMakeLists.txt --- a/tiff/libtiff/CMakeLists.txt Sun Dec 18 00:57:07 2022 +0100 +++ b/tiff/libtiff/CMakeLists.txt Sun Dec 18 02:25:40 2022 +0100 @@ -46,6 +46,7 @@ add_library(tiff libtiff.def) +add_library(TIFF::TIFF ALIAS tiff) target_sources(tiff PRIVATE ${tiff_public_HEADERS} @@ -66,6 +67,7 @@ tif_fax3sm.c tif_flush.c tif_getimage.c + tif_hash_set.c tif_jbig.c tif_jpeg.c tif_jpeg_12.c @@ -120,7 +122,9 @@ if(JPEG_SUPPORT) target_link_libraries(tiff PRIVATE JPEG::JPEG) string(APPEND tiff_requires_private " libjpeg") - if(JPEG_DUAL_MODE_8_12) + if(HAVE_JPEGTURBO_DUAL_MODE_8_12) + target_compile_definitions(tiff PRIVATE HAVE_JPEGTURBO_DUAL_MODE_8_12) + elseif(JPEG_DUAL_MODE_8_12) target_include_directories(tiff PRIVATE ${JPEG12_INCLUDE_DIR}) target_link_libraries(tiff PRIVATE ${JPEG12_LIBRARIES}) endif() @@ -148,8 +152,8 @@ target_link_libraries(tiff PRIVATE WebP::WebP) string(APPEND tiff_requires_private " libwebp") endif() -target_link_libraries(tiff PRIVATE CMath::CMath) if(CMath_LIBRARY) + target_link_libraries(tiff PRIVATE CMath::CMath) list(APPEND tiff_libs_private_list "${CMath_LIBRARY}") endif() @@ -169,27 +173,37 @@ "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libtiff.map") endif() -export(TARGETS tiff NAMESPACE TIFF:: FILE "${CMAKE_CURRENT_BINARY_DIR}/libtiffTargets.cmake") -install(TARGETS tiff EXPORT TiffTargets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +if(tiff-install) + export(TARGETS tiff NAMESPACE TIFF:: FILE "${CMAKE_CURRENT_BINARY_DIR}/libtiffTargets.cmake") + install(TARGETS tiff EXPORT TiffTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -install(FILES ${tiff_public_HEADERS} - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + install(FILES ${tiff_public_HEADERS} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") -set(TIFF_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/tiff) -install(EXPORT TiffTargets - FILE TiffTargets.cmake - NAMESPACE TIFF:: - DESTINATION ${TIFF_CONFIGDIR} -) + set(TIFF_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/tiff) + install(EXPORT TiffTargets + FILE TiffTargets.cmake + NAMESPACE TIFF:: + DESTINATION ${TIFF_CONFIGDIR} + ) +endif() if(CXX_SUPPORT) set(tiffxx_HEADERS tiffio.hxx) - add_library(tiffxx ../placeholder.h) + # No .def file for this library. + if (WIN32) + add_library(tiffxx STATIC ../placeholder.h) + else() + add_library(tiffxx ../placeholder.h) + endif() + + add_library(TIFF::CXX ALIAS tiffxx) + target_sources(tiffxx PRIVATE ${tiffxx_HEADERS} tif_stream.cxx) @@ -207,22 +221,26 @@ "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libtiffxx.map") endif() - install(TARGETS tiffxx - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + if(tiff-install) + install(TARGETS tiffxx + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(FILES ${tiffxx_HEADERS} - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") - + install(FILES ${tiffxx_HEADERS} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + endif() + endif() -add_executable(mkg3states ../placeholder.h) -target_sources(mkg3states PRIVATE mkg3states.c tif_fax3.h) -target_link_libraries(mkg3states tiff port) +if(NOT CMAKE_CROSSCOMPILING) + add_executable(tiff_mkg3states ../placeholder.h) + target_sources(tiff_mkg3states PRIVATE mkg3states.c tif_fax3.h) + target_link_libraries(tiff_mkg3states tiff tiff_port) -add_custom_target(faxtable - DEPENDS mkg3states - COMMAND ${CMAKE_COMMAND} -E rm "tif_fax3sm.c" - COMMAND mkg3states -b -c const "tif_fax3sm.c" - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + add_custom_target(tiff_faxtable + DEPENDS tiff_mkg3states + COMMAND ${CMAKE_COMMAND} -E rm "tif_fax3sm.c" + COMMAND tiff_mkg3states -b -c const "tif_fax3sm.c" + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") +endif() diff -r 674f3e081026 -r 365e6b2d0954 tiff/libtiff/Makefile.am --- a/tiff/libtiff/Makefile.am Sun Dec 18 00:57:07 2022 +0100 +++ b/tiff/libtiff/Makefile.am Sun Dec 18 02:25:40 2022 +0100 @@ -47,6 +47,7 @@ noinst_HEADERS = \ t4.h \ tif_dir.h \ + tif_hash_set.h \ tif_predict.h \ tiffiop.h \ uvcode.h @@ -71,6 +72,7 @@ tif_fax3sm.c \ tif_flush.c \ tif_getimage.c \ + tif_hash_set.c \ tif_jbig.c \ tif_jpeg.c \ tif_jpeg_12.c \ @@ -153,4 +155,10 @@ extra_CPPFLAGS = endif -AM_CPPFLAGS = -I$(top_srcdir)/libtiff -I$(top_srcdir)/port $(extra_CPPFLAGS) +if HAVE_JPEGTURBO_DUAL_MODE_8_12 +JPEGTURBO_CPPFLAGS = -DHAVE_JPEGTURBO_DUAL_MODE_8_12 +else +JPEGTURBO_CPPFLAGS = +endif + +AM_CPPFLAGS = -I$(top_srcdir)/libtiff -I$(top_srcdir)/port $(extra_CPPFLAGS) $(JPEGTURBO_CPPFLAGS) diff -r 674f3e081026 -r 365e6b2d0954 tiff/libtiff/Makefile.in --- a/tiff/libtiff/Makefile.in Sun Dec 18 00:57:07 2022 +0100 +++ b/tiff/libtiff/Makefile.in Sun Dec 18 02:25:40 2022 +0100 @@ -178,25 +178,26 @@ tif_color.c tif_compress.c tif_dir.c tif_dirinfo.c \ tif_dirread.c tif_dirwrite.c tif_dumpmode.c tif_error.c \ tif_extension.c tif_fax3.c tif_fax3sm.c tif_flush.c \ - tif_getimage.c tif_jbig.c tif_jpeg.c tif_jpeg_12.c tif_lerc.c \ - tif_luv.c tif_lzma.c tif_lzw.c tif_next.c tif_ojpeg.c \ - tif_open.c tif_packbits.c tif_pixarlog.c tif_predict.c \ - tif_print.c tif_read.c tif_strip.c tif_swab.c tif_thunder.c \ - tif_tile.c tif_version.c tif_warning.c tif_webp.c tif_write.c \ - tif_zip.c tif_zstd.c tif_win32.c tif_unix.c + tif_getimage.c tif_hash_set.c tif_jbig.c tif_jpeg.c \ + tif_jpeg_12.c tif_lerc.c tif_luv.c tif_lzma.c tif_lzw.c \ + tif_next.c tif_ojpeg.c tif_open.c tif_packbits.c \ + tif_pixarlog.c tif_predict.c tif_print.c tif_read.c \ + tif_strip.c tif_swab.c tif_thunder.c tif_tile.c tif_version.c \ + tif_warning.c tif_webp.c tif_write.c tif_zip.c tif_zstd.c \ + tif_win32.c tif_unix.c @WIN32_IO_TRUE@am__objects_1 = tif_win32.lo @WIN32_IO_FALSE@am__objects_2 = tif_unix.lo am_libtiff_la_OBJECTS = tif_aux.lo tif_close.lo tif_codec.lo \ tif_color.lo tif_compress.lo tif_dir.lo tif_dirinfo.lo \ tif_dirread.lo tif_dirwrite.lo tif_dumpmode.lo tif_error.lo \ tif_extension.lo tif_fax3.lo tif_fax3sm.lo tif_flush.lo \ - tif_getimage.lo tif_jbig.lo tif_jpeg.lo tif_jpeg_12.lo \ - tif_lerc.lo tif_luv.lo tif_lzma.lo tif_lzw.lo tif_next.lo \ - tif_ojpeg.lo tif_open.lo tif_packbits.lo tif_pixarlog.lo \ - tif_predict.lo tif_print.lo tif_read.lo tif_strip.lo \ - tif_swab.lo tif_thunder.lo tif_tile.lo tif_version.lo \ - tif_warning.lo tif_webp.lo tif_write.lo tif_zip.lo tif_zstd.lo \ - $(am__objects_1) $(am__objects_2) + tif_getimage.lo tif_hash_set.lo tif_jbig.lo tif_jpeg.lo \ + tif_jpeg_12.lo tif_lerc.lo tif_luv.lo tif_lzma.lo tif_lzw.lo \ + tif_next.lo tif_ojpeg.lo tif_open.lo tif_packbits.lo \ + tif_pixarlog.lo tif_predict.lo tif_print.lo tif_read.lo \ + tif_strip.lo tif_swab.lo tif_thunder.lo tif_tile.lo \ + tif_version.lo tif_warning.lo tif_webp.lo tif_write.lo \ + tif_zip.lo tif_zstd.lo $(am__objects_1) $(am__objects_2) libtiff_la_OBJECTS = $(am_libtiff_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -238,20 +239,21 @@ ./$(DEPDIR)/tif_error.Plo ./$(DEPDIR)/tif_extension.Plo \ ./$(DEPDIR)/tif_fax3.Plo ./$(DEPDIR)/tif_fax3sm.Plo \ ./$(DEPDIR)/tif_flush.Plo ./$(DEPDIR)/tif_getimage.Plo \ - ./$(DEPDIR)/tif_jbig.Plo ./$(DEPDIR)/tif_jpeg.Plo \ - ./$(DEPDIR)/tif_jpeg_12.Plo ./$(DEPDIR)/tif_lerc.Plo \ - ./$(DEPDIR)/tif_luv.Plo ./$(DEPDIR)/tif_lzma.Plo \ - ./$(DEPDIR)/tif_lzw.Plo ./$(DEPDIR)/tif_next.Plo \ - ./$(DEPDIR)/tif_ojpeg.Plo ./$(DEPDIR)/tif_open.Plo \ - ./$(DEPDIR)/tif_packbits.Plo ./$(DEPDIR)/tif_pixarlog.Plo \ - ./$(DEPDIR)/tif_predict.Plo ./$(DEPDIR)/tif_print.Plo \ - ./$(DEPDIR)/tif_read.Plo ./$(DEPDIR)/tif_stream.Plo \ - ./$(DEPDIR)/tif_strip.Plo ./$(DEPDIR)/tif_swab.Plo \ - ./$(DEPDIR)/tif_thunder.Plo ./$(DEPDIR)/tif_tile.Plo \ - ./$(DEPDIR)/tif_unix.Plo ./$(DEPDIR)/tif_version.Plo \ - ./$(DEPDIR)/tif_warning.Plo ./$(DEPDIR)/tif_webp.Plo \ - ./$(DEPDIR)/tif_win32.Plo ./$(DEPDIR)/tif_write.Plo \ - ./$(DEPDIR)/tif_zip.Plo ./$(DEPDIR)/tif_zstd.Plo + ./$(DEPDIR)/tif_hash_set.Plo ./$(DEPDIR)/tif_jbig.Plo \ + ./$(DEPDIR)/tif_jpeg.Plo ./$(DEPDIR)/tif_jpeg_12.Plo \ + ./$(DEPDIR)/tif_lerc.Plo ./$(DEPDIR)/tif_luv.Plo \ + ./$(DEPDIR)/tif_lzma.Plo ./$(DEPDIR)/tif_lzw.Plo \ + ./$(DEPDIR)/tif_next.Plo ./$(DEPDIR)/tif_ojpeg.Plo \ + ./$(DEPDIR)/tif_open.Plo ./$(DEPDIR)/tif_packbits.Plo \ + ./$(DEPDIR)/tif_pixarlog.Plo ./$(DEPDIR)/tif_predict.Plo \ + ./$(DEPDIR)/tif_print.Plo ./$(DEPDIR)/tif_read.Plo \ + ./$(DEPDIR)/tif_stream.Plo ./$(DEPDIR)/tif_strip.Plo \ + ./$(DEPDIR)/tif_swab.Plo ./$(DEPDIR)/tif_thunder.Plo \ + ./$(DEPDIR)/tif_tile.Plo ./$(DEPDIR)/tif_unix.Plo \ + ./$(DEPDIR)/tif_version.Plo ./$(DEPDIR)/tif_warning.Plo \ + ./$(DEPDIR)/tif_webp.Plo ./$(DEPDIR)/tif_win32.Plo \ + ./$(DEPDIR)/tif_write.Plo ./$(DEPDIR)/tif_zip.Plo \ + ./$(DEPDIR)/tif_zstd.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -407,11 +409,17 @@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ +PYTHON_BIN = @PYTHON_BIN@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SPHINX_BUILD = @SPHINX_BUILD@ STRIP = @STRIP@ +TIFF_MAN1_GEN = @TIFF_MAN1_GEN@ +TIFF_MAN1_PREBUILT = @TIFF_MAN1_PREBUILT@ +TIFF_MAN3_GEN = @TIFF_MAN3_GEN@ +TIFF_MAN3_PREBUILT = @TIFF_MAN3_PREBUILT@ VERSION = @VERSION@ XMKMF = @XMKMF@ X_CFLAGS = @X_CFLAGS@ @@ -485,6 +493,7 @@ noinst_HEADERS = \ t4.h \ tif_dir.h \ + tif_hash_set.h \ tif_predict.h \ tiffiop.h \ uvcode.h @@ -495,13 +504,13 @@ libtiff_la_SOURCES = tif_aux.c tif_close.c tif_codec.c tif_color.c \ tif_compress.c tif_dir.c tif_dirinfo.c tif_dirread.c \ tif_dirwrite.c tif_dumpmode.c tif_error.c tif_extension.c \ - tif_fax3.c tif_fax3sm.c tif_flush.c tif_getimage.c tif_jbig.c \ - tif_jpeg.c tif_jpeg_12.c tif_lerc.c tif_luv.c tif_lzma.c \ - tif_lzw.c tif_next.c tif_ojpeg.c tif_open.c tif_packbits.c \ - tif_pixarlog.c tif_predict.c tif_print.c tif_read.c \ - tif_strip.c tif_swab.c tif_thunder.c tif_tile.c tif_version.c \ - tif_warning.c tif_webp.c tif_write.c tif_zip.c tif_zstd.c \ - $(am__append_3) $(am__append_5) + tif_fax3.c tif_fax3sm.c tif_flush.c tif_getimage.c \ + tif_hash_set.c tif_jbig.c tif_jpeg.c tif_jpeg_12.c tif_lerc.c \ + tif_luv.c tif_lzma.c tif_lzw.c tif_next.c tif_ojpeg.c \ + tif_open.c tif_packbits.c tif_pixarlog.c tif_predict.c \ + tif_print.c tif_read.c tif_strip.c tif_swab.c tif_thunder.c \ + tif_tile.c tif_version.c tif_warning.c tif_webp.c tif_write.c \ + tif_zip.c tif_zstd.c $(am__append_3) $(am__append_5) libtiffxx_la_SOURCES = \ tif_stream.cxx @@ -516,7 +525,9 @@ mkg3states_LDADD = $(LIBPORT) @STATIC_LERC_FALSE@extra_CPPFLAGS = @STATIC_LERC_TRUE@extra_CPPFLAGS = -DLERC_STATIC -AM_CPPFLAGS = -I$(top_srcdir)/libtiff -I$(top_srcdir)/port $(extra_CPPFLAGS) +@HAVE_JPEGTURBO_DUAL_MODE_8_12_FALSE@JPEGTURBO_CPPFLAGS = +@HAVE_JPEGTURBO_DUAL_MODE_8_12_TRUE@JPEGTURBO_CPPFLAGS = -DHAVE_JPEGTURBO_DUAL_MODE_8_12 +AM_CPPFLAGS = -I$(top_srcdir)/libtiff -I$(top_srcdir)/port $(extra_CPPFLAGS) $(JPEGTURBO_CPPFLAGS) all: tif_config.h tiffconf.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -648,6 +659,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_fax3sm.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_flush.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_getimage.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_hash_set.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_jbig.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_jpeg.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_jpeg_12.Plo@am__quote@ # am--include-marker @@ -919,6 +931,7 @@ -rm -f ./$(DEPDIR)/tif_fax3sm.Plo -rm -f ./$(DEPDIR)/tif_flush.Plo -rm -f ./$(DEPDIR)/tif_getimage.Plo + -rm -f ./$(DEPDIR)/tif_hash_set.Plo -rm -f ./$(DEPDIR)/tif_jbig.Plo -rm -f ./$(DEPDIR)/tif_jpeg.Plo -rm -f ./$(DEPDIR)/tif_jpeg_12.Plo @@ -1010,6 +1023,7 @@ -rm -f ./$(DEPDIR)/tif_fax3sm.Plo -rm -f ./$(DEPDIR)/tif_flush.Plo -rm -f ./$(DEPDIR)/tif_getimage.Plo + -rm -f ./$(DEPDIR)/tif_hash_set.Plo -rm -f ./$(DEPDIR)/tif_jbig.Plo -rm -f ./$(DEPDIR)/tif_jpeg.Plo -rm -f ./$(DEPDIR)/tif_jpeg_12.Plo diff -r 674f3e081026 -r 365e6b2d0954 tiff/libtiff/Makefile.vc --- a/tiff/libtiff/Makefile.vc Sun Dec 18 00:57:07 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,100 +0,0 @@ -# Copyright (C) 2004, Andrey Kiselev <[email protected]> -# -# Permission to use, copy, modify, distribute, and sell this software and -# its documentation for any purpose is hereby granted without fee, provided -# that (i) the above copyright notices and this permission notice appear in -# all copies of the software and related documentation, and (ii) the names of -# Sam Leffler and Silicon Graphics may not be used in any advertising or -# publicity relating to the software without the specific, prior written -# permission of Sam Leffler and Silicon Graphics. -# -# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, -# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY -# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. -# -# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR -# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, -# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF -# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE -# OF THIS SOFTWARE. -# -# Makefile for MS Visual C and Watcom C compilers. -# -# To build: -# C:\libtiff\libtiff> nmake /f makefile.vc all -# - -!INCLUDE ..\nmake.opt - -INCL = -I. $(JPEG_INCLUDE) $(ZLIB_INCLUDE) $(JBIG_INCLUDE) - -!IFDEF USE_WIN_CRT_LIB -OBJ_SYSDEP_MODULE = tif_unix.obj -!ELSE -OBJ_SYSDEP_MODULE = tif_win32.obj -!ENDIF - -OBJ = \ - tif_aux.obj \ - tif_close.obj \ - tif_codec.obj \ - tif_color.obj \ - tif_compress.obj \ - tif_dir.obj \ - tif_dirinfo.obj \ - tif_dirread.obj \ - tif_dirwrite.obj \ - tif_dumpmode.obj \ - tif_error.obj \ - tif_extension.obj \ - tif_fax3.obj \ - tif_fax3sm.obj \ - tif_getimage.obj \ - tif_jbig.obj \ - tif_jpeg.obj \ - tif_jpeg_12.obj \ - tif_ojpeg.obj \ - tif_flush.obj \ - tif_luv.obj \ - tif_lzw.obj \ - tif_next.obj \ - tif_open.obj \ - tif_packbits.obj \ - tif_pixarlog.obj \ - tif_predict.obj \ - tif_print.obj \ - tif_read.obj \ - tif_stream.obj \ - tif_swab.obj \ - tif_strip.obj \ - tif_thunder.obj \ - tif_tile.obj \ - tif_version.obj \ - tif_warning.obj \ - tif_write.obj \ - tif_zip.obj \ - $(OBJ_SYSDEP_MODULE) - -all: libtiff.lib $(DLLNAME) - -tif_config.h: tif_config.vc.h - copy tif_config.vc.h tif_config.h - -tiffconf.h: tiffconf.vc.h - copy tiffconf.vc.h tiffconf.h - -libtiff.lib: tif_config.h tiffconf.h $(OBJ) - $(AR) /out:libtiff.lib ..\port\libport.lib $(OBJ) $(LIBS) - -$(DLLNAME): tif_config.h tiffconf.h libtiff.def $(OBJ) - $(LD) /debug /dll /def:libtiff.def /out:$(DLLNAME) \ - /implib:libtiff_i.lib ..\port\libport.lib $(OBJ) $(LIBS) - -clean: - -del tif_config.h tiffconf.h - -del *.obj - -del *.lib - -del *.dll - -del *.dll.manifest - -del *.pdb diff -r 674f3e081026 -r 365e6b2d0954 tiff/libtiff/SConstruct --- a/tiff/libtiff/SConstruct Sun Dec 18 00:57:07 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,71 +0,0 @@ -# Tag Image File Format (TIFF) Software -# -# Copyright (C) 2005, Andrey Kiselev <[email protected]> -# -# Permission to use, copy, modify, distribute, and sell this software and -# its documentation for any purpose is hereby granted without fee, provided -# that (i) the above copyright notices and this permission notice appear in -# all copies of the software and related documentation, and (ii) the names of -# Sam Leffler and Silicon Graphics may not be used in any advertising or -# publicity relating to the software without the specific, prior written -# permission of Sam Leffler and Silicon Graphics. -# -# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, -# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY -# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. -# -# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR -# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, -# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF -# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE -# OF THIS SOFTWARE. - -# This file contains rules to build software with the SCons tool -# (see the http://www.scons.org/ for details on SCons). - -# Import globally defined options -Import([ 'env', 'idir_lib' ]) - -SRCS = [ \ - 'tif_aux.c', \ - 'tif_close.c', \ - 'tif_codec.c', \ - 'tif_color.c', \ - 'tif_compress.c', \ - 'tif_dir.c', \ - 'tif_dirinfo.c', \ - 'tif_dirread.c', \ - 'tif_dirwrite.c', \ - 'tif_dumpmode.c', \ - 'tif_error.c', \ - 'tif_extension.c', \ - 'tif_fax3.c', \ - 'tif_fax3sm.c', \ - 'tif_flush.c', \ - 'tif_getimage.c', \ - 'tif_jbig.c', \ - 'tif_jpeg.c', \ - 'tif_luv.c', \ - 'tif_lzw.c', \ - 'tif_next.c', \ - 'tif_ojpeg.c', \ - 'tif_open.c', \ - 'tif_packbits.c', \ - 'tif_pixarlog.c', \