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

clear TIFF_ISTILED in TIFFDefaultDirectory()

Browse Source
This commit is contained in:
Frank Warmerdam 2000-10-17 03:23:36 +00:00
parent 0cd032f123
commit 91b8b7c26c
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2000-10-16 Frank Warmerdam <warmerda@cs46980-c> 2000-10-16 Frank Warmerdam <warmerda@cs46980-c>
* tif_dir.c: Clear TIFF_ISTILED flag in TIFFDefaultDirectory
as per http://bugzilla.remotesensing.org/show_bug.cgi?id=18
from vandrove@vc.cvut.cz.
* Modified tif_packbits.c decoding to avoid overrunning the * Modified tif_packbits.c decoding to avoid overrunning the
output buffer, and to issue a warning if data needs to be output buffer, and to issue a warning if data needs to be
discarded. See http://bugzilla.remotesensing.org/show_bug.cgi?id=18 discarded. See http://bugzilla.remotesensing.org/show_bug.cgi?id=18

10
libtiff/tif_dir.c
View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dir.c,v 1.13 2000-07-17 14:50:01 warmerda Exp $ */ /* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dir.c,v 1.14 2000-10-17 03:23:36 warmerda Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -1041,6 +1041,14 @@ TIFFDefaultDirectory(TIFF* tif)
* (i.e. TIFFSetField). * (i.e. TIFFSetField).
*/ */
tif->tif_flags &= ~TIFF_DIRTYDIRECT; tif->tif_flags &= ~TIFF_DIRTYDIRECT;
/*
* As per http://bugzilla.remotesensing.org/show_bug.cgi?id=19
* we clear the ISTILED flag when setting up a new directory.
* Should we also be clearing stuff like INSUBIFD?
*/
tif->tif_flags &= ~TIFF_ISTILED;
return (1); return (1);
} }