--- ray/src/util/glaresrc.c	1991/03/18 12:15:40	1.1
+++ ray/src/util/glaresrc.c	1991/03/19 17:06:25	1.5
@@ -50,29 +50,30 @@ analyze()			/* analyze our scene */
 	if (spanbr == NULL)
 		memerr("view span brightness buffer");
 	for (v = vsize; v >= -vsize; v--) {
+		close_sources(v);
 		getviewspan(v, spanbr);
 		left = hsize + 1;
-		for (h = -hsize; h <= hsize; h++)
+		for (h = -hsize; h <= hsize; h++) {
 			if (spanbr[h+hsize] < 0.0) {	/* off view */
 				if (left < h) {
-					addsrcspan(newspan(left,h-1,v,spanbr));
+					addsrcspan(newspan(left,h,v,spanbr));
 					left = hsize + 1;
 				}
 				continue;
 			}
 			if (spanbr[h+hsize] > threshold) {	/* in source */
-				if (left >= h)
+				if (left > h)
 					left = h;
 			} else {			/* out of source */
 				if (left < h) {
-					addsrcspan(newspan(left,h-1,v,spanbr));
+					addsrcspan(newspan(left,h,v,spanbr));
 					left = hsize + 1;
 				}
 				addindirect(h, spanbr[h+hsize]);
 			}
+		}
 		if (left < h)
-			addsrcspan(newspan(left,h-1,v,spanbr));
-		close_sources(v);
+			addsrcspan(newspan(left,h,v,spanbr));
 	}
 	close_allsrcs();
 	free((char *)spanbr);
@@ -87,7 +88,7 @@ double	br;
 	register int	i;
 
 	if (h <= -hlim) {			/* left region */
-		d = (double)(h+hlim)/SAMPDENS;
+		d = (double)(h+hlim)/sampdens;
 		if (d <= -1.0+FTINY)
 			return;
 		tanb = d/sqrt(1.0-d*d);
@@ -101,7 +102,7 @@ double	br;
 		return;
 	}
 	if (h >= hlim) {			/* right region */
-		d = (double)(h-hlim)/SAMPDENS;
+		d = (double)(h-hlim)/sampdens;
 		if (d >= 1.0-FTINY)
 			return;
 		tanb = d/sqrt(1.0-d*d);
@@ -152,10 +153,12 @@ comp_thresh()			/* compute glare threshold */
 		fprintf(stderr, "%s: threshold zero!\n", progname);
 		exit(1);
 	}
-	if (verbose)
+	if (verbose) {
+		pict_stats();
 		fprintf(stderr,
 			"%s: threshold set to %f cd/m2 from %d samples\n",
 				progname, threshold, nsamps);
+	}
 }
 
 
@@ -164,7 +167,6 @@ struct srcspan	*nss;
 {
 	struct source	*last, *cs, *this;
 	register struct srcspan	*ss;
-	register int	res;
 
 	cs = NULL;
 	for (this = curlist; this != NULL; this = this->next) {
@@ -178,6 +180,7 @@ struct srcspan	*nss;
 					mergesource(cs, this);
 					last->next = this->next;
 					free((char *)this);
+					this = last;
 				}
 				break;
 			}
@@ -243,10 +246,14 @@ int	v;
 
 close_allsrcs()			/* done with everything */
 {
-	register struct source	*this;
+	register struct source	*this, *next;
 
-	for (this = curlist; this != NULL; this = this->next)
+	this = curlist;
+	while (this != NULL) {
+		next = this->next;
 		donesource(this);
+		this = next;
+	}
 	curlist = NULL;
 }
 
@@ -260,30 +267,31 @@ register struct source	*sp;
 	double	d;
 
 	sp->dom = 0.0;
-	sp->dir[0] = sp->dir[1] = sp->dir[1] = 0.0;
+	sp->dir[0] = sp->dir[1] = sp->dir[2] = 0.0;
 	sp->brt = 0.0;
+	n = 0;
 	for (ss = sp->first; ss != NULL; ss = ss->next) {
 		sp->brt += ss->brsum;
 		n += ss->r - ss->l;
-		compdir(dright, ss->r, ss->v);
-		for (h = ss->r-1; h >= ss->l; h--) {
-			compdir(dthis, h, ss->v);
-			d = dist2(dthis, dright);
-			fvsum(sp->dir, sp->dir, dthis, d);
-			sp->dom += d;
-			VCOPY(dright, dthis);
-		}
+		if (compdir(dright, ss->r, ss->v) < 0)
+			compdir(dright, ss->r-2, ss->v);
+		for (h = ss->r-1; h >= ss->l; h--)
+			if (compdir(dthis, h, ss->v) == 0) {
+				d = dist2(dthis, dright);
+				fvsum(sp->dir, sp->dir, dthis, d);
+				sp->dom += d;
+				VCOPY(dright, dthis);
+			}
 		free((char *)ss);
 	}
 	sp->first = NULL;
 	sp->brt /= (double)n;
-	sp->dir[0] /= sp->dom;
-	sp->dir[1] /= sp->dom;
-	sp->dir[2] /= sp->dom;
+	normalize(sp->dir);
 	sp->next = donelist;
 	donelist = sp;
 	if (verbose)
 		fprintf(stderr,
-	"%s: found source at (%f,%f,%f), solid angle %f, brightness %f\n",
-			progname, sp->dir[0], sp->dir[1], sp->dir[2], sp->brt);
+	"%s: found source at (%.3f,%.3f,%.3f), dw %.5f, br %.1f (%d samps)\n",
+			progname, sp->dir[0], sp->dir[1], sp->dir[2], 
+			sp->dom, sp->brt, n);
 }