ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/common/tiff.h

Comparing ray/src/common/tiff.h (file contents):
Revision 3.10 by schorsch, Sun Jul 27 22:12:01 2003 UTC vs.
Revision 3.17 by greg, Thu Aug 2 18:33:42 2018 UTC

#	Line 1 | Line 1
1	<	/* $Header$ */
1	>	/* $Id$ */
2
3		/*
4		* Copyright (c) 1988-1997 Sam Leffler
#	Line 36 | Line 36
36		*    Suite 200
37		*    Seattle, WA  98104
38		*    206-622-5500
39	+	*
40	+	*    (http://partners.adobe.com/asn/developer/PDFS/TN/TIFF6.pdf)
41	+	*
42	+	* For Big TIFF design notes see the following link
43	+	*    http://gdal.maptools.org/twiki/bin/view/libtiff/BigTIFFDesign
44		*/
45	<	#define TIFF_VERSION    42
45	>	#define TIFF_VERSION            42
46	>	#define TIFF_BIGTIFF_VERSION    43
47
48		#define TIFF_BIGENDIAN          0x4d4d
49		#define TIFF_LITTLEENDIAN       0x4949
50
51	<	#ifndef _TIFF_DATA_TYPEDEFS_
51	>	/*
52	>	* The so called TIFF types conflict with definitions from inttypes.h
53	>	* included from sys/types.h on AIX (at least using VisualAge compiler).
54	>	* We try to work around this by detecting this case.  Defining
55	>	* _TIFF_DATA_TYPEDEFS_ short circuits the later definitions in tiff.h, and
56	>	* we will in the holes not provided for by inttypes.h.
57	>	*
58	>	* See http://bugzilla.remotesensing.org/show_bug.cgi?id=39
59	>	*/
60	>	#if defined(_H_INTTYPES) && defined(_ALL_SOURCE) && defined(USING_VISUALAGE)
61	>
62		#define _TIFF_DATA_TYPEDEFS_
63	+	typedef unsigned char uint8;
64	+	typedef unsigned short uint16;
65	+	typedef unsigned int uint32;
66	+
67	+	#endif
68	+
69		/*
70		* Intrinsic data types required by the file format:
71		*
#	Line 52 | Line 74
74		* 32-bit quantities    int32/uint32
75		* strings              unsigned char*
76		*/
77	<	#ifdef __STDC__
77	>	#ifndef _TIFF_DATA_TYPEDEFS_
78	>	#define _TIFF_DATA_TYPEDEFS_
79	>
80		typedef signed char int8;       /* NB: non-ANSI compilers may not grok */
57	–	#else
58	–	typedef char int8;
59	–	#endif
81		typedef unsigned char uint8;
82		typedef short int16;
83		typedef unsigned short uint16;  /* sizeof (uint16) must == 2 */
84	<	#if defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64)
84	>	#if defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64) || defined(__LP64__) || defined(__arch64__) || defined(__sparcv9)
85		typedef int int32;
86		typedef unsigned int uint32;    /* sizeof (uint32) must == 4 */
87		#else
88		typedef long int32;
89		typedef unsigned long uint32;   /* sizeof (uint32) must == 4 */
90		#endif
91	+
92		#endif /* _TIFF_DATA_TYPEDEFS_ */
93
94	<	/*      For TIFFReassignTagToIgnore */
94	>	/* For TIFFReassignTagToIgnore */
95		enum TIFFIgnoreSense /* IGNORE tag table */
96		{
97		TIS_STORE,
#	Line 77 | Line 99 | enum TIFFIgnoreSense /* IGNORE tag table */
99		TIS_EMPTY
100		};
101
102	+	/*
103	+	* TIFF header.
104	+	*/
105		typedef struct {
106		uint16  tiff_magic;     /* magic number (defines byte order) */
107	+	#define TIFF_MAGIC_SIZE         2
108		uint16  tiff_version;   /* TIFF version number */
109	+	#define TIFF_VERSION_SIZE       2
110		uint32  tiff_diroff;    /* byte offset to first directory */
111	+	#define TIFF_DIROFFSET_SIZE     4
112		} TIFFHeader;
113
114	+
115		/*
116	<	* TIFF Image File Directories are comprised of
117	<	* a table of field descriptors of the form shown
118	<	* below.  The table is sorted in ascending order
119	<	* by tag.  The values associated with each entry
120	<	* are disjoint and may appear anywhere in the file
92	<	* (so long as they are placed on a word boundary).
116	>	* TIFF Image File Directories are comprised of a table of field
117	>	* descriptors of the form shown below.  The table is sorted in
118	>	* ascending order by tag.  The values associated with each entry are
119	>	* disjoint and may appear anywhere in the file (so long as they are
120	>	* placed on a word boundary).
121		*
122	<	* If the value is 4 bytes or less, then it is placed
123	<	* in the offset field to save space.  If the value
124	<	* is less than 4 bytes, it is left-justified in the
97	<	* offset field.
122	>	* If the value is 4 bytes or less, then it is placed in the offset
123	>	* field to save space.  If the value is less than 4 bytes, it is
124	>	* left-justified in the offset field.
125		*/
126		typedef struct {
127	<	uint16  tdir_tag;       /* see below */
128	<	uint16  tdir_type;      /* data type; see below */
129	<	uint32  tdir_count;     /* number of items; length in spec */
130	<	uint32  tdir_offset;    /* byte offset to field data */
127	>	uint16          tdir_tag;       /* see below */
128	>	uint16          tdir_type;      /* data type; see below */
129	>	uint32          tdir_count;     /* number of items; length in spec */
130	>	uint32          tdir_offset;    /* byte offset to field data */
131		} TIFFDirEntry;
132
133		/*
#	Line 109 | Line 136 | typedef        struct {
136		*  - items marked with a ! are introduced in revision 6.0.
137		*  - items marked with a % are introduced post revision 6.0.
138		*  - items marked with a $ are obsoleted by revision 6.0.
139	+	*  - items marked with a & are introduced by Adobe DNG specification.
140		*/
141
142		/*
#	Line 129 | Line 157 | typedef        enum {
157		TIFF_SLONG      = 9,    /* !32-bit signed integer */
158		TIFF_SRATIONAL  = 10,   /* !64-bit signed fraction */
159		TIFF_FLOAT      = 11,   /* !32-bit IEEE floating point */
160	<	TIFF_DOUBLE     = 12    /* !64-bit IEEE floating point */
160	>	TIFF_DOUBLE     = 12,   /* !64-bit IEEE floating point */
161	>	TIFF_IFD        = 13    /* %32-bit unsigned integer (offset) */
162		} TIFFDataType;
163
164		/*
#	Line 150 | Line 179 | typedef        enum {
179		#define     COMPRESSION_NONE            1       /* dump mode */
180		#define     COMPRESSION_CCITTRLE        2       /* CCITT modified Huffman RLE */
181		#define     COMPRESSION_CCITTFAX3       3       /* CCITT Group 3 fax encoding */
182	+	#define     COMPRESSION_CCITT_T4        3       /* CCITT T.4 (TIFF 6 name) */
183		#define     COMPRESSION_CCITTFAX4       4       /* CCITT Group 4 fax encoding */
184	+	#define     COMPRESSION_CCITT_T6        4       /* CCITT T.6 (TIFF 6 name) */
185		#define     COMPRESSION_LZW             5       /* Lempel-Ziv  & Welch */
186		#define     COMPRESSION_OJPEG           6       /* !6.0 JPEG */
187		#define     COMPRESSION_JPEG            7       /* %JPEG DCT compression */
#	Line 158 | Line 189 | typedef        enum {
189		#define     COMPRESSION_CCITTRLEW       32771   /* #1 w/ word alignment */
190		#define     COMPRESSION_PACKBITS        32773   /* Macintosh RLE */
191		#define     COMPRESSION_THUNDERSCAN     32809   /* ThunderScan RLE */
192	<	/* codes 32895-32898 are reserved for ANSI IT8 TIFF/IT <[email protected]) */
192	>	/* codes 32895-32898 are reserved for ANSI IT8 TIFF/IT <[email protected]) */
193		#define     COMPRESSION_IT8CTPAD        32895   /* IT8 CT w/padding */
194		#define     COMPRESSION_IT8LW           32896   /* IT8 Linework RLE */
195		#define     COMPRESSION_IT8MP           32897   /* IT8 Monochrome picture */
#	Line 167 | Line 198 | typedef        enum {
198		#define     COMPRESSION_PIXARFILM       32908   /* Pixar companded 10bit LZW */
199		#define     COMPRESSION_PIXARLOG        32909   /* Pixar companded 11bit ZIP */
200		#define     COMPRESSION_DEFLATE         32946   /* Deflate compression */
201	<	#define     COMPRESSION_ADOBE_DEFLATE   8       /* Deflate compression, as recognized by Adobe */
201	>	#define     COMPRESSION_ADOBE_DEFLATE   8       /* Deflate compression,
202	>	as recognized by Adobe */
203		/* compression code 32947 is reserved for Oceana Matrix <[email protected]> */
204		#define     COMPRESSION_DCS             32947   /* Kodak DCS encoding */
205		#define     COMPRESSION_JBIG            34661   /* ISO JBIG */
206		#define     COMPRESSION_SGILOG          34676   /* SGI Log Luminance RLE */
207		#define     COMPRESSION_SGILOG24        34677   /* SGI Log 24-bit packed */
208	+	#define     COMPRESSION_JP2000          34712   /* Leadtools JPEG2000 */
209		#define TIFFTAG_PHOTOMETRIC             262     /* photometric interpretation */
210		#define     PHOTOMETRIC_MINISWHITE      0       /* min value is white */
211		#define     PHOTOMETRIC_MINISBLACK      1       /* min value is black */
#	Line 182 | Line 215 | typedef        enum {
215		#define     PHOTOMETRIC_SEPARATED       5       /* !color separations */
216		#define     PHOTOMETRIC_YCBCR           6       /* !CCIR 601 */
217		#define     PHOTOMETRIC_CIELAB          8       /* !1976 CIE L*a*b* */
218	+	#define     PHOTOMETRIC_ICCLAB          9       /* ICC L*a*b* [Adobe TIFF Technote 4] */
219	+	#define     PHOTOMETRIC_ITULAB          10      /* ITU L*a*b* */
220		#define     PHOTOMETRIC_LOGL            32844   /* CIE Log2(L) */
221		#define     PHOTOMETRIC_LOGLUV          32845   /* CIE Log2(L) (u',v') */
222		#define TIFFTAG_THRESHHOLDING           263     /* +thresholding used on data */
#	Line 230 | Line 265 | typedef        enum {
265		#define     GRAYRESPONSEUNIT_100000S    5       /* hundred-thousandths */
266		#define TIFFTAG_GRAYRESPONSECURVE       291     /* $gray scale response curve */
267		#define TIFFTAG_GROUP3OPTIONS           292     /* 32 flag bits */
268	+	#define TIFFTAG_T4OPTIONS               292     /* TIFF 6.0 proper name alias */
269		#define     GROUP3OPT_2DENCODING        0x1     /* 2-dimensional coding */
270		#define     GROUP3OPT_UNCOMPRESSED      0x2     /* data not compressed */
271		#define     GROUP3OPT_FILLBITS          0x4     /* fill to byte boundary */
272		#define TIFFTAG_GROUP4OPTIONS           293     /* 32 flag bits */
273	+	#define TIFFTAG_T6OPTIONS               293     /* TIFF 6.0 proper name */
274		#define     GROUP4OPT_UNCOMPRESSED      0x2     /* data not compressed */
275		#define TIFFTAG_RESOLUTIONUNIT          296     /* units of resolutions */
276		#define     RESUNIT_NONE                1       /* no meaningful units */
#	Line 252 | Line 289 | typedef        enum {
289		#define TIFFTAG_ARTIST                  315     /* creator of image */
290		#define TIFFTAG_HOSTCOMPUTER            316     /* machine where created */
291		#define TIFFTAG_PREDICTOR               317     /* prediction scheme w/ LZW */
292	+	#define     PREDICTOR_NONE              1       /* no prediction scheme used */
293	+	#define     PREDICTOR_HORIZONTAL        2       /* horizontal differencing */
294	+	#define     PREDICTOR_FLOATINGPOINT     3       /* floating point predictor */
295		#define TIFFTAG_WHITEPOINT              318     /* image white point */
296		#define TIFFTAG_PRIMARYCHROMATICITIES   319     /* !primary chromaticities */
297		#define TIFFTAG_COLORMAP                320     /* RGB map for pallette image */
298		#define TIFFTAG_HALFTONEHINTS           321     /* !highlight+shadow info */
299	<	#define TIFFTAG_TILEWIDTH               322     /* !rows/data tile */
300	<	#define TIFFTAG_TILELENGTH              323     /* !cols/data tile */
299	>	#define TIFFTAG_TILEWIDTH               322     /* !tile width in pixels */
300	>	#define TIFFTAG_TILELENGTH              323     /* !tile height in pixels */
301		#define TIFFTAG_TILEOFFSETS             324     /* !offsets to data tiles */
302		#define TIFFTAG_TILEBYTECOUNTS          325     /* !byte counts for tiles */
303		#define TIFFTAG_BADFAXLINES             326     /* lines w/ wrong pixel count */
#	Line 268 | Line 308 | typedef        enum {
308		#define TIFFTAG_CONSECUTIVEBADFAXLINES  328     /* max consecutive bad lines */
309		#define TIFFTAG_SUBIFD                  330     /* subimage descriptors */
310		#define TIFFTAG_INKSET                  332     /* !inks in separated image */
311	<	#define     INKSET_CMYK                 1       /* !cyan-magenta-yellow-black */
311	>	#define     INKSET_CMYK                 1       /* !cyan-magenta-yellow-black color */
312	>	#define     INKSET_MULTIINK             2       /* !multi-ink or hi-fi color */
313		#define TIFFTAG_INKNAMES                333     /* !ascii names of inks */
314		#define TIFFTAG_NUMBEROFINKS            334     /* !number of inks */
315		#define TIFFTAG_DOTRANGE                336     /* !0% and 100% dot codes */
#	Line 286 | Line 327 | typedef        enum {
327		#define     SAMPLEFORMAT_COMPLEXIEEEFP  6       /* !complex ieee floating */
328		#define TIFFTAG_SMINSAMPLEVALUE         340     /* !variable MinSampleValue */
329		#define TIFFTAG_SMAXSAMPLEVALUE         341     /* !variable MaxSampleValue */
330	+	#define TIFFTAG_CLIPPATH                343     /* %ClipPath
331	+	[Adobe TIFF technote 2] */
332	+	#define TIFFTAG_XCLIPPATHUNITS          344     /* %XClipPathUnits
333	+	[Adobe TIFF technote 2] */
334	+	#define TIFFTAG_YCLIPPATHUNITS          345     /* %YClipPathUnits
335	+	[Adobe TIFF technote 2] */
336	+	#define TIFFTAG_INDEXED                 346     /* %Indexed
337	+	[Adobe TIFF Technote 3] */
338		#define TIFFTAG_JPEGTABLES              347     /* %JPEG table stream */
339	+	#define TIFFTAG_OPIPROXY                351     /* %OPI Proxy [Adobe TIFF technote] */
340		/*
341	<	* Tags 512-521 are obsoleted by Technical Note #2
342	<	* which specifies a revised JPEG-in-TIFF scheme.
341	>	* Tags 512-521 are obsoleted by Technical Note #2 which specifies a
342	>	* revised JPEG-in-TIFF scheme.
343		*/
344		#define TIFFTAG_JPEGPROC                512     /* !JPEG processing algorithm */
345		#define     JPEGPROC_BASELINE           1       /* !baseline sequential */
#	Line 308 | Line 358 | typedef        enum {
358		#define     YCBCRPOSITION_CENTERED      1       /* !as in PostScript Level 2 */
359		#define     YCBCRPOSITION_COSITED       2       /* !as in CCIR 601-1 */
360		#define TIFFTAG_REFERENCEBLACKWHITE     532     /* !colorimetry info */
361	+	#define TIFFTAG_XMLPACKET               700     /* %XML packet
362	+	[Adobe XMP Specification,
363	+	January 2004 */
364	+	#define TIFFTAG_OPIIMAGEID              32781   /* %OPI ImageID
365	+	[Adobe TIFF technote] */
366		/* tags 32952-32956 are private tags registered to Island Graphics */
367		#define TIFFTAG_REFPTS                  32953   /* image reference points */
368		#define TIFFTAG_REGIONTACKPOINT         32954   /* region-xform tack point */
#	Line 341 | Line 396 | typedef        enum {
396		/* tag 33432 is listed in the 6.0 spec w/ unknown ownership */
397		#define TIFFTAG_COPYRIGHT               33432   /* copyright string */
398		/* IPTC TAG from RichTIFF specifications */
399	<	#define TIFFTAG_RICHTIFFIPTC    33723
400	<	/* 34016-34029 are reserved for ANSI IT8 TIFF/IT <[email protected]) */
399	>	#define TIFFTAG_RICHTIFFIPTC            33723
400	>	/* 34016-34029 are reserved for ANSI IT8 TIFF/IT <[email protected]) */
401		#define TIFFTAG_IT8SITE                 34016   /* site name */
402		#define TIFFTAG_IT8COLORSEQUENCE        34017   /* color seq. [RGB,CMYK,etc] */
403		#define TIFFTAG_IT8HEADER               34018   /* DDES Header */
#	Line 357 | Line 412 | typedef        enum {
412		#define TIFFTAG_IT8PIXELINTENSITYRANGE  34027   /* MP pixel intensity value */
413		#define TIFFTAG_IT8TRANSPARENCYINDICATOR 34028  /* HC transparency switch */
414		#define TIFFTAG_IT8COLORCHARACTERIZATION 34029  /* color character. table */
415	+	#define TIFFTAG_IT8HCUSAGE              34030   /* HC usage indicator */
416	+	#define TIFFTAG_IT8TRAPINDICATOR        34031   /* Trapping indicator
417	+	(untrapped=0, trapped=1) */
418	+	#define TIFFTAG_IT8CMYKEQUIVALENT       34032   /* CMYK color equivalents */
419		/* tags 34232-34236 are private tags registered to Texas Instruments */
420		#define TIFFTAG_FRAMECOUNT              34232   /* Sequence Frame Count */
421	+	/* tag 34377 is private tag registered to Adobe for PhotoShop */
422	+	#define TIFFTAG_PHOTOSHOP               34377
423	+	/* tags 34665, 34853 and 40965 are documented in EXIF specification */
424	+	#define TIFFTAG_EXIFIFD                 34665   /* Pointer to EXIF private directory */
425		/* tag 34750 is a private tag registered to Adobe? */
426		#define TIFFTAG_ICCPROFILE              34675   /* ICC profile data */
364	–	/* tag 34377 is private tag registered to Adobe for PhotoShop */
365	–	#define TIFFTAG_PHOTOSHOP                               34377
427		/* tag 34750 is a private tag registered to Pixel Magic */
428		#define TIFFTAG_JBIGOPTIONS             34750   /* JBIG options */
429	+	#define TIFFTAG_GPSIFD                  34853   /* Pointer to GPS private directory */
430		/* tags 34908-34914 are private tags registered to SGI */
431		#define TIFFTAG_FAXRECVPARAMS           34908   /* encoded Class 2 ses. parms */
432		#define TIFFTAG_FAXSUBADDRESS           34909   /* received SubAddr string */
433		#define TIFFTAG_FAXRECVTIME             34910   /* receive time (secs) */
434	<	/* tag 34929 is a private tag registered to FedEx */
373	<	#define TIFFTAG_FEDEX_EDR               34929   /* unknown use */
434	>	#define TIFFTAG_FAXDCS                  34911   /* encoded fax ses. params, Table 2/T.30 */
435		/* tags 37439-37443 are registered to SGI <[email protected]> */
436		#define TIFFTAG_STONITS                 37439   /* Sample value to Nits */
437	+	/* tag 34929 is a private tag registered to FedEx */
438	+	#define TIFFTAG_FEDEX_EDR               34929   /* unknown use */
439	+	#define TIFFTAG_INTEROPERABILITYIFD     40965   /* Pointer to Interoperability private directory */
440	+	/* Adobe Digital Negative (DNG) format tags */
441	+	#define TIFFTAG_DNGVERSION              50706   /* &DNG version number */
442	+	#define TIFFTAG_DNGBACKWARDVERSION      50707   /* &DNG compatibility version */
443	+	#define TIFFTAG_UNIQUECAMERAMODEL       50708   /* &name for the camera model */
444	+	#define TIFFTAG_LOCALIZEDCAMERAMODEL    50709   /* &localized camera model
445	+	name */
446	+	#define TIFFTAG_CFAPLANECOLOR           50710   /* &CFAPattern->LinearRaw space
447	+	mapping */
448	+	#define TIFFTAG_CFALAYOUT               50711   /* &spatial layout of the CFA */
449	+	#define TIFFTAG_LINEARIZATIONTABLE      50712   /* &lookup table description */
450	+	#define TIFFTAG_BLACKLEVELREPEATDIM     50713   /* &repeat pattern size for
451	+	the BlackLevel tag */
452	+	#define TIFFTAG_BLACKLEVEL              50714   /* &zero light encoding level */
453	+	#define TIFFTAG_BLACKLEVELDELTAH        50715   /* &zero light encoding level
454	+	differences (columns) */
455	+	#define TIFFTAG_BLACKLEVELDELTAV        50716   /* &zero light encoding level
456	+	differences (rows) */
457	+	#define TIFFTAG_WHITELEVEL              50717   /* &fully saturated encoding
458	+	level */
459	+	#define TIFFTAG_DEFAULTSCALE            50718   /* &default scale factors */
460	+	#define TIFFTAG_DEFAULTCROPORIGIN       50719   /* &origin of the final image
461	+	area */
462	+	#define TIFFTAG_DEFAULTCROPSIZE         50720   /* &size of the final image
463	+	area */
464	+	#define TIFFTAG_COLORMATRIX1            50721   /* &XYZ->reference color space
465	+	transformation matrix 1 */
466	+	#define TIFFTAG_COLORMATRIX2            50722   /* &XYZ->reference color space
467	+	transformation matrix 2 */
468	+	#define TIFFTAG_CAMERACALIBRATION1      50723   /* &calibration matrix 1 */
469	+	#define TIFFTAG_CAMERACALIBRATION2      50724   /* &calibration matrix 2 */
470	+	#define TIFFTAG_REDUCTIONMATRIX1        50725   /* &dimensionality reduction
471	+	matrix 1 */
472	+	#define TIFFTAG_REDUCTIONMATRIX2        50726   /* &dimensionality reduction
473	+	matrix 2 */
474	+	#define TIFFTAG_ANALOGBALANCE           50727   /* &gain applied the stored raw
475	+	values*/
476	+	#define TIFFTAG_ASSHOTNEUTRAL           50728   /* &selected white balance in
477	+	linear reference space */
478	+	#define TIFFTAG_ASSHOTWHITEXY           50729   /* &selected white balance in
479	+	x-y chromaticity
480	+	coordinates */
481	+	#define TIFFTAG_BASELINEEXPOSURE        50730   /* &how much to move the zero
482	+	point */
483	+	#define TIFFTAG_BASELINENOISE           50731   /* &relative noise level */
484	+	#define TIFFTAG_BASELINESHARPNESS       50732   /* &relative amount of
485	+	sharpening */
486	+	#define TIFFTAG_BAYERGREENSPLIT         50733   /* &how closely the values of
487	+	the green pixels in the
488	+	blue/green rows track the
489	+	values of the green pixels
490	+	in the red/green rows */
491	+	#define TIFFTAG_LINEARRESPONSELIMIT     50734   /* &non-linear encoding range */
492	+	#define TIFFTAG_CAMERASERIALNUMBER      50735   /* &camera's serial number */
493	+	#define TIFFTAG_LENSINFO                50736   /* info about the lens */
494	+	#define TIFFTAG_CHROMABLURRADIUS        50737   /* &chroma blur radius */
495	+	#define TIFFTAG_ANTIALIASSTRENGTH       50738   /* &relative strength of the
496	+	camera's anti-alias filter */
497	+	#define TIFFTAG_SHADOWSCALE             50739   /* &used by Adobe Camera Raw */
498	+	#define TIFFTAG_DNGPRIVATEDATA          50740   /* &manufacturer's private data */
499	+	#define TIFFTAG_MAKERNOTESAFETY         50741   /* &whether the EXIF MakerNote
500	+	tag is safe to preserve
501	+	along with the rest of the
502	+	EXIF data */
503	+	#define TIFFTAG_CALIBRATIONILLUMINANT1  50778   /* &illuminant 1 */
504	+	#define TIFFTAG_CALIBRATIONILLUMINANT2  50779   /* &illuminant 2 */
505	+	#define TIFFTAG_BESTQUALITYSCALE        50780   /* &best quality multiplier */
506	+	#define TIFFTAG_RAWDATAUNIQUEID         50781   /* &unique identifier for
507	+	the raw image data */
508	+	#define TIFFTAG_ORIGINALRAWFILENAME     50827   /* &file name of the original
509	+	raw file */
510	+	#define TIFFTAG_ORIGINALRAWFILEDATA     50828   /* &contents of the original
511	+	raw file */
512	+	#define TIFFTAG_ACTIVEAREA              50829   /* &active (non-masked) pixels
513	+	of the sensor */
514	+	#define TIFFTAG_MASKEDAREAS             50830   /* &list of coordinates
515	+	of fully masked pixels */
516	+	#define TIFFTAG_ASSHOTICCPROFILE        50831   /* &these two tags used to */
517	+	#define TIFFTAG_ASSHOTPREPROFILEMATRIX  50832   /* map cameras's color space
518	+	into ICC profile space */
519	+	#define TIFFTAG_CURRENTICCPROFILE       50833   /* & */
520	+	#define TIFFTAG_CURRENTPREPROFILEMATRIX 50834   /* & */
521		/* tag 65535 is an undefined tag used by Eastman Kodak */
522		#define TIFFTAG_DCSHUESHIFTVALUES       65535   /* hue shift correction data */
523
524		/*
525	<	* The following are ``pseudo tags'' that can be
526	<	* used to control codec-specific functionality.
527	<	* These tags are not written to file.  Note that
528	<	* these values start at 0xffff+1 so that they'll
384	<	* never collide with Aldus-assigned tags.
525	>	* The following are ``pseudo tags'' that can be used to control
526	>	* codec-specific functionality.  These tags are not written to file.
527	>	* Note that these values start at 0xffff+1 so that they'll never
528	>	* collide with Aldus-assigned tags.
529		*
530	<	* If you want your private pseudo tags ``registered''
531	<	* (i.e. added to this file), send mail to [email protected]
532	<	* with the appropriate C definitions to add.
530	>	* If you want your private pseudo tags ``registered'' (i.e. added to
531	>	* this file), please post a bug report via the tracking system at
532	>	* http://www.remotesensing.org/libtiff/bugs.html with the appropriate
533	>	* C definitions to add.
534		*/
535		#define TIFFTAG_FAXMODE                 65536   /* Group 3/4 format control */
536		#define     FAXMODE_CLASSIC     0x0000          /* default, include RTC */
#	Line 438 | Line 583 | typedef        enum {
583		#define     SGILOGDATAFMT_16BIT         1       /* 16-bit samples */
584		#define     SGILOGDATAFMT_RAW           2       /* uninterpreted data */
585		#define     SGILOGDATAFMT_8BIT          3       /* 8-bit RGB monitor values */
586	<	#define TIFFTAG_SGILOGENCODE            65561   /* SGILog data encoding control */
587	<	#define     SGILOGENCODE_NODITHER       0       /* do not dither encoded values */
588	<	#define     SGILOGENCODE_RANDITHER      1       /* randomly dither encoded values */
586	>	#define TIFFTAG_SGILOGENCODE            65561 /* SGILog data encoding control*/
587	>	#define     SGILOGENCODE_NODITHER       0     /* do not dither encoded values*/
588	>	#define     SGILOGENCODE_RANDITHER      1     /* randomly dither encd values */
589		#endif /* _TIFF_ */
590	+
591	+	/* vim: set ts=8 sts=8 sw=8 noet: */

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)