| 77 |
|
|
| 78 |
|
double exposure = 1.0; /* exposure compensation used */ |
| 79 |
|
|
| 80 |
+ |
int wrongformat = 0; /* input in another format? */ |
| 81 |
+ |
|
| 82 |
|
GC revgc; /* graphics context with GXinvert */ |
| 83 |
|
|
| 84 |
|
XRASTER *ourras; /* our stored image */ |
| 158 |
|
} else if (i != argc) |
| 159 |
|
goto userr; |
| 160 |
|
/* get header */ |
| 161 |
< |
getheader(fin, headline); |
| 161 |
> |
getheader(fin, headline, NULL); |
| 162 |
|
/* get picture dimensions */ |
| 163 |
< |
if (fgetresolu(&xmax, &ymax, fin) != (YMAJOR|YDECR)) |
| 164 |
< |
quiterr("bad picture size"); |
| 163 |
> |
if (wrongformat || fgetresolu(&xmax, &ymax, fin) != (YMAJOR|YDECR)) |
| 164 |
> |
quiterr("bad picture format"); |
| 165 |
|
/* set view parameters */ |
| 166 |
|
if (gotview && setview(&ourview) != NULL) |
| 167 |
|
gotview = 0; |
| 185 |
|
{ |
| 186 |
|
static char *altname[] = {"rview","rpict","pinterp",VIEWSTR,NULL}; |
| 187 |
|
register char **an; |
| 188 |
+ |
char fmt[32]; |
| 189 |
|
|
| 190 |
|
if (isexpos(s)) |
| 191 |
|
exposure *= exposval(s); |
| 192 |
< |
else |
| 192 |
> |
else if (isformat(s)) { |
| 193 |
> |
formatval(fmt, s); |
| 194 |
> |
wrongformat = strcmp(fmt, COLRFMT); |
| 195 |
> |
} else |
| 196 |
|
for (an = altname; *an != NULL; an++) |
| 197 |
|
if (!strncmp(*an, s, strlen(*an))) { |
| 198 |
|
if (sscanview(&ourview, s+strlen(*an)) > 0) |
