| 31 |
|
|
| 32 |
|
int nfiles; /* number of input files */ |
| 33 |
|
|
| 34 |
+ |
VIEW commvw; /* common view parameters */ |
| 35 |
+ |
|
| 36 |
|
char ourfmt[LPICFMT+1] = PICFMT; /* input picture format */ |
| 37 |
|
|
| 38 |
|
char StandardInput[] = "<stdin>"; |
| 214 |
|
} |
| 215 |
|
break; |
| 216 |
|
} |
| 217 |
< |
/* set/get output resolution */ |
| 216 |
< |
if (!vardefined(vxres)) |
| 217 |
< |
varset(vxres, ':', (double)xmax); |
| 218 |
< |
if (!vardefined(vyres)) |
| 219 |
< |
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 (commvw.type) { |
| 228 |
+ |
fputs(VIEWSTR, stdout); |
| 229 |
+ |
fprintview(&commvw, stdout); |
| 230 |
+ |
fputc('\n', stdout); |
| 231 |
+ |
} |
| 232 |
|
if (strcmp(ourfmt, PICFMT)) |
| 233 |
|
fputformat(ourfmt, stdout); /* print format if known */ |
| 234 |
|
putchar('\n'); |
| 307 |
|
} |
| 308 |
|
if (!gotview || setview(&input[nfiles].vw) != NULL) |
| 309 |
|
input[nfiles].vw.type = 0; |
| 310 |
+ |
else if (!commvw.type) |
| 311 |
+ |
commvw = input[nfiles].vw; |
| 312 |
|
if (!fgetsresolu(&input[nfiles].rs, input[nfiles].fp)) { |
| 313 |
|
eputs(input[nfiles].name); |
| 314 |
|
eputs(": bad picture size\n"); |
| 376 |
|
ourbright = xyz_bright; |
| 377 |
|
} else |
| 378 |
|
varset(vwhteff, ':', WHTEFFICACY); |
| 379 |
+ |
/* these may be overridden */ |
| 380 |
+ |
varset(vxres, ':', (double)xmax); |
| 381 |
+ |
varset(vyres, ':', (double)ymax); |
| 382 |
|
} |
| 383 |
|
|
| 384 |
|
|
