--- ray/src/gen/mkillum2.c	1995/11/07 17:50:44	2.7
+++ ray/src/gen/mkillum2.c	2003/06/26 00:58:09	2.10
@@ -1,19 +1,13 @@
-/* Copyright (c) 1995 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: mkillum2.c,v 2.10 2003/06/26 00:58:09 schorsch Exp $";
 #endif
-
 /*
  * Routines to do the actual calculation for mkillum
  */
 
 #include  "mkillum.h"
-
 #include  "face.h"
-
 #include  "cone.h"
-
 #include  "random.h"
 
 
@@ -118,7 +112,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 +131,7 @@ char  *nm;
 		printobj(il->altmat, ob);
 				/* clean up */
 	freeface(ob);
-	free((char *)distarr);
+	free((void *)distarr);
 #undef MAXMISS
 }
 
@@ -207,7 +201,7 @@ char  *nm;
 	} else
 		printobj(il->altmat, ob);
 				/* clean up */
-	free((char *)distarr);
+	free((void *)distarr);
 }
 
 
@@ -276,7 +270,7 @@ char  *nm;
 		printobj(il->altmat, ob);
 				/* clean up */
 	freecone(ob);
-	free((char *)distarr);
+	free((void *)distarr);
 }
 
 
@@ -305,10 +299,10 @@ register struct rtproc  *rt;
 		return;
 	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,
+	if ( process(&(rt->pd), (char *)rt->buf, (char *)rt->buf,
+			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--) {