m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

support for libtiff 3.x

Browse Source
This commit is contained in:
Thomas Bernard 2019-02-09 15:48:35 +01:00
parent e278d0551c
commit ada76ff54a
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile
View File

@ -515,7 +515,7 @@ endif
COPT += -D__GP2X__ $(TTFCOPT) $(JOYCOPT) $(LUACOPT) COPT += -D__GP2X__ $(TTFCOPT) $(JOYCOPT) $(LUACOPT)
LOPT = -static LOPT = -static
LOPT += $(shell $(SDLCONFIG) --static-libs) LOPT += $(shell $(SDLCONFIG) --static-libs)
LOPT += -lSDL_image -ljpeg -lpng -lz LOPT += -lSDL_image -ltiff -ljpeg -lpng -lz
LOPT += -lm $(TTFLOPT) $(LUALOPT) LOPT += -lm $(TTFLOPT) $(LUALOPT)
OBJDIR = ../obj/gp2x OBJDIR = ../obj/gp2x
NOTTF = 1 NOTTF = 1

8
src/tifformat.c
View File

@ -434,7 +434,11 @@ void Load_TIFF_Sub(T_IO_Context * context, TIFF * tif, unsigned long file_size)
for (;;) for (;;)
{ {
word subifd_count; word subifd_count;
#if TIFFLIB_VERSION < 20120101
uint32 * subifd_array;
#else
uint64 * subifd_array; uint64 * subifd_array;
#endif
if (TIFFGetField(tif, TIFFTAG_SUBIFD, &subifd_count, &subifd_array)) if (TIFFGetField(tif, TIFFTAG_SUBIFD, &subifd_count, &subifd_array))
{ {
GFX2_Log(GFX2_DEBUG, "TIFFTAG_SUBIFD : count = %u\n", subifd_count); GFX2_Log(GFX2_DEBUG, "TIFFTAG_SUBIFD : count = %u\n", subifd_count);
@ -474,7 +478,7 @@ struct memory_buffer
unsigned long alloc_size; 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; struct memory_buffer * mbuffer = (struct memory_buffer *)p;
GFX2_Log(GFX2_DEBUG, "lTIFF_read(%p, %p, %u)\n", p, data, size); 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; 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; struct memory_buffer * mbuffer = (struct memory_buffer *)p;
GFX2_Log(GFX2_DEBUG, "lTIFF_write(%p, %p, %u)\n", p, data, size); GFX2_Log(GFX2_DEBUG, "lTIFF_write(%p, %p, %u)\n", p, data, size);