--- ray/src/gen/mkillum2.c	1992/08/13 11:23:46	2.5
+++ ray/src/gen/mkillum2.c	2003/02/22 02:07:24	2.9
@@ -1,9 +1,6 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: mkillum2.c,v 2.9 2003/02/22 02:07:24 greg Exp $";
 #endif
-
 /*
  * Routines to do the actual calculation for mkillum
  */
@@ -118,7 +115,7 @@ char  *nm;
 			objerror(ob, WARNING, "bad aspect");
 			rt->nrays = 0;
 			freeface(ob);
-			free((char *)distarr);
+			free((void *)distarr);
 			o_default(ob, il, rt, nm);
 			return;
 		    }
@@ -137,7 +134,7 @@ char  *nm;
 		printobj(il->altmat, ob);
 				/* clean up */
 	freeface(ob);
-	free((char *)distarr);
+	free((void *)distarr);
 #undef MAXMISS
 }
 
@@ -163,8 +160,8 @@ char  *nm;
 		nalt = nazi = 1;
 	else {
 		n = 4.*PI * il->sampdens;
-		nalt = sqrt(n/PI) + .5;
-		nazi = PI*nalt + .5;
+		nalt = sqrt(2./PI*n) + .5;
+		nazi = PI/2.*nalt + .5;
 	}
 	n = nalt*nazi;
 	distarr = (float *)calloc(n, 3*sizeof(float));
@@ -207,7 +204,7 @@ char  *nm;
 	} else
 		printobj(il->altmat, ob);
 				/* clean up */
-	free((char *)distarr);
+	free((void *)distarr);
 }
 
 
@@ -260,7 +257,7 @@ char  *nm;
 		    r1 = r3*cos(r2);
 		    r2 = r3*sin(r2);
 		    for (j = 0; j < 3; j++)
-			org[j] = CO_P0(co)[j] + r1*u[j] + r1*v[j] +
+			org[j] = CO_P0(co)[j] + r1*u[j] + r2*v[j] +
 					.001*co->ad[j];
 
 					/* send sample */
@@ -276,7 +273,7 @@ char  *nm;
 		printobj(il->altmat, ob);
 				/* clean up */
 	freecone(ob);
-	free((char *)distarr);
+	free((void *)distarr);
 }
 
 
@@ -306,9 +303,9 @@ register struct rtproc  *rt;
 	bzero(rt->buf+6*rt->nrays, 6*sizeof(float));
 	errno = 0;
 	if ( process(rt->pd, (char *)rt->buf, (char *)rt->buf,
-			3*sizeof(float)*rt->nrays,
+			3*sizeof(float)*(rt->nrays+1),
 			6*sizeof(float)*(rt->nrays+1)) <
-			3*sizeof(float)*rt->nrays )
+			3*sizeof(float)*(rt->nrays+1) )
 		error(SYSTEM, "error reading from rtrace process");
 	i = rt->nrays;
 	while (i--) {