Merge pull request #11624 from schwehr/tif_jxl

tif_jxl: Add include for TIFF type and use TIFF_SIZE_FORMAT for error.
OSGeo · Jan 10, 2025 · 313e89c · 313e89c
2 parents 64b2347 + e2d46a6
commit 313e89c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/frmts/gtiff/tif_jxl.c b/frmts/gtiff/tif_jxl.c
@@ -413,8 +413,8 @@ static int JXLPreDecode(TIFF *tif, uint16_t s)
             if (buffer_size != channel_size)
             {
                 TIFFErrorExtR(tif, module,
-                              "JxlDecoderExtraChannelBufferSize returned %ld, "
-                              "expecting %u",
+                              "JxlDecoderExtraChannelBufferSize returned "
+                              "%" TIFF_SIZE_FORMAT ", expecting %u",
                               buffer_size, channel_size);
                 _TIFFfreeExt(tif, extra_channel_buffer);
                 return 0;

diff --git a/frmts/gtiff/tif_jxl.h b/frmts/gtiff/tif_jxl.h
@@ -25,6 +25,8 @@
 #ifndef TIFF_JXL_H_DEFINED
 #define TIFF_JXL_H_DEFINED
 
+#include "tiffio.h"
+
 #ifndef COMPRESSION_JXL
 #define COMPRESSION_JXL                                                        \
     50002 /* JPEGXL: WARNING not registered in Adobe-maintained registry */