diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2022-12-13 22:45:19 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2022-12-13 22:45:19 +0100 |
| commit | 8d5fbea923d0909416a840d3a70570cef80800f0 (patch) | |
| tree | 3334ceb51e496f0537d38c67353463c683be3b57 /libtiff | |
| parent | 06910438d1b2da4cc055bd345e68c3d90101e3fe (diff) | |
| download | libtiff-git-8d5fbea923d0909416a840d3a70570cef80800f0.tar.gz | |
TIFFAdvanceDirectory()/TIFFUnlinkDirectory(): fix build warnings/errors on OSX due to uint16_t->tdir_t type change
Diffstat (limited to 'libtiff')
| -rw-r--r-- | libtiff/tif_dir.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c index 901dff82..4a366545 100644 --- a/libtiff/tif_dir.c +++ b/libtiff/tif_dir.c @@ -1982,8 +1982,8 @@ static int TIFFAdvanceDirectory(TIFF *tif, uint64_t *nextdiroff, uint64_t *off, { TIFFWarningExtR( tif, module, - "the next directory %" PRIu16 " at offset 0x%" PRIx64 - " (%" PRIu64 ") might be an IFD loop. Treating directory %d as " + "the next directory %u at offset 0x%" PRIx64 " (%" PRIu64 + ") might be an IFD loop. Treating directory %d as " "last directory", *nextdirnum, *nextdiroff, *nextdiroff, (int)(*nextdirnum) - 1); *nextdiroff = 0; @@ -2160,8 +2160,7 @@ int TIFFUnlinkDirectory(TIFF *tif, tdir_t dirn) { if (nextdir == 0) { - TIFFErrorExtR(tif, module, "Directory %" PRIu16 " does not exist", - dirn); + TIFFErrorExtR(tif, module, "Directory %u does not exist", dirn); return (0); } if (!TIFFAdvanceDirectory(tif, &nextdir, &off, &nextdirnum)) |