From d390f16ea140ea55267fec921887e2b5e5576acb Mon Sep 17 00:00:00 2001 From: fredkiefer Date: Sun, 11 Jan 2015 21:51:20 +0000 Subject: [PATCH] * Source/tiff.m: Use type tmsize_t. Base on patch by Marat Ibadinov git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@38287 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/tiff.m | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 72c72762c..b65941973 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-01-11 Fred Kiefer + + * Source/tiff.m: Use type tmsize_t. + Base on patch by Marat Ibadinov + 2015-01-08 Fred Kiefer * Source/NSTextView.m: Protect usages of sharedSpellChecker with diff --git a/Source/tiff.m b/Source/tiff.m index 33067feb9..b67a5fc9d 100644 --- a/Source/tiff.m +++ b/Source/tiff.m @@ -73,6 +73,11 @@ #include /* for L_SET, etc definitions */ #endif /* !__WIN32__ */ +#if !defined(tmsize_t) +// This only got added in version 4 of libtiff, but TIFFLIB_VERSION is unusable to differentiate here +typedef tsize_t tmsize_t; +#endif + typedef struct { char* data; long size; @@ -366,7 +371,7 @@ NSTiffRead(TIFF *image, NSTiffInfo *info, unsigned char *data) uint8* buf; uint8* raster; NSTiffColormap* map; - int scan_line_size; + tmsize_t scan_line_size; if (data == NULL) return -1; @@ -471,7 +476,7 @@ NSTiffWrite(TIFF *image, NSTiffInfo *info, unsigned char *data) int i; unsigned int row; int error = 0; - int scan_line_size; + tmsize_t scan_line_size; TIFFSetField(image, TIFFTAG_IMAGEWIDTH, info->width); TIFFSetField(image, TIFFTAG_IMAGELENGTH, info->height);