241 |
|
if (cvts.pconf != PLANARCONFIG_CONTIG) |
242 |
|
quiterr("cannot handle separate Luv planes"); |
243 |
|
TIFFSetField(cvts.tif, TIFFTAG_SGILOGDATAFMT, |
244 |
< |
SGILOGDATAFMT_FLTXYZ); |
244 |
> |
SGILOGDATAFMT_FLOAT); |
245 |
|
cvts.tf = Luv2Color; |
246 |
|
break; |
247 |
|
case PHOTOMETRIC_LOGL: |
248 |
|
SET(C_GRY|C_RFLT|C_TFLT|C_GAMUT); |
249 |
|
cvts.pconf = PLANARCONFIG_CONTIG; |
250 |
|
TIFFSetField(cvts.tif, TIFFTAG_SGILOGDATAFMT, |
251 |
< |
SGILOGDATAFMT_FLTY); |
251 |
> |
SGILOGDATAFMT_FLOAT); |
252 |
|
cvts.tf = L2Color; |
253 |
|
break; |
254 |
|
case PHOTOMETRIC_YCBCR: |
278 |
|
break; |
279 |
|
case PHOTOMETRIC_MINISBLACK: |
280 |
|
SET(C_GRY|C_GAMMA|C_GAMUT); |
281 |
+ |
setcolrgam(cvts.gamcor); |
282 |
|
cvts.pconf = PLANARCONFIG_CONTIG; |
283 |
|
if (!TIFFGetField(cvts.tif, TIFFTAG_SAMPLESPERPIXEL, &hi) || |
284 |
|
hi != 1) |
417 |
|
cvts.comp != COMPRESSION_SGILOG24) |
418 |
|
quiterr("internal error 2 in initfromrad"); |
419 |
|
TIFFSetField(cvts.tif, TIFFTAG_SGILOGDATAFMT, |
420 |
< |
SGILOGDATAFMT_FLTXYZ); |
420 |
> |
SGILOGDATAFMT_FLOAT); |
421 |
|
cvts.tf = Color2Luv; |
422 |
|
break; |
423 |
|
case PHOTOMETRIC_LOGL: |
425 |
|
if (cvts.comp != COMPRESSION_SGILOG) |
426 |
|
quiterr("internal error 3 in initfromrad"); |
427 |
|
TIFFSetField(cvts.tif, TIFFTAG_SGILOGDATAFMT, |
428 |
< |
SGILOGDATAFMT_FLTY); |
428 |
> |
SGILOGDATAFMT_FLOAT); |
429 |
|
cvts.tf = Color2L; |
430 |
|
break; |
431 |
|
case PHOTOMETRIC_RGB: |
580 |
|
if (TIFFReadScanline(cvts.tif, cvts.t.p, y, 0) < 0) |
581 |
|
goto readerr; |
582 |
|
if (TIFFReadScanline(cvts.tif, |
583 |
< |
(tidata_t)(cvts.t.bp + cvts.xmax), y, 1) < 0) |
583 |
> |
(tdata_t)(cvts.t.bp + cvts.xmax), y, 1) < 0) |
584 |
|
goto readerr; |
585 |
|
if (TIFFReadScanline(cvts.tif, |
586 |
< |
(tidata_t)(cvts.t.bp + 2*cvts.xmax), y, 2) < 0) |
586 |
> |
(tdata_t)(cvts.t.bp + 2*cvts.xmax), y, 2) < 0) |
587 |
|
goto readerr; |
588 |
|
for (x = cvts.xmax; x--; ) { |
589 |
|
cvts.r.colrs[x][RED] = cvts.t.bp[x]; |
647 |
|
double m = pow(2.,(double)cvts.bradj); |
648 |
|
register int x; |
649 |
|
|
650 |
< |
if (CHK(C_RFLT|C_TFLT) != (C_RFLT|C_TFLT) | !CHK(C_GRY)) |
650 |
> |
if (CHK(C_RFLT|C_TFLT|C_GRY) != (C_RFLT|C_TFLT|C_GRY)) |
651 |
|
quiterr("internal error 1 in Color2L"); |
652 |
|
|
653 |
|
if (freadscan(cvts.r.colors, cvts.xmax, cvts.rfp) < 0) |