--- ray/src/px/pcond4.c	1996/10/05 11:17:10	3.7
+++ ray/src/px/pcond4.c	1996/10/10 16:36:39	3.9
@@ -146,16 +146,15 @@ int	y;
 
 /****************** ACUITY STUFF *******************/
 
-typedef struct scanbar {
-	short	sampr;		/* sample area size (power of 2) */
+typedef struct {
+	short	sampe;		/* sample area size (exponent of 2) */
 	short	nscans;		/* number of scanlines in this bar */
 	int	len;		/* individual scanline length */
-	struct scanbar	*next;	/* next higher resolution scanbar */
 	int	nread;		/* number of scanlines loaded */
-			/* followed by the scanline data */
+	COLOR	*sdata;		/* scanbar data */
 } SCANBAR;
 
-#define bscan(sb,y)	((COLOR *)((sb)+1)+((y)%(sb)->nscans)*(sb)->len)
+#define bscan(sb,y)	((COLOR *)(sb)->sdata+((y)%(sb)->nscans)*(sb)->len)
 
 SCANBAR	*rootbar;		/* root scan bar (lowest resolution) */
 
@@ -208,17 +207,17 @@ int	y;
 		return(NULL);
 	for ( ; y >= sb->nread; sb->nread++) {		/* read as necessary */
 		mysl = bscan(sb, sb->nread);
-		if (sb->sampr == 1) {
+		if (sb->sampe == 0) {
 			if (freadscan(mysl, sb->len, infp) < 0) {
 				fprintf(stderr, "%s: %s: scanline read error\n",
 						progname, infn);
 				exit(1);
 			}
 		} else {
-			sl0 = getascan(sb->next, 2*y);
+			sl0 = getascan(sb+1, 2*y);
 			if (sl0 == NULL)
 				return(NULL);
-			sl1 = getascan(sb->next, 2*y+1);
+			sl1 = getascan(sb+1, 2*y+1);
 			for (i = 0; i < sb->len; i++) {
 				copycolor(mysl[i], sl0[2*i]);
 				addcolor(mysl[i], sl0[2*i+1]);
@@ -242,12 +241,12 @@ int	y;
 	register int	x;
 					/* compute foveal y position */
 	iy = dy = (y+.5)/numscans(&inpres)*fvyr - .5;
-	if (iy >= fvyr-1) iy--;
+	while (iy >= fvyr-1) iy--;
 	dy -= (double)iy;
 	for (x = 0; x < scanlen(&inpres); x++) {
 					/* compute foveal x position */
 		ix = dx = (x+.5)/scanlen(&inpres)*fvxr - .5;
-		if (ix >= fvxr-1) ix--;
+		while (ix >= fvxr-1) ix--;
 		dx -= (double)ix;
 					/* interpolate sample rate */
 		sr = (1.-dy)*((1.-dx)*tsampr(ix,iy) + dx*tsampr(ix+1,iy)) +
@@ -267,14 +266,13 @@ double	sr;
 	double	d;
 	register SCANBAR	*sb0;
 
-	for (sb0 = rootbar; sb0->next != NULL && sb0->next->sampr > sr;
-			sb0 = sb0->next)
+	for (sb0 = rootbar; sb0->sampe != 0 && 1<<sb0[1].sampe > sr; sb0++)
 		;
 	ascanval(col, x, y, sb0);
-	if (sb0->next == NULL)		/* don't extrapolate highest */
+	if (sb0->sampe == 0)		/* don't extrapolate highest */
 		return;
-	ascanval(c1, x, y, sb0->next);
-	d = (sb0->sampr - sr)/(sb0->sampr - sb0->next->sampr);
+	ascanval(c1, x, y, sb0+1);
+	d = ((1<<sb0->sampe) - sr)/(1<<sb0[1].sampe);
 	scalecolor(col, 1.-d);
 	scalecolor(c1, d);
 	addcolor(col, c1);
@@ -290,25 +288,27 @@ SCANBAR	*sb;
 	double	dx, dy;
 	int	ix, iy;
 
-	if (sb->sampr == 1) {		/* no need to interpolate */
+	if (sb->sampe == 0) {		/* no need to interpolate */
 		sl0 = getascan(sb, y);
 		copycolor(col, sl0[x]);
 		return;
 	}
 					/* compute coordinates for sb */
-	ix = dx = (x+.5)/sb->sampr - .5;
+	ix = dx = (x+.5)/(1<<sb->sampe) - .5;
 	while (ix >= sb->len-1) ix--;
 	dx -= (double)ix;
-	iy = dy = (y+.5)/sb->sampr - .5;
-	while (iy >= numscans(&inpres)/sb->sampr-1) iy--;
+	iy = dy = (y+.5)/(1<<sb->sampe) - .5;
+	while (iy >= (numscans(&inpres)>>sb->sampe)-1) iy--;
 	dy -= (double)iy;
 					/* get scanlines */
 	sl0 = getascan(sb, iy);
+#ifdef DEBUG
 	if (sl0 == NULL) {
 		fprintf(stderr, "%s: internal - cannot backspace in ascanval\n",
 				progname);
-		exit(1);
+		abort();
 	}
+#endif
 	sl1 = getascan(sb, iy+1);
 					/* 2D linear interpolation */
 	copycolor(col, sl0[ix]);
@@ -324,28 +324,36 @@ SCANBAR	*sb;
 	scalecolor(col, 1.-dy);
 	scalecolor(c1y, dy);
 	addcolor(col, c1y);
+	for (ix = 0; ix < 3; ix++)	/* make sure no negative */
+		if (colval(col,ix) < 0.)
+			colval(col,ix) = 0.;
 }
 
 
 SCANBAR	*
-sballoc(sr, ns, sl)		/* allocate scanbar */
-int	sr;		/* sampling rate */
+sballoc(se, ns, sl)		/* allocate scanbar */
+int	se;		/* sampling rate exponent */
 int	ns;		/* number of scanlines */
 int	sl;		/* original scanline length */
 {
+	SCANBAR	*sbarr;
 	register SCANBAR	*sb;
 
-	sb = (SCANBAR *)malloc(sizeof(SCANBAR)+(sl/sr)*ns*sizeof(COLOR));
+	sbarr = sb = (SCANBAR *)malloc((se+1)*sizeof(SCANBAR));
 	if (sb == NULL)
 		syserror("malloc");
-	sb->nscans = ns;
-	sb->len = sl/sr;
-	sb->nread = 0;
-	if ((sb->sampr = sr) > 1)
-		sb->next = sballoc(sr/2, ns*2, sl);
-	else
-		sb->next = NULL;
-	return(sb);
+	do {
+		sb->sampe = se;
+		sb->len = sl>>se;
+		sb->nscans = ns;
+		sb->sdata = (COLOR *)malloc(sb->len*ns*sizeof(COLOR));
+		if (sb->sdata == NULL)
+			syserror("malloc");
+		sb->nread = 0;
+		ns <<= 1;
+		sb++;
+	} while (--se >= 0);
+	return(sbarr);
 }
 
 
@@ -385,9 +393,9 @@ initacuity()			/* initialize variable acuity sampling 
 		tsampr(x,fvyr-1) = tsampr(x,fvyr-2);
 	}
 	for (y = 0; y < fvyr; y++) {
-		tsampr(y,0) = tsampr(y,1);
-		tsampr(y,fvxr-1) = tsampr(y,fvxr-2);
+		tsampr(0,y) = tsampr(1,y);
+		tsampr(fvxr-1,y) = tsampr(fvxr-2,y);
 	}
 					/* initialize with next power of two */
-	rootbar = sballoc(2<<(int)(log(maxsr)/log(2.)), 2, scanlen(&inpres));
+	rootbar = sballoc((int)(log(maxsr)/log(2.))+1, 2, scanlen(&inpres));
 }