--- ray/src/rt/rpict.c	1991/10/10 09:18:58	1.33
+++ ray/src/rt/rpict.c	1991/11/11 14:02:45	1.36
@@ -15,13 +15,15 @@ static char SCCSid[] = "$SunId$ LBL";
 #ifdef BSD
 #include  <sys/time.h>
 #include  <sys/resource.h>
-#else
-#include  <signal.h>
 #endif
+
+#include  <signal.h>
 #include  <fcntl.h>
 
 #include  "view.h"
 
+#include  "resolu.h"
+
 #include  "random.h"
 
 int  dimlist[MAXDIM];			/* sampling dimensions */
@@ -40,9 +42,10 @@ double  dstrpix = 0.67;			/* square pixel distribution
 double  dstrsrc = 0.0;			/* square source distribution */
 double  shadthresh = .05;		/* shadow threshold */
 double  shadcert = .5;			/* shadow certainty */
-int  directrelay = 0;			/* number of source relays */
+int  directrelay = 1;			/* number of source relays */
 int  vspretest = 512;			/* virtual source pretest density */
 int  directinvis = 0;			/* sources invisible? */
+double  srcsizerat = .25;		/* maximum ratio source size/dist. */
 
 int  maxdepth = 6;			/* maximum recursion depth */
 double  minweight = 5e-3;		/* minimum ray weight */
@@ -159,7 +162,7 @@ char  *zfile, *oldfile;
 			zbar[i] = NULL;
 	}
 					/* write out boundaries */
-	fputresolu(YMAJOR|YDECR, hresolu, vresolu, stdout);
+	fprtresolu(hresolu, vresolu, stdout);
 					/* recover file and compute first */
 	i = salvage(oldfile);
 	if (zfd != -1 && i > 0 &&
@@ -397,7 +400,7 @@ char  *oldfile;
 				/* discard header */
 	getheader(fp, NULL);
 				/* get picture size */
-	if (fgetresolu(&x, &y, fp) != (YMAJOR|YDECR)) {
+	if (!fscnresolu(&x, &y, fp)) {
 		sprintf(errmsg, "bad recover file \"%s\"", oldfile);
 		error(WARNING, errmsg);
 		fclose(fp);