diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-09 03:03:35 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-09 03:03:35 +0100 |
| commit | 3d157f9773a2db1a3096a86e5170ace975646ca3 (patch) | |
| tree | dbd80681ab81d0364cb32e0796ddf43a366cee35 /src/3rdparty/libtiff/libtiff/tif_print.c | |
| parent | 8ca5b34c1aacc4b7a8f20bf9aadd04f1eeafd3f6 (diff) | |
| parent | ba1fb21bc61a2075c7fd058e7f7ba5caf7d2f400 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: Iaaf98e10d41867b2c6ceda89cb5c9c315301190b
Diffstat (limited to 'src/3rdparty/libtiff/libtiff/tif_print.c')
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_print.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_print.c b/src/3rdparty/libtiff/libtiff/tif_print.c index 1d86adb..a073794 100644 --- a/src/3rdparty/libtiff/libtiff/tif_print.c +++ b/src/3rdparty/libtiff/libtiff/tif_print.c @@ -652,8 +652,6 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags) if (tif->tif_tagmethods.printdir) (*tif->tif_tagmethods.printdir)(tif, fd, flags); - _TIFFFillStriles( tif ); - if ((flags & TIFFPRINT_STRIPS) && TIFFFieldSet(tif,FIELD_STRIPOFFSETS)) { uint32 s; @@ -665,13 +663,13 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags) #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) fprintf(fd, " %3lu: [%8I64u, %8I64u]\n", (unsigned long) s, - td->td_stripoffset ? (unsigned __int64) td->td_stripoffset[s] : 0, - td->td_stripbytecount ? (unsigned __int64) td->td_stripbytecount[s] : 0); + (unsigned __int64) TIFFGetStrileOffset(tif, s), + (unsigned __int64) TIFFGetStrileByteCount(tif, s)); #else fprintf(fd, " %3lu: [%8llu, %8llu]\n", (unsigned long) s, - td->td_stripoffset ? (unsigned long long) td->td_stripoffset[s] : 0, - td->td_stripbytecount ? (unsigned long long) td->td_stripbytecount[s] : 0); + (unsigned long long) TIFFGetStrileOffset(tif, s), + (unsigned long long) TIFFGetStrileByteCount(tif, s)); #endif } } |