Browse Source

fix build break

cxgeorge 24 years ago
parent
commit
48cfd2b402
1 changed files with 275 additions and 271 deletions
  1. 275 271
      panda/src/tiff/tiff.h

+ 275 - 271
panda/src/tiff/tiff.h

@@ -25,7 +25,7 @@
  */
  */
 
 
 #ifndef _TIFF_
 #ifndef _TIFF_
-#define	_TIFF_
+#define _TIFF_
 /*
 /*
  * Tag Image File Format (TIFF)
  * Tag Image File Format (TIFF)
  *
  *
@@ -37,50 +37,54 @@
  *    Seattle, WA  98104
  *    Seattle, WA  98104
  *    206-622-5500
  *    206-622-5500
  */
  */
-#define	TIFF_VERSION	42
+#define TIFF_VERSION    42
 
 
-#define	TIFF_BIGENDIAN		0x4d4d
-#define	TIFF_LITTLEENDIAN	0x4949
+#define TIFF_BIGENDIAN      0x4d4d
+#define TIFF_LITTLEENDIAN   0x4949
 
 
 #ifndef _TIFF_DATA_TYPEDEFS_
 #ifndef _TIFF_DATA_TYPEDEFS_
 #define _TIFF_DATA_TYPEDEFS_
 #define _TIFF_DATA_TYPEDEFS_
 /*
 /*
  * Intrinsic data types required by the file format:
  * Intrinsic data types required by the file format:
  *
  *
- * 8-bit quantities	int8/uint8
- * 16-bit quantities	int16/uint16
- * 32-bit quantities	int32/uint32
- * strings		unsigned char*
+ * 8-bit quantities int8/uint8
+ * 16-bit quantities    int16/uint16
+ * 32-bit quantities    int32/uint32
+ * strings      unsigned char*
  */
  */
+#ifndef PROTYPES_H 
+// panda comment:  int8 already defined in with nspr\include\obsolete\protypes.h
 #ifdef __STDC__
 #ifdef __STDC__
-typedef	signed char int8;	/* NB: non-ANSI compilers may not grok */
+typedef signed char int8;   /* NB: non-ANSI compilers may not grok */
 #else
 #else
-typedef	char int8;
+typedef char int8;
 #endif
 #endif
-typedef	unsigned char uint8;
-typedef	short int16;
-typedef	unsigned short uint16;	/* sizeof (uint16) must == 2 */
+#endif
+
+typedef unsigned char uint8;
+typedef short int16;
+typedef unsigned short uint16;  /* sizeof (uint16) must == 2 */
 #if defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64)
 #if defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64)
-typedef	int int32;
-typedef	unsigned int uint32;	/* sizeof (uint32) must == 4 */
+typedef int int32;
+typedef unsigned int uint32;    /* sizeof (uint32) must == 4 */
 #else
 #else
-typedef	long int32;
-typedef	unsigned long uint32;	/* sizeof (uint32) must == 4 */
+typedef long int32;
+typedef unsigned long uint32;   /* sizeof (uint32) must == 4 */
 #endif
 #endif
 #endif /* _TIFF_DATA_TYPEDEFS_ */
 #endif /* _TIFF_DATA_TYPEDEFS_ */
 
 
-/*	For TIFFReassignTagToIgnore */
+/*  For TIFFReassignTagToIgnore */
 enum TIFFIgnoreSense /* IGNORE tag table */
 enum TIFFIgnoreSense /* IGNORE tag table */
 {
 {
-	TIS_STORE,
-	TIS_EXTRACT,
-	TIS_EMPTY
+    TIS_STORE,
+    TIS_EXTRACT,
+    TIS_EMPTY
 };
 };
 
 
-typedef	struct {
-	uint16	tiff_magic;	/* magic number (defines byte order) */
-	uint16	tiff_version;	/* TIFF version number */
-	uint32	tiff_diroff;	/* byte offset to first directory */
+typedef struct {
+    uint16  tiff_magic; /* magic number (defines byte order) */
+    uint16  tiff_version;   /* TIFF version number */
+    uint32  tiff_diroff;    /* byte offset to first directory */
 } TIFFHeader;
 } TIFFHeader;
 
 
 /*
 /*
@@ -96,11 +100,11 @@ typedef	struct {
  * is less than 4 bytes, it is left-justified in the
  * is less than 4 bytes, it is left-justified in the
  * offset field.
  * offset field.
  */
  */
-typedef	struct {
-	uint16	tdir_tag;	/* see below */
-	uint16	tdir_type;	/* data type; see below */
-	uint32  tdir_count;	/* number of items; length in spec */
-	uint32  tdir_offset;	/* byte offset to field data */
+typedef struct {
+    uint16  tdir_tag;   /* see below */
+    uint16  tdir_type;  /* data type; see below */
+    uint32  tdir_count; /* number of items; length in spec */
+    uint32  tdir_offset;    /* byte offset to field data */
 } TIFFDirEntry;
 } TIFFDirEntry;
 
 
 /*
 /*
@@ -116,208 +120,208 @@ typedef	struct {
  *
  *
  * Note: RATIONALs are the ratio of two 32-bit integer values.
  * Note: RATIONALs are the ratio of two 32-bit integer values.
  */
  */
-typedef	enum {
-	TIFF_NOTYPE	= 0,	/* placeholder */
-	TIFF_BYTE	= 1,	/* 8-bit unsigned integer */
-	TIFF_ASCII	= 2,	/* 8-bit bytes w/ last byte null */
-	TIFF_SHORT	= 3,	/* 16-bit unsigned integer */
-	TIFF_LONG	= 4,	/* 32-bit unsigned integer */
-	TIFF_RATIONAL	= 5,	/* 64-bit unsigned fraction */
-	TIFF_SBYTE	= 6,	/* !8-bit signed integer */
-	TIFF_UNDEFINED	= 7,	/* !8-bit untyped data */
-	TIFF_SSHORT	= 8,	/* !16-bit signed integer */
-	TIFF_SLONG	= 9,	/* !32-bit signed integer */
-	TIFF_SRATIONAL	= 10,	/* !64-bit signed fraction */
-	TIFF_FLOAT	= 11,	/* !32-bit IEEE floating point */
-	TIFF_DOUBLE	= 12	/* !64-bit IEEE floating point */
+typedef enum {
+    TIFF_NOTYPE = 0,    /* placeholder */
+    TIFF_BYTE   = 1,    /* 8-bit unsigned integer */
+    TIFF_ASCII  = 2,    /* 8-bit bytes w/ last byte null */
+    TIFF_SHORT  = 3,    /* 16-bit unsigned integer */
+    TIFF_LONG   = 4,    /* 32-bit unsigned integer */
+    TIFF_RATIONAL   = 5,    /* 64-bit unsigned fraction */
+    TIFF_SBYTE  = 6,    /* !8-bit signed integer */
+    TIFF_UNDEFINED  = 7,    /* !8-bit untyped data */
+    TIFF_SSHORT = 8,    /* !16-bit signed integer */
+    TIFF_SLONG  = 9,    /* !32-bit signed integer */
+    TIFF_SRATIONAL  = 10,   /* !64-bit signed fraction */
+    TIFF_FLOAT  = 11,   /* !32-bit IEEE floating point */
+    TIFF_DOUBLE = 12    /* !64-bit IEEE floating point */
 } TIFFDataType;
 } TIFFDataType;
 
 
 /*
 /*
  * TIFF Tag Definitions.
  * TIFF Tag Definitions.
  */
  */
-#define	TIFFTAG_SUBFILETYPE		254	/* subfile data descriptor */
-#define	    FILETYPE_REDUCEDIMAGE	0x1	/* reduced resolution version */
-#define	    FILETYPE_PAGE		0x2	/* one page of many */
-#define	    FILETYPE_MASK		0x4	/* transparency mask */
-#define	TIFFTAG_OSUBFILETYPE		255	/* +kind of data in subfile */
-#define	    OFILETYPE_IMAGE		1	/* full resolution image data */
-#define	    OFILETYPE_REDUCEDIMAGE	2	/* reduced size image data */
-#define	    OFILETYPE_PAGE		3	/* one page of many */
-#define	TIFFTAG_IMAGEWIDTH		256	/* image width in pixels */
-#define	TIFFTAG_IMAGELENGTH		257	/* image height in pixels */
-#define	TIFFTAG_BITSPERSAMPLE		258	/* bits per channel (sample) */
-#define	TIFFTAG_COMPRESSION		259	/* data compression technique */
-#define	    COMPRESSION_NONE		1	/* dump mode */
-#define	    COMPRESSION_CCITTRLE	2	/* CCITT modified Huffman RLE */
-#define	    COMPRESSION_CCITTFAX3	3	/* CCITT Group 3 fax encoding */
-#define	    COMPRESSION_CCITTFAX4	4	/* CCITT Group 4 fax encoding */
-#define	    COMPRESSION_LZW		5       /* Lempel-Ziv  & Welch */
-#define	    COMPRESSION_OJPEG		6	/* !6.0 JPEG */
-#define	    COMPRESSION_JPEG		7	/* %JPEG DCT compression */
-#define	    COMPRESSION_NEXT		32766	/* NeXT 2-bit RLE */
-#define	    COMPRESSION_CCITTRLEW	32771	/* #1 w/ word alignment */
-#define	    COMPRESSION_PACKBITS	32773	/* Macintosh RLE */
-#define	    COMPRESSION_THUNDERSCAN	32809	/* ThunderScan RLE */
+#define TIFFTAG_SUBFILETYPE     254 /* subfile data descriptor */
+#define     FILETYPE_REDUCEDIMAGE   0x1 /* reduced resolution version */
+#define     FILETYPE_PAGE       0x2 /* one page of many */
+#define     FILETYPE_MASK       0x4 /* transparency mask */
+#define TIFFTAG_OSUBFILETYPE        255 /* +kind of data in subfile */
+#define     OFILETYPE_IMAGE     1   /* full resolution image data */
+#define     OFILETYPE_REDUCEDIMAGE  2   /* reduced size image data */
+#define     OFILETYPE_PAGE      3   /* one page of many */
+#define TIFFTAG_IMAGEWIDTH      256 /* image width in pixels */
+#define TIFFTAG_IMAGELENGTH     257 /* image height in pixels */
+#define TIFFTAG_BITSPERSAMPLE       258 /* bits per channel (sample) */
+#define TIFFTAG_COMPRESSION     259 /* data compression technique */
+#define     COMPRESSION_NONE        1   /* dump mode */
+#define     COMPRESSION_CCITTRLE    2   /* CCITT modified Huffman RLE */
+#define     COMPRESSION_CCITTFAX3   3   /* CCITT Group 3 fax encoding */
+#define     COMPRESSION_CCITTFAX4   4   /* CCITT Group 4 fax encoding */
+#define     COMPRESSION_LZW     5       /* Lempel-Ziv  & Welch */
+#define     COMPRESSION_OJPEG       6   /* !6.0 JPEG */
+#define     COMPRESSION_JPEG        7   /* %JPEG DCT compression */
+#define     COMPRESSION_NEXT        32766   /* NeXT 2-bit RLE */
+#define     COMPRESSION_CCITTRLEW   32771   /* #1 w/ word alignment */
+#define     COMPRESSION_PACKBITS    32773   /* Macintosh RLE */
+#define     COMPRESSION_THUNDERSCAN 32809   /* ThunderScan RLE */
 /* codes 32895-32898 are reserved for ANSI IT8 TIFF/IT <[email protected]) */
 /* codes 32895-32898 are reserved for ANSI IT8 TIFF/IT <[email protected]) */
-#define	    COMPRESSION_IT8CTPAD	32895   /* IT8 CT w/padding */
-#define	    COMPRESSION_IT8LW		32896   /* IT8 Linework RLE */
-#define	    COMPRESSION_IT8MP		32897   /* IT8 Monochrome picture */
-#define	    COMPRESSION_IT8BL		32898   /* IT8 Binary line art */
+#define     COMPRESSION_IT8CTPAD    32895   /* IT8 CT w/padding */
+#define     COMPRESSION_IT8LW       32896   /* IT8 Linework RLE */
+#define     COMPRESSION_IT8MP       32897   /* IT8 Monochrome picture */
+#define     COMPRESSION_IT8BL       32898   /* IT8 Binary line art */
 /* compression codes 32908-32911 are reserved for Pixar */
 /* compression codes 32908-32911 are reserved for Pixar */
-#define     COMPRESSION_PIXARFILM	32908   /* Pixar companded 10bit LZW */
-#define	    COMPRESSION_PIXARLOG	32909   /* Pixar companded 11bit ZIP */
-#define	    COMPRESSION_DEFLATE		32946	/* Deflate compression */
+#define     COMPRESSION_PIXARFILM   32908   /* Pixar companded 10bit LZW */
+#define     COMPRESSION_PIXARLOG    32909   /* Pixar companded 11bit ZIP */
+#define     COMPRESSION_DEFLATE     32946   /* Deflate compression */
 #define     COMPRESSION_ADOBE_DEFLATE   8       /* Deflate compression, as recognized by Adobe */
 #define     COMPRESSION_ADOBE_DEFLATE   8       /* Deflate compression, as recognized by Adobe */
 /* compression code 32947 is reserved for Oceana Matrix <[email protected]> */
 /* compression code 32947 is reserved for Oceana Matrix <[email protected]> */
 #define     COMPRESSION_DCS             32947   /* Kodak DCS encoding */
 #define     COMPRESSION_DCS             32947   /* Kodak DCS encoding */
-#define	    COMPRESSION_JBIG		34661	/* ISO JBIG */
-#define     COMPRESSION_SGILOG		34676	/* SGI Log Luminance RLE */
-#define     COMPRESSION_SGILOG24	34677	/* SGI Log 24-bit packed */
-#define	TIFFTAG_PHOTOMETRIC		262	/* photometric interpretation */
-#define	    PHOTOMETRIC_MINISWHITE	0	/* min value is white */
-#define	    PHOTOMETRIC_MINISBLACK	1	/* min value is black */
-#define	    PHOTOMETRIC_RGB		2	/* RGB color model */
-#define	    PHOTOMETRIC_PALETTE		3	/* color map indexed */
-#define	    PHOTOMETRIC_MASK		4	/* $holdout mask */
-#define	    PHOTOMETRIC_SEPARATED	5	/* !color separations */
-#define	    PHOTOMETRIC_YCBCR		6	/* !CCIR 601 */
-#define	    PHOTOMETRIC_CIELAB		8	/* !1976 CIE L*a*b* */
-#define     PHOTOMETRIC_LOGL		32844	/* CIE Log2(L) */
-#define     PHOTOMETRIC_LOGLUV		32845	/* CIE Log2(L) (u',v') */
-#define	TIFFTAG_THRESHHOLDING		263	/* +thresholding used on data */
-#define	    THRESHHOLD_BILEVEL		1	/* b&w art scan */
-#define	    THRESHHOLD_HALFTONE		2	/* or dithered scan */
-#define	    THRESHHOLD_ERRORDIFFUSE	3	/* usually floyd-steinberg */
-#define	TIFFTAG_CELLWIDTH		264	/* +dithering matrix width */
-#define	TIFFTAG_CELLLENGTH		265	/* +dithering matrix height */
-#define	TIFFTAG_FILLORDER		266	/* data order within a byte */
-#define	    FILLORDER_MSB2LSB		1	/* most significant -> least */
-#define	    FILLORDER_LSB2MSB		2	/* least significant -> most */
-#define	TIFFTAG_DOCUMENTNAME		269	/* name of doc. image is from */
-#define	TIFFTAG_IMAGEDESCRIPTION	270	/* info about image */
-#define	TIFFTAG_MAKE			271	/* scanner manufacturer name */
-#define	TIFFTAG_MODEL			272	/* scanner model name/number */
-#define	TIFFTAG_STRIPOFFSETS		273	/* offsets to data strips */
-#define	TIFFTAG_ORIENTATION		274	/* +image orientation */
-#define	    ORIENTATION_TOPLEFT		1	/* row 0 top, col 0 lhs */
-#define	    ORIENTATION_TOPRIGHT	2	/* row 0 top, col 0 rhs */
-#define	    ORIENTATION_BOTRIGHT	3	/* row 0 bottom, col 0 rhs */
-#define	    ORIENTATION_BOTLEFT		4	/* row 0 bottom, col 0 lhs */
-#define	    ORIENTATION_LEFTTOP		5	/* row 0 lhs, col 0 top */
-#define	    ORIENTATION_RIGHTTOP	6	/* row 0 rhs, col 0 top */
-#define	    ORIENTATION_RIGHTBOT	7	/* row 0 rhs, col 0 bottom */
-#define	    ORIENTATION_LEFTBOT		8	/* row 0 lhs, col 0 bottom */
-#define	TIFFTAG_SAMPLESPERPIXEL		277	/* samples per pixel */
-#define	TIFFTAG_ROWSPERSTRIP		278	/* rows per strip of data */
-#define	TIFFTAG_STRIPBYTECOUNTS		279	/* bytes counts for strips */
-#define	TIFFTAG_MINSAMPLEVALUE		280	/* +minimum sample value */
-#define	TIFFTAG_MAXSAMPLEVALUE		281	/* +maximum sample value */
-#define	TIFFTAG_XRESOLUTION		282	/* pixels/resolution in x */
-#define	TIFFTAG_YRESOLUTION		283	/* pixels/resolution in y */
-#define	TIFFTAG_PLANARCONFIG		284	/* storage organization */
-#define	    PLANARCONFIG_CONTIG		1	/* single image plane */
-#define	    PLANARCONFIG_SEPARATE	2	/* separate planes of data */
-#define	TIFFTAG_PAGENAME		285	/* page name image is from */
-#define	TIFFTAG_XPOSITION		286	/* x page offset of image lhs */
-#define	TIFFTAG_YPOSITION		287	/* y page offset of image lhs */
-#define	TIFFTAG_FREEOFFSETS		288	/* +byte offset to free block */
-#define	TIFFTAG_FREEBYTECOUNTS		289	/* +sizes of free blocks */
-#define	TIFFTAG_GRAYRESPONSEUNIT	290	/* $gray scale curve accuracy */
-#define	    GRAYRESPONSEUNIT_10S	1	/* tenths of a unit */
-#define	    GRAYRESPONSEUNIT_100S	2	/* hundredths of a unit */
-#define	    GRAYRESPONSEUNIT_1000S	3	/* thousandths of a unit */
-#define	    GRAYRESPONSEUNIT_10000S	4	/* ten-thousandths of a unit */
-#define	    GRAYRESPONSEUNIT_100000S	5	/* hundred-thousandths */
-#define	TIFFTAG_GRAYRESPONSECURVE	291	/* $gray scale response curve */
-#define	TIFFTAG_GROUP3OPTIONS		292	/* 32 flag bits */
-#define	    GROUP3OPT_2DENCODING	0x1	/* 2-dimensional coding */
-#define	    GROUP3OPT_UNCOMPRESSED	0x2	/* data not compressed */
-#define	    GROUP3OPT_FILLBITS		0x4	/* fill to byte boundary */
-#define	TIFFTAG_GROUP4OPTIONS		293	/* 32 flag bits */
-#define	    GROUP4OPT_UNCOMPRESSED	0x2	/* data not compressed */
-#define	TIFFTAG_RESOLUTIONUNIT		296	/* units of resolutions */
-#define	    RESUNIT_NONE		1	/* no meaningful units */
-#define	    RESUNIT_INCH		2	/* english */
-#define	    RESUNIT_CENTIMETER		3	/* metric */
-#define	TIFFTAG_PAGENUMBER		297	/* page numbers of multi-page */
-#define	TIFFTAG_COLORRESPONSEUNIT	300	/* $color curve accuracy */
-#define	    COLORRESPONSEUNIT_10S	1	/* tenths of a unit */
-#define	    COLORRESPONSEUNIT_100S	2	/* hundredths of a unit */
-#define	    COLORRESPONSEUNIT_1000S	3	/* thousandths of a unit */
-#define	    COLORRESPONSEUNIT_10000S	4	/* ten-thousandths of a unit */
-#define	    COLORRESPONSEUNIT_100000S	5	/* hundred-thousandths */
-#define	TIFFTAG_TRANSFERFUNCTION	301	/* !colorimetry info */
-#define	TIFFTAG_SOFTWARE		305	/* name & release */
-#define	TIFFTAG_DATETIME		306	/* creation date and time */
-#define	TIFFTAG_ARTIST			315	/* creator of image */
-#define	TIFFTAG_HOSTCOMPUTER		316	/* machine where created */
-#define	TIFFTAG_PREDICTOR		317	/* prediction scheme w/ LZW */
-#define	TIFFTAG_WHITEPOINT		318	/* image white point */
-#define	TIFFTAG_PRIMARYCHROMATICITIES	319	/* !primary chromaticities */
-#define	TIFFTAG_COLORMAP		320	/* RGB map for pallette image */
-#define	TIFFTAG_HALFTONEHINTS		321	/* !highlight+shadow info */
-#define	TIFFTAG_TILEWIDTH		322	/* !rows/data tile */
-#define	TIFFTAG_TILELENGTH		323	/* !cols/data tile */
-#define TIFFTAG_TILEOFFSETS		324	/* !offsets to data tiles */
-#define TIFFTAG_TILEBYTECOUNTS		325	/* !byte counts for tiles */
-#define	TIFFTAG_BADFAXLINES		326	/* lines w/ wrong pixel count */
-#define	TIFFTAG_CLEANFAXDATA		327	/* regenerated line info */
-#define	    CLEANFAXDATA_CLEAN		0	/* no errors detected */
-#define	    CLEANFAXDATA_REGENERATED	1	/* receiver regenerated lines */
-#define	    CLEANFAXDATA_UNCLEAN	2	/* uncorrected errors exist */
-#define	TIFFTAG_CONSECUTIVEBADFAXLINES	328	/* max consecutive bad lines */
-#define	TIFFTAG_SUBIFD			330	/* subimage descriptors */
-#define	TIFFTAG_INKSET			332	/* !inks in separated image */
-#define	    INKSET_CMYK			1	/* !cyan-magenta-yellow-black */
-#define	TIFFTAG_INKNAMES		333	/* !ascii names of inks */
-#define	TIFFTAG_NUMBEROFINKS		334	/* !number of inks */
-#define	TIFFTAG_DOTRANGE		336	/* !0% and 100% dot codes */
-#define	TIFFTAG_TARGETPRINTER		337	/* !separation target */
-#define	TIFFTAG_EXTRASAMPLES		338	/* !info about extra samples */
-#define	    EXTRASAMPLE_UNSPECIFIED	0	/* !unspecified data */
-#define	    EXTRASAMPLE_ASSOCALPHA	1	/* !associated alpha data */
-#define	    EXTRASAMPLE_UNASSALPHA	2	/* !unassociated alpha data */
-#define	TIFFTAG_SAMPLEFORMAT		339	/* !data sample format */
-#define	    SAMPLEFORMAT_UINT		1	/* !unsigned integer data */
-#define	    SAMPLEFORMAT_INT		2	/* !signed integer data */
-#define	    SAMPLEFORMAT_IEEEFP		3	/* !IEEE floating point data */
-#define	    SAMPLEFORMAT_VOID		4	/* !untyped data */
-#define	    SAMPLEFORMAT_COMPLEXINT	5	/* !complex signed int */
-#define	    SAMPLEFORMAT_COMPLEXIEEEFP	6	/* !complex ieee floating */
-#define	TIFFTAG_SMINSAMPLEVALUE		340	/* !variable MinSampleValue */
-#define	TIFFTAG_SMAXSAMPLEVALUE		341	/* !variable MaxSampleValue */
-#define	TIFFTAG_JPEGTABLES		347	/* %JPEG table stream */
+#define     COMPRESSION_JBIG        34661   /* ISO JBIG */
+#define     COMPRESSION_SGILOG      34676   /* SGI Log Luminance RLE */
+#define     COMPRESSION_SGILOG24    34677   /* SGI Log 24-bit packed */
+#define TIFFTAG_PHOTOMETRIC     262 /* photometric interpretation */
+#define     PHOTOMETRIC_MINISWHITE  0   /* min value is white */
+#define     PHOTOMETRIC_MINISBLACK  1   /* min value is black */
+#define     PHOTOMETRIC_RGB     2   /* RGB color model */
+#define     PHOTOMETRIC_PALETTE     3   /* color map indexed */
+#define     PHOTOMETRIC_MASK        4   /* $holdout mask */
+#define     PHOTOMETRIC_SEPARATED   5   /* !color separations */
+#define     PHOTOMETRIC_YCBCR       6   /* !CCIR 601 */
+#define     PHOTOMETRIC_CIELAB      8   /* !1976 CIE L*a*b* */
+#define     PHOTOMETRIC_LOGL        32844   /* CIE Log2(L) */
+#define     PHOTOMETRIC_LOGLUV      32845   /* CIE Log2(L) (u',v') */
+#define TIFFTAG_THRESHHOLDING       263 /* +thresholding used on data */
+#define     THRESHHOLD_BILEVEL      1   /* b&w art scan */
+#define     THRESHHOLD_HALFTONE     2   /* or dithered scan */
+#define     THRESHHOLD_ERRORDIFFUSE 3   /* usually floyd-steinberg */
+#define TIFFTAG_CELLWIDTH       264 /* +dithering matrix width */
+#define TIFFTAG_CELLLENGTH      265 /* +dithering matrix height */
+#define TIFFTAG_FILLORDER       266 /* data order within a byte */
+#define     FILLORDER_MSB2LSB       1   /* most significant -> least */
+#define     FILLORDER_LSB2MSB       2   /* least significant -> most */
+#define TIFFTAG_DOCUMENTNAME        269 /* name of doc. image is from */
+#define TIFFTAG_IMAGEDESCRIPTION    270 /* info about image */
+#define TIFFTAG_MAKE            271 /* scanner manufacturer name */
+#define TIFFTAG_MODEL           272 /* scanner model name/number */
+#define TIFFTAG_STRIPOFFSETS        273 /* offsets to data strips */
+#define TIFFTAG_ORIENTATION     274 /* +image orientation */
+#define     ORIENTATION_TOPLEFT     1   /* row 0 top, col 0 lhs */
+#define     ORIENTATION_TOPRIGHT    2   /* row 0 top, col 0 rhs */
+#define     ORIENTATION_BOTRIGHT    3   /* row 0 bottom, col 0 rhs */
+#define     ORIENTATION_BOTLEFT     4   /* row 0 bottom, col 0 lhs */
+#define     ORIENTATION_LEFTTOP     5   /* row 0 lhs, col 0 top */
+#define     ORIENTATION_RIGHTTOP    6   /* row 0 rhs, col 0 top */
+#define     ORIENTATION_RIGHTBOT    7   /* row 0 rhs, col 0 bottom */
+#define     ORIENTATION_LEFTBOT     8   /* row 0 lhs, col 0 bottom */
+#define TIFFTAG_SAMPLESPERPIXEL     277 /* samples per pixel */
+#define TIFFTAG_ROWSPERSTRIP        278 /* rows per strip of data */
+#define TIFFTAG_STRIPBYTECOUNTS     279 /* bytes counts for strips */
+#define TIFFTAG_MINSAMPLEVALUE      280 /* +minimum sample value */
+#define TIFFTAG_MAXSAMPLEVALUE      281 /* +maximum sample value */
+#define TIFFTAG_XRESOLUTION     282 /* pixels/resolution in x */
+#define TIFFTAG_YRESOLUTION     283 /* pixels/resolution in y */
+#define TIFFTAG_PLANARCONFIG        284 /* storage organization */
+#define     PLANARCONFIG_CONTIG     1   /* single image plane */
+#define     PLANARCONFIG_SEPARATE   2   /* separate planes of data */
+#define TIFFTAG_PAGENAME        285 /* page name image is from */
+#define TIFFTAG_XPOSITION       286 /* x page offset of image lhs */
+#define TIFFTAG_YPOSITION       287 /* y page offset of image lhs */
+#define TIFFTAG_FREEOFFSETS     288 /* +byte offset to free block */
+#define TIFFTAG_FREEBYTECOUNTS      289 /* +sizes of free blocks */
+#define TIFFTAG_GRAYRESPONSEUNIT    290 /* $gray scale curve accuracy */
+#define     GRAYRESPONSEUNIT_10S    1   /* tenths of a unit */
+#define     GRAYRESPONSEUNIT_100S   2   /* hundredths of a unit */
+#define     GRAYRESPONSEUNIT_1000S  3   /* thousandths of a unit */
+#define     GRAYRESPONSEUNIT_10000S 4   /* ten-thousandths of a unit */
+#define     GRAYRESPONSEUNIT_100000S    5   /* hundred-thousandths */
+#define TIFFTAG_GRAYRESPONSECURVE   291 /* $gray scale response curve */
+#define TIFFTAG_GROUP3OPTIONS       292 /* 32 flag bits */
+#define     GROUP3OPT_2DENCODING    0x1 /* 2-dimensional coding */
+#define     GROUP3OPT_UNCOMPRESSED  0x2 /* data not compressed */
+#define     GROUP3OPT_FILLBITS      0x4 /* fill to byte boundary */
+#define TIFFTAG_GROUP4OPTIONS       293 /* 32 flag bits */
+#define     GROUP4OPT_UNCOMPRESSED  0x2 /* data not compressed */
+#define TIFFTAG_RESOLUTIONUNIT      296 /* units of resolutions */
+#define     RESUNIT_NONE        1   /* no meaningful units */
+#define     RESUNIT_INCH        2   /* english */
+#define     RESUNIT_CENTIMETER      3   /* metric */
+#define TIFFTAG_PAGENUMBER      297 /* page numbers of multi-page */
+#define TIFFTAG_COLORRESPONSEUNIT   300 /* $color curve accuracy */
+#define     COLORRESPONSEUNIT_10S   1   /* tenths of a unit */
+#define     COLORRESPONSEUNIT_100S  2   /* hundredths of a unit */
+#define     COLORRESPONSEUNIT_1000S 3   /* thousandths of a unit */
+#define     COLORRESPONSEUNIT_10000S    4   /* ten-thousandths of a unit */
+#define     COLORRESPONSEUNIT_100000S   5   /* hundred-thousandths */
+#define TIFFTAG_TRANSFERFUNCTION    301 /* !colorimetry info */
+#define TIFFTAG_SOFTWARE        305 /* name & release */
+#define TIFFTAG_DATETIME        306 /* creation date and time */
+#define TIFFTAG_ARTIST          315 /* creator of image */
+#define TIFFTAG_HOSTCOMPUTER        316 /* machine where created */
+#define TIFFTAG_PREDICTOR       317 /* prediction scheme w/ LZW */
+#define TIFFTAG_WHITEPOINT      318 /* image white point */
+#define TIFFTAG_PRIMARYCHROMATICITIES   319 /* !primary chromaticities */
+#define TIFFTAG_COLORMAP        320 /* RGB map for pallette image */
+#define TIFFTAG_HALFTONEHINTS       321 /* !highlight+shadow info */
+#define TIFFTAG_TILEWIDTH       322 /* !rows/data tile */
+#define TIFFTAG_TILELENGTH      323 /* !cols/data tile */
+#define TIFFTAG_TILEOFFSETS     324 /* !offsets to data tiles */
+#define TIFFTAG_TILEBYTECOUNTS      325 /* !byte counts for tiles */
+#define TIFFTAG_BADFAXLINES     326 /* lines w/ wrong pixel count */
+#define TIFFTAG_CLEANFAXDATA        327 /* regenerated line info */
+#define     CLEANFAXDATA_CLEAN      0   /* no errors detected */
+#define     CLEANFAXDATA_REGENERATED    1   /* receiver regenerated lines */
+#define     CLEANFAXDATA_UNCLEAN    2   /* uncorrected errors exist */
+#define TIFFTAG_CONSECUTIVEBADFAXLINES  328 /* max consecutive bad lines */
+#define TIFFTAG_SUBIFD          330 /* subimage descriptors */
+#define TIFFTAG_INKSET          332 /* !inks in separated image */
+#define     INKSET_CMYK         1   /* !cyan-magenta-yellow-black */
+#define TIFFTAG_INKNAMES        333 /* !ascii names of inks */
+#define TIFFTAG_NUMBEROFINKS        334 /* !number of inks */
+#define TIFFTAG_DOTRANGE        336 /* !0% and 100% dot codes */
+#define TIFFTAG_TARGETPRINTER       337 /* !separation target */
+#define TIFFTAG_EXTRASAMPLES        338 /* !info about extra samples */
+#define     EXTRASAMPLE_UNSPECIFIED 0   /* !unspecified data */
+#define     EXTRASAMPLE_ASSOCALPHA  1   /* !associated alpha data */
+#define     EXTRASAMPLE_UNASSALPHA  2   /* !unassociated alpha data */
+#define TIFFTAG_SAMPLEFORMAT        339 /* !data sample format */
+#define     SAMPLEFORMAT_UINT       1   /* !unsigned integer data */
+#define     SAMPLEFORMAT_INT        2   /* !signed integer data */
+#define     SAMPLEFORMAT_IEEEFP     3   /* !IEEE floating point data */
+#define     SAMPLEFORMAT_VOID       4   /* !untyped data */
+#define     SAMPLEFORMAT_COMPLEXINT 5   /* !complex signed int */
+#define     SAMPLEFORMAT_COMPLEXIEEEFP  6   /* !complex ieee floating */
+#define TIFFTAG_SMINSAMPLEVALUE     340 /* !variable MinSampleValue */
+#define TIFFTAG_SMAXSAMPLEVALUE     341 /* !variable MaxSampleValue */
+#define TIFFTAG_JPEGTABLES      347 /* %JPEG table stream */
 /*
 /*
  * Tags 512-521 are obsoleted by Technical Note #2
  * Tags 512-521 are obsoleted by Technical Note #2
  * which specifies a revised JPEG-in-TIFF scheme.
  * which specifies a revised JPEG-in-TIFF scheme.
  */
  */
-#define	TIFFTAG_JPEGPROC		512	/* !JPEG processing algorithm */
-#define	    JPEGPROC_BASELINE		1	/* !baseline sequential */
-#define	    JPEGPROC_LOSSLESS		14	/* !Huffman coded lossless */
-#define	TIFFTAG_JPEGIFOFFSET		513	/* !pointer to SOI marker */
-#define	TIFFTAG_JPEGIFBYTECOUNT		514	/* !JFIF stream length */
-#define	TIFFTAG_JPEGRESTARTINTERVAL	515	/* !restart interval length */
-#define	TIFFTAG_JPEGLOSSLESSPREDICTORS	517	/* !lossless proc predictor */
-#define	TIFFTAG_JPEGPOINTTRANSFORM	518	/* !lossless point transform */
-#define	TIFFTAG_JPEGQTABLES		519	/* !Q matrice offsets */
-#define	TIFFTAG_JPEGDCTABLES		520	/* !DCT table offsets */
-#define	TIFFTAG_JPEGACTABLES		521	/* !AC coefficient offsets */
-#define	TIFFTAG_YCBCRCOEFFICIENTS	529	/* !RGB -> YCbCr transform */
-#define	TIFFTAG_YCBCRSUBSAMPLING	530	/* !YCbCr subsampling factors */
-#define	TIFFTAG_YCBCRPOSITIONING	531	/* !subsample positioning */
-#define	    YCBCRPOSITION_CENTERED	1	/* !as in PostScript Level 2 */
-#define	    YCBCRPOSITION_COSITED	2	/* !as in CCIR 601-1 */
-#define	TIFFTAG_REFERENCEBLACKWHITE	532	/* !colorimetry info */
+#define TIFFTAG_JPEGPROC        512 /* !JPEG processing algorithm */
+#define     JPEGPROC_BASELINE       1   /* !baseline sequential */
+#define     JPEGPROC_LOSSLESS       14  /* !Huffman coded lossless */
+#define TIFFTAG_JPEGIFOFFSET        513 /* !pointer to SOI marker */
+#define TIFFTAG_JPEGIFBYTECOUNT     514 /* !JFIF stream length */
+#define TIFFTAG_JPEGRESTARTINTERVAL 515 /* !restart interval length */
+#define TIFFTAG_JPEGLOSSLESSPREDICTORS  517 /* !lossless proc predictor */
+#define TIFFTAG_JPEGPOINTTRANSFORM  518 /* !lossless point transform */
+#define TIFFTAG_JPEGQTABLES     519 /* !Q matrice offsets */
+#define TIFFTAG_JPEGDCTABLES        520 /* !DCT table offsets */
+#define TIFFTAG_JPEGACTABLES        521 /* !AC coefficient offsets */
+#define TIFFTAG_YCBCRCOEFFICIENTS   529 /* !RGB -> YCbCr transform */
+#define TIFFTAG_YCBCRSUBSAMPLING    530 /* !YCbCr subsampling factors */
+#define TIFFTAG_YCBCRPOSITIONING    531 /* !subsample positioning */
+#define     YCBCRPOSITION_CENTERED  1   /* !as in PostScript Level 2 */
+#define     YCBCRPOSITION_COSITED   2   /* !as in CCIR 601-1 */
+#define TIFFTAG_REFERENCEBLACKWHITE 532 /* !colorimetry info */
 /* tags 32952-32956 are private tags registered to Island Graphics */
 /* tags 32952-32956 are private tags registered to Island Graphics */
-#define TIFFTAG_REFPTS			32953	/* image reference points */
-#define TIFFTAG_REGIONTACKPOINT		32954	/* region-xform tack point */
-#define TIFFTAG_REGIONWARPCORNERS	32955	/* warp quadrilateral */
-#define TIFFTAG_REGIONAFFINE		32956	/* affine transformation mat */
+#define TIFFTAG_REFPTS          32953   /* image reference points */
+#define TIFFTAG_REGIONTACKPOINT     32954   /* region-xform tack point */
+#define TIFFTAG_REGIONWARPCORNERS   32955   /* warp quadrilateral */
+#define TIFFTAG_REGIONAFFINE        32956   /* affine transformation mat */
 /* tags 32995-32999 are private tags registered to SGI */
 /* tags 32995-32999 are private tags registered to SGI */
-#define	TIFFTAG_MATTEING		32995	/* $use ExtraSamples */
-#define	TIFFTAG_DATATYPE		32996	/* $use SampleFormat */
-#define	TIFFTAG_IMAGEDEPTH		32997	/* z depth of image */
-#define	TIFFTAG_TILEDEPTH		32998	/* z depth/data tile */
+#define TIFFTAG_MATTEING        32995   /* $use ExtraSamples */
+#define TIFFTAG_DATATYPE        32996   /* $use SampleFormat */
+#define TIFFTAG_IMAGEDEPTH      32997   /* z depth of image */
+#define TIFFTAG_TILEDEPTH       32998   /* z depth/data tile */
 /* tags 33300-33309 are private tags registered to Pixar */
 /* tags 33300-33309 are private tags registered to Pixar */
 /*
 /*
  * TIFFTAG_PIXAR_IMAGEFULLWIDTH and TIFFTAG_PIXAR_IMAGEFULLLENGTH
  * TIFFTAG_PIXAR_IMAGEFULLWIDTH and TIFFTAG_PIXAR_IMAGEFULLLENGTH
@@ -331,48 +335,48 @@ typedef	enum {
  /* Tags 33302-33306 are used to identify special image modes and data
  /* Tags 33302-33306 are used to identify special image modes and data
   * used by Pixar's texture formats.
   * used by Pixar's texture formats.
   */
   */
-#define TIFFTAG_PIXAR_TEXTUREFORMAT	33302	/* texture map format */
-#define TIFFTAG_PIXAR_WRAPMODES		33303	/* s & t wrap modes */
-#define TIFFTAG_PIXAR_FOVCOT		33304	/* cotan(fov) for env. maps */
+#define TIFFTAG_PIXAR_TEXTUREFORMAT 33302   /* texture map format */
+#define TIFFTAG_PIXAR_WRAPMODES     33303   /* s & t wrap modes */
+#define TIFFTAG_PIXAR_FOVCOT        33304   /* cotan(fov) for env. maps */
 #define TIFFTAG_PIXAR_MATRIX_WORLDTOSCREEN 33305
 #define TIFFTAG_PIXAR_MATRIX_WORLDTOSCREEN 33305
 #define TIFFTAG_PIXAR_MATRIX_WORLDTOCAMERA 33306
 #define TIFFTAG_PIXAR_MATRIX_WORLDTOCAMERA 33306
 /* tag 33405 is a private tag registered to Eastman Kodak */
 /* tag 33405 is a private tag registered to Eastman Kodak */
 #define TIFFTAG_WRITERSERIALNUMBER      33405   /* device serial number */
 #define TIFFTAG_WRITERSERIALNUMBER      33405   /* device serial number */
 /* tag 33432 is listed in the 6.0 spec w/ unknown ownership */
 /* tag 33432 is listed in the 6.0 spec w/ unknown ownership */
-#define	TIFFTAG_COPYRIGHT		33432	/* copyright string */
+#define TIFFTAG_COPYRIGHT       33432   /* copyright string */
 /* IPTC TAG from RichTIFF specifications */
 /* IPTC TAG from RichTIFF specifications */
 #define TIFFTAG_RICHTIFFIPTC    33723
 #define TIFFTAG_RICHTIFFIPTC    33723
 /* 34016-34029 are reserved for ANSI IT8 TIFF/IT <[email protected]) */
 /* 34016-34029 are reserved for ANSI IT8 TIFF/IT <[email protected]) */
-#define TIFFTAG_IT8SITE			34016	/* site name */
-#define TIFFTAG_IT8COLORSEQUENCE	34017	/* color seq. [RGB,CMYK,etc] */
-#define TIFFTAG_IT8HEADER		34018	/* DDES Header */
-#define TIFFTAG_IT8RASTERPADDING	34019	/* raster scanline padding */
-#define TIFFTAG_IT8BITSPERRUNLENGTH	34020	/* # of bits in short run */
+#define TIFFTAG_IT8SITE         34016   /* site name */
+#define TIFFTAG_IT8COLORSEQUENCE    34017   /* color seq. [RGB,CMYK,etc] */
+#define TIFFTAG_IT8HEADER       34018   /* DDES Header */
+#define TIFFTAG_IT8RASTERPADDING    34019   /* raster scanline padding */
+#define TIFFTAG_IT8BITSPERRUNLENGTH 34020   /* # of bits in short run */
 #define TIFFTAG_IT8BITSPEREXTENDEDRUNLENGTH 34021/* # of bits in long run */
 #define TIFFTAG_IT8BITSPEREXTENDEDRUNLENGTH 34021/* # of bits in long run */
-#define TIFFTAG_IT8COLORTABLE		34022	/* LW colortable */
-#define TIFFTAG_IT8IMAGECOLORINDICATOR	34023	/* BP/BL image color switch */
-#define TIFFTAG_IT8BKGCOLORINDICATOR	34024	/* BP/BL bg color switch */
-#define TIFFTAG_IT8IMAGECOLORVALUE	34025	/* BP/BL image color value */
-#define TIFFTAG_IT8BKGCOLORVALUE	34026	/* BP/BL bg color value */
-#define TIFFTAG_IT8PIXELINTENSITYRANGE	34027	/* MP pixel intensity value */
-#define TIFFTAG_IT8TRANSPARENCYINDICATOR 34028	/* HC transparency switch */
-#define TIFFTAG_IT8COLORCHARACTERIZATION 34029	/* color character. table */
+#define TIFFTAG_IT8COLORTABLE       34022   /* LW colortable */
+#define TIFFTAG_IT8IMAGECOLORINDICATOR  34023   /* BP/BL image color switch */
+#define TIFFTAG_IT8BKGCOLORINDICATOR    34024   /* BP/BL bg color switch */
+#define TIFFTAG_IT8IMAGECOLORVALUE  34025   /* BP/BL image color value */
+#define TIFFTAG_IT8BKGCOLORVALUE    34026   /* BP/BL bg color value */
+#define TIFFTAG_IT8PIXELINTENSITYRANGE  34027   /* MP pixel intensity value */
+#define TIFFTAG_IT8TRANSPARENCYINDICATOR 34028  /* HC transparency switch */
+#define TIFFTAG_IT8COLORCHARACTERIZATION 34029  /* color character. table */
 /* tags 34232-34236 are private tags registered to Texas Instruments */
 /* tags 34232-34236 are private tags registered to Texas Instruments */
 #define TIFFTAG_FRAMECOUNT              34232   /* Sequence Frame Count */
 #define TIFFTAG_FRAMECOUNT              34232   /* Sequence Frame Count */
 /* tag 34750 is a private tag registered to Adobe? */
 /* tag 34750 is a private tag registered to Adobe? */
-#define TIFFTAG_ICCPROFILE		34675	/* ICC profile data */
+#define TIFFTAG_ICCPROFILE      34675   /* ICC profile data */
 /* tag 34377 is private tag registered to Adobe for PhotoShop */
 /* tag 34377 is private tag registered to Adobe for PhotoShop */
-#define TIFFTAG_PHOTOSHOP				34377 
+#define TIFFTAG_PHOTOSHOP               34377 
 /* tag 34750 is a private tag registered to Pixel Magic */
 /* tag 34750 is a private tag registered to Pixel Magic */
-#define	TIFFTAG_JBIGOPTIONS		34750	/* JBIG options */
+#define TIFFTAG_JBIGOPTIONS     34750   /* JBIG options */
 /* tags 34908-34914 are private tags registered to SGI */
 /* tags 34908-34914 are private tags registered to SGI */
-#define	TIFFTAG_FAXRECVPARAMS		34908	/* encoded Class 2 ses. parms */
-#define	TIFFTAG_FAXSUBADDRESS		34909	/* received SubAddr string */
-#define	TIFFTAG_FAXRECVTIME		34910	/* receive time (secs) */
+#define TIFFTAG_FAXRECVPARAMS       34908   /* encoded Class 2 ses. parms */
+#define TIFFTAG_FAXSUBADDRESS       34909   /* received SubAddr string */
+#define TIFFTAG_FAXRECVTIME     34910   /* receive time (secs) */
 /* tags 37439-37443 are registered to SGI <[email protected]> */
 /* tags 37439-37443 are registered to SGI <[email protected]> */
-#define TIFFTAG_STONITS			37439	/* Sample value to Nits */
+#define TIFFTAG_STONITS         37439   /* Sample value to Nits */
 /* tag 34929 is a private tag registered to FedEx */
 /* tag 34929 is a private tag registered to FedEx */
-#define	TIFFTAG_FEDEX_EDR		34929	/* unknown use */
+#define TIFFTAG_FEDEX_EDR       34929   /* unknown use */
 /* tag 65535 is an undefined tag used by Eastman Kodak */
 /* tag 65535 is an undefined tag used by Eastman Kodak */
 #define TIFFTAG_DCSHUESHIFTVALUES       65535   /* hue shift correction data */
 #define TIFFTAG_DCSHUESHIFTVALUES       65535   /* hue shift correction data */
 
 
@@ -387,30 +391,30 @@ typedef	enum {
  * (i.e. added to this file), send mail to [email protected]
  * (i.e. added to this file), send mail to [email protected]
  * with the appropriate C definitions to add.
  * with the appropriate C definitions to add.
  */
  */
-#define	TIFFTAG_FAXMODE			65536	/* Group 3/4 format control */
-#define	    FAXMODE_CLASSIC	0x0000		/* default, include RTC */
-#define	    FAXMODE_NORTC	0x0001		/* no RTC at end of data */
-#define	    FAXMODE_NOEOL	0x0002		/* no EOL code at end of row */
-#define	    FAXMODE_BYTEALIGN	0x0004		/* byte align row */
-#define	    FAXMODE_WORDALIGN	0x0008		/* word align row */
-#define	    FAXMODE_CLASSF	FAXMODE_NORTC	/* TIFF Class F */
-#define	TIFFTAG_JPEGQUALITY		65537	/* Compression quality level */
+#define TIFFTAG_FAXMODE         65536   /* Group 3/4 format control */
+#define     FAXMODE_CLASSIC 0x0000      /* default, include RTC */
+#define     FAXMODE_NORTC   0x0001      /* no RTC at end of data */
+#define     FAXMODE_NOEOL   0x0002      /* no EOL code at end of row */
+#define     FAXMODE_BYTEALIGN   0x0004      /* byte align row */
+#define     FAXMODE_WORDALIGN   0x0008      /* word align row */
+#define     FAXMODE_CLASSF  FAXMODE_NORTC   /* TIFF Class F */
+#define TIFFTAG_JPEGQUALITY     65537   /* Compression quality level */
 /* Note: quality level is on the IJG 0-100 scale.  Default value is 75 */
 /* Note: quality level is on the IJG 0-100 scale.  Default value is 75 */
-#define	TIFFTAG_JPEGCOLORMODE		65538	/* Auto RGB<=>YCbCr convert? */
-#define	    JPEGCOLORMODE_RAW	0x0000		/* no conversion (default) */
-#define	    JPEGCOLORMODE_RGB	0x0001		/* do auto conversion */
-#define	TIFFTAG_JPEGTABLESMODE		65539	/* What to put in JPEGTables */
-#define	    JPEGTABLESMODE_QUANT 0x0001		/* include quantization tbls */
-#define	    JPEGTABLESMODE_HUFF	0x0002		/* include Huffman tbls */
+#define TIFFTAG_JPEGCOLORMODE       65538   /* Auto RGB<=>YCbCr convert? */
+#define     JPEGCOLORMODE_RAW   0x0000      /* no conversion (default) */
+#define     JPEGCOLORMODE_RGB   0x0001      /* do auto conversion */
+#define TIFFTAG_JPEGTABLESMODE      65539   /* What to put in JPEGTables */
+#define     JPEGTABLESMODE_QUANT 0x0001     /* include quantization tbls */
+#define     JPEGTABLESMODE_HUFF 0x0002      /* include Huffman tbls */
 /* Note: default is JPEGTABLESMODE_QUANT | JPEGTABLESMODE_HUFF */
 /* Note: default is JPEGTABLESMODE_QUANT | JPEGTABLESMODE_HUFF */
-#define	TIFFTAG_FAXFILLFUNC		65540	/* G3/G4 fill function */
-#define	TIFFTAG_PIXARLOGDATAFMT		65549	/* PixarLogCodec I/O data sz */
-#define	    PIXARLOGDATAFMT_8BIT	0	/* regular u_char samples */
-#define	    PIXARLOGDATAFMT_8BITABGR	1	/* ABGR-order u_chars */
-#define	    PIXARLOGDATAFMT_11BITLOG	2	/* 11-bit log-encoded (raw) */
-#define	    PIXARLOGDATAFMT_12BITPICIO	3	/* as per PICIO (1.0==2048) */
-#define	    PIXARLOGDATAFMT_16BIT	4	/* signed short samples */
-#define	    PIXARLOGDATAFMT_FLOAT	5	/* IEEE float samples */
+#define TIFFTAG_FAXFILLFUNC     65540   /* G3/G4 fill function */
+#define TIFFTAG_PIXARLOGDATAFMT     65549   /* PixarLogCodec I/O data sz */
+#define     PIXARLOGDATAFMT_8BIT    0   /* regular u_char samples */
+#define     PIXARLOGDATAFMT_8BITABGR    1   /* ABGR-order u_chars */
+#define     PIXARLOGDATAFMT_11BITLOG    2   /* 11-bit log-encoded (raw) */
+#define     PIXARLOGDATAFMT_12BITPICIO  3   /* as per PICIO (1.0==2048) */
+#define     PIXARLOGDATAFMT_16BIT   4   /* signed short samples */
+#define     PIXARLOGDATAFMT_FLOAT   5   /* IEEE float samples */
 /* 65550-65556 are allocated to Oceana Matrix <[email protected]> */
 /* 65550-65556 are allocated to Oceana Matrix <[email protected]> */
 #define TIFFTAG_DCSIMAGERTYPE           65550   /* imager model & filter */
 #define TIFFTAG_DCSIMAGERTYPE           65550   /* imager model & filter */
 #define     DCSIMAGERMODEL_M3           0       /* M3 chip (1280 x 1024) */
 #define     DCSIMAGERMODEL_M3           0       /* M3 chip (1280 x 1024) */
@@ -429,13 +433,13 @@ typedef	enum {
 #define TIFFTAG_DCSTOESHOULDERPTS       65555   /* toe & shoulder points */
 #define TIFFTAG_DCSTOESHOULDERPTS       65555   /* toe & shoulder points */
 #define TIFFTAG_DCSCALIBRATIONFD        65556   /* calibration file desc */
 #define TIFFTAG_DCSCALIBRATIONFD        65556   /* calibration file desc */
 /* Note: quality level is on the ZLIB 1-9 scale. Default value is -1 */
 /* Note: quality level is on the ZLIB 1-9 scale. Default value is -1 */
-#define	TIFFTAG_ZIPQUALITY		65557	/* compression quality level */
-#define	TIFFTAG_PIXARLOGQUALITY		65558	/* PixarLog uses same scale */
+#define TIFFTAG_ZIPQUALITY      65557   /* compression quality level */
+#define TIFFTAG_PIXARLOGQUALITY     65558   /* PixarLog uses same scale */
 /* 65559 is allocated to Oceana Matrix <[email protected]> */
 /* 65559 is allocated to Oceana Matrix <[email protected]> */
-#define TIFFTAG_DCSCLIPRECTANGLE	65559	/* area of image to acquire */
-#define TIFFTAG_SGILOGDATAFMT		65560	/* SGILog user data format */
-#define     SGILOGDATAFMT_FLOAT		0	/* IEEE float samples */
-#define     SGILOGDATAFMT_16BIT		1	/* 16-bit samples */
-#define     SGILOGDATAFMT_RAW		2	/* uninterpreted data */
-#define     SGILOGDATAFMT_8BIT		3	/* 8-bit RGB monitor values */
+#define TIFFTAG_DCSCLIPRECTANGLE    65559   /* area of image to acquire */
+#define TIFFTAG_SGILOGDATAFMT       65560   /* SGILog user data format */
+#define     SGILOGDATAFMT_FLOAT     0   /* IEEE float samples */
+#define     SGILOGDATAFMT_16BIT     1   /* 16-bit samples */
+#define     SGILOGDATAFMT_RAW       2   /* uninterpreted data */
+#define     SGILOGDATAFMT_8BIT      3   /* 8-bit RGB monitor values */
 #endif /* _TIFF_ */
 #endif /* _TIFF_ */