--- ray/src/px/ximage.c	1989/05/11 08:25:21	1.6
+++ ray/src/px/ximage.c	1989/11/06 15:12:03	1.14
@@ -38,7 +38,7 @@ static char SCCSid[] = "$SunId$ LBL";
 #define  BORWIDTH	5		/* border width */
 #define  BARHEIGHT	25		/* menu bar size */
 
-double  gamcor = 2.0;			/* gamma correction */
+double  gamcor = 2.2;			/* gamma correction */
 
 XRASTER  *ourras = NULL;		/* our stored raster image */
 
@@ -141,7 +141,7 @@ char  *argv[];
 				/* get header */
 	getheader(fin, headline);
 				/* get picture dimensions */
-	if (fscanf(fin, "-Y %d +X %d\n", &ymax, &xmax) != 2)
+	if (fgetresolu(&xmax, &ymax, fin) != (YMAJOR|YDECR))
 		quiterr("bad picture size");
 				/* set view parameters */
 	if (gotview) {
@@ -345,7 +345,7 @@ redraw(x, y, w, h)			/* redraw section of window */
 int  x, y;
 int  w, h;
 {
-	if (map_rcolors(ourras) == NULL) {
+	if (ourras->ncolors && map_rcolors(ourras) == NULL) {
 		fprintf(stderr, "%s: cannot allocate colors\n", progname);
 		return(-1);
 	}
@@ -648,35 +648,20 @@ picreadline3(y, l3)			/* read in 3-byte scanline */
 int  y;
 register rgbpixel  *l3;
 {
-	register BYTE	*l4;
-	register int	shift, c;
-	int	i;
-
+	register int	i;
+							/* read scanline */
 	if (getscan(y) < 0)
 		quiterr("cannot seek for picreadline");
 							/* convert scanline */
-	for (l4=scanline[0], i=xmax; i--; l4+=4, l3++) {
-		shift = l4[EXP] - COLXS + scale;
-		if (shift >= 8) {
-			l3->r = l3->g = l3->b = 255;
-		} else if (shift <= -8) {
-			l3->r = l3->g = l3->b = 0;
-		} else if (shift > 0) {
-			c = l4[RED] << shift;
-			l3->r = c > 255 ? 255 : c;
-			c = l4[GRN] << shift;
-			l3->g = c > 255 ? 255 : c;
-			c = l4[BLU] << shift;
-			l3->b = c > 255 ? 255 : c;
-		} else if (shift < 0) {
-			l3->r = l4[RED] >> -shift;
-			l3->g = l4[GRN] >> -shift;
-			l3->b = l4[BLU] >> -shift;
-		} else {
-			l3->r = l4[RED];
-			l3->g = l4[GRN];
-			l3->b = l4[BLU];
-		}
+	if (scale != 0)
+		for (i = 0; i < xmax; i++)
+			if (scanline[i][EXP]+scale >= 0)
+				scanline[i][EXP] += scale;
+	normcolrs(scanline, xmax);
+	for (i = 0; i < xmax; i++) {
+		l3[i].r = scanline[i][RED];
+		l3[i].g = scanline[i][GRN];
+		l3[i].b = scanline[i][BLU];
 	}
 }
 
@@ -689,7 +674,7 @@ pixel  *l;
 }
 
 
-picreadcm(map)			/* do gamcor correction */
+picreadcm(map)			/* do gamma correction */
 colormap  map;
 {
 	extern double  pow();