--- ray/src/px/aedimage.c	1989/09/12 13:04:16	1.3
+++ ray/src/px/aedimage.c	1989/10/20 20:35:57	1.5
@@ -105,8 +105,7 @@ main(argc, argv)
 int  argc;
 char  *argv[];
 {
-	int  onintr();
-	double  atof();
+	int  onintr(), checkhead();
 	char  sbuf[256];
 	register int  i;
 	
@@ -141,10 +140,7 @@ char  *argv[];
 		quitmsg(errmsg);
 	}
 				/* get header */
-	while (fgets(sbuf, sizeof(sbuf), fin) != NULL && sbuf[0] != '\n')
-		if (!strncmp(sbuf, "EXPOSURE=", 9))
-			exposure *= atof(sbuf+9);
-
+	getheader(fin, checkhead);
 				/* get picture dimensions */
 	if (fgetresolu(&xmax, &ymax, fin) != (YMAJOR|YDECR))
 		quitmsg("bad picture size");
@@ -170,6 +166,14 @@ userr:
 }
 
 
+checkhead(line)				/* deal with line from header */
+char  *line;
+{
+	if (!strncmp(line, "EXPOSURE=", 9))
+		exposure *= atof(line+9);
+}
+
+
 init()			/* initialize terminal */
 {
 	struct sgttyb  flags;
@@ -392,34 +396,15 @@ 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 */
 	getscan(y);
 							/* convert scanline */
-	for (l4=scanline[0], i=xmax; i--; l4+=4, l3++) {
-		shift = l4[EXP] - COLXS;
-		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];
-		}
+	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];
 	}
 }