--- ray/src/util/rad.c	2008/03/11 12:42:07	2.84
+++ ray/src/util/rad.c	2008/12/05 00:51:59	2.88
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rad.c,v 2.84 2008/03/11 12:42:07 greg Exp $";
+static const char	RCSid[] = "$Id: rad.c,v 2.88 2008/12/05 00:51:59 greg Exp $";
 #endif
 /*
  * Executive program for oconv, rpict and pfilt
@@ -208,7 +208,7 @@ main(
 		goto userr;
 	rifname = argv[i];
 				/* check command-line options */
-	if ((nprocs > 1) & (viewselect != NULL))
+	if ((nprocs > 1) & (viewselect != NULL) & (rvdevice == NULL))
 		nprocs = 1;
 				/* assign Radiance root file name */
 	rootname(radname, rifname);
@@ -1197,6 +1197,8 @@ rvu(				/* run rvu with first view */
 	if (sayview)
 		myprintview(vw, stdout);
 	sprintf(combuf, "rvu %s%s%s -R %s ", vw, po, opts, rifname);
+	if (nprocs > 1)
+		sprintf(combuf+strlen(combuf), "-n %d ", nprocs);
 	if (rvdevice != NULL)
 		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
 	if (vdef(EXPOSURE))
@@ -1277,7 +1279,7 @@ rpict(				/* run rpict and pfilt for each view */
 			myprintview(vw, stdout);
 		if (!vs[0])
 			sprintf(vs, "%d", vn);
-		sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
+		sprintf(picfile, "%s_%s.hdr", vval(PICTURE), vs);
 		if (vdef(ZFILE))
 			sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs);
 		else
@@ -1366,7 +1368,7 @@ rpict(				/* run rpict and pfilt for each view */
 		}
 						/* remove/rename raw file */
 		if (vdef(RAWFILE)) {
-			sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs);
+			sprintf(combuf, "%s_%s.hdr", vval(RAWFILE), vs);
 			mvfile(rawfile, combuf);
 		} else
 			rmfile(rawfile);
@@ -1483,8 +1485,8 @@ wait_process(			/* wait for process(es) to finish */
 	int	all
 )
 {
-	int	ourstatus = 0;
-	RT_PID	pid, status;
+	int	ourstatus = 0, status;
+	RT_PID	pid;
 
 	if (all)
 		all = children_running;
@@ -1521,7 +1523,8 @@ int	all;
 }
 int
 kill(pid, sig) /* win|unix_process.c should also wait and kill */
-RT_PID pid, sig;
+RT_PID pid;
+int sig;
 {
 	return 0;
 }