14 |
|
#include "calcomp.h" |
15 |
|
#include "view.h" |
16 |
|
|
17 |
< |
#define MAXINP 32 /* maximum number of input files */ |
17 |
> |
#define MAXINP 512 /* maximum number of input files */ |
18 |
|
#define WINSIZ 64 /* scanline window size */ |
19 |
|
#define MIDSCN ((WINSIZ-1)/2+1) |
20 |
|
|
68 |
|
|
69 |
|
char *progname; /* global argv[0] */ |
70 |
|
|
71 |
+ |
int echoheader = 1; |
72 |
|
int wrongformat = 0; |
73 |
|
int gotview; |
74 |
|
|
75 |
|
|
76 |
< |
static gethfunc tabputs; |
76 |
> |
static gethfunc headline; |
77 |
|
static void checkfile(void); |
78 |
|
static double rgb_bright(COLOR clr); |
79 |
|
static double xyz_bright(COLOR clr); |
111 |
|
case 'w': |
112 |
|
nowarn = !nowarn; |
113 |
|
continue; |
114 |
+ |
case 'h': |
115 |
+ |
echoheader = !echoheader; |
116 |
+ |
continue; |
117 |
|
case 'f': |
118 |
|
case 'e': |
119 |
|
a++; |
198 |
|
continue; |
199 |
|
case 'w': |
200 |
|
continue; |
201 |
+ |
case 'h': |
202 |
+ |
continue; |
203 |
|
case 'f': |
204 |
|
fcompile(argv[++a]); |
205 |
|
continue; |
234 |
|
eputs("Usage: "); |
235 |
|
eputs(argv[0]); |
236 |
|
eputs( |
237 |
< |
" [-w][-x xr][-y yr][-e expr][-f file] [ [-o][-s f][-c r g b] pic ..]\n"); |
237 |
> |
" [-w][-h][-x xr][-y yr][-e expr][-f file] [ [-o][-s f][-c r g b] pic ..]\n"); |
238 |
|
quit(1); |
239 |
|
return 1; /* pro forma return */ |
240 |
|
} |
241 |
|
|
242 |
|
|
243 |
|
static int |
244 |
< |
tabputs( /* put out string preceded by a tab */ |
244 |
> |
headline( /* check header line & echo if requested */ |
245 |
|
char *s, |
246 |
|
void *p |
247 |
|
) |
270 |
|
input[nfiles].pa *= aspectval(s); |
271 |
|
else if (isview(s) && sscanview(&input[nfiles].vw, s) > 0) |
272 |
|
gotview++; |
273 |
< |
/* echo line */ |
274 |
< |
putchar('\t'); |
275 |
< |
return(fputs(s, stdout)); |
273 |
> |
|
274 |
> |
if (echoheader) { /* echo line */ |
275 |
> |
putchar('\t'); |
276 |
> |
return(fputs(s, stdout)); |
277 |
> |
} |
278 |
> |
return(0); |
279 |
|
} |
280 |
|
|
281 |
|
|
285 |
|
register int i; |
286 |
|
/* process header */ |
287 |
|
gotview = 0; |
288 |
< |
fputs(input[nfiles].name, stdout); |
289 |
< |
fputs(":\n", stdout); |
290 |
< |
getheader(input[nfiles].fp, tabputs, NULL); |
288 |
> |
if (echoheader) { |
289 |
> |
fputs(input[nfiles].name, stdout); |
290 |
> |
fputs(":\n", stdout); |
291 |
> |
} |
292 |
> |
getheader(input[nfiles].fp, headline, NULL); |
293 |
|
if (wrongformat < 0) { |
294 |
|
eputs(input[nfiles].name); |
295 |
|
eputs(": not a Radiance picture\n"); |