diff options
| author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2019-11-05 09:58:05 +0100 |
|---|---|---|
| committer | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2019-11-06 11:13:07 +0000 |
| commit | 6d4cf4b392c53e3edb8573d89b5ca4b6257bb99f (patch) | |
| tree | e82ca5d06248ff92f438ed0221b8c5114f8d5c2b /src/3rdparty/libtiff/libtiff/tif_dir.h | |
| parent | b722026bd89c2c0e5688131a257a5c24e70a16ed (diff) | |
Update bundled libtiff to version 4.1.0
[ChangeLog][Third-Party Code] Bundled libtiff was updated to version 4.1.0
Change-Id: I3e841863c5cf8588bf62b6520f34e64909394998
(cherry picked from commit ba1fb21bc61a2075c7fd058e7f7ba5caf7d2f400)
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src/3rdparty/libtiff/libtiff/tif_dir.h')
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_dir.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_dir.h b/src/3rdparty/libtiff/libtiff/tif_dir.h index b2f5e69..e7f0667 100644 --- a/src/3rdparty/libtiff/libtiff/tif_dir.h +++ b/src/3rdparty/libtiff/libtiff/tif_dir.h @@ -58,6 +58,7 @@ typedef struct { uint32 toff_long; uint64 toff_long8; } tdir_offset; /* either offset or the data itself if fits */ + uint8 tdir_ignore; /* flag status to ignore tag when parsing tags in tif_dirread.c */ } TIFFDirEntry; /* @@ -97,13 +98,14 @@ typedef struct { * number of striles */ uint32 td_stripsperimage; uint32 td_nstrips; /* size of offset & bytecount arrays */ - uint64* td_stripoffset; - uint64* td_stripbytecount; + uint64* td_stripoffset_p; /* should be accessed with TIFFGetStrileOffset */ + uint64* td_stripbytecount_p; /* should be accessed with TIFFGetStrileByteCount */ + uint32 td_stripoffsetbyteallocsize; /* number of elements currently allocated for td_stripoffset/td_stripbytecount. Only used if TIFF_LAZYSTRILELOAD is set */ +#ifdef STRIPBYTECOUNTSORTED_UNUSED int td_stripbytecountsorted; /* is the bytecount array sorted ascending? */ -#if defined(DEFER_STRILE_LOAD) +#endif TIFFDirEntry td_stripoffset_entry; /* for deferred loading */ TIFFDirEntry td_stripbytecount_entry; /* for deferred loading */ -#endif uint16 td_nsubifd; uint64* td_subifd; /* YCbCr parameters */ @@ -118,6 +120,8 @@ typedef struct { int td_customValueCount; TIFFTagValue *td_customValues; + + unsigned char td_deferstrilearraywriting; /* see TIFFDeferStrileArrayWriting() */ } TIFFDirectory; /* |