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 |
|
|
137 |
|
sprintf(errmsg, "can't open file \"%s\"", fname); |
138 |
|
quiterr(errmsg); |
139 |
|
} |
140 |
< |
} else |
141 |
< |
goto userr; |
142 |
< |
|
140 |
> |
} |
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 |
|
} |
429 |
|
getras(); |
430 |
|
/* fall through */ |
431 |
|
case CTRL(R): /* redraw */ |
432 |
+ |
case CTRL(L): |
433 |
|
XClear(wind); |
434 |
|
return(redraw(0, 0, width, height)); |
435 |
|
case ' ': /* clear */ |
648 |
|
int y; |
649 |
|
register rgbpixel *l3; |
650 |
|
{ |
651 |
< |
register BYTE *l4; |
652 |
< |
register int shift, c; |
654 |
< |
int i; |
655 |
< |
|
651 |
> |
register int i; |
652 |
> |
/* read scanline */ |
653 |
|
if (getscan(y) < 0) |
654 |
|
quiterr("cannot seek for picreadline"); |
655 |
|
/* convert scanline */ |
656 |
< |
for (l4=scanline[0], i=xmax; i--; l4+=4, l3++) { |
657 |
< |
shift = l4[EXP] - COLXS + scale; |
658 |
< |
if (shift >= 8) { |
659 |
< |
l3->r = l3->g = l3->b = 255; |
660 |
< |
} else if (shift <= -8) { |
661 |
< |
l3->r = l3->g = l3->b = 0; |
662 |
< |
} else if (shift > 0) { |
663 |
< |
c = l4[RED] << shift; |
664 |
< |
l3->r = c > 255 ? 255 : c; |
668 |
< |
c = l4[GRN] << shift; |
669 |
< |
l3->g = c > 255 ? 255 : c; |
670 |
< |
c = l4[BLU] << shift; |
671 |
< |
l3->b = c > 255 ? 255 : c; |
672 |
< |
} else if (shift < 0) { |
673 |
< |
l3->r = l4[RED] >> -shift; |
674 |
< |
l3->g = l4[GRN] >> -shift; |
675 |
< |
l3->b = l4[BLU] >> -shift; |
676 |
< |
} else { |
677 |
< |
l3->r = l4[RED]; |
678 |
< |
l3->g = l4[GRN]; |
679 |
< |
l3->b = l4[BLU]; |
680 |
< |
} |
656 |
> |
if (scale != 0) |
657 |
> |
for (i = 0; i < xmax; i++) |
658 |
> |
if (scanline[i][EXP]+scale >= 0) |
659 |
> |
scanline[i][EXP] += scale; |
660 |
> |
normcolrs(scanline, xmax); |
661 |
> |
for (i = 0; i < xmax; i++) { |
662 |
> |
l3[i].r = scanline[i][RED]; |
663 |
> |
l3[i].g = scanline[i][GRN]; |
664 |
> |
l3[i].b = scanline[i][BLU]; |
665 |
|
} |
666 |
|
} |
667 |
|
|
674 |
|
} |
675 |
|
|
676 |
|
|
677 |
< |
picreadcm(map) /* do gamcor correction */ |
677 |
> |
picreadcm(map) /* do gamma correction */ |
678 |
|
colormap map; |
679 |
|
{ |
680 |
|
extern double pow(); |