--- ray/src/px/ximage.c	1990/01/08 14:47:11	1.21
+++ ray/src/px/ximage.c	1990/01/26 08:17:43	1.23
@@ -656,11 +656,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 +669,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));
 }