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

avoid warnings about TIFFReadDirEntryFloat(), etc

Browse Source
This commit is contained in:
Frank Warmerdam 2008-09-01 23:26:27 +00:00
parent 11e620b7f9
commit 80ca2298a3
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2008-09-01 Frank Warmerdam <warmerdam@pobox.com> 2008-09-01 Frank Warmerdam <warmerdam@pobox.com>
* libtiff/tif_dirread.c: Avoid unused TIFFReadDirEntryFloat() function.
* libtiff/tif_dirwrite.c: modified to write IFDs as either IFD8 or IFD * libtiff/tif_dirwrite.c: modified to write IFDs as either IFD8 or IFD
depending on whether the file is bigtiff or classic tiff. depending on whether the file is bigtiff or classic tiff.
http://bugzilla.maptools.org/show_bug.cgi?id=1917 http://bugzilla.maptools.org/show_bug.cgi?id=1917

7
libtiff/tif_dirread.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_dirread.c,v 1.143 2008-07-29 18:45:40 fwarmerdam Exp $ */ /* $Id: tif_dirread.c,v 1.144 2008-09-01 23:26:27 fwarmerdam Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -66,7 +66,9 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryByte(TIFF* tif, TIFFDirEntry* di
static enum TIFFReadDirEntryErr TIFFReadDirEntryShort(TIFF* tif, TIFFDirEntry* direntry, uint16* value); static enum TIFFReadDirEntryErr TIFFReadDirEntryShort(TIFF* tif, TIFFDirEntry* direntry, uint16* value);
static enum TIFFReadDirEntryErr TIFFReadDirEntryLong(TIFF* tif, TIFFDirEntry* direntry, uint32* value); static enum TIFFReadDirEntryErr TIFFReadDirEntryLong(TIFF* tif, TIFFDirEntry* direntry, uint32* value);
static enum TIFFReadDirEntryErr TIFFReadDirEntryLong8(TIFF* tif, TIFFDirEntry* direntry, uint64* value); static enum TIFFReadDirEntryErr TIFFReadDirEntryLong8(TIFF* tif, TIFFDirEntry* direntry, uint64* value);
#ifdef notdef
static enum TIFFReadDirEntryErr TIFFReadDirEntryFloat(TIFF* tif, TIFFDirEntry* direntry, float* value); static enum TIFFReadDirEntryErr TIFFReadDirEntryFloat(TIFF* tif, TIFFDirEntry* direntry, float* value);
#endif
static enum TIFFReadDirEntryErr TIFFReadDirEntryDouble(TIFF* tif, TIFFDirEntry* direntry, double* value); static enum TIFFReadDirEntryErr TIFFReadDirEntryDouble(TIFF* tif, TIFFDirEntry* direntry, double* value);
static enum TIFFReadDirEntryErr TIFFReadDirEntryIfd8(TIFF* tif, TIFFDirEntry* direntry, uint64* value); static enum TIFFReadDirEntryErr TIFFReadDirEntryIfd8(TIFF* tif, TIFFDirEntry* direntry, uint64* value);
@ -498,6 +500,7 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryLong8(TIFF* tif, TIFFDirEntry* d
} }
} }
#ifdef notdef
static enum TIFFReadDirEntryErr TIFFReadDirEntryFloat(TIFF* tif, TIFFDirEntry* direntry, float* value) static enum TIFFReadDirEntryErr TIFFReadDirEntryFloat(TIFF* tif, TIFFDirEntry* direntry, float* value)
{ {
enum TIFFReadDirEntryErr err; enum TIFFReadDirEntryErr err;
@ -599,6 +602,7 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryFloat(TIFF* tif, TIFFDirEntry* d
return(TIFFReadDirEntryErrType); return(TIFFReadDirEntryErrType);
} }
} }
#endif /* def notdef */
static enum TIFFReadDirEntryErr TIFFReadDirEntryDouble(TIFF* tif, TIFFDirEntry* direntry, double* value) static enum TIFFReadDirEntryErr TIFFReadDirEntryDouble(TIFF* tif, TIFFDirEntry* direntry, double* value)
{ {
@ -732,6 +736,7 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryArray(TIFF* tif, TIFFDirEntry* d
*value=0; *value=0;
return(TIFFReadDirEntryErrOk); return(TIFFReadDirEntryErrOk);
} }
(void) desttypesize;
#ifdef notdef #ifdef notdef
if ((uint64)(4*1024*1024/typesize)<direntry->tdir_count) if ((uint64)(4*1024*1024/typesize)<direntry->tdir_count)
return(TIFFReadDirEntryErrSizesan); return(TIFFReadDirEntryErrSizesan);