--- ray/src/hd/rhpict2.c	1999/03/08 14:09:11	3.3
+++ ray/src/hd/rhpict2.c	1999/03/09 11:41:29	3.5
@@ -120,8 +120,12 @@ int	n;
 	int	d;
 	register int4	i, p;
 
-	if (n <= 0)
+	if (n <= 0) {
+#ifdef DEBUG
+		error(WARNING, "neighborless sample in kill_occl");
+#endif
 		return(1);
+	}
 	p = v*hres + h;
 	forequad[0][0] = forequad[0][1] = forequad[1][0] = forequad[1][1] = 0;
 	for (i = n; i--; ) {
@@ -147,7 +151,7 @@ int	n;
 	int	dis[NNEIGH], ndis;
 	COLOR	mykern[MAXRAD2];
 	int4	maxr2;
-	double	w, d;
+	double	d;
 	register int4	p, r2;
 	int	i, r, maxr, h2, v2;
 
@@ -192,8 +196,7 @@ int	n;
 			}
 			if (i >= 0) continue;	/* outside edge */
 			addcolor(mypixel[v2*hres+h2], mykern[r2]);
-			myweight[v2*hres+h2] += pixWeight[r2] *
-							myweight[v*hres+h];
+			myweight[v2*hres+h2] += pixWeight[r2] * myweight[p];
 		}
 	}
 	return(1);
@@ -202,23 +205,11 @@ int	n;
 
 pixFlush()			/* done with beams -- flush pixel values */
 {
+	if (pixWeight[0] <= FTINY)
+		init_wfunc();		/* initialize weighting function */
 	reset_flags();			/* set occupancy flags */
 	meet_neighbors(kill_occl);	/* eliminate occlusion errors */
 	reset_flags();			/* reset occupancy flags */
-	if (pixWeight[0] <= FTINY) {	/* initialize weighting function */
-		register int	i, j, r2;
-		double	d;
-		for (i = 1; i <= MAXRAD; i++)
-			for (j = 0; j <= i; j++) {
-				r2 = i*i + j*j;
-				if (r2 >= MAXRAD2) break;
-				d = sqrt((double)r2);
-				pixWeight[r2] = G0NORM/d;
-				isqrttab[r2] = d + 0.99;
-			}
-		pixWeight[0] = 1.;
-		isqrttab[0] = 0;
-	}
 	meet_neighbors(grow_samp);	/* grow valid samples over image */
 	free((char *)pixFlags);		/* free pixel flags */
 	pixFlags = NULL;
@@ -227,7 +218,7 @@ pixFlush()			/* done with beams -- flush pixel values 
 
 reset_flags()			/* allocate/set/reset occupancy flags */
 {
-	register int	p;
+	register int4	p;
 
 	if (pixFlags == NULL) {
 		pixFlags = (int4 *)calloc(FL4NELS(hres*vres), sizeof(int4));
@@ -237,6 +228,25 @@ reset_flags()			/* allocate/set/reset occupancy flags 
 	for (p = hres*vres; p--; )
 		if (myweight[p] > FTINY)
 			SET4(pixFlags, p);
+}
+
+
+init_wfunc()			/* initialize weighting function */
+{
+	register int	i, j;
+	register int4	r2;
+	register double	d;
+
+	for (i = 1; i <= MAXRAD; i++)
+		for (j = 0; j <= i; j++) {
+			r2 = i*i + j*j;
+			if (r2 >= MAXRAD2) break;
+			d = sqrt((double)r2);
+			pixWeight[r2] = G0NORM/d;
+			isqrttab[r2] = d + 0.99;
+		}
+	pixWeight[0] = 1.;
+	isqrttab[0] = 0;
 }