--- ray/src/rt/rv2.c	1991/10/22 11:58:17	1.31
+++ ray/src/rt/rv2.c	1991/11/11 17:42:19	1.33
@@ -18,6 +18,8 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "rpaint.h"
 
+#include  "resolu.h"
+
 #include  <ctype.h>
 
 #define  CTRL(c)	('c'-'@')
@@ -142,7 +144,7 @@ char  *s;
 	if (sscanf(s, "%s", buf) == 1) {	/* get parameters from a file */
 		copystruct(&nv, &stdview);
 		if ((fname = getpath(buf, NULL, 0)) == NULL ||
-				(success = viewfile(fname, &nv, 0, 0)) == -1) {
+				(success = viewfile(fname, &nv, NULL)) == -1) {
 			sprintf(errmsg, "cannot open \"%s\"", buf);
 			error(COMMAND, errmsg);
 			return;
@@ -536,10 +538,11 @@ char  *s;
 			(*dev->comout)(buf);
 		}
 		(*dev->comin)(buf, NULL);
-		sprintf(buf, "with value (%.6g %.6g %.6g)",
+		sprintf(buf, "value (%.5g %.5g %.5g) (%.1fL)",
 				colval(thisray.rcol,RED),
 				colval(thisray.rcol,GRN),
-				colval(thisray.rcol,BLU));
+				colval(thisray.rcol,BLU),
+				luminance(thisray.rcol));
 		(*dev->comout)(buf);
 	}
 	(*dev->comin)(buf, NULL);
@@ -582,7 +585,7 @@ char  *s;
 		fputaspect(dev->pixaspect, fp);
 	fputformat(COLRFMT, fp);
 	putc('\n', fp);
-	fputresolu(YMAJOR|YDECR, hresolu, vresolu, fp);
+	fprtresolu(hresolu, vresolu, fp);
 
 	scanline = (COLR *)malloc(hresolu*sizeof(COLR));
 	if (scanline == NULL) {