summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Warmerdam <warmerdam@pobox.com>2010-03-31 06:40:10 +0000
committerFrank Warmerdam <warmerdam@pobox.com>2010-03-31 06:40:10 +0000
commit23532025ca9f95500c4e911481f17b0209dd8d67 (patch)
tree510f311fc51650945697b6ed059830c2f7dc3579
parentfda0494e8e6231514cbf1c3b15f9a14d97a54426 (diff)
downloadlibtiff-git-23532025ca9f95500c4e911481f17b0209dd8d67.tar.gz
use TIFFRewriteDirectory() in TIFFFlush() to migrate directories if needed
-rw-r--r--ChangeLog6
-rw-r--r--libtiff/tif_flush.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b268df31..5bc83b0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-31 Frank Warmerdam <warmerdam@pobox.com>
+
+ * libtiff/tif_flush.c: Use TIFFRewriteDirectory() when flushing
+ directories so previously placed directories will be migrated to
+ the end of file if needed.
+
2010-03-30 Frank Warmerdam <warmerdam@pobox.com>
* libtiff/tif_lzw.c: change type of dec_bitsleft field to uint64
diff --git a/libtiff/tif_flush.c b/libtiff/tif_flush.c
index 81956284..fd14e4cd 100644
--- a/libtiff/tif_flush.c
+++ b/libtiff/tif_flush.c
@@ -1,4 +1,4 @@
-/* $Id: tif_flush.c,v 1.8 2010-03-10 18:56:48 bfriesen Exp $ */
+/* $Id: tif_flush.c,v 1.9 2010-03-31 06:40:10 fwarmerdam Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@@ -80,7 +80,7 @@ TIFFFlush(TIFF* tif)
}
if ((tif->tif_flags & (TIFF_DIRTYDIRECT|TIFF_DIRTYSTRIP))
- && !TIFFWriteDirectory(tif))
+ && !TIFFRewriteDirectory(tif))
return (0);
return (1);