--- ray/src/px/ximage.c	1990/01/08 14:47:11	1.21
+++ ray/src/px/ximage.c	1990/11/07 13:10:39	1.27
@@ -287,7 +287,7 @@ getras()				/* get raster file */
 	}
 	return;
 memerr:
-	quit("out of memory");
+	quiterr("out of memory");
 }
 
 
@@ -407,8 +407,9 @@ XKeyEvent  *ekey;
 			XFeep(0);
 			return(-1);
 		}
-		viewray(rorg, rdir, &ourview, (ekey->x-xoff+.5)/xmax,
-				(ymax-1-ekey->y+yoff+.5)/ymax);
+		if (viewray(rorg, rdir, &ourview, (ekey->x-xoff+.5)/xmax,
+				(ymax-1-ekey->y+yoff+.5)/ymax) < 0)
+			return(-1);
 		printf("%e %e %e ", rorg[0], rorg[1], rorg[2]);
 		printf("%e %e %e\n", rdir[0], rdir[1], rdir[2]);
 		fflush(stdout);
@@ -542,20 +543,20 @@ getmono()			/* get monochrome data */
 	register unsigned short	*dp;
 	register int	x, err;
 	int	y;
-	rgbpixel	*inline;
+	rgbpixel	*inl;
 	short	*cerr;
 
-	if ((inline = (rgbpixel *)malloc(xmax*sizeof(rgbpixel))) == NULL
+	if ((inl = (rgbpixel *)malloc(xmax*sizeof(rgbpixel))) == NULL
 			|| (cerr = (short *)calloc(xmax,sizeof(short))) == NULL)
-		quit("out of memory in getmono");
+		quiterr("out of memory in getmono");
 	dp = ourras->data.m - 1;
 	for (y = 0; y < ymax; y++) {
-		picreadline3(y, inline);
+		picreadline3(y, inl);
 		err = 0;
 		for (x = 0; x < xmax; x++) {
 			if (!(x&0xf))
 				*++dp = 0;
-			err += rgb_bright(&inline[x]) + cerr[x];
+			err += rgb_bright(&inl[x]) + cerr[x];
 			if (err > 127)
 				err -= 255;
 			else
@@ -563,7 +564,7 @@ getmono()			/* get monochrome data */
 			cerr[x] = err >>= 1;
 		}
 	}
-	free((char *)inline);
+	free((char *)inl);
 	free((char *)cerr);
 }
 
@@ -634,7 +635,7 @@ int  y;
 		if (scanpos == NULL || scanpos[y] == -1)
 			return(-1);
 		if (fseek(fin, scanpos[y], 0) == -1)
-			quit("fseek error");
+			quiterr("fseek error");
 		cury = y;
 	} else if (scanpos != NULL)
 		scanpos[y] = ftell(fin);
@@ -656,11 +657,7 @@ register rgbpixel  *l3;
 	if (getscan(y) < 0)
 		quiterr("cannot seek for picreadline");
 							/* convert scanline */
-	if (scale)
-		for (i = 0; i < xmax; i++)
-			if (scanline[i][EXP])
-				scanline[i][EXP] += scale;
-	normcolrs(scanline, xmax);
+	normcolrs(scanline, xmax, scale);
 	for (i = 0; i < xmax; i++) {
 		l3[i].r = scanline[i][RED];
 		l3[i].g = scanline[i][GRN];
@@ -673,7 +670,7 @@ picwriteline(y, l)		/* add 8-bit scanline to image */
 int  y;
 pixel  *l;
 {
-	bcopy(l, ourras->data.bz+BZPixmapSize(xmax,y), BZPixmapSize(xmax,1));
+	bcopy((char *)l, (char *)ourras->data.bz+BZPixmapSize(xmax,y), BZPixmapSize(xmax,1));
 }
 
 
@@ -684,7 +681,7 @@ colormap  map;
 	register int  i, val;
 
 	for (i = 0; i < 256; i++) {
-		val = pow(i/256.0, 1.0/gamcor) * 256.0;
+		val = pow((i+0.5)/256.0, 1.0/gamcor) * 256.0;
 		map[0][i] = map[1][i] = map[2][i] = val;
 	}
 }