--- ray/src/px/ximage.c	1990/03/12 15:14:49	1.24
+++ ray/src/px/ximage.c	1991/04/18 14:35:52	1.29
@@ -72,6 +72,8 @@ int  cury = 0;				/* current scan location */
 
 double  exposure = 1.0;			/* exposure compensation used */
 
+int  wrongformat = 0;			/* input in another format */
+
 struct {
 	int  xmin, ymin, xsiz, ysiz;
 }  box = {0, 0, 0, 0};			/* current box */
@@ -141,9 +143,9 @@ char  *argv[];
 		}
 	}
 				/* get header */
-	getheader(fin, headline);
+	getheader(fin, headline, NULL);
 				/* get picture dimensions */
-	if (fgetresolu(&xmax, &ymax, fin) != (YMAJOR|YDECR))
+	if (wrongformat || fgetresolu(&xmax, &ymax, fin) != (YMAJOR|YDECR))
 		quiterr("bad picture size");
 				/* set view parameters */
 	if (gotview && setview(&ourview) != NULL)
@@ -168,10 +170,14 @@ char  *s;
 {
 	static char  *altname[] = {"rview","rpict",VIEWSTR,NULL};
 	register char  **an;
+	char  fmt[32];
 
 	if (isexpos(s))
 		exposure *= exposval(s);
-	else
+	else if (isformat(s)) {
+		formatval(fmt, s);
+		wrongformat = strcmp(fmt, COLRFMT);
+	} else
 		for (an = altname; *an != NULL; an++)
 			if (!strncmp(*an, s, strlen(*an))) {
 				if (sscanview(&ourview, s+strlen(*an)) > 0)
@@ -287,7 +293,7 @@ getras()				/* get raster file */
 	}
 	return;
 memerr:
-	quit("out of memory");
+	quiterr("out of memory");
 }
 
 
@@ -373,7 +379,7 @@ XKeyEvent  *ekey;
 			sprintf(buf, "%.3f", intens(cval)/exposure);
 			break;
 		case 'l':				/* luminance */
-			sprintf(buf, "%.0fn", bright(cval)*683.0/exposure);
+			sprintf(buf, "%.0fn", luminance(cval)/exposure);
 			break;
 		case 'c':				/* color */
 			comp = pow(2.0, (double)scale);
@@ -407,8 +413,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);
@@ -547,7 +554,7 @@ getmono()			/* get monochrome data */
 
 	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, inl);
@@ -634,7 +641,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);
@@ -680,7 +687,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;
 	}
 }