From bfaf1f4433372b13eb1b50c3be2c27c547cd9af5 Mon Sep 17 00:00:00 2001
From: scuri <scuri>
Date: Fri, 11 Dec 2009 15:17:41 +0000
Subject: *** empty log message ***

---
 src/libtiff/t4.h            |  2 +-
 src/libtiff/tif_aux.c       |  2 +-
 src/libtiff/tif_close.c     |  2 +-
 src/libtiff/tif_codec.c     |  2 +-
 src/libtiff/tif_color.c     |  2 +-
 src/libtiff/tif_compress.c  |  2 +-
 src/libtiff/tif_dir.c       |  2 +-
 src/libtiff/tif_dir.h       |  2 +-
 src/libtiff/tif_dirinfo.c   |  3 ++-
 src/libtiff/tif_dirread.c   | 11 +++++++++--
 src/libtiff/tif_dirwrite.c  |  3 ++-
 src/libtiff/tif_dumpmode.c  |  2 +-
 src/libtiff/tif_error.c     |  2 +-
 src/libtiff/tif_extension.c |  2 +-
 src/libtiff/tif_fax3.c      |  2 +-
 src/libtiff/tif_fax3.h      |  2 +-
 src/libtiff/tif_flush.c     |  2 +-
 src/libtiff/tif_getimage.c  |  8 ++++----
 src/libtiff/tif_jpeg.c      | 12 +++++-------
 src/libtiff/tif_luv.c       |  2 +-
 src/libtiff/tif_lzw.c       |  2 +-
 src/libtiff/tif_next.c      |  2 +-
 src/libtiff/tif_ojpeg.c     |  9 ++++++---
 src/libtiff/tif_open.c      |  2 +-
 src/libtiff/tif_packbits.c  |  2 +-
 src/libtiff/tif_pixarlog.c  |  2 +-
 src/libtiff/tif_predict.c   |  2 +-
 src/libtiff/tif_predict.h   |  2 +-
 src/libtiff/tif_print.c     |  4 ++--
 src/libtiff/tif_read.c      |  2 +-
 src/libtiff/tif_strip.c     |  2 +-
 src/libtiff/tif_swab.c      |  2 +-
 src/libtiff/tif_thunder.c   |  2 +-
 src/libtiff/tif_tile.c      |  2 +-
 src/libtiff/tif_version.c   |  2 +-
 src/libtiff/tif_warning.c   |  2 +-
 src/libtiff/tif_write.c     |  2 +-
 src/libtiff/tif_zip.c       |  2 +-
 src/libtiff/tiff.h          |  2 +-
 src/libtiff/tiffio.h        |  2 +-
 src/libtiff/tiffiop.h       |  2 +-
 src/libtiff/tiffvers.h      |  4 ++--
 42 files changed, 66 insertions(+), 56 deletions(-)

(limited to 'src/libtiff')

diff --git a/src/libtiff/t4.h b/src/libtiff/t4.h
index f7bfe1e..b8a2b9e 100644
--- a/src/libtiff/t4.h
+++ b/src/libtiff/t4.h
@@ -1,4 +1,4 @@
-/* $Id: t4.h,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: t4.h,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/src/libtiff/tif_aux.c b/src/libtiff/tif_aux.c
index 8aad4eb..7500295 100644
--- a/src/libtiff/tif_aux.c
+++ b/src/libtiff/tif_aux.c
@@ -1,4 +1,4 @@
-/* $Id: tif_aux.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_aux.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff --git a/src/libtiff/tif_close.c b/src/libtiff/tif_close.c
index 2e8250e..a594de1 100644
--- a/src/libtiff/tif_close.c
+++ b/src/libtiff/tif_close.c
@@ -1,4 +1,4 @@
-/* $Id: tif_close.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_close.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/src/libtiff/tif_codec.c b/src/libtiff/tif_codec.c
index 6f7099f..69bfca8 100644
--- a/src/libtiff/tif_codec.c
+++ b/src/libtiff/tif_codec.c
@@ -1,4 +1,4 @@
-/* $Id: tif_codec.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_codec.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/src/libtiff/tif_color.c b/src/libtiff/tif_color.c
index 1f69d22..704b714 100644
--- a/src/libtiff/tif_color.c
+++ b/src/libtiff/tif_color.c
@@ -1,4 +1,4 @@
-/* $Id: tif_color.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_color.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/src/libtiff/tif_compress.c b/src/libtiff/tif_compress.c
index e99dc93..2efc9e2 100644
--- a/src/libtiff/tif_compress.c
+++ b/src/libtiff/tif_compress.c
@@ -1,4 +1,4 @@
-/* $Id: tif_compress.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_compress.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/src/libtiff/tif_dir.c b/src/libtiff/tif_dir.c
index f9621ca..0290bfd 100644
--- a/src/libtiff/tif_dir.c
+++ b/src/libtiff/tif_dir.c
@@ -1,4 +1,4 @@
-/* $Id: tif_dir.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_dir.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/src/libtiff/tif_dir.h b/src/libtiff/tif_dir.h
index c843b02..bc86d0e 100644
--- a/src/libtiff/tif_dir.h
+++ b/src/libtiff/tif_dir.h
@@ -1,4 +1,4 @@
-/* $Id: tif_dir.h,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_dir.h,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/src/libtiff/tif_dirinfo.c b/src/libtiff/tif_dirinfo.c
index 610632d..440cf32 100644
--- a/src/libtiff/tif_dirinfo.c
+++ b/src/libtiff/tif_dirinfo.c
@@ -1,4 +1,4 @@
-/* $Id: tif_dirinfo.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_dirinfo.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -31,6 +31,7 @@
  */
 #include "tiffiop.h"
 #include <stdlib.h>
+#include <string.h>
 
 /*
  * NB: NB: THIS ARRAY IS ASSUMED TO BE SORTED BY TAG.
diff --git a/src/libtiff/tif_dirread.c b/src/libtiff/tif_dirread.c
index 22f675a..4dc0f67 100644
--- a/src/libtiff/tif_dirread.c
+++ b/src/libtiff/tif_dirread.c
@@ -1,4 +1,4 @@
-/* $Id: tif_dirread.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_dirread.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -1426,7 +1426,14 @@ TIFFFetchFloatArray(TIFF* tif, TIFFDirEntry* dir, float* v)
 {
 
 	if (dir->tdir_count == 1) {
-		v[0] = *(float*) &dir->tdir_offset;
+	        union
+		{
+		  float  f;
+		  uint32 i;
+		} float_union;
+
+		float_union.i=dir->tdir_offset;
+		v[0]=float_union.f;
 		TIFFCvtIEEEFloatToNative(tif, dir->tdir_count, v);
 		return (1);
 	} else	if (TIFFFetchData(tif, dir, (char*) v)) {
diff --git a/src/libtiff/tif_dirwrite.c b/src/libtiff/tif_dirwrite.c
index b04b73a..fe6107d 100644
--- a/src/libtiff/tif_dirwrite.c
+++ b/src/libtiff/tif_dirwrite.c
@@ -1,4 +1,4 @@
-/* $Id: tif_dirwrite.c,v 1.3 2009/09/29 21:26:38 scuri Exp $ */
+/* $Id: tif_dirwrite.c,v 1.4 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -1144,6 +1144,7 @@ TIFFWriteAnyArray(TIFF* tif,
                     if( !TIFFWriteDoubleArray(tif, dir, v))
                         goto out;
                 }
+		break;
 	default:
 		/* TIFF_NOTYPE */
 		/* TIFF_ASCII */
diff --git a/src/libtiff/tif_dumpmode.c b/src/libtiff/tif_dumpmode.c
index cc9f999..c93763a 100644
--- a/src/libtiff/tif_dumpmode.c
+++ b/src/libtiff/tif_dumpmode.c
@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/imtoolkit/im/src/libtiff/tif_dumpmode.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Header: /cvsroot/imtoolkit/im/src/libtiff/tif_dumpmode.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/src/libtiff/tif_error.c b/src/libtiff/tif_error.c
index 37dadf0..f31c07e 100644
--- a/src/libtiff/tif_error.c
+++ b/src/libtiff/tif_error.c
@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/imtoolkit/im/src/libtiff/tif_error.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Header: /cvsroot/imtoolkit/im/src/libtiff/tif_error.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/src/libtiff/tif_extension.c b/src/libtiff/tif_extension.c
index 39678d7..9fd1912 100644
--- a/src/libtiff/tif_extension.c
+++ b/src/libtiff/tif_extension.c
@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/imtoolkit/im/src/libtiff/tif_extension.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Header: /cvsroot/imtoolkit/im/src/libtiff/tif_extension.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/src/libtiff/tif_fax3.c b/src/libtiff/tif_fax3.c
index 3116900..9c909c4 100644
--- a/src/libtiff/tif_fax3.c
+++ b/src/libtiff/tif_fax3.c
@@ -1,4 +1,4 @@
-/* $Id: tif_fax3.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_fax3.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1990-1997 Sam Leffler
diff --git a/src/libtiff/tif_fax3.h b/src/libtiff/tif_fax3.h
index 7fd2205..51c7bfa 100644
--- a/src/libtiff/tif_fax3.h
+++ b/src/libtiff/tif_fax3.h
@@ -1,4 +1,4 @@
-/* $Id: tif_fax3.h,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_fax3.h,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1990-1997 Sam Leffler
diff --git a/src/libtiff/tif_flush.c b/src/libtiff/tif_flush.c
index 4893b9a..5eab382 100644
--- a/src/libtiff/tif_flush.c
+++ b/src/libtiff/tif_flush.c
@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/imtoolkit/im/src/libtiff/tif_flush.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Header: /cvsroot/imtoolkit/im/src/libtiff/tif_flush.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/src/libtiff/tif_getimage.c b/src/libtiff/tif_getimage.c
index 862fdb2..f9d85e0 100644
--- a/src/libtiff/tif_getimage.c
+++ b/src/libtiff/tif_getimage.c
@@ -1,4 +1,4 @@
-/* $Id: tif_getimage.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_getimage.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
@@ -481,7 +481,7 @@ TIFFReadRGBAImageOriented(TIFF* tif,
 			rwidth, img.height);
 		TIFFRGBAImageEnd(&img);
 	} else {
-		TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), emsg);
+		TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "%s", emsg);
 		ok = 0;
     }
     return (ok);
@@ -2555,7 +2555,7 @@ TIFFReadRGBAStrip(TIFF* tif, uint32 row, uint32 * raster )
         
 	TIFFRGBAImageEnd(&img);
     } else {
-		TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), emsg);
+		TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "%s", emsg);
 		ok = 0;
     }
     
@@ -2607,7 +2607,7 @@ TIFFReadRGBATile(TIFF* tif, uint32 col, uint32 row, uint32 * raster)
     
     if (!TIFFRGBAImageOK(tif, emsg) 
 	|| !TIFFRGBAImageBegin(&img, tif, 0, emsg)) {
-	    TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), emsg);
+	    TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "%s", emsg);
 	    return( 0 );
     }
 
diff --git a/src/libtiff/tif_jpeg.c b/src/libtiff/tif_jpeg.c
index 90e157e..0068ad9 100644
--- a/src/libtiff/tif_jpeg.c
+++ b/src/libtiff/tif_jpeg.c
@@ -1,4 +1,4 @@
-/* $Id: tif_jpeg.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_jpeg.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1994-1997 Sam Leffler
@@ -228,7 +228,7 @@ TIFFjpeg_error_exit(j_common_ptr cinfo)
 	char buffer[JMSG_LENGTH_MAX];
 
 	(*cinfo->err->format_message) (cinfo, buffer);
-	TIFFErrorExt(sp->tif->tif_clientdata, "JPEGLib", buffer);		/* display the error message */
+	TIFFErrorExt(sp->tif->tif_clientdata, "JPEGLib", "%s", buffer);		/* display the error message */
 	jpeg_abort(cinfo);			/* clean up libjpeg state */
 	LONGJMP(sp->exit_jmpbuf, 1);		/* return to libtiff caller */
 }
@@ -244,7 +244,7 @@ TIFFjpeg_output_message(j_common_ptr cinfo)
 	char buffer[JMSG_LENGTH_MAX];
 
 	(*cinfo->err->format_message) (cinfo, buffer);
-	TIFFWarningExt(((JPEGState *) cinfo)->tif->tif_clientdata, "JPEGLib", buffer);
+	TIFFWarningExt(((JPEGState *) cinfo)->tif->tif_clientdata, "JPEGLib", "%s", buffer);
 }
 
 /*
@@ -844,10 +844,9 @@ JPEGPreDecode(TIFF* tif, tsample_t s)
 			/* Suppress colorspace handling */
 		sp->cinfo.d.jpeg_color_space = JCS_UNKNOWN;
 		sp->cinfo.d.out_color_space = JCS_UNKNOWN;
- 		tif->tif_flags |= TIFF_UPSAMPLED;  /* IMLIB - allow upsampling when there is no  colorspace handling
 		if (td->td_planarconfig == PLANARCONFIG_CONTIG &&
 		    (sp->h_sampling != 1 || sp->v_sampling != 1))
-			downsampled_output = TRUE;  */
+			downsampled_output = TRUE;
 		/* XXX what about up-sampling? */
 	}
 	if (downsampled_output) {
@@ -1339,9 +1338,8 @@ JPEGPreEncode(TIFF* tif, tsample_t s)
 				sp->cinfo.c.in_color_space = JCS_RGB;
 			} else {
 				sp->cinfo.c.in_color_space = JCS_YCbCr;
-				tif->tif_flags |= TIFF_UPSAMPLED; /* IMLIB - allow upsampling in the input data
 				if (sp->h_sampling != 1 || sp->v_sampling != 1)
-					downsampled_input = TRUE;  */
+					downsampled_input = TRUE;
 			}
 			if (!TIFFjpeg_set_colorspace(sp, JCS_YCbCr))
 				return (0);
diff --git a/src/libtiff/tif_luv.c b/src/libtiff/tif_luv.c
index db1b746..3b43704 100644
--- a/src/libtiff/tif_luv.c
+++ b/src/libtiff/tif_luv.c
@@ -1,4 +1,4 @@
-/* $Id: tif_luv.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_luv.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1997 Greg Ward Larson
diff --git a/src/libtiff/tif_lzw.c b/src/libtiff/tif_lzw.c
index ba47c34..578da97 100644
--- a/src/libtiff/tif_lzw.c
+++ b/src/libtiff/tif_lzw.c
@@ -1,4 +1,4 @@
-/* $Id: tif_lzw.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_lzw.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/src/libtiff/tif_next.c b/src/libtiff/tif_next.c
index 3cb0085..fc9a13d 100644
--- a/src/libtiff/tif_next.c
+++ b/src/libtiff/tif_next.c
@@ -1,4 +1,4 @@
-/* $Id: tif_next.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_next.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/src/libtiff/tif_ojpeg.c b/src/libtiff/tif_ojpeg.c
index f9f0508..0c876cd 100644
--- a/src/libtiff/tif_ojpeg.c
+++ b/src/libtiff/tif_ojpeg.c
@@ -1,4 +1,4 @@
-/* $Id: tif_ojpeg.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_ojpeg.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /* WARNING: The type of JPEG encapsulation defined by the TIFF Version 6.0
    specification is now totally obsolete and deprecated for new applications and
@@ -1127,6 +1127,9 @@ OJPEGWriteHeaderInfo(TIFF* tif)
 	if ((sp->subsampling_force_desubsampling_inside_decompression==0) && (sp->samples_per_pixel_per_plane>1))
 	{
 		sp->libjpeg_jpeg_decompress_struct.raw_data_out=1;
+#if JPEG_LIB_VERSION >= 70
+		sp->libjpeg_jpeg_decompress_struct.do_fancy_upsampling=FALSE;
+#endif
 		sp->libjpeg_jpeg_query_style=0;
 		if (sp->subsampling_convert_log==0)
 		{
@@ -2359,7 +2362,7 @@ OJPEGLibjpegJpegErrorMgrOutputMessage(jpeg_common_struct* cinfo)
 {
 	char buffer[JMSG_LENGTH_MAX];
 	(*cinfo->err->format_message)(cinfo,buffer);
-	TIFFWarningExt(((TIFF*)(cinfo->client_data))->tif_clientdata,"LibJpeg",buffer);
+	TIFFWarningExt(((TIFF*)(cinfo->client_data))->tif_clientdata,"LibJpeg", "%s", buffer);
 }
 
 static void
@@ -2367,7 +2370,7 @@ OJPEGLibjpegJpegErrorMgrErrorExit(jpeg_common_struct* cinfo)
 {
 	char buffer[JMSG_LENGTH_MAX];
 	(*cinfo->err->format_message)(cinfo,buffer);
-	TIFFErrorExt(((TIFF*)(cinfo->client_data))->tif_clientdata,"LibJpeg",buffer);
+	TIFFErrorExt(((TIFF*)(cinfo->client_data))->tif_clientdata,"LibJpeg", "%s", buffer);
 	jpeg_encap_unwind((TIFF*)(cinfo->client_data));
 }
 
diff --git a/src/libtiff/tif_open.c b/src/libtiff/tif_open.c
index 9020973..0ab465a 100644
--- a/src/libtiff/tif_open.c
+++ b/src/libtiff/tif_open.c
@@ -1,4 +1,4 @@
-/* $Id: tif_open.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_open.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/src/libtiff/tif_packbits.c b/src/libtiff/tif_packbits.c
index 8c40b60..3e857d9 100644
--- a/src/libtiff/tif_packbits.c
+++ b/src/libtiff/tif_packbits.c
@@ -1,4 +1,4 @@
-/* $Id: tif_packbits.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_packbits.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/src/libtiff/tif_pixarlog.c b/src/libtiff/tif_pixarlog.c
index b05b6da..b5f5c60 100644
--- a/src/libtiff/tif_pixarlog.c
+++ b/src/libtiff/tif_pixarlog.c
@@ -1,4 +1,4 @@
-/* $Id: tif_pixarlog.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_pixarlog.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1996-1997 Sam Leffler
diff --git a/src/libtiff/tif_predict.c b/src/libtiff/tif_predict.c
index ca5c091..3761d24 100644
--- a/src/libtiff/tif_predict.c
+++ b/src/libtiff/tif_predict.c
@@ -1,4 +1,4 @@
-/* $Id: tif_predict.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_predict.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/src/libtiff/tif_predict.h b/src/libtiff/tif_predict.h
index 00dacde..4a1e9ab 100644
--- a/src/libtiff/tif_predict.h
+++ b/src/libtiff/tif_predict.h
@@ -1,4 +1,4 @@
-/* $Id: tif_predict.h,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_predict.h,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1995-1997 Sam Leffler
diff --git a/src/libtiff/tif_print.c b/src/libtiff/tif_print.c
index 25bdda9..c3c3455 100644
--- a/src/libtiff/tif_print.c
+++ b/src/libtiff/tif_print.c
@@ -1,4 +1,4 @@
-/* $Id: tif_print.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_print.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -31,7 +31,7 @@
  */
 #include "tiffiop.h"
 #include <stdio.h>
-
+#include <string.h>
 #include <ctype.h>
 
 static const char *photoNames[] = {
diff --git a/src/libtiff/tif_read.c b/src/libtiff/tif_read.c
index 888e4d7..a0c898c 100644
--- a/src/libtiff/tif_read.c
+++ b/src/libtiff/tif_read.c
@@ -1,4 +1,4 @@
-/* $Id: tif_read.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_read.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/src/libtiff/tif_strip.c b/src/libtiff/tif_strip.c
index 9eaa98e..0c4f3a0 100644
--- a/src/libtiff/tif_strip.c
+++ b/src/libtiff/tif_strip.c
@@ -1,4 +1,4 @@
-/* $Id: tif_strip.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_strip.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff --git a/src/libtiff/tif_swab.c b/src/libtiff/tif_swab.c
index 7cf2e2f..82008ad 100644
--- a/src/libtiff/tif_swab.c
+++ b/src/libtiff/tif_swab.c
@@ -1,4 +1,4 @@
-/* $Id: tif_swab.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_swab.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/src/libtiff/tif_thunder.c b/src/libtiff/tif_thunder.c
index 8befaf3..e75ad4a 100644
--- a/src/libtiff/tif_thunder.c
+++ b/src/libtiff/tif_thunder.c
@@ -1,4 +1,4 @@
-/* $Id: tif_thunder.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_thunder.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/src/libtiff/tif_tile.c b/src/libtiff/tif_tile.c
index c11fb49..6bb87df 100644
--- a/src/libtiff/tif_tile.c
+++ b/src/libtiff/tif_tile.c
@@ -1,4 +1,4 @@
-/* $Id: tif_tile.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_tile.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff --git a/src/libtiff/tif_version.c b/src/libtiff/tif_version.c
index e4b210a..710805b 100644
--- a/src/libtiff/tif_version.c
+++ b/src/libtiff/tif_version.c
@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/imtoolkit/im/src/libtiff/tif_version.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Header: /cvsroot/imtoolkit/im/src/libtiff/tif_version.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 /*
  * Copyright (c) 1992-1997 Sam Leffler
  * Copyright (c) 1992-1997 Silicon Graphics, Inc.
diff --git a/src/libtiff/tif_warning.c b/src/libtiff/tif_warning.c
index 30f7c40..e76ed8d 100644
--- a/src/libtiff/tif_warning.c
+++ b/src/libtiff/tif_warning.c
@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/imtoolkit/im/src/libtiff/tif_warning.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Header: /cvsroot/imtoolkit/im/src/libtiff/tif_warning.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/src/libtiff/tif_write.c b/src/libtiff/tif_write.c
index 58fc4b4..8a90fc7 100644
--- a/src/libtiff/tif_write.c
+++ b/src/libtiff/tif_write.c
@@ -1,4 +1,4 @@
-/* $Id: tif_write.c,v 1.3 2009/09/29 21:26:39 scuri Exp $ */
+/* $Id: tif_write.c,v 1.4 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/src/libtiff/tif_zip.c b/src/libtiff/tif_zip.c
index a55e73f..35ae791 100644
--- a/src/libtiff/tif_zip.c
+++ b/src/libtiff/tif_zip.c
@@ -1,4 +1,4 @@
-/* $Id: tif_zip.c,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tif_zip.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1995-1997 Sam Leffler
diff --git a/src/libtiff/tiff.h b/src/libtiff/tiff.h
index b258f25..358b54b 100644
--- a/src/libtiff/tiff.h
+++ b/src/libtiff/tiff.h
@@ -1,4 +1,4 @@
-/* $Id: tiff.h,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tiff.h,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/src/libtiff/tiffio.h b/src/libtiff/tiffio.h
index 3cfcb22..eb14c36 100644
--- a/src/libtiff/tiffio.h
+++ b/src/libtiff/tiffio.h
@@ -1,4 +1,4 @@
-/* $Id: tiffio.h,v 1.2 2009/08/21 04:01:59 scuri Exp $ */
+/* $Id: tiffio.h,v 1.3 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/src/libtiff/tiffiop.h b/src/libtiff/tiffiop.h
index 3360b7a..c8e9677 100644
--- a/src/libtiff/tiffiop.h
+++ b/src/libtiff/tiffiop.h
@@ -1,4 +1,4 @@
-/* $Id: tiffiop.h,v 1.3 2009/08/22 04:31:04 scuri Exp $ */
+/* $Id: tiffiop.h,v 1.4 2009/12/11 15:17:41 scuri Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/src/libtiff/tiffvers.h b/src/libtiff/tiffvers.h
index c4693f4..7108541 100644
--- a/src/libtiff/tiffvers.h
+++ b/src/libtiff/tiffvers.h
@@ -1,4 +1,4 @@
-#define TIFFLIB_VERSION_STR "LIBTIFF, Version 3.9.1\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc."
+#define TIFFLIB_VERSION_STR "LIBTIFF, Version 3.9.2\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 20090828
+#define TIFFLIB_VERSION 20091104
-- 
cgit v1.2.3