ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/tiff.h
(Generate patch)

Comparing ray/src/common/tiff.h (file contents):
Revision 3.10 by schorsch, Sun Jul 27 22:12:01 2003 UTC vs.
Revision 3.11 by greg, Tue Sep 9 15:01:22 2003 UTC

# Line 42 | Line 42
42   #define TIFF_BIGENDIAN          0x4d4d
43   #define TIFF_LITTLEENDIAN       0x4949
44  
45 + /*
46 + * The so called TIFF types conflict with definitions from inttypes.h
47 + * included from sys/types.h on AIX (at least using VisualAge compiler).
48 + * We try to work around this by detecting this case.  Defining
49 + * _TIFF_DATA_TYPEDEFS_ short circuits the later definitions in tiff.h, and
50 + * we will in the holes not provided for by inttypes.h.
51 + *
52 + * See http://bugzilla.remotesensing.org/show_bug.cgi?id=39
53 + */
54 + #if defined(_H_INTTYPES) && defined(_ALL_SOURCE)
55 +
56   #ifndef _TIFF_DATA_TYPEDEFS_
57   #define _TIFF_DATA_TYPEDEFS_
58 + typedef unsigned char uint8;
59 + typedef unsigned short uint16;
60 + typedef unsigned int uint32;
61 + #endif
62 +
63 + #endif
64 +
65   /*
66   * Intrinsic data types required by the file format:
67   *
# Line 52 | Line 70
70   * 32-bit quantities    int32/uint32
71   * strings              unsigned char*
72   */
73 + #ifndef _TIFF_DATA_TYPEDEFS_
74 + #define _TIFF_DATA_TYPEDEFS_
75 +
76   #ifdef __STDC__
77   typedef signed char int8;       /* NB: non-ANSI compilers may not grok */
78   #else
# Line 60 | Line 81 | typedef        char int8;
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__)
85   typedef int int32;
86   typedef unsigned int uint32;    /* sizeof (uint32) must == 4 */
87   #else
# Line 150 | Line 171 | typedef        enum {
171   #define     COMPRESSION_NONE            1       /* dump mode */
172   #define     COMPRESSION_CCITTRLE        2       /* CCITT modified Huffman RLE */
173   #define     COMPRESSION_CCITTFAX3       3       /* CCITT Group 3 fax encoding */
174 + #define     COMPRESSION_CCITT_T4        3       /* CCITT T.4 (TIFF 6 name) */
175   #define     COMPRESSION_CCITTFAX4       4       /* CCITT Group 4 fax encoding */
176 + #define     COMPRESSION_CCITT_T6        4       /* CCITT T.6 (TIFF 6 name) */
177   #define     COMPRESSION_LZW             5       /* Lempel-Ziv  & Welch */
178   #define     COMPRESSION_OJPEG           6       /* !6.0 JPEG */
179   #define     COMPRESSION_JPEG            7       /* %JPEG DCT compression */
# Line 182 | Line 205 | typedef        enum {
205   #define     PHOTOMETRIC_SEPARATED       5       /* !color separations */
206   #define     PHOTOMETRIC_YCBCR           6       /* !CCIR 601 */
207   #define     PHOTOMETRIC_CIELAB          8       /* !1976 CIE L*a*b* */
208 + #define     PHOTOMETRIC_ITULAB          10      /* ITU L*a*b* */
209   #define     PHOTOMETRIC_LOGL            32844   /* CIE Log2(L) */
210   #define     PHOTOMETRIC_LOGLUV          32845   /* CIE Log2(L) (u',v') */
211   #define TIFFTAG_THRESHHOLDING           263     /* +thresholding used on data */
# Line 230 | Line 254 | typedef        enum {
254   #define     GRAYRESPONSEUNIT_100000S    5       /* hundred-thousandths */
255   #define TIFFTAG_GRAYRESPONSECURVE       291     /* $gray scale response curve */
256   #define TIFFTAG_GROUP3OPTIONS           292     /* 32 flag bits */
257 + #define TIFFTAG_T4OPTIONS               292     /* TIFF 6.0 proper name alias */
258   #define     GROUP3OPT_2DENCODING        0x1     /* 2-dimensional coding */
259   #define     GROUP3OPT_UNCOMPRESSED      0x2     /* data not compressed */
260   #define     GROUP3OPT_FILLBITS          0x4     /* fill to byte boundary */
261   #define TIFFTAG_GROUP4OPTIONS           293     /* 32 flag bits */
262 + #define TIFFTAG_T6OPTIONS               293     /* TIFF 6.0 proper name */
263   #define     GROUP4OPT_UNCOMPRESSED      0x2     /* data not compressed */
264   #define TIFFTAG_RESOLUTIONUNIT          296     /* units of resolutions */
265   #define     RESUNIT_NONE                1       /* no meaningful units */
# Line 369 | Line 395 | typedef        enum {
395   #define TIFFTAG_FAXRECVPARAMS           34908   /* encoded Class 2 ses. parms */
396   #define TIFFTAG_FAXSUBADDRESS           34909   /* received SubAddr string */
397   #define TIFFTAG_FAXRECVTIME             34910   /* receive time (secs) */
372 – /* tag 34929 is a private tag registered to FedEx */
373 – #define TIFFTAG_FEDEX_EDR               34929   /* unknown use */
398   /* tags 37439-37443 are registered to SGI <[email protected]> */
399   #define TIFFTAG_STONITS                 37439   /* Sample value to Nits */
400 + /* tag 34929 is a private tag registered to FedEx */
401 + #define TIFFTAG_FEDEX_EDR               34929   /* unknown use */
402   /* tag 65535 is an undefined tag used by Eastman Kodak */
403   #define TIFFTAG_DCSHUESHIFTVALUES       65535   /* hue shift correction data */
404  
# Line 438 | Line 464 | typedef        enum {
464   #define     SGILOGDATAFMT_16BIT         1       /* 16-bit samples */
465   #define     SGILOGDATAFMT_RAW           2       /* uninterpreted data */
466   #define     SGILOGDATAFMT_8BIT          3       /* 8-bit RGB monitor values */
467 < #define TIFFTAG_SGILOGENCODE            65561   /* SGILog data encoding control */
468 < #define     SGILOGENCODE_NODITHER       0       /* do not dither encoded values */
469 < #define     SGILOGENCODE_RANDITHER      1       /* randomly dither encoded values */
467 > #define TIFFTAG_SGILOGENCODE            65561 /* SGILog data encoding control*/
468 > #define     SGILOGENCODE_NODITHER       0     /* do not dither encoded values*/
469 > #define     SGILOGENCODE_RANDITHER      1     /* randomly dither encd values */
470   #endif /* _TIFF_ */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines