cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move TIFFCleanup() back to the tiffio.h.

Browse Source
This commit is contained in:
Andrey Kiselev 2004-01-30 20:22:18 +00:00
parent 792ee438d9
commit e071c35ea7
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libtiff/tif_close.c
View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_close.c,v 1.7 2004-01-29 08:47:36 dron Exp $ */ /* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_close.c,v 1.8 2004-01-30 20:22:18 dron Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -30,7 +30,7 @@
#include "tiffiop.h" #include "tiffiop.h"
/************************************************************************/ /************************************************************************/
/* _TIFFCleanup() */ /* TIFFCleanup() */
/************************************************************************/ /************************************************************************/
/** /**
@ -43,7 +43,7 @@
*/ */
void void
_TIFFCleanup(TIFF* tif) TIFFCleanup(TIFF* tif)
{ {
if (tif->tif_mode != O_RDONLY) if (tif->tif_mode != O_RDONLY)
/* /*
@ -113,7 +113,7 @@ TIFFClose(TIFF* tif)
TIFFCloseProc closeproc = tif->tif_closeproc; TIFFCloseProc closeproc = tif->tif_closeproc;
thandle_t fd = tif->tif_clientdata; thandle_t fd = tif->tif_clientdata;
_TIFFCleanup(tif); TIFFCleanup(tif);
(void) (*closeproc)(fd); (void) (*closeproc)(fd);
} }

4
libtiff/tif_open.c
View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_open.c,v 1.14 2004-01-29 15:34:01 dron Exp $ */ /* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_open.c,v 1.15 2004-01-30 20:22:18 dron Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -382,7 +382,7 @@ TIFFClientOpen(
} }
bad: bad:
tif->tif_mode = O_RDONLY; /* XXX avoid flush */ tif->tif_mode = O_RDONLY; /* XXX avoid flush */
_TIFFCleanup(tif); TIFFCleanup(tif);
bad2: bad2:
return ((TIFF*)0); return ((TIFF*)0);
(void) (*closeproc)(clientdata); (void) (*closeproc)(clientdata);

3
libtiff/tiffio.h
View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tiffio.h,v 1.29 2004-01-29 08:47:36 dron Exp $ */ /* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tiffio.h,v 1.30 2004-01-30 20:22:18 dron Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -289,6 +289,7 @@ extern void _TIFFmemcpy(tdata_t, const tdata_t, tsize_t);
extern int _TIFFmemcmp(const tdata_t, const tdata_t, tsize_t); extern int _TIFFmemcmp(const tdata_t, const tdata_t, tsize_t);
extern void _TIFFfree(tdata_t); extern void _TIFFfree(tdata_t);
extern void TIFFCleanup(TIFF*);
extern void TIFFClose(TIFF*); extern void TIFFClose(TIFF*);
extern int TIFFFlush(TIFF*); extern int TIFFFlush(TIFF*);
extern int TIFFFlushData(TIFF*); extern int TIFFFlushData(TIFF*);

3
libtiff/tiffiop.h
View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tiffiop.h,v 1.10 2004-01-29 08:47:36 dron Exp $ */ /* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tiffiop.h,v 1.11 2004-01-30 20:22:18 dron Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -207,7 +207,6 @@ struct tiff {
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
#endif #endif
extern void _TIFFCleanup(TIFF*);
extern int _TIFFgetMode(const char*, const char*); extern int _TIFFgetMode(const char*, const char*);
extern int _TIFFNoRowEncode(TIFF*, tidata_t, tsize_t, tsample_t); extern int _TIFFNoRowEncode(TIFF*, tidata_t, tsize_t, tsample_t);
extern int _TIFFNoStripEncode(TIFF*, tidata_t, tsize_t, tsample_t); extern int _TIFFNoStripEncode(TIFF*, tidata_t, tsize_t, tsample_t);