--- ray/src/px/pcomb.c	2003/06/05 19:29:34	2.23
+++ ray/src/px/pcomb.c	2005/05/25 04:44:25	2.38
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: pcomb.c,v 2.23 2003/06/05 19:29:34 schorsch Exp $";
+static const char	RCSid[] = "$Id: pcomb.c,v 2.38 2005/05/25 04:44:25 greg Exp $";
 #endif
 /*
  *  Combine picture files according to calcomp functions.
@@ -7,12 +7,14 @@ static const char	RCSid[] = "$Id: pcomb.c,v 2.23 2003/
  *	1/4/89
  */
 
+#include "platform.h"
 #include "standard.h"
+#include "rtprocess.h"
 #include "color.h"
 #include "calcomp.h"
 #include "view.h"
 
-#define MAXINP		32		/* maximum number of input files */
+#define MAXINP		512		/* maximum number of input files */
 #define WINSIZ		64		/* scanline window size */
 #define MIDSCN		((WINSIZ-1)/2+1)
 
@@ -31,6 +33,7 @@ int	nfiles;				/* number of input files */
 
 char	ourfmt[LPICFMT+1] = PICFMT;	/* input picture format */
 
+char	StandardInput[] = "<stdin>";
 char	Command[] = "<Command>";
 char	vcolin[3][4] = {"ri", "gi", "bi"};
 char	vcolout[3][4] = {"ro", "go", "bo"};
@@ -68,18 +71,30 @@ char	*progname;			/* global argv[0] */
 int	wrongformat = 0;
 int	gotview;
 
-FILE	*popen();
 
-extern char	*emalloc();
+static gethfunc tabputs;
+static void checkfile(void);
+static double rgb_bright(COLOR  clr);
+static double xyz_bright(COLOR  clr);
+static void init(void);
+static void combine(void);
+static void advance(void);
+static double l_expos(char	*nam);
+static double l_pixaspect(char *nm);
+static double l_colin(char	*nam);
+static double l_ray(char	*nam);
+static double l_psize(char *nm);
 
 
-main(argc, argv)
-int	argc;
-char	*argv[];
+int
+main(
+	int	argc,
+	char	*argv[]
+)
 {
 	int	original;
 	double	f;
-	int	a, i;
+	int	a;
 	SET_DEFAULT_BINARY();
 	SET_FILE_BINARY(stdin);
 	SET_FILE_BINARY(stdout);
@@ -108,7 +123,7 @@ char	*argv[];
 	for (nfiles = 0; nfiles < MAXINP; nfiles++) {
 		setcolor(input[nfiles].coef, 1.0, 1.0, 1.0);
 		setcolor(input[nfiles].expos, 1.0, 1.0, 1.0);
-		copystruct(&input[nfiles].vw, &stdview);
+		input[nfiles].vw = stdview;
 		input[nfiles].pa = 1.0;
 	}
 	nfiles = 0;
@@ -122,7 +137,7 @@ char	*argv[];
 		if (argv[a][0] == '-')
 			switch (argv[a][1]) {
 			case '\0':
-				input[nfiles].name = "<stdin>";
+				input[nfiles].name = StandardInput;
 				input[nfiles].fp = stdin;
 				break;
 			case 'o':
@@ -215,11 +230,15 @@ usage:
 	eputs(
 " [-w][-x xr][-y yr][-e expr][-f file] [ [-o][-s f][-c r g b] pic ..]\n");
 	quit(1);
+	return 1; /* pro forma return */
 }
 
 
-tabputs(s)			/* put out string preceded by a tab */
-char	*s;
+static int
+tabputs(			/* put out string preceded by a tab */
+	char	*s,
+	void	*p
+)
 {
 	char	fmt[32];
 	double	d;
@@ -251,7 +270,8 @@ char	*s;
 }
 
 
-checkfile()			/* ready a file */
+static void
+checkfile(void)			/* ready a file */
 {
 	register int	i;
 					/* process header */
@@ -290,17 +310,19 @@ checkfile()			/* ready a file */
 }
 
 
-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]);
 }
@@ -309,9 +331,9 @@ COLOR  clr;
 double	(*ourbright)() = rgb_bright;
 
 
-init()					/* perform final setup */
+static void
+init(void)					/* perform final setup */
 {
-	double	l_colin(), l_expos(), l_pixaspect(), l_ray(), l_psize();
 	register int	i;
 						/* define constants */
 	varset("PI", ':', PI);
@@ -338,7 +360,8 @@ init()					/* perform final setup */
 }
 
 
-combine()			/* combine pictures */
+static void
+combine(void)			/* combine pictures */
 {
 	EPNODE	*coldef[3], *brtdef;
 	COLOR	*scanout;
@@ -396,7 +419,8 @@ combine()			/* combine pictures */
 }
 
 
-advance()			/* read in data for next scanline */
+static void
+advance(void)			/* read in data for next scanline */
 {
 	int	ytarget;
 	register COLOR	*st;
@@ -415,18 +439,16 @@ advance()			/* read in data for next scanline */
 				eputs(": read error\n");
 				quit(1);
 			}
-			if (fabs(colval(input[i].coef,RED)-1.0) > 1e-3 ||
-				fabs(colval(input[i].coef,GRN)-1.0) > 1e-3 ||
-				fabs(colval(input[i].coef,BLU)-1.0) > 1e-3)
-				for (j = 0; j < xmax; j++)  /* adjust color */
-					multcolor(st[j], input[i].coef);
+			for (j = 0; j < xmax; j++)	/* adjust color */
+				multcolor(st[j], input[i].coef);
 		}
 }
 
 
-double
-l_expos(nam)			/* return picture exposure */
-register char	*nam;
+static double
+l_expos(			/* return picture exposure */
+	register char	*nam
+)
 {
 	register int	fn, n;
 
@@ -441,11 +463,12 @@ register char	*nam;
 			return(colval(input[fn].expos,n));
 	eputs("Bad call to l_expos()!\n");
 	quit(1);
+	return 1; /* pro forma return */
 }
 
 
-double
-l_pixaspect()			/* return pixel aspect ratio */
+static double
+l_pixaspect(char *nm)		/* return pixel aspect ratio */
 {
 	register int	fn;
 
@@ -456,9 +479,10 @@ l_pixaspect()			/* return pixel aspect ratio */
 }
 
 
-double
-l_colin(nam)			/* return color value for picture */
-register char	*nam;
+static double
+l_colin(			/* return color value for picture */
+	register char	*nam
+)
 {
 	int	fn;
 	register int	n, xoff, yoff;
@@ -507,17 +531,19 @@ register char	*nam;
 		return(colval(input[fn].scan[MIDSCN+yoff][xscan+xoff],n));
 	eputs("Bad call to l_colin()!\n");
 	quit(1);
+	return 1; /* pro forma return */
 }
 
 
-double
-l_ray(nam)		/* return ray origin or direction */
-register char	*nam;
+static double
+l_ray(		/* return ray origin or direction */
+	register char	*nam
+)
 {
 	static unsigned long	ltick[MAXINP];
 	static FVECT	lorg[MAXINP], ldir[MAXINP];
 	static double	ldist[MAXINP];
-	FLOAT	loc[2];
+	RREAL	loc[2];
 	int	fn;
 	register int	i;
 
@@ -546,16 +572,17 @@ register char	*nam;
 			return(i < 3 ? lorg[fn][i] : ldir[fn][i-3]);
 	eputs("Bad call to l_ray()!\n");
 	quit(1);
+	return 1; /* pro forma return */
 }
 
 
-double
-l_psize()			/* compute pixel size in steradians */
+static double
+l_psize(char *nm)		/* compute pixel size in steradians */
 {
 	static unsigned long	ltick[MAXINP];
 	static double	psize[MAXINP];
 	FVECT	dir0, org, dirx, diry;
-	FLOAT	locx[2], locy[2];
+	RREAL	locx[2], locy[2];
 	double	d;
 	int	fn;
 	register int	i;
@@ -571,22 +598,22 @@ l_psize()			/* compute pixel size in steradians */
 		if (input[fn].vw.type == 0)
 			errno = EDOM;
 		else if (input[fn].vw.type != VT_PAR &&
-				funvalue(vray[6], 1, &d) >= 0) {
+				funvalue(vray[6], 1, &d) >= -FTINY) {
 			for (i = 0; i < 3; i++)
 				dir0[i] = funvalue(vray[3+i], 1, &d);
 			pix2loc(locx, &input[fn].rs, xscan+1, ymax-1-yscan);
 			pix2loc(locy, &input[fn].rs, xscan, ymax-yscan);
 			if (viewray(org, dirx, &input[fn].vw,
-					locx[0], locx[1]) >= 0 &&
+					locx[0], locx[1]) >= -FTINY &&
 					viewray(org, diry, &input[fn].vw,
-					locy[0], locy[1]) >= 0) {
+					locy[0], locy[1]) >= -FTINY) {
 						/* approximate solid angle */
 				for (i = 0; i < 3; i++) {
 					dirx[i] -= dir0[i];
 					diry[i] -= dir0[i];
 				}
 				fcross(dir0, dirx, diry);
-				psize[fn] = sqrt(DOT(dir0,dir0));
+				psize[fn] = VLEN(dir0);
 			}
 		}
 		ltick[fn] = eclock;
@@ -595,26 +622,23 @@ l_psize()			/* compute pixel size in steradians */
 }
 
 
-void
-wputs(msg)
-char	*msg;
+extern void
+wputs(char	*msg)
 {
 	if (!nowarn)
 		eputs(msg);
 }
 
 
-void
-eputs(msg)
-char	*msg;
+extern void
+eputs(char *msg)
 {
 	fputs(msg, stderr);
 }
 
 
-void
-quit(code)		/* exit gracefully */
-int  code;
+extern void
+quit(int code)		/* exit gracefully */
 {
 	register int  i;
 				/* close input files */