33 |
|
struct { |
34 |
|
uint16 flags; /* conversion flags (defined above) */ |
35 |
|
uint16 comp; /* TIFF compression type */ |
36 |
+ |
uint16 phot; /* TIFF photometric type */ |
37 |
|
uint16 pconf; /* TIFF planar configuration */ |
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 */ |
57 |
|
} t; /* TIFF scanline */ |
58 |
|
int (*tf)(); /* translation procedure */ |
59 |
|
} cvts = { /* conversion structure */ |
60 |
< |
0, COMPRESSION_NONE, PLANARCONFIG_CONTIG, GAMCOR, 0, |
60 |
> |
0, COMPRESSION_NONE, PHOTOMETRIC_RGB, |
61 |
> |
PLANARCONFIG_CONTIG, GAMCOR, 0, 1, 1., 1., |
62 |
|
}; |
63 |
|
|
64 |
|
#define CHK(f) (cvts.flags & (f)) |
107 |
|
cvts.comp = COMPRESSION_LZW; |
108 |
|
break; |
109 |
|
case 'L': /* LogLuv 32-bit output */ |
110 |
< |
cvts.comp = COMPRESSION_LOGLUV32; |
110 |
> |
cvts.comp = COMPRESSION_SGILOG; |
111 |
> |
cvts.phot = PHOTOMETRIC_LOGLUV; |
112 |
|
break; |
113 |
|
case 'l': /* LogLuv 24-bit output */ |
114 |
< |
cvts.comp = COMPRESSION_LOGLUV24; |
114 |
> |
cvts.comp = COMPRESSION_SGILOG24; |
115 |
> |
cvts.phot = PHOTOMETRIC_LOGLUV; |
116 |
|
break; |
117 |
|
case 'b': /* greyscale output? */ |
118 |
|
TGL(C_GRY); |
145 |
|
if (i != argc-2) |
146 |
|
goto userr; |
147 |
|
|
148 |
< |
if (CHK(C_GRY) && (cvts.comp == COMPRESSION_LOGLUV24 || |
149 |
< |
cvts.comp == COMPRESSION_LOGLUV32)) |
150 |
< |
cvts.comp = COMPRESSION_LOGL16; |
148 |
> |
if (CHK(C_GRY)) /* consistency corrections */ |
149 |
> |
if (cvts.phot == PHOTOMETRIC_RGB) |
150 |
> |
cvts.phot = PHOTOMETRIC_MINISBLACK; |
151 |
> |
else { |
152 |
> |
cvts.phot = PHOTOMETRIC_LOGL; |
153 |
> |
cvts.comp = COMPRESSION_SGILOG; |
154 |
> |
} |
155 |
|
|
156 |
|
ra2tiff(i, argv); |
157 |
|
} |
224 |
|
if (TIFFGetField(cvts.tif, TIFFTAG_XRESOLUTION, &f1) && |
225 |
|
TIFFGetField(cvts.tif, TIFFTAG_YRESOLUTION, &f2)) |
226 |
|
cvts.pixrat = f1/f2; |
219 |
– |
else |
220 |
– |
cvts.pixrat = 1.; |
227 |
|
|
228 |
< |
if (!TIFFGetFieldDefaulted(cvts.tif, TIFFTAG_ORIENTATION, &cvts.orient)) |
223 |
< |
cvts.orient = 1; |
228 |
> |
TIFFGetFieldDefaulted(cvts.tif, TIFFTAG_ORIENTATION, &cvts.orient); |
229 |
|
|
230 |
< |
switch (cvts.comp) { |
231 |
< |
case COMPRESSION_LOGL16: |
232 |
< |
SET(C_GRY|C_RFLT|C_TFLT|C_GAMUT); |
233 |
< |
cvts.pconf = PLANARCONFIG_CONTIG; |
234 |
< |
TIFFSetField(cvts.tif, TIFFTAG_LOGLUVDATAFMT, |
230 |
< |
LOGLUVDATAFMT_FLTY); |
231 |
< |
TIFFSetField(cvts.tif, TIFFTAG_SAMPLEFORMAT, |
232 |
< |
SAMPLEFORMAT_IEEEFP); |
233 |
< |
cvts.tf = L2Color; |
234 |
< |
break; |
235 |
< |
case COMPRESSION_LOGLUV24: |
236 |
< |
case COMPRESSION_LOGLUV32: |
230 |
> |
if (!TIFFGetFieldDefaulted(cvts.tif, TIFFTAG_PHOTOMETRIC, &cvts.phot)) |
231 |
> |
quiterr("TIFF has unspecified photometric type"); |
232 |
> |
|
233 |
> |
switch (cvts.phot) { |
234 |
> |
case PHOTOMETRIC_LOGLUV: |
235 |
|
SET(C_RFLT|C_TFLT); |
236 |
|
if (!CHK(C_XYZE)) { |
237 |
|
cpcolormat(cvts.cmat, xyz2rgbmat); |
238 |
|
SET(C_CXFM|C_GAMUT); |
239 |
< |
} else if (cvts.comp == COMPRESSION_LOGLUV32) |
239 |
> |
} else if (cvts.comp == COMPRESSION_SGILOG) |
240 |
|
SET(C_GAMUT); |
241 |
|
if (cvts.pconf != PLANARCONFIG_CONTIG) |
242 |
|
quiterr("cannot handle separate Luv planes"); |
243 |
< |
TIFFSetField(cvts.tif, TIFFTAG_LOGLUVDATAFMT, |
244 |
< |
LOGLUVDATAFMT_FLTXYZ); |
247 |
< |
TIFFSetField(cvts.tif, TIFFTAG_SAMPLEFORMAT, |
248 |
< |
SAMPLEFORMAT_IEEEFP); |
243 |
> |
TIFFSetField(cvts.tif, TIFFTAG_SGILOGDATAFMT, |
244 |
> |
SGILOGDATAFMT_FLOAT); |
245 |
|
cvts.tf = Luv2Color; |
246 |
|
break; |
247 |
< |
default: |
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_FLOAT); |
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); |
266 |
|
if (CHK(C_XYZE)) { |
269 |
|
SET(C_CXFM); |
270 |
|
} |
271 |
|
if (!TIFFGetField(cvts.tif, TIFFTAG_SAMPLESPERPIXEL, &hi) || |
272 |
< |
(hi != 1 && hi != 3)) |
273 |
< |
quiterr("unsupported samples per pixel"); |
262 |
< |
if (hi == 1) { |
263 |
< |
SET(C_GRY); |
264 |
< |
cvts.pconf = PLANARCONFIG_CONTIG; |
265 |
< |
cvts.tf = Gry2Colr; |
266 |
< |
} else |
267 |
< |
cvts.tf = RGB2Colr; |
272 |
> |
hi != 3) |
273 |
> |
quiterr("unsupported samples per pixel for RGB"); |
274 |
|
if (!TIFFGetField(cvts.tif, TIFFTAG_BITSPERSAMPLE, &hi) || |
275 |
|
hi != 8) |
276 |
< |
quiterr("unsupported bits per sample"); |
276 |
> |
quiterr("unsupported bits per sample for RGB"); |
277 |
> |
cvts.tf = RGB2Colr; |
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) |
285 |
+ |
quiterr("unsupported samples per pixel for greyscale"); |
286 |
+ |
if (!TIFFGetField(cvts.tif, TIFFTAG_BITSPERSAMPLE, &hi) || |
287 |
+ |
hi != 8) |
288 |
+ |
quiterr("unsupported bits per sample for greyscale"); |
289 |
+ |
cvts.tf = Gry2Colr; |
290 |
+ |
break; |
291 |
+ |
default: |
292 |
+ |
quiterr("unsupported photometric type"); |
293 |
+ |
break; |
294 |
|
} |
295 |
|
|
274 |
– |
if (TIFFGetField(cvts.tif, TIFFTAG_PHOTOMETRIC, &hi) && |
275 |
– |
hi != (CHK(C_GRY) ? PHOTOMETRIC_MINISBLACK : PHOTOMETRIC_RGB)) |
276 |
– |
quiterr("unsupported photometric interpretation"); |
277 |
– |
|
296 |
|
if (!TIFFGetField(cvts.tif, TIFFTAG_IMAGEWIDTH, &cvts.xmax) || |
297 |
|
!TIFFGetField(cvts.tif, TIFFTAG_IMAGELENGTH, &cvts.ymax)) |
298 |
|
quiterr("unknown input image resolution"); |
360 |
|
SET(C_XYZE); |
361 |
|
else |
362 |
|
quiterr("unrecognized input picture format"); |
363 |
< |
return; |
363 |
> |
return(1); |
364 |
|
} |
365 |
|
if (isexpos(s)) { |
366 |
|
cvts.stonits /= exposval(s); |
367 |
< |
return; |
367 |
> |
return(1); |
368 |
|
} |
369 |
|
if (isaspect(s)) { |
370 |
|
cvts.pixrat *= aspectval(s); |
371 |
< |
return; |
371 |
> |
return(1); |
372 |
|
} |
373 |
|
if (isprims(s)) { |
374 |
|
primsval(cvts.prims, s); |
375 |
|
SET(C_PRIM); |
376 |
< |
return; |
376 |
> |
return(1); |
377 |
|
} |
378 |
+ |
return(0); |
379 |
|
} |
380 |
|
|
381 |
|
|
404 |
|
cvts.stonits *= WHTEFFICACY; |
405 |
|
/* set up conversion */ |
406 |
|
TIFFSetField(cvts.tif, TIFFTAG_COMPRESSION, cvts.comp); |
407 |
+ |
TIFFSetField(cvts.tif, TIFFTAG_PHOTOMETRIC, cvts.phot); |
408 |
|
|
409 |
< |
switch (cvts.comp) { |
410 |
< |
case COMPRESSION_LOGL16: |
391 |
< |
SET(C_GRY|C_RFLT|C_TFLT); |
392 |
< |
TIFFSetField(cvts.tif, TIFFTAG_LOGLUVDATAFMT, |
393 |
< |
LOGLUVDATAFMT_FLTY); |
394 |
< |
TIFFSetField(cvts.tif, TIFFTAG_SAMPLEFORMAT, |
395 |
< |
SAMPLEFORMAT_IEEEFP); |
396 |
< |
cvts.tf = Color2L; |
397 |
< |
break; |
398 |
< |
case COMPRESSION_LOGLUV24: |
399 |
< |
case COMPRESSION_LOGLUV32: |
409 |
> |
switch (cvts.phot) { |
410 |
> |
case PHOTOMETRIC_LOGLUV: |
411 |
|
SET(C_RFLT|C_TFLT); |
412 |
|
CLR(C_GRY); |
413 |
|
if (!CHK(C_XYZE)) { |
414 |
|
cpcolormat(cvts.cmat, rgb2xyzmat); |
415 |
|
SET(C_CXFM); |
416 |
|
} |
417 |
< |
TIFFSetField(cvts.tif, TIFFTAG_LOGLUVDATAFMT, |
418 |
< |
LOGLUVDATAFMT_FLTXYZ); |
419 |
< |
TIFFSetField(cvts.tif, TIFFTAG_SAMPLEFORMAT, |
420 |
< |
SAMPLEFORMAT_IEEEFP); |
417 |
> |
if (cvts.comp != COMPRESSION_SGILOG && |
418 |
> |
cvts.comp != COMPRESSION_SGILOG24) |
419 |
> |
quiterr("internal error 2 in initfromrad"); |
420 |
> |
TIFFSetField(cvts.tif, TIFFTAG_SGILOGDATAFMT, |
421 |
> |
SGILOGDATAFMT_FLOAT); |
422 |
|
cvts.tf = Color2Luv; |
423 |
|
break; |
424 |
< |
default: |
424 |
> |
case PHOTOMETRIC_LOGL: |
425 |
> |
SET(C_GRY|C_RFLT|C_TFLT); |
426 |
> |
if (cvts.comp != COMPRESSION_SGILOG) |
427 |
> |
quiterr("internal error 3 in initfromrad"); |
428 |
> |
TIFFSetField(cvts.tif, TIFFTAG_SGILOGDATAFMT, |
429 |
> |
SGILOGDATAFMT_FLOAT); |
430 |
> |
cvts.tf = Color2L; |
431 |
> |
break; |
432 |
> |
case PHOTOMETRIC_RGB: |
433 |
|
SET(C_GAMMA|C_GAMUT); |
434 |
+ |
CLR(C_GRY); |
435 |
|
setcolrgam(cvts.gamcor); |
436 |
|
if (CHK(C_XYZE)) { |
437 |
|
compxyz2rgbmat(cvts.cmat, |
438 |
|
CHK(C_PRIM) ? cvts.prims : stdprims); |
439 |
|
SET(C_CXFM); |
440 |
|
} |
420 |
– |
if (CHK(C_GRY)) |
421 |
– |
cvts.tf = Colr2Gry; |
422 |
– |
else |
423 |
– |
cvts.tf = Colr2RGB; |
441 |
|
if (CHK(C_PRIM)) { |
442 |
|
TIFFSetField(cvts.tif, TIFFTAG_PRIMARYCHROMATICITIES, |
443 |
|
(float *)cvts.prims); |
444 |
|
TIFFSetField(cvts.tif, TIFFTAG_WHITEPOINT, |
445 |
|
(float *)cvts.prims[WHT]); |
446 |
|
} |
447 |
+ |
cvts.tf = Colr2RGB; |
448 |
|
break; |
449 |
+ |
case PHOTOMETRIC_MINISBLACK: |
450 |
+ |
SET(C_GRY|C_GAMMA|C_GAMUT); |
451 |
+ |
setcolrgam(cvts.gamcor); |
452 |
+ |
cvts.tf = Colr2Gry; |
453 |
+ |
break; |
454 |
+ |
default: |
455 |
+ |
quiterr("internal error 4 in initfromrad"); |
456 |
+ |
break; |
457 |
|
} |
458 |
|
/* set other TIFF fields */ |
459 |
|
TIFFSetField(cvts.tif, TIFFTAG_IMAGEWIDTH, cvts.xmax); |
460 |
|
TIFFSetField(cvts.tif, TIFFTAG_IMAGELENGTH, cvts.ymax); |
461 |
|
TIFFSetField(cvts.tif, TIFFTAG_SAMPLESPERPIXEL, CHK(C_GRY) ? 1 : 3); |
462 |
|
TIFFSetField(cvts.tif, TIFFTAG_BITSPERSAMPLE, CHK(C_TFLT) ? 32 : 8); |
437 |
– |
TIFFSetField(cvts.tif, TIFFTAG_PHOTOMETRIC, |
438 |
– |
CHK(C_GRY) ? PHOTOMETRIC_MINISBLACK : PHOTOMETRIC_RGB); |
463 |
|
TIFFSetField(cvts.tif, TIFFTAG_XRESOLUTION, 72.); |
464 |
|
TIFFSetField(cvts.tif, TIFFTAG_YRESOLUTION, 72./cvts.pixrat); |
465 |
|
TIFFSetField(cvts.tif, TIFFTAG_ORIENTATION, cvts.orient); |
467 |
|
TIFFSetField(cvts.tif, TIFFTAG_PLANARCONFIG, cvts.pconf); |
468 |
|
TIFFSetField(cvts.tif, TIFFTAG_STONITS, |
469 |
|
cvts.stonits/pow(2.,(double)cvts.bradj)); |
470 |
< |
i1 = TIFFScanlineSize(cvts.tif); |
470 |
> |
if (cvts.comp == COMPRESSION_NONE) |
471 |
> |
i1 = TIFFScanlineSize(cvts.tif); |
472 |
> |
else |
473 |
> |
i1 = 3*cvts.xmax; /* conservative guess */ |
474 |
|
i2 = 8192/i1; /* compute good strip size */ |
475 |
|
if (i2 < 1) i2 = 1; |
476 |
|
TIFFSetField(cvts.tif, TIFFTAG_ROWSPERSTRIP, (uint32)i2); |
516 |
|
quiterr("error reading TIFF input"); |
517 |
|
|
518 |
|
for (x = cvts.xmax; x--; ) { |
519 |
< |
cvts.r.colors[x][RED] = cvts.t.fp[3*x]; |
520 |
< |
cvts.r.colors[x][GRN] = cvts.t.fp[3*x + 1]; |
521 |
< |
cvts.r.colors[x][BLU] = cvts.t.fp[3*x + 2]; |
519 |
> |
colval(cvts.r.colors[x],CIEX) = cvts.t.fp[3*x]; |
520 |
> |
colval(cvts.r.colors[x],CIEY) = cvts.t.fp[3*x + 1]; |
521 |
> |
colval(cvts.r.colors[x],CIEZ) = cvts.t.fp[3*x + 2]; |
522 |
|
if (CHK(C_CXFM)) |
523 |
|
colortrans(cvts.r.colors[x], cvts.cmat, |
524 |
|
cvts.r.colors[x]); |
550 |
|
quiterr("error reading TIFF input"); |
551 |
|
|
552 |
|
for (x = cvts.xmax; x--; ) |
553 |
< |
cvts.r.colors[x][RED] = |
554 |
< |
cvts.r.colors[x][GRN] = |
555 |
< |
cvts.r.colors[x][BLU] = cvts.t.fp[x] > 0. ? cvts.t.fp[x] : 0.; |
553 |
> |
colval(cvts.r.colors[x],RED) = |
554 |
> |
colval(cvts.r.colors[x],GRN) = |
555 |
> |
colval(cvts.r.colors[x],BLU) = |
556 |
> |
cvts.t.fp[x] > 0. ? cvts.t.fp[x] : 0.; |
557 |
|
|
558 |
|
if (fwritescan(cvts.r.colors, cvts.xmax, cvts.rfp) < 0) |
559 |
|
quiterr("error writing Radiance picture"); |
582 |
|
if (TIFFReadScanline(cvts.tif, cvts.t.p, y, 0) < 0) |
583 |
|
goto readerr; |
584 |
|
if (TIFFReadScanline(cvts.tif, |
585 |
< |
(tidata_t)(cvts.t.bp + cvts.xmax), y, 1) < 0) |
585 |
> |
(tdata_t)(cvts.t.bp + cvts.xmax), y, 1) < 0) |
586 |
|
goto readerr; |
587 |
|
if (TIFFReadScanline(cvts.tif, |
588 |
< |
(tidata_t)(cvts.t.bp + 2*cvts.xmax), y, 2) < 0) |
588 |
> |
(tdata_t)(cvts.t.bp + 2*cvts.xmax), y, 2) < 0) |
589 |
|
goto readerr; |
590 |
|
for (x = cvts.xmax; x--; ) { |
591 |
|
cvts.r.colrs[x][RED] = cvts.t.bp[x]; |
649 |
|
double m = pow(2.,(double)cvts.bradj); |
650 |
|
register int x; |
651 |
|
|
652 |
< |
if (CHK(C_RFLT|C_TFLT) != (C_RFLT|C_TFLT) | !CHK(C_GRY)) |
652 |
> |
if (CHK(C_RFLT|C_TFLT|C_GRY) != (C_RFLT|C_TFLT|C_GRY)) |
653 |
|
quiterr("internal error 1 in Color2L"); |
654 |
|
|
655 |
|
if (freadscan(cvts.r.colors, cvts.xmax, cvts.rfp) < 0) |
687 |
|
} |
688 |
|
|
689 |
|
for (x = cvts.xmax; x--; ) { |
690 |
< |
cvts.t.fp[3*x] = colval(cvts.r.colors[x],RED); |
691 |
< |
cvts.t.fp[3*x+1] = colval(cvts.r.colors[x],GRN); |
692 |
< |
cvts.t.fp[3*x+2] = colval(cvts.r.colors[x],BLU); |
690 |
> |
cvts.t.fp[3*x] = colval(cvts.r.colors[x],CIEX); |
691 |
> |
cvts.t.fp[3*x+1] = colval(cvts.r.colors[x],CIEY); |
692 |
> |
cvts.t.fp[3*x+2] = colval(cvts.r.colors[x],CIEZ); |
693 |
|
} |
694 |
|
|
695 |
|
if (TIFFWriteScanline(cvts.tif, cvts.t.p, y, 0) < 0) |