fixed fetching of TIFFTAG_SAMPLEFORMAT

This commit is contained in:
Frank Warmerdam 2000-03-03 15:22:00 +00:00
parent d3144ac463
commit e4c99df427

View File

@ -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 * 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; *va_arg(ap, uint32 *) = td->td_tiledepth;
return (1); return (1);
case TIFFTAG_DATATYPE: case TIFFTAG_DATATYPE:
case TIFFTAG_SAMPLEFORMAT:
*va_arg(ap, uint16 *) = td->td_sampleformat-1; *va_arg(ap, uint16 *) = td->td_sampleformat-1;
return (1); return (1);
case TIFFTAG_SAMPLEFORMAT:
*va_arg(ap, uint16 *) = td->td_sampleformat;
return(1);
case TIFFTAG_IMAGEDEPTH: case TIFFTAG_IMAGEDEPTH:
*va_arg(ap, uint32 *) = td->td_imagedepth; *va_arg(ap, uint32 *) = td->td_imagedepth;
return (1); return (1);