--- ray/src/rt/srcdraw.c	1996/06/08 21:16:04	2.3
+++ ray/src/rt/srcdraw.c	2003/02/22 02:07:29	2.5
@@ -1,13 +1,69 @@
-/* Copyright (c) 1996 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: srcdraw.c,v 2.5 2003/02/22 02:07:29 greg Exp $";
 #endif
-
 /*
  * Draw small sources into image in case we missed them.
+ *
+ *  External symbols declared in ray.h
  */
 
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
+ *
+ * Copyright (c) 1990 - 2002 The Regents of the University of California,
+ * through Lawrence Berkeley National Laboratory.   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *         notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *           if any, must include the following acknowledgment:
+ *             "This product includes Radiance software
+ *                 (http://radsite.lbl.gov/)
+ *                 developed by the Lawrence Berkeley National Laboratory
+ *               (http://www.lbl.gov/)."
+ *       Alternately, this acknowledgment may appear in the software itself,
+ *       if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
+ *       and "The Regents of the University of California" must
+ *       not be used to endorse or promote products derived from this
+ *       software without prior written permission. For written
+ *       permission, please contact radiance@radsite.lbl.gov.
+ *
+ * 5. Products derived from this software may not be called "Radiance",
+ *       nor may "Radiance" appear in their name, without prior written
+ *       permission of Lawrence Berkeley National Laboratory.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
+ * information on Lawrence Berkeley National Laboratory, please see
+ * <http://www.lbl.gov/>.
+ */
+
 #include  "ray.h"
 
 #include  "view.h"
@@ -337,7 +393,7 @@ int	rad;				/* source sample size */
 					/* free old source list if one */
 	for (sp = sphead; sp != NULL; sp = sphead) {
 		sphead = sp->next;
-		free((char *)sp);
+		free((void *)sp);
 	}
 					/* loop through all sources */
 	for (i = nsources; i--; ) {
@@ -356,7 +412,7 @@ int	rad;				/* source sample size */
 	}
 }
 
-			/* add sources smaller than rad to computed subimage */
+void			/* add sources smaller than rad to computed subimage */
 drawsources(pic, zbf, x0, xsiz, y0, ysiz)
 COLOR	*pic[];				/* subimage pixel value array */
 float	*zbf[];				/* subimage distance array (opt.) */
@@ -366,7 +422,7 @@ int	x0, xsiz, y0, ysiz;		/* origin and size of subimag
 	int	nsv, npv;
 	int	xmin, xmax, ymin, ymax, x, y;
 	FLOAT	cxy[2];
-	double	pa;
+	double	w;
 	RAY	sr;
 	register SPLIST	*sp;
 	register int	i;
@@ -415,11 +471,14 @@ int	x0, xsiz, y0, ysiz;		/* origin and size of subimag
 					continue;	/* missed/blocked */
 							/* modify pixel */
 				if (zbf[y-y0] != NULL &&
-						sr.rt < zbf[y-y0][x-x0])
+						sr.rt < 0.999*zbf[y-y0][x-x0])
 					zbf[y-y0][x-x0] = sr.rt;
-				pa = poly_area(ppoly, npv);
-				scalecolor(sr.rcol, pa*hres*vres);
-				scalecolor(pic[y-y0][x-x0], (1.-pa*hres*vres));
+				else if (!bigdiff(sr.rcol, pic[y-y0][x-x0],
+						0.001))	/* source sample */
+					setcolor(pic[y-y0][x-x0], 0., 0., 0.);
+				w = poly_area(ppoly, npv) * hres * vres;
+				scalecolor(sr.rcol, w);
+				scalecolor(pic[y-y0][x-x0], 1.-w);
 				addcolor(pic[y-y0][x-x0], sr.rcol);
 			}
 	}