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

* libtiff/tif_dirread.c: fix for Zeiss LSM and Canon CR2 files

Browse Source 
http://bugzilla.maptools.org/show_bug.cgi?id=2164
This commit is contained in:
Lee Howard 2010-12-13 05:15:50 +00:00
parent 3c383d15fa
commit 7f39edf058
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2010-12-12 Lee Howard <faxguy@howardsilvan.com>
* libtiff/tif_dirread.c: fix for Zeiss LSM and Canon CR2 files
http://bugzilla.maptools.org/show_bug.cgi?id=2164
2010-12-11 Lee Howard <faxguy@howardsilvan.com>
* tools/tiff2pdf.c: remove invalid duplication for Lab

6
libtiff/tif_dirread.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_dirread.c,v 1.162 2010-12-11 23:22:07 faxguy Exp $ */
/* $Id: tif_dirread.c,v 1.163 2010-12-13 05:15:50 faxguy Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@ -2727,7 +2727,7 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryPersampleShort(TIFF* tif, TIFFDi
uint16* m;
uint16* na;
uint16 nb;
if (direntry->tdir_count!=(uint64)tif->tif_dir.td_samplesperpixel)
if (direntry->tdir_count<(uint64)tif->tif_dir.td_samplesperpixel)
return(TIFFReadDirEntryErrCount);
err=TIFFReadDirEntryShortArray(tif,direntry,&m);
if (err!=TIFFReadDirEntryErrOk)
@ -2755,7 +2755,7 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryPersampleDouble(TIFF* tif, TIFFD
double* m;
double* na;
uint16 nb;
if (direntry->tdir_count!=(uint64)tif->tif_dir.td_samplesperpixel)
if (direntry->tdir_count<(uint64)tif->tif_dir.td_samplesperpixel)
return(TIFFReadDirEntryErrCount);
err=TIFFReadDirEntryDoubleArray(tif,direntry,&m);
if (err!=TIFFReadDirEntryErrOk)