--- ray/src/util/glare.h	1991/04/22 10:28:10	1.16
+++ ray/src/util/glare.h	2003/06/27 11:32:12	2.4
@@ -1,11 +1,14 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
-/* SCCSid "$SunId$ LBL" */
-
+/* RCSid: $Id: glare.h,v 2.4 2003/06/27 11:32:12 schorsch Exp $ */
 /*
  * Common data structures for glare source finding routines
  */
+#ifndef _RAD_GLARE_H_
+#define _RAD_GLARE_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 
+
 #include "standard.h"
 #include "view.h"
 #include "color.h"
@@ -13,7 +16,7 @@
 
 #define GLAREBR		7.0		/* glare source is this * avg. lum. */
 
-#define SAMPDENS	50		/* default samples per unit in image */
+#define SAMPDENS	75		/* default samples per unit in image */
 #define TSAMPSTEP	10		/* sample step to compute threshold */
 
 #define SEPS		1		/* sources this close ==> contig. */
@@ -23,6 +26,9 @@
 
 #define TOOSMALL(s)	((s)->brt*(s)->dom < threshold*SAMIN)
 
+#define SABIG		.025		/* solid angle of splittable source */
+#define LCORR		.12		/* linearity of splittable source */
+
 extern VIEW	ourview;		/* our view */
 extern VIEW	pictview;		/* picture view */
 extern VIEW	leftview, rightview;	/* leftmost and rightmost views */
@@ -67,8 +73,16 @@ extern struct source {
 	struct source	*next;	/* next source in list */
 } *donelist;			/* finished sources */
 
-extern double	getviewpix();
-extern double	pixsize();
+extern double	getviewpix(int vh, int vv);
+extern double	pixsize(int x, int y);
 
 extern long	npixinvw;	/* number of samples in view */
 extern long	npixmiss;	/* number of samples missing */
+
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* _RAD_GLARE_H_ */
+