--- ray/src/rt/rvmain.c	2016/03/10 18:25:46	2.15
+++ ray/src/rt/rvmain.c	2024/01/17 01:31:08	2.20
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rvmain.c,v 2.15 2016/03/10 18:25:46 schorsch Exp $";
+static const char	RCSid[] = "$Id: rvmain.c,v 2.20 2024/01/17 01:31:08 greg Exp $";
 #endif
 /*
  *  rvmain.c - main for rview interactive viewer
@@ -55,7 +55,6 @@ static void onsig(int  signo);
 static void sigdie(int  signo, char  *msg);
 static void printdefaults(void);
 
-
 int
 main(int argc, char *argv[])
 {
@@ -84,7 +83,7 @@ main(int argc, char *argv[])
 	specthresh = .3;
 	specjitter = 1.;
 	maxdepth = 6;
-	minweight = 1e-2;
+	minweight = 1e-3;
 	ambacc = 0.3;
 	ambres = 32;
 	ambdiv = 256;
@@ -192,6 +191,11 @@ main(int argc, char *argv[])
 			goto badopt;
 		}
 	}
+					/* set/check spectral sampling */
+	rval = setspectrsamp(CNDX, WLPART);
+	if (rval < 0)
+		error(USER, "unsupported spectral sampling");
+
 	err = setview(&ourview);	/* set viewing parameters */
 	if (err != NULL)
 		error(USER, err);
@@ -230,13 +234,20 @@ main(int argc, char *argv[])
 	
 	ray_init(octnm);		/* also calls ray_init_pmap() */
 	
+/* temporary shortcut, until winrview is refactored into a "device" */
+#ifndef WIN_RVIEW
 	rview();			/* run interactive viewer */
 
+
 	devclose();			/* close output device */
+#endif
 
 	/* PMAP: free photon maps */
 	ray_done_pmap();
 	
+#ifdef WIN_RVIEW
+	return 1;
+#endif
 	quit(0);
 
 badopt:
@@ -251,7 +262,7 @@ badopt:
 
 void
 wputs(				/* warning output function */
-	char	*s
+	const char	*s
 )
 {
 	int  lasterrno = errno;
@@ -262,7 +273,7 @@ wputs(				/* warning output function */
 
 void
 eputs(				/* put string to stderr */
-	char  *s
+	const char  *s
 )
 {
 	static int  midline = 0;