cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix an issue with not being able to open some valid TIFF files.

Browse Source 
http://www.sigmasoft.com/~openbsd/archive/openbsd-ports/200503/msg00090.html

From: Bernd Ahlers <b dot ahlers at ba-net dot org>
This commit is contained in:
brad 2005-03-27 05:12:15 +00:00
parent ebc59d0d2f
commit 7faf47bc10
7 changed files with 86 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/tiff/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.32 2005/03/27 03:59:00 brad Exp $ # $OpenBSD: Makefile,v 1.33 2005/03/27 05:12:15 brad Exp $
COMMENT= "tools and library routines for working with TIFF images" COMMENT= "tools and library routines for working with TIFF images"
VERSION= 3.6.1 VERSION= 3.6.1
DISTNAME= tiff-v${VERSION} DISTNAME= tiff-v${VERSION}
PKGNAME= tiff-${VERSION}p4 PKGNAME= tiff-${VERSION}p5
CATEGORIES= graphics CATEGORIES= graphics
MASTER_SITES= ftp://ftp.remotesensing.org/pub/libtiff/old/ MASTER_SITES= ftp://ftp.remotesensing.org/pub/libtiff/old/

58
graphics/tiff/patches/patch-libtiff_tif_dirread_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libtiff_tif_dirread_c,v 1.2 2005/03/27 03:57:26 brad Exp $ $OpenBSD: patch-libtiff_tif_dirread_c,v 1.3 2005/03/27 05:12:15 brad Exp $
--- libtiff/tif_dirread.c.orig Mon Dec 22 03:22:15 2003 --- libtiff/tif_dirread.c.orig Mon Dec 22 03:22:15 2003
+++ libtiff/tif_dirread.c Sat Mar 26 22:45:43 2005 +++ libtiff/tif_dirread.c Sat Mar 26 23:18:01 2005
@@ -62,11 +62,17 @@ static int TIFFFetchShortPair(TIFF*, TIF @@ -62,11 +62,17 @@ static int TIFFFetchShortPair(TIFF*, TIF
static void ChopUpSingleUncompressedStrip(TIFF*); static void ChopUpSingleUncompressedStrip(TIFF*);
@ -112,25 +112,37 @@ $OpenBSD: patch-libtiff_tif_dirread_c,v 1.2 2005/03/27 03:57:26 brad Exp $
if (!TIFFFieldSet(tif, FIELD_MAXSAMPLEVALUE)) if (!TIFFFieldSet(tif, FIELD_MAXSAMPLEVALUE))
td->td_maxsamplevalue = (uint16)((1L<<td->td_bitspersample)-1); td->td_maxsamplevalue = (uint16)((1L<<td->td_bitspersample)-1);
/* /*
@@ -603,6 +619,17 @@ TIFFReadDirectory(TIFF* tif) @@ -601,8 +617,28 @@ TIFFReadDirectory(TIFF* tif)
tif->tif_curstrip = (tstrip_t) -1;
tif->tif_col = (uint32) -1;
tif->tif_curtile = (ttile_t) -1; tif->tif_curtile = (ttile_t) -1;
tif->tif_tilesize = TIFFTileSize(tif); - tif->tif_tilesize = TIFFTileSize(tif);
+ tif->tif_tilesize = (tsize_t) -1;
tif->tif_scanlinesize = TIFFScanlineSize(tif); tif->tif_scanlinesize = TIFFScanlineSize(tif);
+ +
+ if (!tif->tif_tilesize) {
+ TIFFError(module, "%s: cannot handle zero tile size",
+ tif->tif_name);
+ return (0);
+ }
+ if (!tif->tif_scanlinesize) { + if (!tif->tif_scanlinesize) {
+ TIFFError(module, "%s: cannot handle zero scanline size", + TIFFError(module, "%s: cannot handle zero scanline size",
+ tif->tif_name); + tif->tif_name);
+ return (0); + return (0);
+ }
+ if (isTiled(tif)) {
+ tif->tif_tilesize = TIFFTileSize(tif);
+ if (!tif->tif_tilesize) {
+ TIFFError(module, "%s: cannot handle zero tile size",
+ tif->tif_name);
+ return (0);
+ }
+ } else {
+ if (!TIFFStripSize(tif)) {
+ TIFFError(module, "%s: cannot handle zero strip size",
+ tif->tif_name);
+ return (0);
+ }
+ } + }
return (1); return (1);
bad: bad:
if (dir) if (dir)
@@ -622,7 +649,7 @@ EstimateStripByteCounts(TIFF* tif, TIFFD @@ -622,7 +658,7 @@ EstimateStripByteCounts(TIFF* tif, TIFFD
if (td->td_stripbytecount) if (td->td_stripbytecount)
_TIFFfree(td->td_stripbytecount); _TIFFfree(td->td_stripbytecount);
td->td_stripbytecount = (uint32*) td->td_stripbytecount = (uint32*)
@ -139,7 +151,7 @@ $OpenBSD: patch-libtiff_tif_dirread_c,v 1.2 2005/03/27 03:57:26 brad Exp $
"for \"StripByteCounts\" array"); "for \"StripByteCounts\" array");
if (td->td_compression != COMPRESSION_NONE) { if (td->td_compression != COMPRESSION_NONE) {
uint32 space = (uint32)(sizeof (TIFFHeader) uint32 space = (uint32)(sizeof (TIFFHeader)
@@ -931,7 +958,7 @@ TIFFFetchRationalArray(TIFF* tif, TIFFDi @@ -931,7 +967,7 @@ TIFFFetchRationalArray(TIFF* tif, TIFFDi
uint32* l; uint32* l;
l = (uint32*)CheckMalloc(tif, l = (uint32*)CheckMalloc(tif,
@ -148,7 +160,7 @@ $OpenBSD: patch-libtiff_tif_dirread_c,v 1.2 2005/03/27 03:57:26 brad Exp $
"to fetch array of rationals"); "to fetch array of rationals");
if (l) { if (l) {
if (TIFFFetchData(tif, dir, (char *)l)) { if (TIFFFetchData(tif, dir, (char *)l)) {
@@ -1087,35 +1114,35 @@ TIFFFetchNormalTag(TIFF* tif, TIFFDirEnt @@ -1087,35 +1123,35 @@ TIFFFetchNormalTag(TIFF* tif, TIFFDirEnt
case TIFF_SBYTE: case TIFF_SBYTE:
/* NB: always expand BYTE values to shorts */ /* NB: always expand BYTE values to shorts */
cp = CheckMalloc(tif, cp = CheckMalloc(tif,
@ -190,7 +202,7 @@ $OpenBSD: patch-libtiff_tif_dirread_c,v 1.2 2005/03/27 03:57:26 brad Exp $
ok = cp && TIFFFetchDoubleArray(tif, dp, (double*) cp); ok = cp && TIFFFetchDoubleArray(tif, dp, (double*) cp);
break; break;
case TIFF_ASCII: case TIFF_ASCII:
@@ -1124,7 +1151,7 @@ TIFFFetchNormalTag(TIFF* tif, TIFFDirEnt @@ -1124,7 +1160,7 @@ TIFFFetchNormalTag(TIFF* tif, TIFFDirEnt
* Some vendors write strings w/o the trailing * Some vendors write strings w/o the trailing
* NULL byte, so always append one just in case. * NULL byte, so always append one just in case.
*/ */
@ -199,7 +211,7 @@ $OpenBSD: patch-libtiff_tif_dirread_c,v 1.2 2005/03/27 03:57:26 brad Exp $
if( (ok = (cp && TIFFFetchString(tif, dp, cp))) != 0 ) if( (ok = (cp && TIFFFetchString(tif, dp, cp))) != 0 )
cp[dp->tdir_count] = '\0'; /* XXX */ cp[dp->tdir_count] = '\0'; /* XXX */
break; break;
@@ -1226,8 +1253,9 @@ TIFFFetchPerSampleShorts(TIFF* tif, TIFF @@ -1226,8 +1262,9 @@ TIFFFetchPerSampleShorts(TIFF* tif, TIFF
uint16* v = buf; uint16* v = buf;
if (samples > NITEMS(buf)) if (samples > NITEMS(buf))
@ -211,7 +223,7 @@ $OpenBSD: patch-libtiff_tif_dirread_c,v 1.2 2005/03/27 03:57:26 brad Exp $
int i; int i;
for (i = 1; i < samples; i++) for (i = 1; i < samples; i++)
if (v[i] != v[0]) { if (v[i] != v[0]) {
@@ -1240,7 +1268,7 @@ TIFFFetchPerSampleShorts(TIFF* tif, TIFF @@ -1240,7 +1277,7 @@ TIFFFetchPerSampleShorts(TIFF* tif, TIFF
status = 1; status = 1;
} }
bad: bad:
@ -220,7 +232,7 @@ $OpenBSD: patch-libtiff_tif_dirread_c,v 1.2 2005/03/27 03:57:26 brad Exp $
_TIFFfree((char*) v); _TIFFfree((char*) v);
} }
return (status); return (status);
@@ -1262,8 +1290,9 @@ TIFFFetchPerSampleAnys(TIFF* tif, TIFFDi @@ -1262,8 +1299,9 @@ TIFFFetchPerSampleAnys(TIFF* tif, TIFFDi
double* v = buf; double* v = buf;
if (samples > NITEMS(buf)) if (samples > NITEMS(buf))
@ -232,7 +244,7 @@ $OpenBSD: patch-libtiff_tif_dirread_c,v 1.2 2005/03/27 03:57:26 brad Exp $
int i; int i;
for (i = 1; i < samples; i++) for (i = 1; i < samples; i++)
if (v[i] != v[0]) { if (v[i] != v[0]) {
@@ -1276,7 +1305,7 @@ TIFFFetchPerSampleAnys(TIFF* tif, TIFFDi @@ -1276,7 +1314,7 @@ TIFFFetchPerSampleAnys(TIFF* tif, TIFFDi
status = 1; status = 1;
} }
bad: bad:
@ -241,7 +253,7 @@ $OpenBSD: patch-libtiff_tif_dirread_c,v 1.2 2005/03/27 03:57:26 brad Exp $
_TIFFfree(v); _TIFFfree(v);
} }
return (status); return (status);
@@ -1301,7 +1330,7 @@ TIFFFetchStripThing(TIFF* tif, TIFFDirEn @@ -1301,7 +1339,7 @@ TIFFFetchStripThing(TIFF* tif, TIFFDirEn
*/ */
if (*lpp == NULL && if (*lpp == NULL &&
(*lpp = (uint32 *)CheckMalloc(tif, (*lpp = (uint32 *)CheckMalloc(tif,
@ -250,7 +262,7 @@ $OpenBSD: patch-libtiff_tif_dirread_c,v 1.2 2005/03/27 03:57:26 brad Exp $
return (0); return (0);
lp = *lpp; lp = *lpp;
memset( lp, 0, sizeof(uint32) * nstrips ); memset( lp, 0, sizeof(uint32) * nstrips );
@@ -1311,7 +1340,7 @@ TIFFFetchStripThing(TIFF* tif, TIFFDirEn @@ -1311,7 +1349,7 @@ TIFFFetchStripThing(TIFF* tif, TIFFDirEn
* Handle uint16->uint32 expansion. * Handle uint16->uint32 expansion.
*/ */
uint16* dp = (uint16*) CheckMalloc(tif, uint16* dp = (uint16*) CheckMalloc(tif,
@ -259,7 +271,7 @@ $OpenBSD: patch-libtiff_tif_dirread_c,v 1.2 2005/03/27 03:57:26 brad Exp $
if (dp == NULL) if (dp == NULL)
return (0); return (0);
if( (status = TIFFFetchShortArray(tif, dir, dp)) != 0 ) { if( (status = TIFFFetchShortArray(tif, dir, dp)) != 0 ) {
@@ -1328,7 +1357,7 @@ TIFFFetchStripThing(TIFF* tif, TIFFDirEn @@ -1328,7 +1366,7 @@ TIFFFetchStripThing(TIFF* tif, TIFFDirEn
/* Special case to correct length */ /* Special case to correct length */
uint32* dp = (uint32*) CheckMalloc(tif, uint32* dp = (uint32*) CheckMalloc(tif,
@ -268,7 +280,7 @@ $OpenBSD: patch-libtiff_tif_dirread_c,v 1.2 2005/03/27 03:57:26 brad Exp $
if (dp == NULL) if (dp == NULL)
return (0); return (0);
@@ -1360,8 +1389,12 @@ TIFFFetchExtraSamples(TIFF* tif, TIFFDir @@ -1360,8 +1398,12 @@ TIFFFetchExtraSamples(TIFF* tif, TIFFDir
uint16* v = buf; uint16* v = buf;
int status; int status;
@ -283,7 +295,7 @@ $OpenBSD: patch-libtiff_tif_dirread_c,v 1.2 2005/03/27 03:57:26 brad Exp $
if (dir->tdir_type == TIFF_BYTE) if (dir->tdir_type == TIFF_BYTE)
status = TIFFFetchByteArray(tif, dir, v); status = TIFFFetchByteArray(tif, dir, v);
else else
@@ -1390,10 +1423,10 @@ TIFFFetchRefBlackWhite(TIFF* tif, TIFFDi @@ -1390,10 +1432,10 @@ TIFFFetchRefBlackWhite(TIFF* tif, TIFFDi
/* /*
* Handle LONG's for backward compatibility. * Handle LONG's for backward compatibility.
*/ */
@ -296,7 +308,7 @@ $OpenBSD: patch-libtiff_tif_dirread_c,v 1.2 2005/03/27 03:57:26 brad Exp $
if( (ok = (fp != NULL)) != 0 ) { if( (ok = (fp != NULL)) != 0 ) {
uint32 i; uint32 i;
for (i = 0; i < dir->tdir_count; i++) for (i = 0; i < dir->tdir_count; i++)
@@ -1444,9 +1477,9 @@ ChopUpSingleUncompressedStrip(TIFF* tif) @@ -1444,9 +1486,9 @@ ChopUpSingleUncompressedStrip(TIFF* tif)
if (rowsperstrip >= td->td_rowsperstrip) if (rowsperstrip >= td->td_rowsperstrip)
return; return;
nstrips = (tstrip_t) TIFFhowmany(bytecount, stripbytes); nstrips = (tstrip_t) TIFFhowmany(bytecount, stripbytes);

12
graphics/tiff/patches/patch-libtiff_tif_jpeg_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libtiff_tif_jpeg_c,v 1.1 2005/03/27 05:12:15 brad Exp $
--- libtiff/tif_jpeg.c.orig Sat Mar 26 23:05:00 2005
+++ libtiff/tif_jpeg.c Sat Mar 26 23:05:52 2005
@@ -1378,7 +1378,7 @@ JPEGVSetField(TIFF* tif, ttag_t tag, va_
* Must recalculate cached tile size
* in case sampling state changed.
*/
- tif->tif_tilesize = TIFFTileSize(tif);
+ tif->tif_tilesize = isTiled(tif) ? TIFFTileSize(tif) : (tsize_t) -1;
return (1); /* pseudo tag */
case TIFFTAG_JPEGTABLESMODE:
sp->jpegtablesmode = va_arg(ap, int);

13
graphics/tiff/patches/patch-libtiff_tif_luv_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libtiff_tif_luv_c,v 1.1 2004/10/20 20:37:48 brad Exp $ $OpenBSD: patch-libtiff_tif_luv_c,v 1.2 2005/03/27 05:12:15 brad Exp $
--- libtiff/tif_luv.c.orig Thu Nov 27 10:08:10 2003 --- libtiff/tif_luv.c.orig Thu Nov 27 10:08:10 2003
+++ libtiff/tif_luv.c Wed Oct 20 14:38:11 2004 +++ libtiff/tif_luv.c Sat Mar 26 23:06:29 2005
@@ -212,11 +212,11 @@ LogL16Decode(TIFF* tif, tidata_t op, tsi @@ -212,11 +212,11 @@ LogL16Decode(TIFF* tif, tidata_t op, tsi
rc = *bp++ + (2-128); rc = *bp++ + (2-128);
b = (int16)(*bp++ << shft); b = (int16)(*bp++ << shft);
@ -73,3 +73,12 @@ $OpenBSD: patch-libtiff_tif_luv_c,v 1.1 2004/10/20 20:37:48 brad Exp $
TIFFError(module, "%s: No space for SGILog translation buffer", TIFFError(module, "%s: No space for SGILog translation buffer",
tif->tif_name); tif->tif_name);
return (0); return (0);
@@ -1497,7 +1508,7 @@ LogLuvVSetField(TIFF* tif, ttag_t tag, v
/*
* Must recalculate sizes should bits/sample change.
*/
- tif->tif_tilesize = TIFFTileSize(tif);
+ tif->tif_tilesize = isTiled(tif) ? TIFFTileSize(tif) : (tsize_t) -1;
tif->tif_scanlinesize = TIFFScanlineSize(tif);
return (1);
case TIFFTAG_SGILOGENCODE:

12
graphics/tiff/patches/patch-libtiff_tif_ojpeg_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libtiff_tif_ojpeg_c,v 1.1 2005/03/27 05:12:15 brad Exp $
--- libtiff/tif_ojpeg.c.orig Sat Mar 26 23:06:47 2005
+++ libtiff/tif_ojpeg.c Sat Mar 26 23:07:14 2005
@@ -2292,7 +2292,7 @@ OJPEGVSetField(register TIFF *tif,ttag_t
if ((tif->tif_flags ^ v32) & TIFF_UPSAMPLED)
{
- tif->tif_tilesize = TIFFTileSize(tif);
+ tif->tif_tilesize = isTiled(tif) ? TIFFTileSize(tif) : (tsize_t) -1;
tif->tif_flags |= TIFF_DIRTYDIRECT;
};
return 1;

13
graphics/tiff/patches/patch-libtiff_tif_pixarlog_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libtiff_tif_pixarlog_c,v 1.1 2004/10/20 20:37:48 brad Exp $ $OpenBSD: patch-libtiff_tif_pixarlog_c,v 1.2 2005/03/27 05:12:15 brad Exp $
--- libtiff/tif_pixarlog.c.orig Tue Jul 8 02:50:09 2003 --- libtiff/tif_pixarlog.c.orig Tue Jul 8 02:50:09 2003
+++ libtiff/tif_pixarlog.c Wed Oct 20 14:38:11 2004 +++ libtiff/tif_pixarlog.c Sat Mar 26 23:07:59 2005
@@ -630,11 +630,23 @@ PixarLogGuessDataFmt(TIFFDirectory *td) @@ -630,11 +630,23 @@ PixarLogGuessDataFmt(TIFFDirectory *td)
return guess; return guess;
} }
@ -65,3 +65,12 @@ $OpenBSD: patch-libtiff_tif_pixarlog_c,v 1.1 2004/10/20 20:37:48 brad Exp $
if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN) if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN)
sp->user_datafmt = PixarLogGuessDataFmt(td); sp->user_datafmt = PixarLogGuessDataFmt(td);
if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN) { if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN) {
@@ -1208,7 +1231,7 @@ PixarLogVSetField(TIFF* tif, ttag_t tag,
/*
* Must recalculate sizes should bits/sample change.
*/
- tif->tif_tilesize = TIFFTileSize(tif);
+ tif->tif_tilesize = isTiled(tif) ? TIFFTileSize(tif) : (tsize_t) -1;
tif->tif_scanlinesize = TIFFScanlineSize(tif);
result = 1; /* NB: pseudo tag */
break;

6
graphics/tiff/patches/patch-libtiff_tif_write_c
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-libtiff_tif_write_c,v 1.1 2004/10/20 20:37:48 brad Exp $ $OpenBSD: patch-libtiff_tif_write_c,v 1.2 2005/03/27 05:12:15 brad Exp $
--- libtiff/tif_write.c.orig Tue Aug 5 04:49:13 2003 --- libtiff/tif_write.c.orig Tue Aug 5 04:49:13 2003
+++ libtiff/tif_write.c Wed Oct 20 14:38:50 2004 +++ libtiff/tif_write.c Sat Mar 26 23:08:30 2005
@@ -542,7 +542,11 @@ TIFFWriteCheck(TIFF* tif, int tiles, con @@ -542,7 +542,11 @@ TIFFWriteCheck(TIFF* tif, int tiles, con
tif->tif_name, isTiled(tif) ? "tile" : "strip"); tif->tif_name, isTiled(tif) ? "tile" : "strip");
return (0); return (0);
} }
- tif->tif_tilesize = TIFFTileSize(tif); - tif->tif_tilesize = TIFFTileSize(tif);
+ if (isTiled(tif)) + if (isTiled(tif))
+ tif->tif_tilesize = TIFFTileSize(tif); + tif->tif_tilesize = isTiled(tif) ? TIFFTileSize(tif) : (tsize_t) -1;
+ else + else
+ tif->tif_tilesize = (tsize_t) -1; + tif->tif_tilesize = (tsize_t) -1;
+ +