--- ray/src/px/pfilt.c	2003/06/30 14:59:12	2.25
+++ ray/src/px/pfilt.c	2004/03/28 20:33:14	2.29
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: pfilt.c,v 2.25 2003/06/30 14:59:12 schorsch Exp $";
+static const char RCSid[] = "$Id: pfilt.c,v 2.29 2004/03/28 20:33:14 schorsch Exp $";
 #endif
 /*
  *  pfilt.c - program to post-process picture file.
@@ -13,13 +13,14 @@ static const char RCSid[] = "$Id: pfilt.c,v 2.25 2003/
 #include  <signal.h>
 #include  <string.h>
 
-#include  "standard.h"
 #include  "platform.h"
+#include  "standard.h"
+#include  "rtio.h"
 #include  "color.h"
 #include  "view.h"
 #include  "paths.h"
+#include  "pfilt.h"
 
-extern float  *matchlamp();
 
 #define	 FEQ(a,b)	((a) >= .98*(b) && (a) <= 1.02*(b))
 
@@ -83,12 +84,23 @@ int  orad = 0;			/* output window radius */
 
 char  *progname;
 
+static gethfunc headline;
+static double rgb_bright(COLOR  clr);
+static double xyz_bright(COLOR  clr);
+static void copyfile(FILE  *in, FILE  *out);
+static void pass1(FILE  *in);
+static void pass2(FILE  *in);
+static void scan2init(void);
+static void scan2sync(int  r);
+static void scan2flush(void);
 
-main(argc, argv)
-int  argc;
-char  **argv;
+
+int
+main(
+	int  argc,
+	char  **argv
+)
 {
-	extern int  headline();
 	FILE  *fin;
 	float  *lampcolor;
 	char  *lamptype = NULL;
@@ -306,20 +318,23 @@ char  **argv;
 	pass2(fin);
 
 	quit(estatus);
+	return estatus; /* pro forma return */
 }
 
 
-double
-rgb_bright(clr)
-COLOR  clr;
+static double
+rgb_bright(
+	COLOR  clr
+)
 {
 	return(bright(clr));
 }
 
 
-double
-xyz_bright(clr)
-COLOR  clr;
+static double
+xyz_bright(
+	COLOR  clr
+)
 {
 	return(clr[CIEY]);
 }
@@ -328,9 +343,11 @@ COLOR  clr;
 double	(*ourbright)() = rgb_bright;
 
 
-int
-headline(s)				/* process line from header */
-char  *s;
+static int
+headline(				/* process line from header */
+	char	*s,
+	void	*p
+)
 {
 	char  fmt[32];
 
@@ -353,8 +370,11 @@ char  *s;
 }
 
 
-copyfile(in, out)			/* copy a file */
-register FILE  *in, *out;
+static void
+copyfile(			/* copy a file */
+	register FILE  *in,
+	register FILE  *out
+)
 {
 	register int  c;
 
@@ -368,8 +388,10 @@ register FILE  *in, *out;
 }
 
 
-pass1(in)				/* first pass of picture file */
-FILE  *in;
+static void
+pass1(				/* first pass of picture file */
+	FILE  *in
+)
 {
 	int  i;
 	COLOR  *scan;
@@ -401,8 +423,10 @@ FILE  *in;
 }
 
 
-pass2(in)			/* last pass on file, write to stdout */
-FILE  *in;
+static void
+pass2(			/* last pass on file, write to stdout */
+	FILE  *in
+)
 {
 	int  yread;
 	int  ycent, xcent;
@@ -452,7 +476,8 @@ FILE  *in;
 }
 
 
-scan2init()			/* prepare scanline arrays */
+static void
+scan2init(void)			/* prepare scanline arrays */
 {
 	COLOR	ctmp;
 	double	d;
@@ -490,12 +515,12 @@ scan2init()			/* prepare scanline arrays */
 	if (obarsize > 0) {
 		scoutbar = (COLOR **)malloc(obarsize*sizeof(COLOR *));
 		greybar = (float **)malloc(obarsize*sizeof(float *));
-		if (scoutbar == NULL | greybar == NULL)
+		if ((scoutbar == NULL) | (greybar == NULL))
 			goto memerr;
 		for (i = 0; i < obarsize; i++) {
 			scoutbar[i] = (COLOR *)malloc(ncols*sizeof(COLOR));
 			greybar[i] = (float *)malloc(ncols*sizeof(float));
-			if (scoutbar[i] == NULL | greybar[i] == NULL)
+			if ((scoutbar[i] == NULL) | (greybar[i] == NULL))
 				goto memerr;
 		}
 	} else {
@@ -529,8 +554,10 @@ memerr:
 }
 
 
-scan2sync(r)			/* synchronize grey averages and output scan */
-int  r;
+static void
+scan2sync(			/* synchronize grey averages and output scan */
+	int  r
+)
 {
 	static int  nextrow = 0;
 	COLOR  ctmp;
@@ -555,7 +582,8 @@ int  r;
 }
 
 
-scan2flush()			/* flush output buffer */
+static void
+scan2flush(void)			/* flush output buffer */
 {
 	register int  r;