diff --git a/maclibs/include/tiff/tiff.h b/maclibs/include/tiff/tiff.h index 19b4e797..fb39634c 100644 --- a/maclibs/include/tiff/tiff.h +++ b/maclibs/include/tiff/tiff.h @@ -1,4 +1,4 @@ -/* $Id: tiff.h,v 1.68 2012-08-19 16:56:35 bfriesen Exp $ */ +/* $Id: tiff.h,v 1.70 2016-01-23 21:20:34 erouault Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -201,6 +201,7 @@ typedef enum { #define PHOTOMETRIC_CIELAB 8 /* !1976 CIE L*a*b* */ #define PHOTOMETRIC_ICCLAB 9 /* ICC L*a*b* [Adobe TIFF Technote 4] */ #define PHOTOMETRIC_ITULAB 10 /* ITU L*a*b* */ +#define PHOTOMETRIC_CFA 32803 /* color filter array */ #define PHOTOMETRIC_LOGL 32844 /* CIE Log2(L) */ #define PHOTOMETRIC_LOGLUV 32845 /* CIE Log2(L) (u',v') */ #define TIFFTAG_THRESHHOLDING 263 /* +thresholding used on data */ @@ -278,7 +279,7 @@ typedef enum { #define PREDICTOR_FLOATINGPOINT 3 /* floating point predictor */ #define TIFFTAG_WHITEPOINT 318 /* image white point */ #define TIFFTAG_PRIMARYCHROMATICITIES 319 /* !primary chromaticities */ -#define TIFFTAG_COLORMAP 320 /* RGB map for pallette image */ +#define TIFFTAG_COLORMAP 320 /* RGB map for palette image */ #define TIFFTAG_HALFTONEHINTS 321 /* !highlight+shadow info */ #define TIFFTAG_TILEWIDTH 322 /* !tile width in pixels */ #define TIFFTAG_TILELENGTH 323 /* !tile height in pixels */ @@ -357,7 +358,7 @@ typedef enum { #define TIFFTAG_JPEGRESTARTINTERVAL 515 /* !restart interval length */ #define TIFFTAG_JPEGLOSSLESSPREDICTORS 517 /* !lossless proc predictor */ #define TIFFTAG_JPEGPOINTTRANSFORM 518 /* !lossless point transform */ -#define TIFFTAG_JPEGQTABLES 519 /* !Q matrice offsets */ +#define TIFFTAG_JPEGQTABLES 519 /* !Q matrix offsets */ #define TIFFTAG_JPEGDCTABLES 520 /* !DCT table offsets */ #define TIFFTAG_JPEGACTABLES 521 /* !AC coefficient offsets */ #define TIFFTAG_YCBCRCOEFFICIENTS 529 /* !RGB -> YCbCr transform */ @@ -402,6 +403,8 @@ typedef enum { #define TIFFTAG_PIXAR_MATRIX_WORLDTOCAMERA 33306 /* tag 33405 is a private tag registered to Eastman Kodak */ #define TIFFTAG_WRITERSERIALNUMBER 33405 /* device serial number */ +#define TIFFTAG_CFAREPEATPATTERNDIM 33421 /* dimensions of CFA pattern */ +#define TIFFTAG_CFAPATTERN 33422 /* color filter array pattern */ /* tag 33432 is listed in the 6.0 spec w/ unknown ownership */ #define TIFFTAG_COPYRIGHT 33432 /* copyright string */ /* IPTC TAG from RichTIFF specifications */ diff --git a/maclibs/include/tiff/tiffconf.h b/maclibs/include/tiff/tiffconf.h index 56f4589d..f37b0b52 100644 --- a/maclibs/include/tiff/tiffconf.h +++ b/maclibs/include/tiff/tiffconf.h @@ -1,6 +1,5 @@ -/* libtiff/tiffconf.h. Generated from tiffconf.h.in by configure. */ /* - Configuration defines for installed libtiff. + Configuration defines for Qt. This file maintained for backward compatibility. Do not use definitions from this file in your programs. */ @@ -8,32 +7,38 @@ #ifndef _TIFFCONF_ #define _TIFFCONF_ +#include + /* Signed 16-bit type */ -#define TIFF_INT16_T signed short +#define TIFF_INT16_T qint16 /* Signed 32-bit type */ -#define TIFF_INT32_T signed int +#define TIFF_INT32_T qint32 /* Signed 64-bit type */ -#define TIFF_INT64_T signed long +#define TIFF_INT64_T qint64 /* Signed 8-bit type */ -#define TIFF_INT8_T signed char +#define TIFF_INT8_T qint8 /* Unsigned 16-bit type */ -#define TIFF_UINT16_T unsigned short +#define TIFF_UINT16_T quint16 /* Unsigned 32-bit type */ -#define TIFF_UINT32_T unsigned int +#define TIFF_UINT32_T quint32 /* Unsigned 64-bit type */ -#define TIFF_UINT64_T unsigned long +#define TIFF_UINT64_T quint64 /* Unsigned 8-bit type */ -#define TIFF_UINT8_T unsigned char +#define TIFF_UINT8_T quint8 /* Signed size type */ -#define TIFF_SSIZE_T signed long +#if QT_POINTER_SIZE == 4 +#define TIFF_SSIZE_T qint32 +#else +#define TIFF_SSIZE_T qint64 +#endif /* Pointer difference type */ #define TIFF_PTRDIFF_T ptrdiff_t @@ -58,7 +63,11 @@ /* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian (Intel) */ +#if (Q_BYTE_ORDER == Q_BIG_ENDIAN) +#define HOST_BIGENDIAN 1 +#else #define HOST_BIGENDIAN 0 +#endif /* Support CCITT Group 3 & 4 algorithms */ #define CCITT_SUPPORT 1 @@ -66,9 +75,6 @@ /* Support JPEG compression (requires IJG JPEG library) */ /* #undef JPEG_SUPPORT */ -/* Support JBIG compression (requires JBIG-KIT library) */ -/* #undef JBIG_SUPPORT */ - /* Support LogLuv high dynamic range encoding */ #define LOGLUV_SUPPORT 1 diff --git a/maclibs/include/tiff/tiffio.h b/maclibs/include/tiff/tiffio.h index 038b6701..ef61b5c0 100644 --- a/maclibs/include/tiff/tiffio.h +++ b/maclibs/include/tiff/tiffio.h @@ -1,4 +1,4 @@ -/* $Id: tiffio.h,v 1.91 2012-07-29 15:45:29 tgl Exp $ */ +/* $Id: tiffio.h,v 1.94 2017-01-11 19:02:49 erouault Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -208,7 +208,7 @@ struct _TIFFRGBAImage { uint16 orientation; /* image orientation */ uint16 req_orientation; /* requested orientation */ uint16 photometric; /* image photometric interp */ - uint16* redcmap; /* colormap pallete */ + uint16* redcmap; /* colormap palette */ uint16* greencmap; uint16* bluecmap; /* get image data routine */ @@ -225,7 +225,7 @@ struct _TIFFRGBAImage { TIFFYCbCrToRGB* ycbcr; /* YCbCr conversion state */ TIFFCIELabToRGB* cielab; /* CIE L*a*b conversion state */ - uint8* UaToAa; /* Unassociated alpha to associated alpha convertion LUT */ + uint8* UaToAa; /* Unassociated alpha to associated alpha conversion LUT */ uint8* Bitdepth16To8; /* LUT for conversion from 16bit to 8bit values */ int row_offset; @@ -293,6 +293,7 @@ extern TIFFCodec* TIFFGetConfiguredCODECs(void); */ extern void* _TIFFmalloc(tmsize_t s); +extern void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz); extern void* _TIFFrealloc(void* p, tmsize_t s); extern void _TIFFmemset(void* p, int v, tmsize_t c); extern void _TIFFmemcpy(void* d, const void* s, tmsize_t c); @@ -430,6 +431,8 @@ extern int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*, int, int); extern int TIFFReadRGBAStrip(TIFF*, uint32, uint32 * ); extern int TIFFReadRGBATile(TIFF*, uint32, uint32, uint32 * ); +extern int TIFFReadRGBAStripExt(TIFF*, uint32, uint32 *, int stop_on_error ); +extern int TIFFReadRGBATileExt(TIFF*, uint32, uint32, uint32 *, int stop_on_error ); extern int TIFFRGBAImageOK(TIFF*, char [1024]); extern int TIFFRGBAImageBegin(TIFFRGBAImage*, TIFF*, int, char [1024]); extern int TIFFRGBAImageGet(TIFFRGBAImage*, uint32*, uint32, uint32); diff --git a/maclibs/include/tiff/tiffvers.h b/maclibs/include/tiff/tiffvers.h index 40edc813..890e433d 100644 --- a/maclibs/include/tiff/tiffvers.h +++ b/maclibs/include/tiff/tiffvers.h @@ -1,4 +1,4 @@ -#define TIFFLIB_VERSION_STR "LIBTIFF, Version 4.0.3\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc." +#define TIFFLIB_VERSION_STR "LIBTIFF, Version 4.0.8\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc." /* * This define can be used in code that requires * compilation-related definitions specific to a @@ -6,4 +6,4 @@ * version checking should be done based on the * string returned by TIFFGetVersion. */ -#define TIFFLIB_VERSION 20120922 +#define TIFFLIB_VERSION 20170521 diff --git a/maclibs/lib/libtiff.dylib b/maclibs/lib/libtiff.dylib index cd77a165..a5358c1a 100644 Binary files a/maclibs/lib/libtiff.dylib and b/maclibs/lib/libtiff.dylib differ