gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 02:10:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/tiff.m: Correct check for old libtiff version based on

Browse source 
idea by Riccardo Mottola <rm@gnu.org>.
        Remove all usages of deprecated types.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@38300 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2015-01-23 13:29:38 +00:00
parent e40611ea6c
commit 29f4f8c512
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2015-01-23 Fred Kiefer <FredKiefer@gmx.de>
* Source/tiff.m: Correct check for old libtiff version based on
idea by Riccardo Mottola <rm@gnu.org>.
Remove all usages of deprecated types.
2015-01-11 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSMenu.m (-update): Added case to menu autoenabler to

16
Source/tiff.m
View file

@ -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 @@ NSTiffWarning(const char *func, const char *msg, va_list ap)
}
/* 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 @@ TiffHandleRead(thandle_t handle, tdata_t buf, tsize_t count)
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 @@ TiffHandleSize(thandle_t handle)
}
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 @@ TiffHandleMap(thandle_t handle, tdata_t* data, toff_t* size)
}
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 @@ NSTiffRead(TIFF *image, NSTiffInfo *info, unsigned char *data)
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;