Author: fredkiefer
Date: Sun Jan 11 22:51:20 2015
New Revision: 38287
URL: http://svn.gna.org/viewcvs/gnustep?rev=38287&view=rev
Log:
* Source/tiff.m: Use type tmsize_t.
Base on patch by Marat Ibadinov <[email protected]>
Modified:
libs/gui/trunk/ChangeLog
libs/gui/trunk/Source/tiff.m
Modified: libs/gui/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/ChangeLog?rev=38287&r1=38286&r2=38287&view=diff
==============================================================================
--- libs/gui/trunk/ChangeLog (original)
+++ libs/gui/trunk/ChangeLog Sun Jan 11 22:51:20 2015
@@ -1,3 +1,8 @@
+2015-01-11 Fred Kiefer <[email protected]>
+
+ * Source/tiff.m: Use type tmsize_t.
+ Base on patch by Marat Ibadinov <[email protected]>
+
2015-01-08 Fred Kiefer <[email protected]>
* Source/NSTextView.m: Protect usages of sharedSpellChecker with
Modified: libs/gui/trunk/Source/tiff.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/tiff.m?rev=38287&r1=38286&r2=38287&view=diff
==============================================================================
--- libs/gui/trunk/Source/tiff.m (original)
+++ libs/gui/trunk/Source/tiff.m Sun Jan 11 22:51:20 2015
@@ -73,6 +73,11 @@
#include <unistd.h> /* 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 @@
uint8* buf;
uint8* raster;
NSTiffColormap* map;
- int scan_line_size;
+ tmsize_t scan_line_size;
if (data == NULL)
return -1;
@@ -471,7 +476,7 @@
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);
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
