10 |
|
|
11 |
|
#include <stdio.h> |
12 |
|
|
13 |
+ |
#include <math.h> |
14 |
+ |
|
15 |
|
#include "tiffio.h" |
16 |
|
|
17 |
|
#include "color.h" |
18 |
|
|
19 |
< |
extern double atof(); |
19 |
> |
#include "resolu.h" |
20 |
|
|
21 |
+ |
|
22 |
|
extern char *malloc(), *realloc(); |
23 |
|
|
24 |
|
int lzcomp = 0; /* use Lempel-Ziv compression? */ |
25 |
|
|
26 |
< |
double gamma = 2.2; /* gamma correction */ |
26 |
> |
int greyscale = 0; /* produce greyscale image? */ |
27 |
|
|
28 |
+ |
double gamcor = 2.2; /* gamma correction */ |
29 |
+ |
|
30 |
|
int bradj = 0; /* brightness adjustment */ |
31 |
|
|
32 |
|
char *progname; |
45 |
|
if (argv[i][0] == '-') |
46 |
|
switch (argv[i][1]) { |
47 |
|
case 'g': |
48 |
< |
gamma = atof(argv[++i]); |
48 |
> |
gamcor = atof(argv[++i]); |
49 |
|
break; |
50 |
|
case 'z': |
51 |
|
lzcomp = !lzcomp; |
52 |
|
break; |
53 |
+ |
case 'b': |
54 |
+ |
greyscale = !greyscale; |
55 |
+ |
break; |
56 |
|
case 'e': |
57 |
|
if (argv[i+1][0] != '+' && argv[i+1][0] != '-') |
58 |
|
goto userr; |
69 |
|
else |
70 |
|
break; |
71 |
|
doneopts: |
72 |
< |
setcolrgam(gamma); |
72 |
> |
setcolrgam(gamcor); |
73 |
|
|
74 |
|
if (reverse) |
75 |
|
if (i != argc-2 && i != argc-1) |
85 |
|
exit(0); |
86 |
|
userr: |
87 |
|
fprintf(stderr, |
88 |
< |
"Usage: %s [-r][-z][-e +/-stops][-g gamma] input output\n", |
88 |
> |
"Usage: %s [-r][-b][-z][-e +/-stops][-g gamma] input output\n", |
89 |
|
progname); |
90 |
|
exit(1); |
91 |
|
} |
107 |
|
{ |
108 |
|
unsigned long xmax, ymax; |
109 |
|
TIFF *tif; |
110 |
< |
unsigned short pconfig; |
110 |
> |
unsigned short pconfig, nsamps; |
111 |
|
unsigned short hi; |
112 |
|
register BYTE *scanin; |
113 |
|
register COLR *scanout; |
116 |
|
/* open/check TIFF file */ |
117 |
|
if ((tif = TIFFOpen(inpf, "r")) == NULL) |
118 |
|
quiterr("cannot open TIFF input"); |
119 |
< |
if (!TIFFGetField(tif, TIFFTAG_SAMPLESPERPIXEL, &hi) || hi != 3) |
119 |
> |
if (!TIFFGetField(tif, TIFFTAG_SAMPLESPERPIXEL, &nsamps) || |
120 |
> |
(nsamps != 1 && nsamps != 3)) |
121 |
|
quiterr("unsupported samples per pixel"); |
122 |
|
if (!TIFFGetField(tif, TIFFTAG_BITSPERSAMPLE, &hi) || hi != 8) |
123 |
|
quiterr("unsupported bits per sample"); |
124 |
< |
if (TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &hi) && hi != 2) |
124 |
> |
if (TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &hi) && |
125 |
> |
hi != (nsamps==1 ? 1 : 2)) |
126 |
|
quiterr("unsupported photometric interpretation"); |
127 |
|
if (!TIFFGetField(tif, TIFFTAG_PLANARCONFIG, &pconfig) || |
128 |
|
(pconfig != 1 && pconfig != 2)) |
145 |
|
fputs(" -r\n", stdout); |
146 |
|
fputformat(COLRFMT, stdout); |
147 |
|
putchar('\n'); |
148 |
< |
fputresolu(YDECR|YMAJOR, xmax, ymax, stdout); |
148 |
> |
fprtresolu(xmax, ymax, stdout); |
149 |
|
/* convert image */ |
150 |
+ |
if (nsamps == 1) |
151 |
+ |
pconfig = 1; |
152 |
|
for (y = 0; y < ymax; y++) { |
153 |
|
if (pconfig == 1) { |
154 |
|
if (TIFFReadScanline(tif, scanin, y, 0) < 0) |
155 |
|
goto readerr; |
156 |
< |
for (x = 0; x < xmax; x++) { |
157 |
< |
scanout[x][RED] = scanin[3*x]; |
158 |
< |
scanout[x][GRN] = scanin[3*x+1]; |
159 |
< |
scanout[x][BLU] = scanin[3*x+2]; |
160 |
< |
} |
156 |
> |
if (nsamps == 1) |
157 |
> |
for (x = 0; x < xmax; x++) |
158 |
> |
scanout[x][RED] = |
159 |
> |
scanout[x][GRN] = |
160 |
> |
scanout[x][BLU] = scanin[x]; |
161 |
> |
else |
162 |
> |
for (x = 0; x < xmax; x++) { |
163 |
> |
scanout[x][RED] = scanin[3*x]; |
164 |
> |
scanout[x][GRN] = scanin[3*x+1]; |
165 |
> |
scanout[x][BLU] = scanin[3*x+2]; |
166 |
> |
} |
167 |
|
} else { |
168 |
|
if (TIFFReadScanline(tif, scanin, y, 0) < 0) |
169 |
|
goto readerr; |
207 |
|
if (strcmp(inpf, "-") && freopen(inpf, "r", stdin) == NULL) |
208 |
|
quiterr("cannot open Radiance input file"); |
209 |
|
if (checkheader(stdin, COLRFMT, NULL) < 0 || |
210 |
< |
fgetresolu(&xmax, &ymax, stdin) != (YDECR|YMAJOR)) |
210 |
> |
fgetresolu(&xmax, &ymax, stdin) < 0) |
211 |
|
quiterr("bad Radiance picture"); |
212 |
|
/* open TIFF file */ |
213 |
|
if ((tif = TIFFOpen(outf, "w")) == NULL) |
214 |
|
quiterr("cannot open TIFF output"); |
215 |
|
TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, (unsigned long)xmax); |
216 |
|
TIFFSetField(tif, TIFFTAG_IMAGELENGTH, (unsigned long)ymax); |
217 |
< |
TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 3); |
217 |
> |
TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, greyscale ? 1 : 3); |
218 |
|
TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 8); |
219 |
< |
TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, 2); |
219 |
> |
TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, greyscale ? 1 : 2); |
220 |
|
TIFFSetField(tif, TIFFTAG_PLANARCONFIG, 1); |
221 |
|
if (lzcomp) |
222 |
|
TIFFSetField(tif, TIFFTAG_COMPRESSION, (unsigned short)5); |
231 |
|
quiterr("error reading Radiance picture"); |
232 |
|
if (bradj) |
233 |
|
shiftcolrs(scanin, xmax, bradj); |
234 |
< |
colrs_gambs(scanin, xmax); |
235 |
< |
for (x = 0; x < xmax; x++) { |
236 |
< |
scanout[3*x] = scanin[x][RED]; |
237 |
< |
scanout[3*x+1] = scanin[x][GRN]; |
238 |
< |
scanout[3*x+2] = scanin[x][BLU]; |
234 |
> |
if (greyscale) { |
235 |
> |
for (x = 0; x < xmax; x++) |
236 |
> |
scanin[x][GRN] = normbright(scanin[x]); |
237 |
> |
colrs_gambs(scanin, xmax); |
238 |
> |
for (x = 0; x < xmax; x++) |
239 |
> |
scanout[x] = scanin[x][GRN]; |
240 |
> |
} else { |
241 |
> |
colrs_gambs(scanin, xmax); |
242 |
> |
for (x = 0; x < xmax; x++) { |
243 |
> |
scanout[3*x] = scanin[x][RED]; |
244 |
> |
scanout[3*x+1] = scanin[x][GRN]; |
245 |
> |
scanout[3*x+2] = scanin[x][BLU]; |
246 |
> |
} |
247 |
|
} |
248 |
|
if (TIFFWriteScanline(tif, scanout, y, 0) < 0) |
249 |
|
quiterr("error writing TIFF output"); |