--- ray/src/rt/rpict.c	2006/04/05 06:22:56	2.77
+++ ray/src/rt/rpict.c	2009/05/11 21:46:31	2.81
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rpict.c,v 2.77 2006/04/05 06:22:56 greg Exp $";
+static const char RCSid[] = "$Id: rpict.c,v 2.81 2009/05/11 21:46:31 greg Exp $";
 #endif
 /*
  *  rpict.c - routines and variables for picture generation.
@@ -9,20 +9,24 @@ static const char RCSid[] = "$Id: rpict.c,v 2.77 2006/
 
 #include  <sys/types.h>
 
-#ifndef NON_POSIX
-#ifdef BSD
-#include  <sys/time.h>
-#include  <sys/resource.h>
+#include  "platform.h"
+#ifdef NON_POSIX
+ #ifdef MINGW
+  #include  <sys/time.h>
+ #endif
 #else
-#include  <sys/times.h>
-#include  <unistd.h>
+ #ifdef BSD
+  #include  <sys/time.h>
+  #include  <sys/resource.h>
+ #else
+  #include  <sys/times.h>
+  #include  <unistd.h>
+ #endif
 #endif
-#endif
 
 #include  <time.h>
 #include  <signal.h>
 
-#include  "platform.h"
 #include  "ray.h"
 #include  "paths.h"
 #include  "ambient.h"
@@ -696,9 +700,11 @@ pixvalue(		/* compute pixel value */
 						/* optional depth-of-field */
 	if (dblur > FTINY && vdist > FTINY) {
 		double  vc, dfh, dfv;
-						/* PI/4. square/circle conv. */
-		dfh = PI/4.*dblur*(.5 - frandom());
-		dfv = PI/4.*dblur*(.5 - frandom());
+						/* square/circle conv. */
+		dfh = vc = frandom();
+		dfv = frandom();
+		dfh *= .5*dblur*sqrt(1. - .5*dfv*dfv);
+		dfv *= .5*dblur*sqrt(1. - .5*vc*vc);
 		if (ourview.type == VT_PER || ourview.type == VT_PAR) {
 			dfh /= sqrt(ourview.hn2);
 			dfv /= sqrt(ourview.vn2);
@@ -710,7 +716,7 @@ pixvalue(		/* compute pixel value */
 			}
 		} else {			/* non-standard view case */
 			double	dfd = PI/4.*dblur*(.5 - frandom());
-			if (ourview.type != VT_ANG) {
+			if (ourview.type != VT_ANG && ourview.type != VT_PLS) {
 				if (ourview.type != VT_CYL)
 					dfh /= sqrt(ourview.hn2);
 				dfv /= sqrt(ourview.vn2);