2009.08.28 01:32 "[Tiff] tiff 3.9.0 writes bad files", by Bob
Friesenhahn
Thread
2009.08.30 16:06 "Re: [Tiff] tiff 3.9.0 writes bad files", by Bob Friesenhahn
On Sun, 30 Aug 2009, Andreas Kleinert wrote:
> What has been changed for 3.9.1 in addition?
> Could you post the other patch(es), too?
These are the changes in the 'libtiff' subdirectory:
Index: libtiff/tif_config.vc.h
===================================================================
RCS file: /cvs/maptools/cvsroot/libtiff/libtiff/tif_config.vc.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- libtiff/tif_config.vc.h 20 Sep 2006 13:35:12 -0000 1.1
+++ libtiff/tif_config.vc.h 27 Aug 2009 23:42:09 -0000 1.1.2.1
@@ -32,6 +32,12 @@
/* The size of a `long', as computed by sizeof. */
#define SIZEOF_LONG 4
+/* Signed 64-bit type */
+#define TIFF_INT64_T signed __int64
+
+/* Unsigned 64-bit type */
+#define TIFF_UINT64_T unsigned __int64
+
/* Set the native cpu bit order */
#define HOST_FILLORDER FILLORDER_LSB2MSB
Index: libtiff/tif_dirwrite.c
=================================================================== RCS file: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dirwrite.c,v
retrieving revision 1.37.2.4
retrieving revision 1.37.2.5
diff -u -r1.37.2.4 -r1.37.2.5
--- libtiff/tif_dirwrite.c 25 May 2008 01:55:38 -0000 1.37.2.4
+++ libtiff/tif_dirwrite.c 28 Aug 2009 17:24:56 -0000 1.37.2.5
@@ -1,4 +1,4 @@
-/* $Id: tif_dirwrite.c,v 1.37.2.4 2008-05-25 01:55:38 fwarmerdam Exp $ */
+/* $Id: tif_dirwrite.c,v 1.37.2.5 2009-08-28 17:24:56 fwarmerdam Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@@ -100,8 +100,6 @@
*/
if (done)
{
- tsize_t orig_rawcc = tif->tif_rawcc;
-
if (tif->tif_flags & TIFF_POSTENCODE) {
tif->tif_flags &= ~TIFF_POSTENCODE;
if (!(*tif->tif_postencode)(tif)) {
@@ -114,12 +112,9 @@
(*tif->tif_close)(tif); /* shutdown encoder */
/*
* Flush any data that might have been written
- * by the compression close+cleanup routines. But
- * be careful not to write stuff if we didn't add data
- * in the previous steps as the "rawcc" data may well be
- * a previously read tile/strip in mixed read/write mode.
+ * by the compression close+cleanup routines.
*/
- if (tif->tif_rawcc > 0 && tif->tif_rawcc != orig_rawcc
+ if (tif->tif_rawcc > 0
&& (tif->tif_flags & TIFF_BEENWRITING) !=
0
&& !TIFFFlushData1(tif)) {
TIFFErrorExt(tif->tif_clientdata,
tif->tif_name,
Index: libtiff/tif_write.c
=================================================================== RCS file: /cvs/maptools/cvsroot/libtiff/libtiff/tif_write.c,v retrieving revision 1.22.2.3
retrieving revision 1.22.2.4
diff -u -r1.22.2.3 -r1.22.2.4
--- libtiff/tif_write.c 20 Aug 2009 20:23:52 -0000 1.22.2.3
+++ libtiff/tif_write.c 28 Aug 2009 02:23:19 -0000 1.22.2.4
@@ -1,4 +1,4 @@
-/* $Id: tif_write.c,v 1.22.2.3 2009-08-20 20:23:52 bfriesen Exp $ */
+/* $Id: tif_write.c,v 1.22.2.4 2009-08-28 02:23:19 bfriesen Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@@ -630,7 +630,7 @@if( td->td_stripbytecount[strip] != 0
&& td->td_stripoffset[strip] != 0- && (tsize_t) td->td_stripbytecount[strip] >= cc )
+ && td->td_stripbytecount[strip] >= cc ){
/*
* There is already tile data on disk, and the new tile
Index: libtiff/tiffvers.h
===================================================================
RCS file: /cvs/maptools/cvsroot/libtiff/libtiff/tiffvers.h,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -u -r1.13.2.2 -r1.13.2.3
--- libtiff/tiffvers.h 20 Aug 2009 22:31:00 -0000 1.13.2.2
+++ libtiff/tiffvers.h 28 Aug 2009 18:49:02 -0000 1.13.2.3
@@ -1,4 +1,4 @@
-#define TIFFLIB_VERSION_STR "LIBTIFF, Version 3.9.0\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc." +#define TIFFLIB_VERSION_STR "LIBTIFF, Version 3.9.1\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc."
/*
- This define can be used in code that requires
- compilation-related definitions specific to a @@ -6,4 +6,4 @@
- version checking should be done based on the
- string returned by TIFFGetVersion.
*/
-#define TIFFLIB_VERSION 20090820
+#define TIFFLIB_VERSION 20090828
--
Bob Friesenhahn
bfriesen@simple.dallas.tx.us, http://www.simplesystems.org/users/bfriesen/
GraphicsMagick Maintainer, http://www.GraphicsMagick.org/