--- ray/src/px/aedimage.c	1989/10/20 20:35:57	1.5
+++ ray/src/px/aedimage.c	1991/11/11 14:38:48	1.11
@@ -99,6 +99,7 @@ long  scanpos[NROWS];
 
 extern double  atof();
 double  exposure = 1.0;
+int  wrong_fmt = 0;
 
 
 main(argc, argv)
@@ -140,9 +141,11 @@ char  *argv[];
 		quitmsg(errmsg);
 	}
 				/* get header */
-	getheader(fin, checkhead);
+	getheader(fin, checkhead, NULL);
+	if (wrong_fmt)
+		quitmsg("input must be a Radiance picture");
 				/* get picture dimensions */
-	if (fgetresolu(&xmax, &ymax, fin) != (YMAJOR|YDECR))
+	if (fgetresolu(&xmax, &ymax, fin) < 0)
 		quitmsg("bad picture size");
 	if (xmax > NCOLS || ymax > NROWS)
 		quitmsg("resolution mismatch");
@@ -169,8 +172,14 @@ userr:
 checkhead(line)				/* deal with line from header */
 char  *line;
 {
-	if (!strncmp(line, "EXPOSURE=", 9))
-		exposure *= atof(line+9);
+	char	fmt[32];
+
+	if (isexpos(line))
+		exposure *= exposval(line);
+	else if (isformat(line)) {
+		formatval(fmt, line);
+		wrong_fmt = strcmp(fmt, COLRFMT);
+	}
 }
 
 
@@ -315,7 +324,7 @@ loopcom()				/* print pixel values interactively */
 				break;
 			case 'l':
 			case 'L':
-				printf("%-3gL", bright(cval)*683.0/exposure);
+				printf("%-3gL", luminance(cval)/exposure);
 				break;
 			case 'c':
 			case 'C':
@@ -400,7 +409,7 @@ register rgbpixel  *l3;
 							/* read scanline */
 	getscan(y);
 							/* convert scanline */
-	normcolrs(scanline, xmax);
+	normcolrs(scanline, xmax, 0);
 	for (i = 0; i < xmax; i++) {
 		l3[i].r = scanline[i][RED];
 		l3[i].g = scanline[i][GRN];
@@ -515,7 +524,7 @@ colormap  map;
 	register int  i, val;
 
 	for (i = 0; i < 256; i++) {
-		val = pow(i/256.0, 1.0/GAMMA) * 256.0;
+		val = pow((i+0.5)/256.0, 1.0/GAMMA) * 256.0;
 		map[0][i] = map[1][i] = map[2][i] = val;
 	}
 }