From 91b8b7c26c030c24e67223c75972a102cf8a4b9f Mon Sep 17 00:00:00 2001 From: Frank Warmerdam Date: Tue, 17 Oct 2000 03:23:36 +0000 Subject: [PATCH] clear TIFF_ISTILED in TIFFDefaultDirectory() --- ChangeLog | 4 ++++ libtiff/tif_dir.c | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f9ace0b4..e313ddf0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2000-10-16 Frank Warmerdam + * 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 output buffer, and to issue a warning if data needs to be discarded. See http://bugzilla.remotesensing.org/show_bug.cgi?id=18 diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c index 9c81bbee..a565f017 100644 --- a/libtiff/tif_dir.c +++ b/libtiff/tif_dir.c @@ -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 @@ -1041,6 +1041,14 @@ TIFFDefaultDirectory(TIFF* tif) * (i.e. TIFFSetField). */ 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); }