diff options
| author | Lee Howard <faxguy@howardsilvan.com> | 2010-12-13 05:15:50 +0000 |
|---|---|---|
| committer | Lee Howard <faxguy@howardsilvan.com> | 2010-12-13 05:15:50 +0000 |
| commit | 7f39edf05884859d39fb2fdea4d3ae627a7a86e2 (patch) | |
| tree | 1a223fea08471811679b3bd3c0da4c8da35ca91f /libtiff/tif_dirread.c | |
| parent | 3c383d15fab61a7af3cdb116fcd587d8c0e1ec93 (diff) | |
| download | libtiff-git-7f39edf05884859d39fb2fdea4d3ae627a7a86e2.tar.gz | |
* libtiff/tif_dirread.c: fix for Zeiss LSM and Canon CR2 files
http://bugzilla.maptools.org/show_bug.cgi?id=2164
Diffstat (limited to 'libtiff/tif_dirread.c')
| -rw-r--r-- | libtiff/tif_dirread.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c index 986cc0a1..2229cb3a 100644 --- a/libtiff/tif_dirread.c +++ b/libtiff/tif_dirread.c @@ -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) |