1 |
– |
/* Copyright (c) 1992 Regents of the University of California */ |
2 |
– |
|
1 |
|
#ifndef lint |
2 |
< |
static char SCCSid[] = "$SunId$ LBL"; |
2 |
> |
static const char RCSid[] = "$Id$"; |
3 |
|
#endif |
6 |
– |
|
4 |
|
/* |
5 |
|
* program to convert between RADIANCE and 24-bit rasterfiles. |
6 |
|
*/ |
11 |
|
#include <fcntl.h> |
12 |
|
#endif |
13 |
|
|
14 |
+ |
#include <time.h> |
15 |
+ |
|
16 |
+ |
#include <math.h> |
17 |
+ |
|
18 |
|
#include "rasterfile.h" |
19 |
|
|
20 |
|
#include "color.h" |
21 |
|
|
22 |
|
#include "resolu.h" |
23 |
|
|
24 |
< |
extern double pow(); |
24 |
> |
double gamcor = 2.2; /* gamma correction */ |
25 |
|
|
25 |
– |
extern char *malloc(); |
26 |
– |
|
27 |
– |
double gamma = 2.2; /* gamma correction */ |
28 |
– |
|
26 |
|
int bradj = 0; /* brightness adjustment */ |
27 |
|
|
28 |
|
char *progname; |
50 |
|
if (argv[i][0] == '-') |
51 |
|
switch (argv[i][1]) { |
52 |
|
case 'g': |
53 |
< |
gamma = atof(argv[++i]); |
53 |
> |
gamcor = atof(argv[++i]); |
54 |
|
break; |
55 |
|
case 'e': |
56 |
|
if (argv[i+1][0] != '+' && argv[i+1][0] != '-') |
77 |
|
exit(1); |
78 |
|
} |
79 |
|
if (i == argc-2 && freopen(argv[i+1], "w", stdout) == NULL) { |
80 |
< |
fprintf(stderr, "can't open output \"%s\"\n", |
80 |
> |
fprintf(stderr, "%s: can't open output \"%s\"\n", |
81 |
|
progname, argv[i+1]); |
82 |
|
exit(1); |
83 |
|
} |
84 |
< |
setcolrgam(gamma); |
84 |
> |
setcolrgam(gamcor); |
85 |
|
if (reverse) { |
86 |
|
/* get header */ |
87 |
|
if (fread((char *)&head, sizeof(head), 1, stdin) != 1) |
96 |
|
|| head.ras_depth != 24) |
97 |
|
quiterr("incompatible format"); |
98 |
|
/* put header */ |
99 |
+ |
newheader("RADIANCE", stdout); |
100 |
|
printargs(i, argv, stdout); |
101 |
|
fputformat(COLRFMT, stdout); |
102 |
|
putchar('\n'); |
103 |
|
fprtresolu(xmax, ymax, stdout); |
104 |
|
/* convert file */ |
105 |
< |
pr2ra(head.ras_type); |
105 |
> |
pr2ra(head.ras_type, head.ras_length/ymax - xmax*3); |
106 |
|
} else { |
107 |
|
/* get header info. */ |
108 |
|
if (checkheader(stdin, COLRFMT, NULL) < 0 || |
110 |
|
quiterr("bad picture format"); |
111 |
|
/* write rasterfile header */ |
112 |
|
head.ras_magic = RAS_MAGIC; |
113 |
< |
head.ras_width = xmax; |
113 |
> |
head.ras_width = xmax + (xmax&1); |
114 |
|
head.ras_height = ymax; |
115 |
|
head.ras_depth = 24; |
116 |
< |
head.ras_length = xmax*ymax*3; |
116 |
> |
head.ras_length = head.ras_width*head.ras_height*3; |
117 |
|
head.ras_maptype = RMT_NONE; |
118 |
|
head.ras_maplength = 0; |
119 |
|
fwrite((char *)&head, sizeof(head), 1, stdout); |
120 |
|
/* convert file */ |
121 |
< |
ra2pr(head.ras_type); |
121 |
> |
ra2pr(head.ras_type, head.ras_length/ymax - xmax*3); |
122 |
|
} |
123 |
|
exit(0); |
124 |
|
userr: |
139 |
|
} |
140 |
|
|
141 |
|
|
142 |
< |
pr2ra(rf) /* convert 24-bit scanlines to Radiance picture */ |
142 |
> |
pr2ra(rf, pad) /* convert 24-bit scanlines to Radiance picture */ |
143 |
|
int rf; |
144 |
+ |
int pad; |
145 |
|
{ |
146 |
|
COLR *scanout; |
147 |
|
register int x; |
164 |
|
scanout[x][GRN] = getc(stdin); |
165 |
|
scanout[x][RED] = getc(stdin); |
166 |
|
} |
167 |
+ |
for (x = pad; x--; getc(stdin)); |
168 |
|
if (feof(stdin) || ferror(stdin)) |
169 |
|
quiterr("error reading rasterfile"); |
170 |
|
gambs_colrs(scanout, xmax); |
174 |
|
quiterr("error writing Radiance picture"); |
175 |
|
} |
176 |
|
/* free scanline */ |
177 |
< |
free((char *)scanout); |
177 |
> |
free((void *)scanout); |
178 |
|
} |
179 |
|
|
180 |
|
|
181 |
< |
ra2pr(rf) /* convert Radiance scanlines to 24-bit rasterfile */ |
182 |
< |
int rf; |
181 |
> |
ra2pr(rf, pad) /* convert Radiance scanlines to 24-bit rasterfile */ |
182 |
> |
int rf; |
183 |
> |
int pad; |
184 |
|
{ |
185 |
+ |
int ord[3]; |
186 |
|
COLR *scanin; |
187 |
|
register int x; |
188 |
|
int y; |
190 |
|
scanin = (COLR *)malloc(xmax*sizeof(COLR)); |
191 |
|
if (scanin == NULL) |
192 |
|
quiterr("out of memory in ra2pr"); |
193 |
+ |
if (rf == RT_FORMAT_RGB) { |
194 |
+ |
ord[0] = RED; ord[1] = GRN; ord[2] = BLU; |
195 |
+ |
} else { |
196 |
+ |
ord[0] = BLU; ord[1] = GRN; ord[2] = RED; |
197 |
+ |
} |
198 |
|
/* convert image */ |
199 |
|
for (y = ymax-1; y >= 0; y--) { |
200 |
|
if (freadcolrs(scanin, xmax, stdin) < 0) |
214 |
|
putc(scanin[x][GRN], stdout); |
215 |
|
putc(scanin[x][RED], stdout); |
216 |
|
} |
217 |
+ |
for (x = 0; x < pad; x++) |
218 |
+ |
putc(scanin[xmax-1][ord[x%3]], stdout); |
219 |
|
if (ferror(stdout)) |
220 |
|
quiterr("error writing rasterfile"); |
221 |
|
} |
222 |
|
/* free scanline */ |
223 |
< |
free((char *)scanin); |
223 |
> |
free((void *)scanin); |
224 |
|
} |