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

* libtiff/tif_dirread.c: warnings cleanup

Browse Source 
http://bugzilla.maptools.org/show_bug.cgi?id=2092
This commit is contained in:
Lee Howard 2010-12-11 23:22:06 +00:00
parent 3467f1927f
commit 7335412b5a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -2,6 +2,8 @@
* libtiff/tif_stream.cxx: warnings cleanup
http://bugzilla.maptools.org/show_bug.cgi?id=2091
* libtiff/tif_dirread.c: warnings cleanup
http://bugzilla.maptools.org/show_bug.cgi?id=2092
2010-12-11 Lee Howard <faxguy@howardsilvan.com>

7
libtiff/tif_dirread.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_dirread.c,v 1.161 2010-12-11 22:28:30 faxguy Exp $ */
/* $Id: tif_dirread.c,v 1.162 2010-12-11 23:22:07 faxguy Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@ -3410,7 +3410,7 @@ TIFFReadDirectory(TIFF* tif)
TIFFDirEntry* dp;
uint16 di;
const TIFFField* fip;
uint32 fii;
uint32 fii=FAILED_FII;
toff_t nextdiroff;
tif->tif_diroff=tif->tif_nextdiroff;
if (!TIFFCheckDirOffset(tif,tif->tif_nextdiroff))
@ -3713,7 +3713,7 @@ TIFFReadDirectory(TIFF* tif)
uint32 countpersample;
uint32 countrequired;
uint32 incrementpersample;
uint16* value;
uint16* value=NULL;
countpersample=(1L<<tif->tif_dir.td_bitspersample);
if ((dp->tdir_tag==TIFFTAG_TRANSFERFUNCTION)&&(dp->tdir_count==(uint64)countpersample))
{
@ -5318,6 +5318,7 @@ TIFFFetchSubjectDistance(TIFF* tif, TIFFDirEntry* dir)
static const char module[] = "TIFFFetchSubjectDistance";
enum TIFFReadDirEntryErr err;
UInt64Aligned_t m;
m.l=0;
assert(sizeof(double)==8);
assert(sizeof(uint64)==8);
assert(sizeof(uint32)==4);