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

Comparing ray/src/common/tiffio.h (file contents):
Revision 3.10 by greg, Tue Sep 9 15:01:22 2003 UTC vs.
Revision 3.11 by greg, Wed Jul 13 15:25:46 2005 UTC

# Line 1 | Line 1
1 < /* $Header$ */
2 <
1 > /* RCSid $Id$ */
2   /*
3   * Copyright (c) 1988-1997 Sam Leffler
4   * Copyright (c) 1991-1997 Silicon Graphics, Inc.
# Line 86 | Line 85 | typedef        uint32 toff_t;          /* file offset */
85   #endif
86  
87   #if defined(USE_WIN32_FILEIO)
88 < #include <windows.h>
89 < #ifdef __WIN32__
88 > # include <windows.h>
89 > # ifdef __WIN32__
90   DECLARE_HANDLE(thandle_t);      /* Win32 file handle */
91 < #else
91 > # else
92   typedef HFILE thandle_t;        /* client data handle */
93 < #endif
93 > # endif /* __WIN32__ */
94   #else
95   typedef void* thandle_t;        /* client data handle */
96 < #endif
96 > #endif /* USE_WIN32_FILEIO */
97  
98   #ifndef NULL
99 < #define NULL    0
99 > # define NULL   (void *)0
100   #endif
101  
102   /*
# Line 114 | Line 113 | typedef        void* thandle_t;        /* client data handle */
113   #define TIFFPRINT_JPEGACTABLES  0x200           /* JPEG AC tables */
114   #define TIFFPRINT_JPEGDCTABLES  0x200           /* JPEG DC tables */
115  
116 + /*
117 + * Colour conversion stuff
118 + */
119 +
120 + /* reference white */
121 + #define D65_X0 (95.0470F)
122 + #define D65_Y0 (100.0F)
123 + #define D65_Z0 (108.8827F)
124 +
125 + #define D50_X0 (96.4250F)
126 + #define D50_Y0 (100.0F)
127 + #define D50_Z0 (82.4680F)
128 +
129 + /* Structure for holding information about a display device. */
130 +
131 + typedef unsigned char TIFFRGBValue;             /* 8-bit samples */
132 +
133 + typedef struct {
134 +        float d_mat[3][3];              /* XYZ -> luminance matrix */
135 +        float d_YCR;                    /* Light o/p for reference white */
136 +        float d_YCG;
137 +        float d_YCB;
138 +        uint32 d_Vrwr;                  /* Pixel values for ref. white */
139 +        uint32 d_Vrwg;
140 +        uint32 d_Vrwb;
141 +        float d_Y0R;                    /* Residual light for black pixel */
142 +        float d_Y0G;
143 +        float d_Y0B;
144 +        float d_gammaR;                 /* Gamma values for the three guns */
145 +        float d_gammaG;
146 +        float d_gammaB;
147 + } TIFFDisplay;
148 +
149 + typedef struct {                                /* YCbCr->RGB support */
150 +        TIFFRGBValue* clamptab;                 /* range clamping table */
151 +        int*    Cr_r_tab;
152 +        int*    Cb_b_tab;
153 +        int32*  Cr_g_tab;
154 +        int32*  Cb_g_tab;
155 +        int32*  Y_tab;
156 + } TIFFYCbCrToRGB;
157 +
158 + typedef struct {                                /* CIE Lab 1976->RGB support */
159 +        int     range;                          /* Size of conversion table */
160 + #define CIELABTORGB_TABLE_RANGE 1500
161 +        float   rstep, gstep, bstep;
162 +        float   X0, Y0, Z0;                     /* Reference white point */
163 +        TIFFDisplay display;
164 +        float   Yr2r[CIELABTORGB_TABLE_RANGE + 1];  /* Conversion of Yr to r */
165 +        float   Yg2g[CIELABTORGB_TABLE_RANGE + 1];  /* Conversion of Yg to g */
166 +        float   Yb2b[CIELABTORGB_TABLE_RANGE + 1];  /* Conversion of Yb to b */
167 + } TIFFCIELabToRGB;
168 +
169   /*
170   * RGBA-style image support.
171   */
120 – typedef unsigned char TIFFRGBValue;             /* 8-bit samples */
172   typedef struct _TIFFRGBAImage TIFFRGBAImage;
173   /*
174   * The image reading and conversion routines invoke
# Line 138 | Line 189 | typedef void (*tileSeparateRoutine)
189   /*
190   * RGBA-reader state.
191   */
141 – typedef struct {                                /* YCbCr->RGB support */
142 –        TIFFRGBValue* clamptab;                 /* range clamping table */
143 –        int*    Cr_r_tab;
144 –        int*    Cb_b_tab;
145 –        int32*  Cr_g_tab;
146 –        int32*  Cb_g_tab;
147 –        float   coeffs[3];                      /* cached for repeated use */
148 – } TIFFYCbCrToRGB;
149 –
192   struct _TIFFRGBAImage {
193          TIFF*   tif;                            /* image handle */
194          int     stoponerr;                      /* stop on read error */
# Line 157 | Line 199 | struct _TIFFRGBAImage {
199          uint16  bitspersample;                  /* image bits/sample */
200          uint16  samplesperpixel;                /* image samples/pixel */
201          uint16  orientation;                    /* image orientation */
202 +        uint16  req_orientation;                /* requested orientation */
203          uint16  photometric;                    /* image photometric interp */
204          uint16* redcmap;                        /* colormap pallete */
205          uint16* greencmap;
# Line 172 | Line 215 | struct _TIFFRGBAImage {
215          uint32** BWmap;                         /* black&white map */
216          uint32** PALmap;                        /* palette image map */
217          TIFFYCbCrToRGB* ycbcr;                  /* YCbCr conversion state */
218 +        TIFFCIELabToRGB* cielab;                /* CIE L*a*b conversion state */
219  
220          int     row_offset;
221          int     col_offset;
# Line 208 | Line 252 | typedef struct {
252   #define LOGLUV_PUBLIC           1      
253   #endif
254  
255 < #if defined(__cplusplus)
255 > #if defined(c_plusplus) || defined(__cplusplus)
256   extern "C" {
257   #endif
258   typedef void (*TIFFErrorHandler)(const char*, const char*, va_list);
# Line 225 | Line 269 | extern const char* TIFFGetVersion(void);
269   extern  const TIFFCodec* TIFFFindCODEC(uint16);
270   extern  TIFFCodec* TIFFRegisterCODEC(uint16, const char*, TIFFInitMethod);
271   extern  void TIFFUnRegisterCODEC(TIFFCodec*);
272 + extern  int TIFFIsCODECConfigured(uint16);
273 + extern  TIFFCodec* TIFFGetConfiguredCODECs();
274  
275   extern  tdata_t _TIFFmalloc(tsize_t);
276   extern  tdata_t _TIFFrealloc(tdata_t, tsize_t);
# Line 233 | Line 279 | extern void _TIFFmemcpy(tdata_t, const tdata_t, tsize_
279   extern  int _TIFFmemcmp(const tdata_t, const tdata_t, tsize_t);
280   extern  void _TIFFfree(tdata_t);
281  
282 + extern  void TIFFCleanup(TIFF*);
283   extern  void TIFFClose(TIFF*);
284   extern  int TIFFFlush(TIFF*);
285   extern  int TIFFFlushData(TIFF*);
# Line 244 | Line 291 | extern int TIFFReadDirectory(TIFF*);
291   extern  tsize_t TIFFScanlineSize(TIFF*);
292   extern  tsize_t TIFFRasterScanlineSize(TIFF*);
293   extern  tsize_t TIFFStripSize(TIFF*);
294 + extern  tsize_t TIFFRawStripSize(TIFF*, tstrip_t);
295   extern  tsize_t TIFFVStripSize(TIFF*, uint32);
296   extern  tsize_t TIFFTileRowSize(TIFF*);
297   extern  tsize_t TIFFTileSize(TIFF*);
# Line 251 | Line 299 | extern tsize_t TIFFVTileSize(TIFF*, uint32);
299   extern  uint32 TIFFDefaultStripSize(TIFF*, uint32);
300   extern  void TIFFDefaultTileSize(TIFF*, uint32*, uint32*);
301   extern  int TIFFFileno(TIFF*);
302 + extern  int TIFFSetFileno(TIFF*, int);
303 + extern  thandle_t TIFFClientdata(TIFF*);
304 + extern  thandle_t TIFFSetClientdata(TIFF*, thandle_t);
305   extern  int TIFFGetMode(TIFF*);
306 + extern  int TIFFSetMode(TIFF*, int);
307   extern  int TIFFIsTiled(TIFF*);
308   extern  int TIFFIsByteSwapped(TIFF*);
309   extern  int TIFFIsUpSampled(TIFF*);
310   extern  int TIFFIsMSB2LSB(TIFF*);
311 + extern  int TIFFIsBigEndian(TIFF*);
312 + extern  TIFFReadWriteProc TIFFGetReadProc(TIFF*);
313 + extern  TIFFReadWriteProc TIFFGetWriteProc(TIFF*);
314 + extern  TIFFSeekProc TIFFGetSeekProc(TIFF*);
315 + extern  TIFFCloseProc TIFFGetCloseProc(TIFF*);
316 + extern  TIFFSizeProc TIFFGetSizeProc(TIFF*);
317 + extern  TIFFMapFileProc TIFFGetMapFileProc(TIFF*);
318 + extern  TIFFUnmapFileProc TIFFGetUnmapFileProc(TIFF*);
319   extern  uint32 TIFFCurrentRow(TIFF*);
320   extern  tdir_t TIFFCurrentDirectory(TIFF*);
321   extern  tdir_t TIFFNumberOfDirectories(TIFF*);
# Line 264 | Line 324 | extern tstrip_t TIFFCurrentStrip(TIFF*);
324   extern  ttile_t TIFFCurrentTile(TIFF*);
325   extern  int TIFFReadBufferSetup(TIFF*, tdata_t, tsize_t);
326   extern  int TIFFWriteBufferSetup(TIFF*, tdata_t, tsize_t);
327 + extern  int TIFFSetupStrips(TIFF *);
328   extern  int TIFFWriteCheck(TIFF*, int, const char *);
329   extern  int TIFFCreateDirectory(TIFF*);
330   extern  int TIFFLastDirectory(TIFF*);
# Line 273 | Line 334 | extern int TIFFUnlinkDirectory(TIFF*, tdir_t);
334   extern  int TIFFSetField(TIFF*, ttag_t, ...);
335   extern  int TIFFVSetField(TIFF*, ttag_t, va_list);
336   extern  int TIFFWriteDirectory(TIFF *);
337 + extern  int TIFFCheckpointDirectory(TIFF *);
338   extern  int TIFFRewriteDirectory(TIFF *);
339   extern  int TIFFReassignTagToIgnore(enum TIFFIgnoreSense, int);
340  
# Line 281 | Line 343 | extern void TIFFPrintDirectory(TIFF*, FILE*, long = 0)
343   extern  int TIFFReadScanline(TIFF*, tdata_t, uint32, tsample_t = 0);
344   extern  int TIFFWriteScanline(TIFF*, tdata_t, uint32, tsample_t = 0);
345   extern  int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int = 0);
346 + extern  int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*,
347 +                                      int = ORIENTATION_BOTLEFT, int = 0);
348   #else
349   extern  void TIFFPrintDirectory(TIFF*, FILE*, long);
350   extern  int TIFFReadScanline(TIFF*, tdata_t, uint32, tsample_t);
351   extern  int TIFFWriteScanline(TIFF*, tdata_t, uint32, tsample_t);
352   extern  int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int);
353 + extern  int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*, int, int);
354   #endif
355  
356   extern  int TIFFReadRGBAStrip(TIFF*, tstrip_t, uint32 * );
# Line 295 | Line 360 | extern int TIFFRGBAImageBegin(TIFFRGBAImage*, TIFF*, i
360   extern  int TIFFRGBAImageGet(TIFFRGBAImage*, uint32*, uint32, uint32);
361   extern  void TIFFRGBAImageEnd(TIFFRGBAImage*);
362   extern  TIFF* TIFFOpen(const char*, const char*);
363 + # ifdef __WIN32__
364 + extern  TIFF* TIFFOpenW(const wchar_t*, const char*);
365 + # endif /* __WIN32__ */
366   extern  TIFF* TIFFFdOpen(int, const char*, const char*);
367   extern  TIFF* TIFFClientOpen(const char*, const char*,
368              thandle_t,
# Line 303 | Line 371 | extern TIFF* TIFFClientOpen(const char*, const char*,
371              TIFFSizeProc,
372              TIFFMapFileProc, TIFFUnmapFileProc);
373   extern  const char* TIFFFileName(TIFF*);
374 + extern const char* TIFFSetFileName(TIFF*, const char *);
375   extern  void TIFFError(const char*, const char*, ...);
376   extern  void TIFFWarning(const char*, const char*, ...);
377   extern  TIFFErrorHandler TIFFSetErrorHandler(TIFFErrorHandler);
# Line 325 | Line 394 | extern tsize_t TIFFWriteEncodedStrip(TIFF*, tstrip_t,
394   extern  tsize_t TIFFWriteRawStrip(TIFF*, tstrip_t, tdata_t, tsize_t);
395   extern  tsize_t TIFFWriteEncodedTile(TIFF*, ttile_t, tdata_t, tsize_t);
396   extern  tsize_t TIFFWriteRawTile(TIFF*, ttile_t, tdata_t, tsize_t);
397 + extern  int TIFFDataWidth(TIFFDataType);    /* table of tag datatype widths */
398   extern  void TIFFSetWriteOffset(TIFF*, toff_t);
399   extern  void TIFFSwabShort(uint16*);
400   extern  void TIFFSwabLong(uint32*);
401   extern  void TIFFSwabDouble(double*);
402   extern  void TIFFSwabArrayOfShort(uint16*, unsigned long);
403 + extern  void TIFFSwabArrayOfTriples(uint8*, unsigned long);
404   extern  void TIFFSwabArrayOfLong(uint32*, unsigned long);
405   extern  void TIFFSwabArrayOfDouble(double*, unsigned long);
406   extern  void TIFFReverseBits(unsigned char *, unsigned long);
407   extern  const unsigned char* TIFFGetBitRevTable(int);
408  
409 < #if LOGLUV_PUBLIC
409 > #ifdef LOGLUV_PUBLIC
410   #define U_NEU           0.210526316
411   #define V_NEU           0.473684211
412   #define UVSCALE         410.
# Line 359 | Line 430 | extern uint32 LogLuv24fromXYZ(float*, int);
430   extern  uint32 LogLuv32fromXYZ(float*, int);
431   #endif
432   #endif /* LOGLUV_PUBLIC */
433 < #if defined(__cplusplus)
433 >
434 > /*
435 > ** Stuff, related to tag handling and creating custom tags.
436 > */
437 > extern  int  TIFFGetTagListCount( TIFF * );
438 > extern  ttag_t TIFFGetTagListEntry( TIFF *, int tag_index );
439 >    
440 > #define TIFF_ANY        TIFF_NOTYPE     /* for field descriptor searching */
441 > #define TIFF_VARIABLE   -1              /* marker for variable length tags */
442 > #define TIFF_SPP        -2              /* marker for SamplesPerPixel tags */
443 > #define TIFF_VARIABLE2  -3              /* marker for uint32 var-length tags */
444 >
445 > #define FIELD_CUSTOM    65    
446 >
447 > typedef struct {
448 >        ttag_t  field_tag;              /* field's tag */
449 >        short   field_readcount;        /* read count/TIFF_VARIABLE/TIFF_SPP */
450 >        short   field_writecount;       /* write count/TIFF_VARIABLE */
451 >        TIFFDataType field_type;        /* type of associated data */
452 >        unsigned short field_bit;       /* bit in fieldsset bit vector */
453 >        unsigned char field_oktochange; /* if true, can change while writing */
454 >        unsigned char field_passcount;  /* if true, pass dir count on set */
455 >        char    *field_name;            /* ASCII name */
456 > } TIFFFieldInfo;
457 >
458 > typedef struct _TIFFTagValue {
459 >    const TIFFFieldInfo  *info;
460 >    int             count;
461 >    void           *value;
462 > } TIFFTagValue;
463 >
464 > extern  void TIFFMergeFieldInfo(TIFF*, const TIFFFieldInfo[], int);
465 > extern  const TIFFFieldInfo* TIFFFindFieldInfo(TIFF*, ttag_t, TIFFDataType);
466 > extern  const TIFFFieldInfo* TIFFFindFieldInfoByName(TIFF* , const char *,
467 >                                                     TIFFDataType);
468 > extern  const TIFFFieldInfo* TIFFFieldWithTag(TIFF*, ttag_t);
469 > extern  const TIFFFieldInfo* TIFFFieldWithName(TIFF*, const char *);
470 >
471 > typedef int (*TIFFVSetMethod)(TIFF*, ttag_t, va_list);
472 > typedef int (*TIFFVGetMethod)(TIFF*, ttag_t, va_list);
473 > typedef void (*TIFFPrintMethod)(TIFF*, FILE*, long);
474 >    
475 > typedef struct {
476 >    TIFFVSetMethod      vsetfield;      /* tag set routine */
477 >    TIFFVGetMethod      vgetfield;      /* tag get routine */
478 >    TIFFPrintMethod     printdir;       /* directory print routine */
479 > } TIFFTagMethods;
480 >        
481 > extern  TIFFTagMethods *TIFFAccessTagMethods( TIFF * );
482 > extern  void *TIFFGetClientInfo( TIFF *, const char * );
483 > extern  void TIFFSetClientInfo( TIFF *, void *, const char * );
484 >    
485 > extern int TIFFCIELabToRGBInit(TIFFCIELabToRGB*, TIFFDisplay *, float*);
486 > extern void TIFFCIELabToXYZ(TIFFCIELabToRGB *, uint32, int32, int32,
487 >                            float *, float *, float *);
488 > extern void TIFFXYZToRGB(TIFFCIELabToRGB *, float, float, float,
489 >                         uint32 *, uint32 *, uint32 *);
490 >
491 > extern int TIFFYCbCrToRGBInit(TIFFYCbCrToRGB*, float*, float*);
492 > extern void TIFFYCbCrtoRGB(TIFFYCbCrToRGB *, uint32, int32, int32,
493 >                           uint32 *, uint32 *, uint32 *);
494 >
495 > #if defined(c_plusplus) || defined(__cplusplus)
496   }
497   #endif
498 +
499   #endif /* _TIFFIO_ */
500 +
501 + /* vim: set ts=8 sts=8 sw=8 noet: */

Diff Legend

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