--- ray/src/util/glare.h	1991/11/12 17:19:16	2.1
+++ ray/src/util/glare.h	2008/05/01 16:42:06	2.7
@@ -1,16 +1,19 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
-/* SCCSid "$SunId$ LBL" */
-
+/* RCSid: $Id: glare.h,v 2.7 2008/05/01 16:42:06 greg Exp $ */
 /*
  * Common data structures for glare source finding routines
  */
+#ifndef _RAD_GLARE_H_
+#define _RAD_GLARE_H_
 
 #include "standard.h"
 #include "view.h"
 #include "color.h"
 #include "setscan.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define GLAREBR		7.0		/* glare source is this * avg. lum. */
 
 #define SAMPDENS	75		/* default samples per unit in image */
@@ -24,7 +27,7 @@
 #define TOOSMALL(s)	((s)->brt*(s)->dom < threshold*SAMIN)
 
 #define SABIG		.025		/* solid angle of splittable source */
-#define LCORR		.8		/* linearity of splittable source */
+#define LCORR		.12		/* linearity of splittable source */
 
 extern VIEW	ourview;		/* our view */
 extern VIEW	pictview;		/* picture view */
@@ -70,8 +73,28 @@ extern struct source {
 	struct source	*next;	/* next source in list */
 } *donelist;			/* finished sources */
 
-extern double	getviewpix();
-extern double	pixsize();
 
 extern long	npixinvw;	/* number of samples in view */
 extern long	npixmiss;	/* number of samples missing */
+
+	/* defined in findglare.c */
+extern void memerr(char	*s);
+extern int compdir(FVECT vd, int x, int y);
+extern double pixsize(int x, int y);
+	/* defined in glaresrc.c */
+extern void comp_thresh(void);
+extern void analyze(void);
+extern void absorb_specks(void);
+	/* defined in glareval.c */
+extern void open_pict(char *fn);
+extern void fork_rtrace(char *av[]);
+extern void close_pict(void);
+extern void done_rtrace(void);
+extern void getviewspan(int vv, float *vb);
+extern double getviewpix(int vh, int vv);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* _RAD_GLARE_H_ */
+