--- ray/src/px/ximage.c	1989/11/29 17:42:27	1.16
+++ ray/src/px/ximage.c	1990/10/13 21:31:45	1.25
@@ -58,7 +58,7 @@ int  scale = 0;				/* scalefactor; power of two */
 int  xoff = 0;				/* x image offset */
 int  yoff = 0;				/* y image offset */
 
-VIEW  ourview = STDVIEW(0);		/* image view parameters */
+VIEW  ourview = STDVIEW;		/* image view parameters */
 int  gotview = 0;			/* got parameters from file */
 
 COLR  *scanline;			/* scan line buffer */
@@ -146,12 +146,8 @@ char  *argv[];
 	if (fgetresolu(&xmax, &ymax, fin) != (YMAJOR|YDECR))
 		quiterr("bad picture size");
 				/* set view parameters */
-	if (gotview) {
-		ourview.hresolu = xmax;
-		ourview.vresolu = ymax;
-		if (setview(&ourview) != NULL)
-			gotview = 0;
-	}
+	if (gotview && setview(&ourview) != NULL)
+		gotview = 0;
 	if ((scanline = (COLR *)malloc(xmax*sizeof(COLR))) == NULL)
 		quiterr("out of memory");
 
@@ -173,28 +169,18 @@ 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))) {
-				if (sscanview(&ourview, s+strlen(*an)) == 0)
+				if (sscanview(&ourview, s+strlen(*an)) > 0)
 					gotview++;
 				return;
 			}
 }
 
 
-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 +370,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);
@@ -421,8 +407,9 @@ XKeyEvent  *ekey;
 			XFeep(0);
 			return(-1);
 		}
-		rayview(rorg, rdir, &ourview,
-				ekey->x-xoff + .5, ymax-1-ekey->y+yoff + .5);
+		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);
@@ -556,20 +543,20 @@ getmono()			/* get monochrome data */
 	register unsigned short	*dp;
 	register int	x, err;
 	int	y;
-	rgbpixel	*inline;
+	rgbpixel	*inl;
 	short	*cerr;
 
-	if ((inline = (rgbpixel *)malloc(xmax*sizeof(rgbpixel))) == NULL
+	if ((inl = (rgbpixel *)malloc(xmax*sizeof(rgbpixel))) == NULL
 			|| (cerr = (short *)calloc(xmax,sizeof(short))) == NULL)
 		quit("out of memory in getmono");
 	dp = ourras->data.m - 1;
 	for (y = 0; y < ymax; y++) {
-		picreadline3(y, inline);
+		picreadline3(y, inl);
 		err = 0;
 		for (x = 0; x < xmax; x++) {
 			if (!(x&0xf))
 				*++dp = 0;
-			err += rgb_bright(&inline[x]) + cerr[x];
+			err += rgb_bright(&inl[x]) + cerr[x];
 			if (err > 127)
 				err -= 255;
 			else
@@ -577,7 +564,7 @@ getmono()			/* get monochrome data */
 			cerr[x] = err >>= 1;
 		}
 	}
-	free((char *)inline);
+	free((char *)inl);
 	free((char *)cerr);
 }
 
@@ -670,11 +657,7 @@ register rgbpixel  *l3;
 	if (getscan(y) < 0)
 		quiterr("cannot seek for picreadline");
 							/* convert scanline */
-	if (scale != 0)
-		for (i = 0; i < xmax; i++)
-			if (scanline[i][EXP]+scale >= 0)
-				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];
@@ -687,7 +670,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));
 }