--- ray/src/px/pcompos.c	2003/10/27 10:24:51	2.25
+++ ray/src/px/pcompos.c	2006/09/08 21:38:25	2.32
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: pcompos.c,v 2.25 2003/10/27 10:24:51 schorsch Exp $";
+static const char	RCSid[] = "$Id: pcompos.c,v 2.32 2006/09/08 21:38:25 greg Exp $";
 #endif
 /*
  *  pcompos.c - program to composite pictures.
@@ -16,10 +16,11 @@ static const char	RCSid[] = "$Id: pcompos.c,v 2.25 200
 
 #include  "platform.h"
 #include  "rtprocess.h"
+#include  "rterror.h"
 #include  "color.h"
 #include  "resolu.h"
 
-#define	 MAXFILE	64
+#define	 MAXFILE	512
 
 #define  HASMIN		1
 #define  HASMAX		2
@@ -39,6 +40,7 @@ int  labelht = 24;			/* label height */
 
 int  checkthresh = 0;			/* check threshold value */
 
+char  StandardInput[] = "<stdin>";
 char  Command[] = "<Command>";
 char  Label[] = "<Label>";
 
@@ -50,20 +52,28 @@ struct {
 	int  xres, yres;		/* picture size */
 	int  xloc, yloc;		/* anchor point */
 	int  flags;			/* HASMIN, HASMAX */
-	COLR  thmin, thmax;		/* thresholds */
+	double  thmin, thmax;		/* thresholds */
 } input[MAXFILE];		/* our input files */
 
 int  nfile;			/* number of files */
 
+int  echoheader = 1;
 char  ourfmt[LPICFMT+1] = PICFMT;
 int  wrongformat = 0;
 
-FILE  *lblopen();
-void  quit();
 
+static gethfunc headline;
+static void compos(void);
+static int cmpcolr(COLR  c1, double lv2);
+static FILE * lblopen(char  *s, int  *xp, int  *yp);
 
-tabputs(s)			/* print line preceded by a tab */
-char  *s;
+
+
+static int
+headline(			/* print line preceded by a tab */
+	char	*s,
+	void	*p
+)
 {
 	char  fmt[32];
 
@@ -75,7 +85,7 @@ char  *s;
 			strcpy(ourfmt, fmt);
 		} else
 			wrongformat = 1;
-	} else {
+	} else if (echoheader) {
 		putc('\t', stdout);
 		fputs(s, stdout);
 	}
@@ -83,9 +93,11 @@ char  *s;
 }
 
 
-main(argc, argv)
-int  argc;
-char  *argv[];
+int
+main(
+	int  argc,
+	char  *argv[]
+)
 {
 	int  ncolumns = 0;
 	int  autolabel = 0;
@@ -100,6 +112,9 @@ char  *argv[];
 
 	for (an = 1; an < argc && argv[an][0] == '-'; an++)
 		switch (argv[an][1]) {
+		case 'h':
+			echoheader = !echoheader;
+			break;
 		case 'x':
 			xsiz = atoi(argv[++an]);
 			break;
@@ -158,16 +173,10 @@ dofiles:
 				checkthresh = 1;
 				if (argv[an][0] == '-') {
 					input[nfile].flags |= HASMIN;
-					setcolr(input[nfile].thmin,
-							atof(argv[an+1]),
-							atof(argv[an+1]),
-							atof(argv[an+1]));
+					input[nfile].thmin = atof(argv[an+1]);
 				} else if (argv[an][0] == '+') {
 					input[nfile].flags |= HASMAX;
-					setcolr(input[nfile].thmax,
-							atof(argv[an+1]),
-							atof(argv[an+1]),
-							atof(argv[an+1]));
+					input[nfile].thmax = atof(argv[an+1]);
 				} else
 					goto userr;
 				an++;
@@ -202,7 +211,7 @@ getfile:
 		if (autolabel && thislabel == NULL)
 			thislabel = argv[an];
 		if (!strcmp(argv[an], "-")) {
-			input[nfile].name = "<stdin>";
+			input[nfile].name = StandardInput;
 			input[nfile].fp = stdin;
 		} else {
 			if (argv[an][0] == '!') {
@@ -219,8 +228,9 @@ getfile:
 		}
 		an++;
 						/* get header */
-		printf("%s:\n", input[nfile].name);
-		getheader(input[nfile].fp, tabputs, NULL);
+		if (echoheader)
+			printf("%s:\n", input[nfile].name);
+		getheader(input[nfile].fp, headline, NULL);
 		if (wrongformat) {
 			fprintf(stderr, "%s: incompatible input format\n",
 					input[nfile].name);
@@ -299,7 +309,7 @@ getfile:
 	quit(0);
 userr:
 	fprintf(stderr,
-	"Usage: %s [-x xr][-y yr][-b r g b][-a n][-s p][-o x0 y0][-la][-lh h] ",
+	"Usage: %s [-h][-x xr][-y yr][-b r g b][-a n][-s p][-o x0 y0][-la][-lh h] ",
 			progname);
 	fprintf(stderr, "[-t min1][+t max1][-l lab][=SS] pic1 x1 y1 ..\n");
 	quit(1);
@@ -310,10 +320,12 @@ toomany:
 labelerr:
 	fprintf(stderr, "%s: error opening label\n", progname);
 	quit(1);
+	return 1; /* pro forma return */
 }
 
 
-compos()				/* composite pictures */
+static void
+compos(void)				/* composite pictures */
 {
 	COLR  *scanin, *scanout;
 	int  y;
@@ -367,6 +379,11 @@ compos()				/* composite pictures */
 			quit(1);
 		}
 	}
+					/* read remainders from streams */
+	for (i = 0; i < nfile; i++)
+		if (input[i].name[0] == '<')
+			while (getc(input[i].fp) != EOF)
+				;
 	return;
 memerr:
 	perror(progname);
@@ -374,26 +391,30 @@ memerr:
 }
 
 
-int
-cmpcolr(c1, c2)			/* compare two colr's (improvisation) */
-register COLR  c1, c2;
+static int
+cmpcolr(			/* compare COLR to luminance */
+	register COLR  c1,
+	double lv2
+)
 {
-	register int  i, j;
-
-	j = 4;				/* check exponents first! */
-	while (j--)
-		if ( (i = c1[j] - c2[j]) )
-			return(i);
+	double	lv1 = .0;
+	
+	if (c1[EXP])
+		lv1 = ldexp((double)normbright(c1), (int)c1[EXP]-(COLXS+8));
+	if (lv1 < lv2) return(-1);
+	if (lv1 > lv2) return(1);
 	return(0);
 }
 
 
-FILE *
-lblopen(s, xp, yp)		/* open pipe to label generator */
-char  *s;
-int  *xp, *yp;
+static FILE *
+lblopen(		/* open pipe to label generator */
+	char  *s,
+	int  *xp,
+	int  *yp
+)
 {
-	char  com[128];
+	char  com[PATH_MAX];
 	FILE  *fp;
 
 	sprintf(com, "psign -s -.15 -a 2 -x %d -y %d '%.90s'", *xp, *yp, s);