38 |
|
#define BORWIDTH 5 /* border width */ |
39 |
|
#define BARHEIGHT 25 /* menu bar size */ |
40 |
|
|
41 |
< |
double gamcor = 2.0; /* gamma correction */ |
41 |
> |
double gamcor = 2.2; /* gamma correction */ |
42 |
|
|
43 |
|
XRASTER *ourras = NULL; /* our stored raster image */ |
44 |
|
|
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) { |
148 |
< |
ourview.hresolu = xmax; |
149 |
< |
ourview.vresolu = ymax; |
147 |
> |
if (gotview) |
148 |
|
if (setview(&ourview) != NULL) |
149 |
|
gotview = 0; |
150 |
< |
} |
150 |
> |
|
151 |
|
if ((scanline = (COLR *)malloc(xmax*sizeof(COLR))) == NULL) |
152 |
|
quiterr("out of memory"); |
153 |
|
|
687 |
|
} |
688 |
|
|
689 |
|
|
690 |
< |
picreadcm(map) /* do gamcor correction */ |
690 |
> |
picreadcm(map) /* do gamma correction */ |
691 |
|
colormap map; |
692 |
|
{ |
693 |
|
extern double pow(); |