diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-11-07 09:28:59 +0200 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-11-07 09:28:59 +0200 |
| commit | 598e1db3a082d2bb473571c6ae3359e0c687c63b (patch) | |
| tree | e88d80d6cf6aaeaf6afb8f37d4bc4404405e2bd2 /src/3rdparty/libtiff/libtiff/tif_dir.h | |
| parent | 00187760aaa137b68e74186ee0cbfb3e1da72281 (diff) | |
| parent | 6d4cf4b392c53e3edb8573d89b5ca4b6257bb99f (diff) | |
Merge 5.12 into 5.12.6
Change-Id: Icfbebe5c86f6c8958f1fc60f98a034d9e338e076
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; /* |