From a9de164cfa3a20b0323a569530e30d2893eed976 Mon Sep 17 00:00:00 2001
From: Even Rouault <[EMAIL REDACTED]>
Date: Tue, 13 Dec 2022 22:56:54 +0100
Subject: [PATCH] tiffinfo/tiffgt: more corect casts related to tdir_t changes
---
tools/tiffgt.c | 4 ++--
tools/tiffinfo.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/tiffgt.c b/tools/tiffgt.c
index 96c692b2..bd7f45af 100644
--- a/tools/tiffgt.c
+++ b/tools/tiffgt.c
@@ -196,7 +196,7 @@ int main(int argc, char *argv[])
*/
glutInitWindowSize(width, height);
snprintf(title, TITLE_LENGTH - 1, "%s [%u]", filelist[fileindex],
- (unsigned int)TIFFCurrentDirectory(tif));
+ TIFFCurrentDirectory(tif));
glutCreateWindow(title);
glutDisplayFunc(raster_draw);
glutReshapeFunc(raster_reshape);
@@ -322,7 +322,7 @@ static void raster_reshape(int win_w, int win_h)
glPixelZoom(xratio, yratio);
glViewport(0, 0, win_w, win_h);
snprintf(title, 1024, "%s [%u] %d%%", filelist[fileindex],
- (unsigned int)TIFFCurrentDirectory(tif), ratio);
+ TIFFCurrentDirectory(tif), ratio);
glutSetWindowTitle(title);
}
diff --git a/tools/tiffinfo.c b/tools/tiffinfo.c
index 43436036..6e24d0f0 100644
--- a/tools/tiffinfo.c
+++ b/tools/tiffinfo.c
@@ -185,11 +185,11 @@ int main(int argc, char *argv[])
{
toff_t offset = 0;
tdir_t curdir = TIFFCurrentDirectory(tif);
- printf("=== TIFF directory %d ===\n", curdir);
+ printf("=== TIFF directory %u ===\n", curdir);
tiffinfo(tif, order, flags, 1);
if (TIFFGetField(tif, TIFFTAG_EXIFIFD, &offset))
{
- printf("--- EXIF directory within directory %d \n",
+ printf("--- EXIF directory within directory %u \n",
curdir);
if (TIFFReadEXIFDirectory(tif, offset))
{
@@ -201,7 +201,7 @@ int main(int argc, char *argv[])
}
if (TIFFGetField(tif, TIFFTAG_GPSIFD, &offset))
{
- printf("--- GPS directory within directory %d \n",
+ printf("--- GPS directory within directory %u \n",
curdir);
if (TIFFReadGPSDirectory(tif, offset))
{
@@ -223,7 +223,7 @@ int main(int argc, char *argv[])
memcpy(subIFDoffsets, vPtr,
nCount * sizeof(subIFDoffsets[0]));
printf("--- SubIFD image descriptor tag within "
- "TIFF directory %d with array of %d "
+ "TIFF directory %u with array of %d "
"SubIFD chains ---\n",
curdir, nCount);
for (int i = 0; i < nCount; i++)