From ada76ff54ae8e552e42955b355de7276508a9249 Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Sat, 9 Feb 2019 15:48:35 +0100
Subject: [PATCH] support for libtiff 3.x

---
 src/Makefile    | 2 +-
 src/tifformat.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 69ab53f4..bcb7a3af 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -515,7 +515,7 @@ endif
         COPT += -D__GP2X__ $(TTFCOPT) $(JOYCOPT) $(LUACOPT)
         LOPT = -static
         LOPT += $(shell $(SDLCONFIG) --static-libs)
-        LOPT += -lSDL_image -ljpeg -lpng -lz
+        LOPT += -lSDL_image -ltiff -ljpeg -lpng -lz
         LOPT += -lm $(TTFLOPT) $(LUALOPT)
         OBJDIR = ../obj/gp2x
         NOTTF = 1
diff --git a/src/tifformat.c b/src/tifformat.c
index 80e8c5e2..e56b4110 100644
--- a/src/tifformat.c
+++ b/src/tifformat.c
@@ -434,7 +434,11 @@ void Load_TIFF_Sub(T_IO_Context * context, TIFF * tif, unsigned long file_size)
   for (;;)
   {
     word subifd_count;
+#if TIFFLIB_VERSION < 20120101
+    uint32 * subifd_array;
+#else
     uint64 * subifd_array;
+#endif
     if (TIFFGetField(tif, TIFFTAG_SUBIFD, &subifd_count, &subifd_array))
     {
       GFX2_Log(GFX2_DEBUG, "TIFFTAG_SUBIFD : count = %u\n", subifd_count);
@@ -474,7 +478,7 @@ struct memory_buffer
   unsigned long alloc_size;
 };
 
-tmsize_t lTIFF_read(thandle_t p, void * data, tmsize_t size)
+tsize_t lTIFF_read(thandle_t p, void * data, tsize_t size)
 {
   struct memory_buffer * mbuffer = (struct memory_buffer *)p;
   GFX2_Log(GFX2_DEBUG, "lTIFF_read(%p, %p, %u)\n", p, data, size);
@@ -483,7 +487,7 @@ tmsize_t lTIFF_read(thandle_t p, void * data, tmsize_t size)
   return size;
 }
 
-tmsize_t lTIFF_write(thandle_t p, void * data, tmsize_t size)
+tsize_t lTIFF_write(thandle_t p, void * data, tsize_t size)
 {
   struct memory_buffer * mbuffer = (struct memory_buffer *)p;
   GFX2_Log(GFX2_DEBUG, "lTIFF_write(%p, %p, %u)\n", p, data, size);