From 5a79742b26661fa424d4899e44cca8b17238079c Mon Sep 17 00:00:00 2001 From: "Vladimir D. Seleznev" Date: Sun, 17 May 2020 18:32:45 +0300 Subject: [PATCH] DEBIAN: libtiff Author: Sergei Golovan Description: Patch allows one to build libtk-img using the system-wide libtiff. This patch adds a hack which sort of ports libtk-img to version 4 of libtiff. The patch is a Debian-specific hack and isn't supposed to be forwarded upstream. Last-modified: Sun, 15 Dec 2013 21:03:21 +0400 --- tkimg/libtiff/Makefile.in | 8 +- tkimg/libtiff/configure | 49 ----- tkimg/libtiff/configure.ac | 14 -- tkimg/libtiff/tifftcl.decls | 139 --------------- tkimg/libtiff/tifftclDecls.h | 304 ++++++-------------------------- tkimg/libtiff/tifftclStubInit.c | 121 ++----------- tkimg/tiff/configure | 2 +- tkimg/tiff/configure.ac | 2 +- tkimg/tiff/tiff.c | 4 - 9 files changed, 82 insertions(+), 561 deletions(-) diff --git a/tkimg/libtiff/Makefile.in b/tkimg/libtiff/Makefile.in index 2b9286e6..b3621be4 100755 --- a/tkimg/libtiff/Makefile.in +++ b/tkimg/libtiff/Makefile.in @@ -33,8 +33,8 @@ # tif_fax3sm is special. It is generated. -PKG_SOURCES = @PKG_SOURCES@ tif_fax3sm.c -PKG_OBJECTS = @PKG_OBJECTS@ tif_fax3sm.$(OBJEXT) +PKG_SOURCES = @PKG_SOURCES@ +PKG_OBJECTS = @PKG_OBJECTS@ PKG_STUB_SOURCES = @PKG_STUB_SOURCES@ PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@ @@ -160,9 +160,9 @@ DEFS = @DEFS@ $(PKG_CFLAGS) CONFIG_CLEAN_FILES = Makefile CPPFLAGS = @CPPFLAGS@ -LIBS = @PKG_LIBS@ @LIBS@ +LIBS = @PKG_LIBS@ @LIBS@ -ltiff AR = @AR@ -CFLAGS = @CFLAGS@ -DTIFFTCLAPI=MODULE_SCOPE +CFLAGS = @CFLAGS@ -DTIFFTCLAPI=MODULE_SCOPE -DMODULE_SCOPE=extern COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) .SUFFIXES: .c .$(OBJEXT) diff --git a/tkimg/libtiff/configure b/tkimg/libtiff/configure index 87e40256..9d7fd8a7 100755 --- a/tkimg/libtiff/configure +++ b/tkimg/libtiff/configure @@ -5796,55 +5796,6 @@ mv -f tifftcl_confdefs.h confdefs.h - - vars=" - ../compat/libtiff/libtiff/tif_aux.c ../compat/libtiff/libtiff/tif_close.c ../compat/libtiff/libtiff/tif_codec.c - ../compat/libtiff/libtiff/tif_compress.c ../compat/libtiff/libtiff/tif_dir.c ../compat/libtiff/libtiff/tif_dirinfo.c - ../compat/libtiff/libtiff/tif_dirread.c ../compat/libtiff/libtiff/tif_dirwrite.c ../compat/libtiff/libtiff/tif_dumpmode.c - ../compat/libtiff/libtiff/tif_error.c ../compat/libtiff/libtiff/tif_fax3.c - ../compat/libtiff/libtiff/tif_getimage.c ../compat/libtiff/libtiff/tif_flush.c ../compat/libtiff/libtiff/tif_luv.c - ../compat/libtiff/libtiff/tif_lzw.c ../compat/libtiff/libtiff/tif_next.c ../compat/libtiff/libtiff/tif_open.c - ../compat/libtiff/libtiff/tif_packbits.c ../compat/libtiff/libtiff/tif_predict.c ../compat/libtiff/libtiff/tif_print.c - ../compat/libtiff/libtiff/tif_read.c ../compat/libtiff/libtiff/tif_swab.c ../compat/libtiff/libtiff/tif_strip.c - ../compat/libtiff/libtiff/tif_thunder.c ../compat/libtiff/libtiff/tif_tile.c ../compat/libtiff/libtiff/tif_version.c - ../compat/libtiff/libtiff/tif_warning.c ../compat/libtiff/libtiff/tif_write.c - ../compat/libtiff/libtiff/tif_color.c ../compat/libtiff/libtiff/tif_extension.c -" - for i in $vars; do - case $i in - \$*) - # allow $-var names - PKG_SOURCES="$PKG_SOURCES $i" - PKG_OBJECTS="$PKG_OBJECTS $i" - ;; - *) - # check for existence - allows for generic/win/unix VPATH - # To add more dirs here (like 'src'), you have to update VPATH - # in Makefile.in as well - if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ - -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ - -a ! -f "${srcdir}/macosx/$i" \ - ; then - as_fn_error $? "could not find source file '$i'" "$LINENO" 5 - fi - PKG_SOURCES="$PKG_SOURCES $i" - # this assumes it is in a VPATH dir - i=`basename $i` - # handle user calling this before or after TEA_SETUP_COMPILER - if test x"${OBJEXT}" != x ; then - j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}" - else - j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}" - fi - PKG_OBJECTS="$PKG_OBJECTS $j" - ;; - esac - done - - - - - vars="tifftcl.h tifftclDecls.h" for i in $vars; do # check for existence, be strict because it is installed diff --git a/tkimg/libtiff/configure.ac b/tkimg/libtiff/configure.ac index 1665e093..13ae587f 100755 --- a/tkimg/libtiff/configure.ac +++ b/tkimg/libtiff/configure.ac @@ -82,20 +82,6 @@ mv -f tifftcl_confdefs.h confdefs.h TEA_ADD_SOURCES([tifftcl.c tifftclStubInit.c]) -TEA_ADD_SOURCES([ - ../compat/libtiff/libtiff/tif_aux.c ../compat/libtiff/libtiff/tif_close.c ../compat/libtiff/libtiff/tif_codec.c - ../compat/libtiff/libtiff/tif_compress.c ../compat/libtiff/libtiff/tif_dir.c ../compat/libtiff/libtiff/tif_dirinfo.c - ../compat/libtiff/libtiff/tif_dirread.c ../compat/libtiff/libtiff/tif_dirwrite.c ../compat/libtiff/libtiff/tif_dumpmode.c - ../compat/libtiff/libtiff/tif_error.c ../compat/libtiff/libtiff/tif_fax3.c - ../compat/libtiff/libtiff/tif_getimage.c ../compat/libtiff/libtiff/tif_flush.c ../compat/libtiff/libtiff/tif_luv.c - ../compat/libtiff/libtiff/tif_lzw.c ../compat/libtiff/libtiff/tif_next.c ../compat/libtiff/libtiff/tif_open.c - ../compat/libtiff/libtiff/tif_packbits.c ../compat/libtiff/libtiff/tif_predict.c ../compat/libtiff/libtiff/tif_print.c - ../compat/libtiff/libtiff/tif_read.c ../compat/libtiff/libtiff/tif_swab.c ../compat/libtiff/libtiff/tif_strip.c - ../compat/libtiff/libtiff/tif_thunder.c ../compat/libtiff/libtiff/tif_tile.c ../compat/libtiff/libtiff/tif_version.c - ../compat/libtiff/libtiff/tif_warning.c ../compat/libtiff/libtiff/tif_write.c - ../compat/libtiff/libtiff/tif_color.c ../compat/libtiff/libtiff/tif_extension.c -]) - TEA_ADD_HEADERS([tifftcl.h tifftclDecls.h]) TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${srcdir}`\"]) TEA_ADD_INCLUDES([-I\"./libtiff\"]) diff --git a/tkimg/libtiff/tifftcl.decls b/tkimg/libtiff/tifftcl.decls index b21f4b05..bc9f1029 100755 --- a/tkimg/libtiff/tifftcl.decls +++ b/tkimg/libtiff/tifftcl.decls @@ -318,159 +318,20 @@ declare 96 { uint64_t TIFFGetStrileOffset(TIFF *tif, uint32_t strile) } -# Source: tif_predict.h ... -declare 100 { - int TIFFPredictorInit(TIFF *tiffptr) -} -declare 101 { - int TIFFPredictorCleanup(TIFF *tiffptr) -} - # Source: tif_dir.h ... declare 111 { int TIFFMergeFieldInfo(TIFF *tiffptr, const TIFFFieldInfo *a, uint32_t b) } -declare 112 { - void _TIFFPrintFieldInfo(TIFF *tiffptr, FILE *a) -} declare 114 { const TIFFField *TIFFFieldWithTag(TIFF *tiffptr, uint32_t a) } -declare 115 { - int _TIFFMergeFields(TIFF *tiffptr, const TIFFField *a, uint32_t b) -} - # Source: tiffiop.h ... - -declare 120 { - int _TIFFgetMode(const char *a, const char *b) -} -declare 121 { - int _TIFFNoRowEncode(TIFF *tiffptr, tidata_t a, tsize_t b, tsample_t c) -} -declare 122 { - int _TIFFNoStripEncode(TIFF *tiffptr, tidata_t c, tsize_t b, tsample_t a) -} -declare 123 { - int _TIFFNoTileEncode(TIFF *tiffptr, tidata_t a, tsize_t b, tsample_t c) -} -declare 124 { - int _TIFFNoRowDecode(TIFF *tiffptr, tidata_t c, tsize_t b, tsample_t a) -} -declare 125 { - int _TIFFNoStripDecode(TIFF *tiffptr, tidata_t a, tsize_t b, tsample_t c) -} -declare 126 { - int _TIFFNoTileDecode(TIFF *tiffptr, tidata_t c, tsize_t b, tsample_t a) -} -declare 127 { - void _TIFFNoPostDecode(TIFF *tiffptr, tidata_t a, tsize_t b) -} -declare 128 { - int _TIFFNoPreCode(TIFF *tiffptr, tsample_t a) -} -declare 129 { - int _TIFFNoSeek(TIFF *tiffptr, uint32_t a) -} -declare 130 { - void _TIFFSwab16BitData(TIFF *tiffptr, tidata_t a, tsize_t b) -} -declare 131 { - void _TIFFSwab32BitData(TIFF *tiffptr, tidata_t b, tsize_t a) -} -declare 132 { - void _TIFFSwab64BitData(TIFF *tiffptr, tidata_t a, tsize_t b) -} -declare 133 { - int TIFFFlushData1(TIFF *tiffptr) -} declare 134 { void TIFFFreeDirectory(TIFF *tiffptr) } -declare 135 { - int TIFFDefaultDirectory(TIFF *tiffptr) -} declare 136 { int TIFFSetCompressionScheme(TIFF *tiffptr, int a) } -declare 137 { - void _TIFFSetDefaultCompressionState(TIFF *tiffptr) -} -declare 138 { - uint32_t _TIFFDefaultStripSize(TIFF *tiffptr, uint32_t a) -} -declare 139 { - void _TIFFDefaultTileSize(TIFF *tiffptr, uint32_t *a, uint32_t *b) -} -declare 140 { - void _TIFFsetByteArray(void **a, const void *b, uint32_t c) -} -declare 142 { - void _TIFFsetShortArray(uint16_t **a, const uint16_t *b, uint32_t c) -} -declare 143 { - void _TIFFsetLongArray(uint32_t **a, const uint32_t *b, uint32_t c) -} -declare 144 { - void _TIFFsetFloatArray(float **a, const float *b, uint32_t c) -} -declare 145 { - void _TIFFsetDoubleArray(double **a, const double *b, uint32_t c) -} -declare 146 { - void _TIFFprintAscii(FILE *a, const char *b) -} -declare 147 { - void _TIFFprintAsciiTag(FILE *a, const char *b, const char *c) -} -declare 148 { - int TIFFInitDumpMode(TIFF *tiffptr, int a) -} -declare 149 generic {!PACKBITS_SUPPORT} { - int TIFFInitPackBits(TIFF *tiffptr, int a) -} -declare 150 generic {!CCITT_SUPPORT} { - int TIFFInitCCITTRLE(TIFF *tiffptr, int a) -} -declare 151 generic {!CCITT_SUPPORT} { - int TIFFInitCCITTRLEW(TIFF *tiffptr, int a) -} -declare 152 generic {!CCITT_SUPPORT} { - int TIFFInitCCITTFax3(TIFF *tiffptr, int a) -} -declare 153 generic {!CCITT_SUPPORT} { - int TIFFInitCCITTFax4(TIFF *tiffptr, int a) -} -declare 154 generic {!THUNDER_SUPPORT} { - int TIFFInitThunderScan(TIFF *tiffptr, int a) -} -declare 155 generic {!NEXT_SUPPORT} { - int TIFFInitNeXT(TIFF *tiffptr, int a) -} -declare 156 generic {!LZW_SUPPORT} { - int TIFFInitLZW(TIFF *tiffptr, int a) -} -declare 157 generic {!OJPEG_SUPPORT} { - int TIFFInitOJPEG(TIFF *tiffptr, int a) -} -declare 158 generic {!JPEG_SUPPORT} { - int TIFFInitJPEG(TIFF *tiffptr, int a) -} -declare 159 generic {!JBIG_SUPPORT} { - int TIFFInitJBIG(TIFF *tiffptr, int a) -} -declare 160 generic {!ZIP_SUPPORT} { - int TIFFInitZIP(TIFF *tiffptr, int a) -} -declare 161 generic {!PIXARLOG_SUPPORT} { - int TIFFInitPixarLog(TIFF *tiffptr, int a) -} -declare 162 generic {!LOGLUV_SUPPORT} { - int TIFFInitSGILog(TIFF *tiffptr, int a) -} -declare 163 { - tmsize_t _TIFFMultiplySSize(TIFF *tiffptr, tmsize_t a, tmsize_t b, const char * c) -} ######################################################################### diff --git a/tkimg/libtiff/tifftclDecls.h b/tkimg/libtiff/tifftclDecls.h index 02e11441..f1334613 100755 --- a/tkimg/libtiff/tifftclDecls.h +++ b/tkimg/libtiff/tifftclDecls.h @@ -271,10 +271,8 @@ TIFFTCLAPI uint64_t TIFFGetStrileOffset(TIFF *tif, uint32_t strile); /* Slot 97 is reserved */ /* Slot 98 is reserved */ /* Slot 99 is reserved */ -/* 100 */ -TIFFTCLAPI int TIFFPredictorInit(TIFF *tiffptr); -/* 101 */ -TIFFTCLAPI int TIFFPredictorCleanup(TIFF *tiffptr); +/* Slot 100 is reserved */ +/* Slot 101 is reserved */ /* Slot 102 is reserved */ /* Slot 103 is reserved */ /* Slot 104 is reserved */ @@ -287,123 +285,34 @@ TIFFTCLAPI int TIFFPredictorCleanup(TIFF *tiffptr); /* 111 */ TIFFTCLAPI int TIFFMergeFieldInfo(TIFF *tiffptr, const TIFFFieldInfo *a, uint32_t b); -/* 112 */ -TIFFTCLAPI void _TIFFPrintFieldInfo(TIFF *tiffptr, FILE *a); +/* Slot 112 is reserved */ /* Slot 113 is reserved */ /* 114 */ TIFFTCLAPI const TIFFField * TIFFFieldWithTag(TIFF *tiffptr, uint32_t a); -/* 115 */ -TIFFTCLAPI int _TIFFMergeFields(TIFF *tiffptr, const TIFFField *a, - uint32_t b); +/* Slot 115 is reserved */ /* Slot 116 is reserved */ /* Slot 117 is reserved */ /* Slot 118 is reserved */ /* Slot 119 is reserved */ -/* 120 */ -TIFFTCLAPI int _TIFFgetMode(const char *a, const char *b); -/* 121 */ -TIFFTCLAPI int _TIFFNoRowEncode(TIFF *tiffptr, tidata_t a, - tsize_t b, tsample_t c); -/* 122 */ -TIFFTCLAPI int _TIFFNoStripEncode(TIFF *tiffptr, tidata_t c, - tsize_t b, tsample_t a); -/* 123 */ -TIFFTCLAPI int _TIFFNoTileEncode(TIFF *tiffptr, tidata_t a, - tsize_t b, tsample_t c); -/* 124 */ -TIFFTCLAPI int _TIFFNoRowDecode(TIFF *tiffptr, tidata_t c, - tsize_t b, tsample_t a); -/* 125 */ -TIFFTCLAPI int _TIFFNoStripDecode(TIFF *tiffptr, tidata_t a, - tsize_t b, tsample_t c); -/* 126 */ -TIFFTCLAPI int _TIFFNoTileDecode(TIFF *tiffptr, tidata_t c, - tsize_t b, tsample_t a); -/* 127 */ -TIFFTCLAPI void _TIFFNoPostDecode(TIFF *tiffptr, tidata_t a, - tsize_t b); -/* 128 */ -TIFFTCLAPI int _TIFFNoPreCode(TIFF *tiffptr, tsample_t a); -/* 129 */ -TIFFTCLAPI int _TIFFNoSeek(TIFF *tiffptr, uint32_t a); -/* 130 */ -TIFFTCLAPI void _TIFFSwab16BitData(TIFF *tiffptr, tidata_t a, - tsize_t b); -/* 131 */ -TIFFTCLAPI void _TIFFSwab32BitData(TIFF *tiffptr, tidata_t b, - tsize_t a); -/* 132 */ -TIFFTCLAPI void _TIFFSwab64BitData(TIFF *tiffptr, tidata_t a, - tsize_t b); -/* 133 */ -TIFFTCLAPI int TIFFFlushData1(TIFF *tiffptr); +/* Slot 120 is reserved */ +/* Slot 121 is reserved */ +/* Slot 122 is reserved */ +/* Slot 123 is reserved */ +/* Slot 124 is reserved */ +/* Slot 125 is reserved */ +/* Slot 126 is reserved */ +/* Slot 127 is reserved */ +/* Slot 128 is reserved */ +/* Slot 129 is reserved */ +/* Slot 130 is reserved */ +/* Slot 131 is reserved */ +/* Slot 132 is reserved */ +/* Slot 133 is reserved */ /* 134 */ TIFFTCLAPI void TIFFFreeDirectory(TIFF *tiffptr); -/* 135 */ -TIFFTCLAPI int TIFFDefaultDirectory(TIFF *tiffptr); +/* Slot 135 is reserved */ /* 136 */ TIFFTCLAPI int TIFFSetCompressionScheme(TIFF *tiffptr, int a); -/* 137 */ -TIFFTCLAPI void _TIFFSetDefaultCompressionState(TIFF *tiffptr); -/* 138 */ -TIFFTCLAPI uint32_t _TIFFDefaultStripSize(TIFF *tiffptr, uint32_t a); -/* 139 */ -TIFFTCLAPI void _TIFFDefaultTileSize(TIFF *tiffptr, uint32_t *a, - uint32_t *b); -/* 140 */ -TIFFTCLAPI void _TIFFsetByteArray(void **a, const void *b, - uint32_t c); -/* Slot 141 is reserved */ -/* 142 */ -TIFFTCLAPI void _TIFFsetShortArray(uint16_t **a, const uint16_t *b, - uint32_t c); -/* 143 */ -TIFFTCLAPI void _TIFFsetLongArray(uint32_t **a, const uint32_t *b, - uint32_t c); -/* 144 */ -TIFFTCLAPI void _TIFFsetFloatArray(float **a, const float *b, - uint32_t c); -/* 145 */ -TIFFTCLAPI void _TIFFsetDoubleArray(double **a, const double *b, - uint32_t c); -/* 146 */ -TIFFTCLAPI void _TIFFprintAscii(FILE *a, const char *b); -/* 147 */ -TIFFTCLAPI void _TIFFprintAsciiTag(FILE *a, const char *b, - const char *c); -/* 148 */ -TIFFTCLAPI int TIFFInitDumpMode(TIFF *tiffptr, int a); -/* 149 */ -TIFFTCLAPI int TIFFInitPackBits(TIFF *tiffptr, int a); -/* 150 */ -TIFFTCLAPI int TIFFInitCCITTRLE(TIFF *tiffptr, int a); -/* 151 */ -TIFFTCLAPI int TIFFInitCCITTRLEW(TIFF *tiffptr, int a); -/* 152 */ -TIFFTCLAPI int TIFFInitCCITTFax3(TIFF *tiffptr, int a); -/* 153 */ -TIFFTCLAPI int TIFFInitCCITTFax4(TIFF *tiffptr, int a); -/* 154 */ -TIFFTCLAPI int TIFFInitThunderScan(TIFF *tiffptr, int a); -/* 155 */ -TIFFTCLAPI int TIFFInitNeXT(TIFF *tiffptr, int a); -/* 156 */ -TIFFTCLAPI int TIFFInitLZW(TIFF *tiffptr, int a); -/* 157 */ -TIFFTCLAPI int TIFFInitOJPEG(TIFF *tiffptr, int a); -/* 158 */ -TIFFTCLAPI int TIFFInitJPEG(TIFF *tiffptr, int a); -/* 159 */ -TIFFTCLAPI int TIFFInitJBIG(TIFF *tiffptr, int a); -/* 160 */ -TIFFTCLAPI int TIFFInitZIP(TIFF *tiffptr, int a); -/* 161 */ -TIFFTCLAPI int TIFFInitPixarLog(TIFF *tiffptr, int a); -/* 162 */ -TIFFTCLAPI int TIFFInitSGILog(TIFF *tiffptr, int a); -/* 163 */ -TIFFTCLAPI tmsize_t _TIFFMultiplySSize(TIFF *tiffptr, tmsize_t a, - tmsize_t b, const char *c); typedef struct TifftclStubs { int magic; @@ -509,8 +418,8 @@ typedef struct TifftclStubs { void (*reserved97)(void); void (*reserved98)(void); void (*reserved99)(void); - int (*tIFFPredictorInit) (TIFF *tiffptr); /* 100 */ - int (*tIFFPredictorCleanup) (TIFF *tiffptr); /* 101 */ + void (*reserved100)(void); + void (*reserved101)(void); void (*reserved102)(void); void (*reserved103)(void); void (*reserved104)(void); @@ -521,58 +430,31 @@ typedef struct TifftclStubs { void (*reserved109)(void); void (*reserved110)(void); int (*tIFFMergeFieldInfo) (TIFF *tiffptr, const TIFFFieldInfo *a, uint32_t b); /* 111 */ - void (*_TIFFPrintFieldInfoPtr) (TIFF *tiffptr, FILE *a); /* 112 */ + void (*reserved112)(void); void (*reserved113)(void); const TIFFField * (*tIFFFieldWithTag) (TIFF *tiffptr, uint32_t a); /* 114 */ - int (*_TIFFMergeFieldsPtr) (TIFF *tiffptr, const TIFFField *a, uint32_t b); /* 115 */ + void (*reserved115)(void); void (*reserved116)(void); void (*reserved117)(void); void (*reserved118)(void); void (*reserved119)(void); - int (*_TIFFgetModePtr) (const char *a, const char *b); /* 120 */ - int (*_TIFFNoRowEncodePtr) (TIFF *tiffptr, tidata_t a, tsize_t b, tsample_t c); /* 121 */ - int (*_TIFFNoStripEncodePtr) (TIFF *tiffptr, tidata_t c, tsize_t b, tsample_t a); /* 122 */ - int (*_TIFFNoTileEncodePtr) (TIFF *tiffptr, tidata_t a, tsize_t b, tsample_t c); /* 123 */ - int (*_TIFFNoRowDecodePtr) (TIFF *tiffptr, tidata_t c, tsize_t b, tsample_t a); /* 124 */ - int (*_TIFFNoStripDecodePtr) (TIFF *tiffptr, tidata_t a, tsize_t b, tsample_t c); /* 125 */ - int (*_TIFFNoTileDecodePtr) (TIFF *tiffptr, tidata_t c, tsize_t b, tsample_t a); /* 126 */ - void (*_TIFFNoPostDecodePtr) (TIFF *tiffptr, tidata_t a, tsize_t b); /* 127 */ - int (*_TIFFNoPreCodePtr) (TIFF *tiffptr, tsample_t a); /* 128 */ - int (*_TIFFNoSeekPtr) (TIFF *tiffptr, uint32_t a); /* 129 */ - void (*_TIFFSwab16BitDataPtr) (TIFF *tiffptr, tidata_t a, tsize_t b); /* 130 */ - void (*_TIFFSwab32BitDataPtr) (TIFF *tiffptr, tidata_t b, tsize_t a); /* 131 */ - void (*_TIFFSwab64BitDataPtr) (TIFF *tiffptr, tidata_t a, tsize_t b); /* 132 */ - int (*tIFFFlushData1) (TIFF *tiffptr); /* 133 */ + void (*reserved120)(void); + void (*reserved121)(void); + void (*reserved122)(void); + void (*reserved123)(void); + void (*reserved124)(void); + void (*reserved125)(void); + void (*reserved126)(void); + void (*reserved127)(void); + void (*reserved128)(void); + void (*reserved129)(void); + void (*reserved130)(void); + void (*reserved131)(void); + void (*reserved132)(void); + void (*reserved133)(void); void (*tIFFFreeDirectory) (TIFF *tiffptr); /* 134 */ - int (*tIFFDefaultDirectory) (TIFF *tiffptr); /* 135 */ + void (*reserved135)(void); int (*tIFFSetCompressionScheme) (TIFF *tiffptr, int a); /* 136 */ - void (*_TIFFSetDefaultCompressionStatePtr) (TIFF *tiffptr); /* 137 */ - uint32_t (*_TIFFDefaultStripSizePtr) (TIFF *tiffptr, uint32_t a); /* 138 */ - void (*_TIFFDefaultTileSizePtr) (TIFF *tiffptr, uint32_t *a, uint32_t *b); /* 139 */ - void (*_TIFFsetByteArrayPtr) (void **a, const void *b, uint32_t c); /* 140 */ - void (*reserved141)(void); - void (*_TIFFsetShortArrayPtr) (uint16_t **a, const uint16_t *b, uint32_t c); /* 142 */ - void (*_TIFFsetLongArrayPtr) (uint32_t **a, const uint32_t *b, uint32_t c); /* 143 */ - void (*_TIFFsetFloatArrayPtr) (float **a, const float *b, uint32_t c); /* 144 */ - void (*_TIFFsetDoubleArrayPtr) (double **a, const double *b, uint32_t c); /* 145 */ - void (*_TIFFprintAsciiPtr) (FILE *a, const char *b); /* 146 */ - void (*_TIFFprintAsciiTagPtr) (FILE *a, const char *b, const char *c); /* 147 */ - int (*tIFFInitDumpMode) (TIFF *tiffptr, int a); /* 148 */ - int (*tIFFInitPackBits) (TIFF *tiffptr, int a); /* 149 */ - int (*tIFFInitCCITTRLE) (TIFF *tiffptr, int a); /* 150 */ - int (*tIFFInitCCITTRLEW) (TIFF *tiffptr, int a); /* 151 */ - int (*tIFFInitCCITTFax3) (TIFF *tiffptr, int a); /* 152 */ - int (*tIFFInitCCITTFax4) (TIFF *tiffptr, int a); /* 153 */ - int (*tIFFInitThunderScan) (TIFF *tiffptr, int a); /* 154 */ - int (*tIFFInitNeXT) (TIFF *tiffptr, int a); /* 155 */ - int (*tIFFInitLZW) (TIFF *tiffptr, int a); /* 156 */ - int (*tIFFInitOJPEG) (TIFF *tiffptr, int a); /* 157 */ - int (*tIFFInitJPEG) (TIFF *tiffptr, int a); /* 158 */ - int (*tIFFInitJBIG) (TIFF *tiffptr, int a); /* 159 */ - int (*tIFFInitZIP) (TIFF *tiffptr, int a); /* 160 */ - int (*tIFFInitPixarLog) (TIFF *tiffptr, int a); /* 161 */ - int (*tIFFInitSGILog) (TIFF *tiffptr, int a); /* 162 */ - tmsize_t (*_TIFFMultiplySSizePtr) (TIFF *tiffptr, tmsize_t a, tmsize_t b, const char *c); /* 163 */ } TifftclStubs; #ifdef __cplusplus @@ -785,10 +667,8 @@ TIFFTCLAPI const TifftclStubs *tifftclStubsPtr; /* Slot 97 is reserved */ /* Slot 98 is reserved */ /* Slot 99 is reserved */ -#define TIFFPredictorInit \ - (tifftclStubsPtr->tIFFPredictorInit) /* 100 */ -#define TIFFPredictorCleanup \ - (tifftclStubsPtr->tIFFPredictorCleanup) /* 101 */ +/* Slot 100 is reserved */ +/* Slot 101 is reserved */ /* Slot 102 is reserved */ /* Slot 103 is reserved */ /* Slot 104 is reserved */ @@ -800,104 +680,34 @@ TIFFTCLAPI const TifftclStubs *tifftclStubsPtr; /* Slot 110 is reserved */ #define TIFFMergeFieldInfo \ (tifftclStubsPtr->tIFFMergeFieldInfo) /* 111 */ -#define _TIFFPrintFieldInfo \ - (tifftclStubsPtr->_TIFFPrintFieldInfoPtr) /* 112 */ +/* Slot 112 is reserved */ /* Slot 113 is reserved */ #define TIFFFieldWithTag \ (tifftclStubsPtr->tIFFFieldWithTag) /* 114 */ -#define _TIFFMergeFields \ - (tifftclStubsPtr->_TIFFMergeFieldsPtr) /* 115 */ +/* Slot 115 is reserved */ /* Slot 116 is reserved */ /* Slot 117 is reserved */ /* Slot 118 is reserved */ /* Slot 119 is reserved */ -#define _TIFFgetMode \ - (tifftclStubsPtr->_TIFFgetModePtr) /* 120 */ -#define _TIFFNoRowEncode \ - (tifftclStubsPtr->_TIFFNoRowEncodePtr) /* 121 */ -#define _TIFFNoStripEncode \ - (tifftclStubsPtr->_TIFFNoStripEncodePtr) /* 122 */ -#define _TIFFNoTileEncode \ - (tifftclStubsPtr->_TIFFNoTileEncodePtr) /* 123 */ -#define _TIFFNoRowDecode \ - (tifftclStubsPtr->_TIFFNoRowDecodePtr) /* 124 */ -#define _TIFFNoStripDecode \ - (tifftclStubsPtr->_TIFFNoStripDecodePtr) /* 125 */ -#define _TIFFNoTileDecode \ - (tifftclStubsPtr->_TIFFNoTileDecodePtr) /* 126 */ -#define _TIFFNoPostDecode \ - (tifftclStubsPtr->_TIFFNoPostDecodePtr) /* 127 */ -#define _TIFFNoPreCode \ - (tifftclStubsPtr->_TIFFNoPreCodePtr) /* 128 */ -#define _TIFFNoSeek \ - (tifftclStubsPtr->_TIFFNoSeekPtr) /* 129 */ -#define _TIFFSwab16BitData \ - (tifftclStubsPtr->_TIFFSwab16BitDataPtr) /* 130 */ -#define _TIFFSwab32BitData \ - (tifftclStubsPtr->_TIFFSwab32BitDataPtr) /* 131 */ -#define _TIFFSwab64BitData \ - (tifftclStubsPtr->_TIFFSwab64BitDataPtr) /* 132 */ -#define TIFFFlushData1 \ - (tifftclStubsPtr->tIFFFlushData1) /* 133 */ +/* Slot 120 is reserved */ +/* Slot 121 is reserved */ +/* Slot 122 is reserved */ +/* Slot 123 is reserved */ +/* Slot 124 is reserved */ +/* Slot 125 is reserved */ +/* Slot 126 is reserved */ +/* Slot 127 is reserved */ +/* Slot 128 is reserved */ +/* Slot 129 is reserved */ +/* Slot 130 is reserved */ +/* Slot 131 is reserved */ +/* Slot 132 is reserved */ +/* Slot 133 is reserved */ #define TIFFFreeDirectory \ (tifftclStubsPtr->tIFFFreeDirectory) /* 134 */ -#define TIFFDefaultDirectory \ - (tifftclStubsPtr->tIFFDefaultDirectory) /* 135 */ +/* Slot 135 is reserved */ #define TIFFSetCompressionScheme \ (tifftclStubsPtr->tIFFSetCompressionScheme) /* 136 */ -#define _TIFFSetDefaultCompressionState \ - (tifftclStubsPtr->_TIFFSetDefaultCompressionStatePtr) /* 137 */ -#define _TIFFDefaultStripSize \ - (tifftclStubsPtr->_TIFFDefaultStripSizePtr) /* 138 */ -#define _TIFFDefaultTileSize \ - (tifftclStubsPtr->_TIFFDefaultTileSizePtr) /* 139 */ -#define _TIFFsetByteArray \ - (tifftclStubsPtr->_TIFFsetByteArrayPtr) /* 140 */ -/* Slot 141 is reserved */ -#define _TIFFsetShortArray \ - (tifftclStubsPtr->_TIFFsetShortArrayPtr) /* 142 */ -#define _TIFFsetLongArray \ - (tifftclStubsPtr->_TIFFsetLongArrayPtr) /* 143 */ -#define _TIFFsetFloatArray \ - (tifftclStubsPtr->_TIFFsetFloatArrayPtr) /* 144 */ -#define _TIFFsetDoubleArray \ - (tifftclStubsPtr->_TIFFsetDoubleArrayPtr) /* 145 */ -#define _TIFFprintAscii \ - (tifftclStubsPtr->_TIFFprintAsciiPtr) /* 146 */ -#define _TIFFprintAsciiTag \ - (tifftclStubsPtr->_TIFFprintAsciiTagPtr) /* 147 */ -#define TIFFInitDumpMode \ - (tifftclStubsPtr->tIFFInitDumpMode) /* 148 */ -#define TIFFInitPackBits \ - (tifftclStubsPtr->tIFFInitPackBits) /* 149 */ -#define TIFFInitCCITTRLE \ - (tifftclStubsPtr->tIFFInitCCITTRLE) /* 150 */ -#define TIFFInitCCITTRLEW \ - (tifftclStubsPtr->tIFFInitCCITTRLEW) /* 151 */ -#define TIFFInitCCITTFax3 \ - (tifftclStubsPtr->tIFFInitCCITTFax3) /* 152 */ -#define TIFFInitCCITTFax4 \ - (tifftclStubsPtr->tIFFInitCCITTFax4) /* 153 */ -#define TIFFInitThunderScan \ - (tifftclStubsPtr->tIFFInitThunderScan) /* 154 */ -#define TIFFInitNeXT \ - (tifftclStubsPtr->tIFFInitNeXT) /* 155 */ -#define TIFFInitLZW \ - (tifftclStubsPtr->tIFFInitLZW) /* 156 */ -#define TIFFInitOJPEG \ - (tifftclStubsPtr->tIFFInitOJPEG) /* 157 */ -#define TIFFInitJPEG \ - (tifftclStubsPtr->tIFFInitJPEG) /* 158 */ -#define TIFFInitJBIG \ - (tifftclStubsPtr->tIFFInitJBIG) /* 159 */ -#define TIFFInitZIP \ - (tifftclStubsPtr->tIFFInitZIP) /* 160 */ -#define TIFFInitPixarLog \ - (tifftclStubsPtr->tIFFInitPixarLog) /* 161 */ -#define TIFFInitSGILog \ - (tifftclStubsPtr->tIFFInitSGILog) /* 162 */ -#define _TIFFMultiplySSize \ - (tifftclStubsPtr->_TIFFMultiplySSizePtr) /* 163 */ #endif /* defined(USE_TIFFTCL_STUBS) */ diff --git a/tkimg/libtiff/tifftclStubInit.c b/tkimg/libtiff/tifftclStubInit.c index 28c55f21..8fc01b29 100755 --- a/tkimg/libtiff/tifftclStubInit.c +++ b/tkimg/libtiff/tifftclStubInit.c @@ -120,8 +120,8 @@ const TifftclStubs tifftclStubs = { 0, /* 97 */ 0, /* 98 */ 0, /* 99 */ - TIFFPredictorInit, /* 100 */ - TIFFPredictorCleanup, /* 101 */ + 0, /* 100 */ + 0, /* 101 */ 0, /* 102 */ 0, /* 103 */ 0, /* 104 */ @@ -132,114 +132,31 @@ const TifftclStubs tifftclStubs = { 0, /* 109 */ 0, /* 110 */ TIFFMergeFieldInfo, /* 111 */ - _TIFFPrintFieldInfo, /* 112 */ + 0, /* 112 */ 0, /* 113 */ TIFFFieldWithTag, /* 114 */ - _TIFFMergeFields, /* 115 */ + 0, /* 115 */ 0, /* 116 */ 0, /* 117 */ 0, /* 118 */ 0, /* 119 */ - _TIFFgetMode, /* 120 */ - _TIFFNoRowEncode, /* 121 */ - _TIFFNoStripEncode, /* 122 */ - _TIFFNoTileEncode, /* 123 */ - _TIFFNoRowDecode, /* 124 */ - _TIFFNoStripDecode, /* 125 */ - _TIFFNoTileDecode, /* 126 */ - _TIFFNoPostDecode, /* 127 */ - _TIFFNoPreCode, /* 128 */ - _TIFFNoSeek, /* 129 */ - _TIFFSwab16BitData, /* 130 */ - _TIFFSwab32BitData, /* 131 */ - _TIFFSwab64BitData, /* 132 */ - TIFFFlushData1, /* 133 */ + 0, /* 120 */ + 0, /* 121 */ + 0, /* 122 */ + 0, /* 123 */ + 0, /* 124 */ + 0, /* 125 */ + 0, /* 126 */ + 0, /* 127 */ + 0, /* 128 */ + 0, /* 129 */ + 0, /* 130 */ + 0, /* 131 */ + 0, /* 132 */ + 0, /* 133 */ TIFFFreeDirectory, /* 134 */ - TIFFDefaultDirectory, /* 135 */ + 0, /* 135 */ TIFFSetCompressionScheme, /* 136 */ - _TIFFSetDefaultCompressionState, /* 137 */ - _TIFFDefaultStripSize, /* 138 */ - _TIFFDefaultTileSize, /* 139 */ - _TIFFsetByteArray, /* 140 */ - 0, /* 141 */ - _TIFFsetShortArray, /* 142 */ - _TIFFsetLongArray, /* 143 */ - _TIFFsetFloatArray, /* 144 */ - _TIFFsetDoubleArray, /* 145 */ - _TIFFprintAscii, /* 146 */ - _TIFFprintAsciiTag, /* 147 */ - TIFFInitDumpMode, /* 148 */ -#if !defined(PACKBITS_SUPPORT) - 0, /* 149 */ -#else /* !PACKBITS_SUPPORT */ - TIFFInitPackBits, /* 149 */ -#endif /* !PACKBITS_SUPPORT */ -#if !defined(CCITT_SUPPORT) - 0, /* 150 */ -#else /* !CCITT_SUPPORT */ - TIFFInitCCITTRLE, /* 150 */ -#endif /* !CCITT_SUPPORT */ -#if !defined(CCITT_SUPPORT) - 0, /* 151 */ -#else /* !CCITT_SUPPORT */ - TIFFInitCCITTRLEW, /* 151 */ -#endif /* !CCITT_SUPPORT */ -#if !defined(CCITT_SUPPORT) - 0, /* 152 */ -#else /* !CCITT_SUPPORT */ - TIFFInitCCITTFax3, /* 152 */ -#endif /* !CCITT_SUPPORT */ -#if !defined(CCITT_SUPPORT) - 0, /* 153 */ -#else /* !CCITT_SUPPORT */ - TIFFInitCCITTFax4, /* 153 */ -#endif /* !CCITT_SUPPORT */ -#if !defined(THUNDER_SUPPORT) - 0, /* 154 */ -#else /* !THUNDER_SUPPORT */ - TIFFInitThunderScan, /* 154 */ -#endif /* !THUNDER_SUPPORT */ -#if !defined(NEXT_SUPPORT) - 0, /* 155 */ -#else /* !NEXT_SUPPORT */ - TIFFInitNeXT, /* 155 */ -#endif /* !NEXT_SUPPORT */ -#if !defined(LZW_SUPPORT) - 0, /* 156 */ -#else /* !LZW_SUPPORT */ - TIFFInitLZW, /* 156 */ -#endif /* !LZW_SUPPORT */ -#if !defined(OJPEG_SUPPORT) - 0, /* 157 */ -#else /* !OJPEG_SUPPORT */ - TIFFInitOJPEG, /* 157 */ -#endif /* !OJPEG_SUPPORT */ -#if !defined(JPEG_SUPPORT) - 0, /* 158 */ -#else /* !JPEG_SUPPORT */ - TIFFInitJPEG, /* 158 */ -#endif /* !JPEG_SUPPORT */ -#if !defined(JBIG_SUPPORT) - 0, /* 159 */ -#else /* !JBIG_SUPPORT */ - TIFFInitJBIG, /* 159 */ -#endif /* !JBIG_SUPPORT */ -#if !defined(ZIP_SUPPORT) - 0, /* 160 */ -#else /* !ZIP_SUPPORT */ - TIFFInitZIP, /* 160 */ -#endif /* !ZIP_SUPPORT */ -#if !defined(PIXARLOG_SUPPORT) - 0, /* 161 */ -#else /* !PIXARLOG_SUPPORT */ - TIFFInitPixarLog, /* 161 */ -#endif /* !PIXARLOG_SUPPORT */ -#if !defined(LOGLUV_SUPPORT) - 0, /* 162 */ -#else /* !LOGLUV_SUPPORT */ - TIFFInitSGILog, /* 162 */ -#endif /* !LOGLUV_SUPPORT */ - _TIFFMultiplySSize, /* 163 */ }; /* !END!: Do not edit above this line. */ diff --git a/tkimg/tiff/configure b/tkimg/tiff/configure index 3fc29c13..d880732a 100755 --- a/tkimg/tiff/configure +++ b/tkimg/tiff/configure @@ -6750,7 +6750,7 @@ fi #----------------------------------------------------------------------- - vars="tiff.c tiffJpeg.c tiffZip.c tiffPixar.c" + vars="tiff.c" for i in $vars; do case $i in \$*) diff --git a/tkimg/tiff/configure.ac b/tkimg/tiff/configure.ac index e26dd10a..db25e47a 100755 --- a/tkimg/tiff/configure.ac +++ b/tkimg/tiff/configure.ac @@ -75,7 +75,7 @@ IMG_SRCPATH(zlibtcl) # and PKG_TCL_SOURCES. #----------------------------------------------------------------------- -TEA_ADD_SOURCES([tiff.c tiffJpeg.c tiffZip.c tiffPixar.c]) +TEA_ADD_SOURCES([tiff.c]) TEA_ADD_HEADERS([]) TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${srcdir}`\"]) TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${tkimg_SRC_PATH}`\"]) diff --git a/tkimg/tiff/tiff.c b/tkimg/tiff/tiff.c index de2e4b01..9641ddbb 100755 --- a/tkimg/tiff/tiff.c +++ b/tkimg/tiff/tiff.c @@ -114,14 +114,10 @@ SetupTiffLibrary (Tcl_Interp *interp) if (Zlibtcl_InitStubs(interp, ZLIBTCL_VERSION, 0) == NULL) { return TCL_ERROR; } - TIFFRegisterCODEC (COMPRESSION_DEFLATE, "Deflate", TkimgTIFFInitZip); - TIFFRegisterCODEC (COMPRESSION_ADOBE_DEFLATE, "AdobeDeflate", TkimgTIFFInitZip); if (Jpegtcl_InitStubs(interp, JPEGTCL_VERSION, 0) == NULL) { return TCL_ERROR; } - TIFFRegisterCODEC (COMPRESSION_JPEG, "JPEG", TkimgTIFFInitJpeg); - TIFFRegisterCODEC (COMPRESSION_PIXARLOG, "PixarLog", TkimgTIFFInitPixar); } return TCL_OK; } -- 2.33.7