diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-06-09 17:08:51 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-06-09 17:08:51 +0300 |
| commit | 6a1af670d52492ab0955933b830026b2a18ed6d6 (patch) | |
| tree | 14e423ab81da7312ac0f800aaa6afce7e23abc20 /src/3rdparty/libtiff/libtiff/tif_open.c | |
| parent | e57b0df609d744c3ddb2d3f23926a7922e661cb6 (diff) | |
| parent | 8fb9a4fdcb05984bb6e9e532e4462aa7bfbeb62e (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into tqtc/lts-5.15-opensourcev5.15.11-lts-lgpl
Change-Id: I1ef7b4328096b0adb6abc46471100b5779504d05
Diffstat (limited to 'src/3rdparty/libtiff/libtiff/tif_open.c')
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_open.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_open.c b/src/3rdparty/libtiff/libtiff/tif_open.c index 9724162..549f56c 100644 --- a/src/3rdparty/libtiff/libtiff/tif_open.c +++ b/src/3rdparty/libtiff/libtiff/tif_open.c @@ -96,7 +96,6 @@ TIFFClientOpen( assert(sizeof(int32_t) == 4); assert(sizeof(uint64_t) == 8); assert(sizeof(int64_t) == 8); - assert(sizeof(tmsize_t)==sizeof(void*)); { union{ uint8_t a8[2]; @@ -354,6 +353,7 @@ TIFFClientOpen( if (!TIFFDefaultDirectory(tif)) goto bad; tif->tif_diroff = 0; + tif->tif_lastdiroff = 0; tif->tif_dirlist = NULL; tif->tif_dirlistsize = 0; tif->tif_dirnumber = 0; @@ -481,8 +481,6 @@ TIFFClientOpen( * Setup initial directory. */ if (TIFFReadDirectory(tif)) { - tif->tif_rawcc = (tmsize_t)-1; - tif->tif_flags |= TIFF_BUFFERSETUP; return (tif); } break; @@ -670,6 +668,15 @@ TIFFIsBigEndian(TIFF* tif) } /* + * Return nonzero if given file is BigTIFF style. + */ +int +TIFFIsBigTIFF(TIFF *tif) +{ + return (tif->tif_header.common.tiff_version == TIFF_VERSION_BIG); +} + +/* * Return pointer to file read method. */ TIFFReadWriteProc |