Return-Path: <tiff-bounces@lists.maptools.org>
X-Original-To: info@awaresystems.be
Delivered-To: info@awaresystems.be
Received: from mx-n.b-one.net (mx-n.one.com [91.198.169.61])
	by mail9.b-one.net (Postfix) with ESMTP id 16C84405115
	for <info@awaresystems.be>; Sun, 30 Aug 2009 18:35:37 +0200 (CEST)
X-Virus-Scanned: by one.com
X-Spam-Score: 0
X-Spam-Level: 
X-Spam-Status: No, score=0 tagged_above=0 required=6 tests=[none]
X-Greylist: domain auto-whitelisted by SQLgrey-1.7.4
Received: from lists.maptools.org (lists.maptools.org [65.39.174.144])
	by mx-n.b-one.net (Postfix) with ESMTP id 308A88C6825
	for <info@awaresystems.be>; Sun, 30 Aug 2009 18:35:36 +0200 (CEST)
Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
	by lists.maptools.org (Postfix) with ESMTP id 4E2221D20208A;
	Sun, 30 Aug 2009 11:34:31 -0500 (EST)
Received: from blade.simplesystems.org (blade.simplesystems.org [65.66.246.74])
	by lists.maptools.org (Postfix) with ESMTPS id 983B71D194A8B
	for <tiff@lists.maptools.org>; Sun, 30 Aug 2009 11:06:40 -0500 (EST)
Received: from freddy.simplesystems.org (freddy.simplesystems.org
	[65.66.246.65])
	by blade.simplesystems.org (8.13.8+Sun/8.13.8) with ESMTP id
	n7UG6ZYs022875; Sun, 30 Aug 2009 11:06:36 -0500 (CDT)
Date: Sun, 30 Aug 2009 11:06:35 -0500 (CDT)
From: Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
X-X-Sender: bfriesen@freddy.simplesystems.org
To: Andreas Kleinert <info@ar-kleinert.de>
In-Reply-To: <4A9A25B1.6060609@ar-kleinert.de>
Message-ID: <Pine.SOC.4.64.0908301105360.1103@freddy.simplesystems.org>
References: <Pine.SOC.4.64.0908272027240.1124@freddy.simplesystems.org>
	<Pine.SOC.4.64.0908272106450.1124@freddy.simplesystems.org>
	<Pine.SOC.4.64.0908272155060.1124@freddy.simplesystems.org>
	<4A9A25B1.6060609@ar-kleinert.de>
MIME-Version: 1.0
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.2
	(blade.simplesystems.org [65.66.246.90]);
	Sun, 30 Aug 2009 11:06:36 -0500 (CDT)
Cc: Tiff List <tiff@lists.maptools.org>
Subject: Re: [Tiff] tiff 3.9.0 writes bad files
X-BeenThere: tiff@lists.maptools.org
X-Mailman-Version: 2.1.9
Precedence: list
List-Id: TIFF and libtiff discussion <tiff.lists.maptools.org>
List-Unsubscribe: <http://lists.maptools.org/mailman/listinfo/tiff>,
	<mailto:tiff-request@lists.maptools.org?subject=unsubscribe>
List-Archive: <http://lists.maptools.org/mailman/private/tiff>
List-Post: <mailto:tiff@lists.maptools.org>
List-Help: <mailto:tiff-request@lists.maptools.org?subject=help>
List-Subscribe: <http://lists.maptools.org/mailman/listinfo/tiff>,
	<mailto:tiff-request@lists.maptools.org?subject=subscribe>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: tiff-bounces@lists.maptools.org
Errors-To: tiff-bounces@lists.maptools.org

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/
_______________________________________________
Tiff mailing list: Tiff@lists.maptools.org
http://lists.maptools.org/mailman/listinfo/tiff
http://www.remotesensing.org/libtiff/
