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.29 by greg, Tue Mar 22 04:51:56 2005 UTC vs.
Revision 2.31 by greg, Tue Jun 7 16:54:23 2005 UTC

# Line 656 | Line 656 | Luv2Color(                     /* read/convert/write Luv->COLOR scanline
656          if (CHK(C_RFLT|C_TWRD|C_TFLT|C_GRY) != (C_RFLT|C_TFLT))
657                  quiterr("internal error 1 in Luv2Color");
658  
659 +        if (cvts.pconf != PLANARCONFIG_CONTIG)
660 +                quiterr("cannot handle separate 32-bit color planes");
661 +
662          if (TIFFReadScanline(cvts.tif, cvts.t.p, y, 0) < 0)
663                  quiterr("error reading TIFF input");
664                                          /* also works for float RGB */
# Line 694 | Line 697 | RRGGBB2Color(                  /* read/convert/write RGB16->COLOR sca
697          if (CHK(C_RFLT|C_TWRD|C_TFLT|C_GRY) != (C_TWRD|C_RFLT))
698                  quiterr("internal error 1 in RRGGBB2Color");
699  
700 +        if (cvts.pconf != PLANARCONFIG_CONTIG)
701 +                quiterr("cannot handle separate 16-bit color planes");
702 +
703          if (TIFFReadScanline(cvts.tif, cvts.t.p, y, 0) < 0)
704                  quiterr("error reading TIFF input");
705          
# Line 973 | Line 979 | Color2RRGGBB(                  /* read/convert/write COLOR->RGB16 sca
979                          colortrans(cvts.r.colors[x], cvts.cmat,
980                                          cvts.r.colors[x]);
981                  if (CHK(C_GAMUT))
982 <                        clipgamut(cvts.r.colors[x], cvts.t.fp[3*x + 1],
982 >                        clipgamut(cvts.r.colors[x], bright(cvts.r.colors[x]),
983                                          CGAMUT_LOWER, cblack, cwhite);
984              }
985              for (i = 3; i--; ) {

Diff Legend

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