9 |
|
|
10 |
|
#include "platform.h" |
11 |
|
#include "standard.h" |
12 |
< |
#include "rtprocess.h" |
12 |
> |
#include "paths.h" |
13 |
|
#include "color.h" |
14 |
|
#include "calcomp.h" |
15 |
|
#include "view.h" |
16 |
|
|
17 |
< |
#define MAXINP 512 /* maximum number of input files */ |
18 |
< |
#define WINSIZ 64 /* scanline window size */ |
17 |
> |
#define MAXINP 1024 /* maximum number of input files */ |
18 |
> |
#define WINSIZ 127 /* scanline window size */ |
19 |
|
#define MIDSCN ((WINSIZ-1)/2+1) |
20 |
|
|
21 |
|
struct { |
31 |
|
|
32 |
|
int nfiles; /* number of input files */ |
33 |
|
|
34 |
+ |
VIEW *commvp = NULL; /* common view parameters */ |
35 |
+ |
|
36 |
|
char ourfmt[LPICFMT+1] = PICFMT; /* input picture format */ |
37 |
|
|
38 |
|
char StandardInput[] = "<stdin>"; |
76 |
|
|
77 |
|
|
78 |
|
static gethfunc headline; |
79 |
< |
static void checkfile(void); |
79 |
> |
static void checkfile(int orig); |
80 |
|
static double rgb_bright(COLOR clr); |
81 |
|
static double xyz_bright(COLOR clr); |
82 |
|
static void init(void); |
98 |
|
int original; |
99 |
|
double f; |
100 |
|
int a; |
101 |
+ |
|
102 |
|
SET_DEFAULT_BINARY(); |
103 |
|
SET_FILE_BINARY(stdin); |
104 |
|
SET_FILE_BINARY(stdout); |
105 |
|
progname = argv[0]; |
106 |
+ |
esupport |= E_VARIABLE|E_FUNCTION|E_RCONST; |
107 |
+ |
esupport &= ~(E_OUTCHAN|E_INCHAN); |
108 |
|
/* scan options */ |
109 |
|
for (a = 1; a < argc; a++) { |
110 |
|
if (argv[a][0] == '-') |
177 |
|
quit(1); |
178 |
|
} |
179 |
|
} |
180 |
< |
checkfile(); |
176 |
< |
if (original) { |
177 |
< |
colval(input[nfiles].coef,RED) /= |
178 |
< |
colval(input[nfiles].expos,RED); |
179 |
< |
colval(input[nfiles].coef,GRN) /= |
180 |
< |
colval(input[nfiles].expos,GRN); |
181 |
< |
colval(input[nfiles].coef,BLU) /= |
182 |
< |
colval(input[nfiles].expos,BLU); |
183 |
< |
setcolor(input[nfiles].expos, 1.0, 1.0, 1.0); |
184 |
< |
} |
180 |
> |
checkfile(original); |
181 |
|
nfiles++; |
182 |
|
original = 0; |
183 |
|
} |
184 |
|
init(); /* set constants */ |
185 |
|
/* go back and get expressions */ |
186 |
|
for (a = 1; a < argc; a++) { |
187 |
+ |
char *fpath; |
188 |
|
if (argv[a][0] == '-') |
189 |
|
switch (argv[a][1]) { |
190 |
|
case 'x': |
198 |
|
case 'h': |
199 |
|
continue; |
200 |
|
case 'f': |
201 |
< |
fcompile(argv[++a]); |
201 |
> |
fpath = getpath(argv[++a], getrlibpath(), 0); |
202 |
> |
if (fpath == NULL) { |
203 |
> |
eputs(argv[0]); |
204 |
> |
eputs(": cannot find file '"); |
205 |
> |
eputs(argv[a]); |
206 |
> |
eputs("'\n"); |
207 |
> |
quit(1); |
208 |
> |
} |
209 |
> |
fcompile(fpath); |
210 |
|
continue; |
211 |
|
case 'e': |
212 |
|
scompile(argv[++a], NULL, 0); |
214 |
|
} |
215 |
|
break; |
216 |
|
} |
217 |
< |
/* set/get output resolution */ |
213 |
< |
if (!vardefined(vxres)) |
214 |
< |
varset(vxres, ':', (double)xmax); |
215 |
< |
if (!vardefined(vyres)) |
216 |
< |
varset(vyres, ':', (double)ymax); |
217 |
> |
/* get output resolution */ |
218 |
|
xres = varvalue(vxres) + .5; |
219 |
|
yres = varvalue(vyres) + .5; |
220 |
|
if (xres <= 0 || yres <= 0) { |
224 |
|
} |
225 |
|
/* complete header */ |
226 |
|
printargs(argc, argv, stdout); |
227 |
+ |
if (commvp != NULL) { |
228 |
+ |
fputs(VIEWSTR, stdout); |
229 |
+ |
fprintview(commvp, stdout); |
230 |
+ |
fputc('\n', stdout); |
231 |
+ |
} |
232 |
|
if (strcmp(ourfmt, PICFMT)) |
233 |
|
fputformat(ourfmt, stdout); /* print format if known */ |
234 |
|
putchar('\n'); |
252 |
|
void *p |
253 |
|
) |
254 |
|
{ |
255 |
< |
char fmt[32]; |
255 |
> |
int orig = *(int *)p; |
256 |
> |
char fmt[MAXFMTLEN]; |
257 |
|
double d; |
258 |
|
COLOR ctmp; |
259 |
|
|
267 |
|
wrongformat = globmatch(PICFMT, fmt) ? 1 : -1; |
268 |
|
return(0); /* don't echo */ |
269 |
|
} |
270 |
< |
if (isexpos(s)) { /* exposure */ |
270 |
> |
if (orig) { /* undo exposure? */ |
271 |
> |
if (isexpos(s)) { |
272 |
> |
d = 1./exposval(s); |
273 |
> |
scalecolor(input[nfiles].coef, d); |
274 |
> |
return(0); /* don't echo */ |
275 |
> |
} |
276 |
> |
if (iscolcor(s)) { |
277 |
> |
int i; |
278 |
> |
colcorval(ctmp, s); |
279 |
> |
for (i = 3; i--; ) |
280 |
> |
colval(input[nfiles].coef,i) /= colval(ctmp,i); |
281 |
> |
return(0); /* don't echo */ |
282 |
> |
} |
283 |
> |
} else if (isexpos(s)) { /* record exposure? */ |
284 |
|
d = exposval(s); |
285 |
|
scalecolor(input[nfiles].expos, d); |
286 |
< |
} else if (iscolcor(s)) { /* color correction */ |
286 |
> |
} else if (iscolcor(s)) { |
287 |
|
colcorval(ctmp, s); |
288 |
|
multcolor(input[nfiles].expos, ctmp); |
289 |
< |
} else if (isaspect(s)) |
289 |
> |
} |
290 |
> |
if (isaspect(s)) |
291 |
|
input[nfiles].pa *= aspectval(s); |
292 |
|
else if (isview(s) && sscanview(&input[nfiles].vw, s) > 0) |
293 |
|
gotview++; |
301 |
|
|
302 |
|
|
303 |
|
static void |
304 |
< |
checkfile(void) /* ready a file */ |
304 |
> |
checkfile(int orig) /* ready a file */ |
305 |
|
{ |
306 |
< |
register int i; |
306 |
> |
int i; |
307 |
|
/* process header */ |
308 |
|
gotview = 0; |
309 |
|
if (echoheader) { |
310 |
|
fputs(input[nfiles].name, stdout); |
311 |
|
fputs(":\n", stdout); |
312 |
|
} |
313 |
< |
getheader(input[nfiles].fp, headline, NULL); |
313 |
> |
getheader(input[nfiles].fp, headline, &orig); |
314 |
|
if (wrongformat < 0) { |
315 |
|
eputs(input[nfiles].name); |
316 |
|
eputs(": not a Radiance picture\n"); |
322 |
|
} |
323 |
|
if (!gotview || setview(&input[nfiles].vw) != NULL) |
324 |
|
input[nfiles].vw.type = 0; |
325 |
+ |
else if (commvp == NULL) |
326 |
+ |
commvp = &input[nfiles].vw; |
327 |
|
if (!fgetsresolu(&input[nfiles].rs, input[nfiles].fp)) { |
328 |
|
eputs(input[nfiles].name); |
329 |
|
eputs(": bad picture size\n"); |
368 |
|
static void |
369 |
|
init(void) /* perform final setup */ |
370 |
|
{ |
371 |
< |
register int i; |
371 |
> |
int i; |
372 |
|
/* define constants */ |
373 |
|
varset("PI", ':', PI); |
374 |
|
varset(vnfiles, ':', (double)nfiles); |
391 |
|
ourbright = xyz_bright; |
392 |
|
} else |
393 |
|
varset(vwhteff, ':', WHTEFFICACY); |
394 |
+ |
/* these may be overridden */ |
395 |
+ |
varset(vxres, ':', (double)xmax); |
396 |
+ |
varset(vyres, ':', (double)ymax); |
397 |
|
} |
398 |
|
|
399 |
|
|
403 |
|
EPNODE *coldef[3], *brtdef; |
404 |
|
COLOR *scanout; |
405 |
|
double d; |
406 |
< |
register int i, j; |
406 |
> |
int i, j; |
407 |
|
/* check defined variables */ |
408 |
|
for (j = 0; j < 3; j++) { |
409 |
|
if (vardefined(vcolout[j])) |
460 |
|
advance(void) /* read in data for next scanline */ |
461 |
|
{ |
462 |
|
int ytarget; |
463 |
< |
register COLOR *st; |
464 |
< |
register int i, j; |
463 |
> |
COLOR *st; |
464 |
> |
int i, j; |
465 |
|
|
466 |
|
for (ytarget = (ypos+.5)*ymax/yres; yscan > ytarget; yscan--) |
467 |
|
for (i = 0; i < nfiles; i++) { |
530 |
|
|
531 |
|
static double |
532 |
|
l_colin( /* return color value for picture */ |
533 |
< |
register char *nam |
533 |
> |
char *nam |
534 |
|
) |
535 |
|
{ |
536 |
|
int fn; |
537 |
< |
register int n, xoff, yoff; |
537 |
> |
int n, xoff, yoff; |
538 |
|
double d; |
539 |
|
|
540 |
|
d = argument(1); |
589 |
|
|
590 |
|
static double |
591 |
|
l_ray( /* return ray origin or direction */ |
592 |
< |
register char *nam |
592 |
> |
char *nam |
593 |
|
) |
594 |
|
{ |
595 |
|
static unsigned long ltick[MAXINP]; |
598 |
|
RREAL loc[2]; |
599 |
|
double d; |
600 |
|
int fn; |
601 |
< |
register int i; |
601 |
> |
int i; |
602 |
|
|
603 |
|
d = argument(1); |
604 |
|
if (d <= -0.5 || d >= nfiles+0.5) { |
641 |
|
RREAL locx[2], locy[2]; |
642 |
|
double d; |
643 |
|
int fn; |
644 |
< |
register int i; |
644 |
> |
int i; |
645 |
|
|
646 |
|
d = argument(1); |
647 |
|
if (d <= -0.5 || d >= nfiles+0.5) { |
698 |
|
extern void |
699 |
|
quit(int code) /* exit gracefully */ |
700 |
|
{ |
701 |
< |
register int i; |
701 |
> |
int i; |
702 |
|
/* close input files */ |
703 |
|
for (i = 0; i < nfiles; i++) |
704 |
|
if (input[i].name == Command) |