--- ray/src/px/ximage.c	1989/11/29 17:42:27	1.16
+++ ray/src/px/ximage.c	1990/01/05 17:52:57	1.20
@@ -173,8 +173,8 @@ char  *s;
 	static char  *altname[] = {"rview","rpict",VIEWSTR,NULL};
 	register char  **an;
 
-	if (!strncmp(s, "EXPOSURE=", 9))
-		exposure *= atof(s+9);
+	if (isexpos(s))
+		exposure *= exposval(s);
 	else
 		for (an = altname; *an != NULL; an++)
 			if (!strncmp(*an, s, strlen(*an))) {
@@ -185,16 +185,6 @@ char  *s;
 }
 
 
-char *
-sskip(s)		/* skip a word */
-register char  *s;
-{
-	while (isspace(*s)) s++;
-	while (*s && !isspace(*s)) s++;
-	return(s);
-}
-
-
 init()			/* get data and open window */
 {
 	register int  i;
@@ -384,10 +374,10 @@ XKeyEvent  *ekey;
 		switch (*cp) {
 		case '\n':
 		case '\r':				/* radiance */
-			sprintf(buf, "%-3g", intens(cval)/exposure);
+			sprintf(buf, "%.3f", intens(cval)/exposure);
 			break;
 		case 'l':				/* luminance */
-			sprintf(buf, "%-3gn", bright(cval)*683.0/exposure);
+			sprintf(buf, "%.0fn", bright(cval)*683.0/exposure);
 			break;
 		case 'c':				/* color */
 			comp = pow(2.0, (double)scale);
@@ -670,9 +660,9 @@ register rgbpixel  *l3;
 	if (getscan(y) < 0)
 		quiterr("cannot seek for picreadline");
 							/* convert scanline */
-	if (scale != 0)
+	if (scale)
 		for (i = 0; i < xmax; i++)
-			if (scanline[i][EXP]+scale >= 0)
+			if (scanline[i][EXP])
 				scanline[i][EXP] += scale;
 	normcolrs(scanline, xmax);
 	for (i = 0; i < xmax; i++) {