141 |
|
/* get header */ |
142 |
|
getheader(fin, headline); |
143 |
|
/* get picture dimensions */ |
144 |
< |
if (fscanf(fin, "-Y %d +X %d\n", &ymax, &xmax) != 2) |
144 |
> |
if (fgetresolu(&xmax, &ymax, fin) != (YMAJOR|YDECR)) |
145 |
|
quiterr("bad picture size"); |
146 |
|
/* set view parameters */ |
147 |
|
if (gotview) { |
345 |
|
int x, y; |
346 |
|
int w, h; |
347 |
|
{ |
348 |
< |
if (map_rcolors(ourras) == NULL) { |
348 |
> |
if (ourras->ncolors && map_rcolors(ourras) == NULL) { |
349 |
|
fprintf(stderr, "%s: cannot allocate colors\n", progname); |
350 |
|
return(-1); |
351 |
|
} |
689 |
|
} |
690 |
|
|
691 |
|
|
692 |
< |
picreadcm(map) /* do gamcor correction */ |
692 |
> |
picreadcm(map) /* do gamma correction */ |
693 |
|
colormap map; |
694 |
|
{ |
695 |
|
extern double pow(); |