From e4c99df427840ff52c612c08df0b3640585004fd Mon Sep 17 00:00:00 2001
From: Frank Warmerdam <warmerdam@pobox.com>
Date: Fri, 3 Mar 2000 15:22:00 +0000
Subject: [PATCH] fixed fetching of TIFFTAG_SAMPLEFORMAT

---
 libtiff/tif_aux.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libtiff/tif_aux.c b/libtiff/tif_aux.c
index 104abee9..7270d9bd 100644
--- a/libtiff/tif_aux.c
+++ b/libtiff/tif_aux.c
@@ -1,4 +1,4 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_aux.c,v 1.2 2000-03-02 19:59:52 warmerda Exp $ */
+/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_aux.c,v 1.3 2000-03-03 15:22:00 warmerda Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
@@ -141,9 +141,11 @@ TIFFVGetFieldDefaulted(TIFF* tif, ttag_t tag, va_list ap)
 		*va_arg(ap, uint32 *) = td->td_tiledepth;
 		return (1);
 	case TIFFTAG_DATATYPE:
-	case TIFFTAG_SAMPLEFORMAT:
 		*va_arg(ap, uint16 *) = td->td_sampleformat-1;
 		return (1);
+	case TIFFTAG_SAMPLEFORMAT:
+		*va_arg(ap, uint16 *) = td->td_sampleformat;
+                return(1);
 	case TIFFTAG_IMAGEDEPTH:
 		*va_arg(ap, uint32 *) = td->td_imagedepth;
 		return (1);