58 |
|
|
59 |
|
int nfile; /* number of files */ |
60 |
|
|
61 |
+ |
char ourfmt[LPICFMT+1] = PICFMT; |
62 |
|
int wrongformat = 0; |
63 |
|
|
64 |
|
FILE *popen(), *lblopen(); |
72 |
|
char fmt[32]; |
73 |
|
|
74 |
|
if (isheadid(s)) |
75 |
< |
return; |
76 |
< |
if (formatval(fmt, s)) |
77 |
< |
wrongformat = strcmp(fmt, COLRFMT); |
78 |
< |
else { |
75 |
> |
return(0); |
76 |
> |
if (formatval(fmt, s)) { |
77 |
> |
if (globmatch(ourfmt, fmt)) { |
78 |
> |
wrongformat = 0; |
79 |
> |
strcpy(ourfmt, fmt); |
80 |
> |
} else |
81 |
> |
wrongformat = 1; |
82 |
> |
} else { |
83 |
|
putc('\t', stdout); |
84 |
|
fputs(s, stdout); |
85 |
|
} |
86 |
+ |
return(0); |
87 |
|
} |
88 |
|
|
89 |
|
|
228 |
|
printf("%s:\n", input[nfile].name); |
229 |
|
getheader(input[nfile].fp, tabputs, NULL); |
230 |
|
if (wrongformat) { |
231 |
< |
fprintf(stderr, "%s: not a Radiance picture\n", |
231 |
> |
fprintf(stderr, "%s: bad Radiance input file\n", |
232 |
|
input[nfile].name); |
233 |
|
quit(1); |
234 |
|
} |
295 |
|
ymax = ysiz; |
296 |
|
/* add new header info. */ |
297 |
|
printargs(argc, argv, stdout); |
298 |
< |
fputformat(COLRFMT, stdout); |
298 |
> |
if (strcmp(ourfmt, PICFMT)) |
299 |
> |
fputformat(ourfmt, stdout); /* print format if known */ |
300 |
|
putchar('\n'); |
301 |
|
fprtresolu(xsiz, ysiz, stdout); |
302 |
|
|