ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/px/ra_tiff.c
(Generate patch)

Comparing ray/src/px/ra_tiff.c (file contents):
Revision 2.10 by gregl, Thu Jul 31 21:26:45 1997 UTC vs.
Revision 2.11 by gregl, Fri Aug 15 18:30:14 1997 UTC

# Line 38 | Line 38 | struct {
38          float   gamcor;         /* gamma correction value */
39          short   bradj;          /* Radiance exposure adjustment (stops) */
40          uint16  orient;         /* visual orientation (TIFF spec.) */
41 <        float   stonits;        /* input conversion to nits */
41 >        double  stonits;        /* input conversion to nits */
42          float   pixrat;         /* pixel aspect ratio */
43          FILE    *rfp;           /* Radiance stream pointer */
44          TIFF    *tif;           /* TIFF pointer */
# Line 251 | Line 251 | initfromtif()          /* initialize conversion from TIFF inpu
251                                  SGILOGDATAFMT_FLTY);
252                  cvts.tf = L2Color;
253                  break;
254 +        case PHOTOMETRIC_YCBCR:
255 +                if (cvts.comp == COMPRESSION_JPEG &&
256 +                                cvts.pconf == PLANARCONFIG_CONTIG) {
257 +                        TIFFSetField(cvts.tif, TIFFTAG_JPEGCOLORMODE,
258 +                                        JPEGCOLORMODE_RGB);
259 +                        cvts.phot = PHOTOMETRIC_RGB;
260 +                } else
261 +                        quiterr("unsupported photometric type");
262 +                /* fall through */
263          case PHOTOMETRIC_RGB:
264                  SET(C_GAMMA|C_GAMUT);
265                  setcolrgam(cvts.gamcor);

Diff Legend

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