--- ray/src/px/pcomb.c	2004/08/31 18:52:27	2.34
+++ 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.34 2004/08/31 18:52:27 greg 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.
@@ -14,7 +14,7 @@ static const char	RCSid[] = "$Id: pcomb.c,v 2.34 2004/
 #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)
 
@@ -439,11 +439,8 @@ advance(void)			/* 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);
 		}
 }
 
@@ -601,22 +598,22 @@ l_psize(char *nm)		/* 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;