Author: fredkiefer
Date: Fri Jan 23 14:29:38 2015
New Revision: 38300
URL: http://svn.gna.org/viewcvs/gnustep?rev=38300&view=rev
Log:
* Source/tiff.m: Correct check for old libtiff version based on
idea by Riccardo Mottola <[email protected]>.
Remove all usages of deprecated types.
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=38300&r1=38299&r2=38300&view=diff
==============================================================================
--- libs/gui/trunk/ChangeLog (original)
+++ libs/gui/trunk/ChangeLog Fri Jan 23 14:29:38 2015
@@ -1,3 +1,9 @@
+2015-01-23 Fred Kiefer <[email protected]>
+
+ * Source/tiff.m: Correct check for old libtiff version based on
+ idea by Riccardo Mottola <[email protected]>.
+ Remove all usages of deprecated types.
+
2015-01-11 Fred Kiefer <[email protected]>
* Source/NSMenu.m (-update): Added case to menu autoenabler to
Modified: libs/gui/trunk/Source/tiff.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/tiff.m?rev=38300&r1=38299&r2=38300&view=diff
==============================================================================
--- libs/gui/trunk/Source/tiff.m (original)
+++ libs/gui/trunk/Source/tiff.m Fri Jan 23 14:29:38 2015
@@ -73,7 +73,7 @@
#include <unistd.h> /* for L_SET, etc definitions */
#endif /* !__WIN32__ */
-#if !defined(tmsize_t)
+#if !defined(TIFF_VERSION_CLASSIC)
// This only got added in version 4 of libtiff, but TIFFLIB_VERSION is
unusable to differentiate here
typedef tsize_t tmsize_t;
#endif
@@ -109,8 +109,8 @@
}
/* Client functions that provide reading/writing of data for libtiff */
-static tsize_t
-TiffHandleRead(thandle_t handle, tdata_t buf, tsize_t count)
+static tmsize_t
+TiffHandleRead(thandle_t handle, void* buf, tmsize_t count)
{
chandle_t* chand = (chandle_t *)handle;
if (chand->position >= chand->size)
@@ -121,8 +121,8 @@
return count;
}
-static tsize_t
-TiffHandleWrite(thandle_t handle, tdata_t buf, tsize_t count)
+static tmsize_t
+TiffHandleWrite(thandle_t handle, void* buf, tmsize_t count)
{
chandle_t* chand = (chandle_t *)handle;
if (chand->mode == 'r')
@@ -178,7 +178,7 @@
}
static int
-TiffHandleMap(thandle_t handle, tdata_t* data, toff_t* size)
+TiffHandleMap(thandle_t handle, void** data, toff_t* size)
{
chandle_t* chand = (chandle_t *)handle;
@@ -189,7 +189,7 @@
}
static void
-TiffHandleUnmap(thandle_t handle, tdata_t data, toff_t size)
+TiffHandleUnmap(thandle_t handle, void* data, toff_t size)
{
/* Nothing to unmap. */
}
@@ -471,7 +471,7 @@
int
NSTiffWrite(TIFF *image, NSTiffInfo *info, unsigned char *data)
{
- tdata_t buf = (tdata_t)data;
+ void* buf = (void*)data;
uint16 sample_info[2];
int i;
unsigned int row;
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
