--- ray/src/px/pinterp.c	1990/03/06 12:04:56	1.26
+++ ray/src/px/pinterp.c	1990/09/04 21:16:25	1.29
@@ -454,7 +454,11 @@ double	z;
 		y1 = p0->y + c1*s1y/l1;
 		for (c2 = l2; c2-- > 0; ) {
 			x = x1 + c2*s2x/l2;
+			if (x < 0 || x >= hresolu)
+				continue;
 			y = y1 + c2*s2y/l2;
+			if (y < 0 || y >= vresolu)
+				continue;
 			if (zscan(y)[x] <= 0 || zscan(y)[x]-z
 						> zeps*zscan(y)[x]) {
 				zscan(y)[x] = z;
@@ -519,35 +523,39 @@ int	samp;
 				}
 				/*
 				 * If we have no background for this pixel,
-				 * or if the background is too distant,
 				 * use the given fill function.
 				 */
-				if ((xback < 0 && yback[x] < 0)
-					|| (samp > 0
-						&& ABS(x-xback) >= samp
-						&& ABS(y-yback[y]) >= samp)) {
-					(*fill)(x,y);
-					if (fill != backfill) {	/* reuse */
-						yback[x] = -2;
-						xback = -2;
-					}
-					continue;
-				}
+				if (xback < 0 && yback[x] < 0)
+					goto fillit;
 				/*
 				 * Compare, and use the background that is
 				 * farther, unless one of them is next to us.
+				 * If the background is too distant, call
+				 * the fill function.
 				 */
 				if ( yback[x] < 0
 					|| (xback >= 0 && ABS(x-xback) <= 1)
 					|| ( ABS(y-yback[x]) > 1
 						&& zscan(yback[x])[x]
 						< zscan(y)[xback] ) ) {
+					if (samp > 0 && ABS(x-xback) >= samp)
+						goto fillit;
 					copycolr(pscan(y)[x],pscan(y)[xback]);
 					zscan(y)[x] = zscan(y)[xback];
 				} else {
+					if (samp > 0 && ABS(y-yback[x]) > samp)
+						goto fillit;
 					copycolr(pscan(y)[x],pscan(yback[x])[x]);
 					zscan(y)[x] = zscan(yback[x])[x];
 				}
+				continue;
+			fillit:
+				(*fill)(x,y);
+				if (fill == rcalfill) {		/* use it */
+					clearqueue();
+					xback = x;
+					yback[x] = y;
+				}
 			} else {				/* full pixel */
 				yback[x] = -2;
 				xback = -2;
@@ -600,10 +608,10 @@ char	*fname;
 		if (donorm) {
 			double	vx, yzn2;
 			register int	x;
-			yzn2 = y - .5*(vresolu-1);
+			yzn2 = (y+.5)/vresolu + ourview.voff - .5;
 			yzn2 = 1. + yzn2*yzn2*ourview.vn2;
 			for (x = 0; x < hresolu; x++) {
-				vx = x - .5*(hresolu-1);
+				vx = (x+.5)/hresolu + ourview.hoff - .5;
 				zout[x] = zscan(y)[x]
 					* sqrt(vx*vx*ourview.hn2 + yzn2);
 			}