--- ray/src/px/pcomb.c	2005/05/25 04:44:25	2.38
+++ ray/src/px/pcomb.c	2008/11/10 19:08:19	2.43
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: pcomb.c,v 2.38 2005/05/25 04:44:25 greg Exp $";
+static const char	RCSid[] = "$Id: pcomb.c,v 2.43 2008/11/10 19:08:19 greg Exp $";
 #endif
 /*
  *  Combine picture files according to calcomp functions.
@@ -68,11 +68,12 @@ int	xpos, ypos;			/* output position */
 
 char	*progname;			/* global argv[0] */
 
+int	echoheader = 1;
 int	wrongformat = 0;
 int	gotview;
 
 
-static gethfunc tabputs;
+static gethfunc headline;
 static void checkfile(void);
 static double rgb_bright(COLOR  clr);
 static double xyz_bright(COLOR  clr);
@@ -110,6 +111,9 @@ main(
 			case 'w':
 				nowarn = !nowarn;
 				continue;
+			case 'h':
+				echoheader = !echoheader;
+				continue;
 			case 'f':
 			case 'e':
 				a++;
@@ -194,6 +198,8 @@ main(
 				continue;
 			case 'w':
 				continue;
+			case 'h':
+				continue;
 			case 'f':
 				fcompile(argv[++a]);
 				continue;
@@ -228,14 +234,14 @@ usage:
 	eputs("Usage: ");
 	eputs(argv[0]);
 	eputs(
-" [-w][-x xr][-y yr][-e expr][-f file] [ [-o][-s f][-c r g b] pic ..]\n");
+" [-w][-h][-x xr][-y yr][-e expr][-f file] [ [-o][-s f][-c r g b] hdr ..]\n");
 	quit(1);
 	return 1; /* pro forma return */
 }
 
 
 static int
-tabputs(			/* put out string preceded by a tab */
+headline(			/* check header line & echo if requested */
 	char	*s,
 	void	*p
 )
@@ -264,9 +270,12 @@ tabputs(			/* put out string preceded by a tab */
 		input[nfiles].pa *= aspectval(s);
 	else if (isview(s) && sscanview(&input[nfiles].vw, s) > 0)
 		gotview++;
-						/* echo line */
-	putchar('\t');
-	return(fputs(s, stdout));
+
+	if (echoheader) {			/* echo line */
+		putchar('\t');
+		return(fputs(s, stdout));
+	}
+	return(0);
 }
 
 
@@ -276,9 +285,11 @@ checkfile(void)			/* ready a file */
 	register int	i;
 					/* process header */
 	gotview = 0;
-	fputs(input[nfiles].name, stdout);
-	fputs(":\n", stdout);
-	getheader(input[nfiles].fp, tabputs, NULL);
+	if (echoheader) {
+		fputs(input[nfiles].name, stdout);
+		fputs(":\n", stdout);
+	}
+	getheader(input[nfiles].fp, headline, NULL);
 	if (wrongformat < 0) {
 		eputs(input[nfiles].name);
 		eputs(": not a Radiance picture\n");
@@ -387,7 +398,7 @@ combine(void)			/* combine pictures */
 	    advance();
 	    varset(vypos, '=', (double)ypos);
 	    for (xpos = 0; xpos < xres; xpos++) {
-		xscan = (long)xpos*xmax/xres;
+		xscan = (xpos+.5)*xmax/xres;
 		varset(vxpos, '=', (double)xpos);
 		eclock++;
 		if (brtdef != NULL) {
@@ -426,7 +437,7 @@ advance(void)			/* read in data for next scanline */
 	register COLOR	*st;
 	register int	i, j;
 
-	for (ytarget = (long)ypos*ymax/yres; yscan > ytarget; yscan--)
+	for (ytarget = (ypos+.5)*ymax/yres; yscan > ytarget; yscan--)
 		for (i = 0; i < nfiles; i++) {
 			st = input[i].scan[WINSIZ-1];
 			for (j = WINSIZ-1; j > 0; j--)	/* rotate window */
@@ -447,14 +458,20 @@ advance(void)			/* read in data for next scanline */
 
 static double
 l_expos(			/* return picture exposure */
-	register char	*nam
+	char	*nam
 )
 {
-	register int	fn, n;
+	int	fn, n;
+	double	d;
 
-	fn = argument(1) - .5;
-	if (fn < 0 || fn >= nfiles)
-		return(1.0);
+	d = argument(1);
+	if (d <= -0.5 || d >= nfiles+0.5) {
+		errno = EDOM;
+		return(0.0);
+	}
+	if (d < 0.5)
+		return((double)nfiles);
+	fn = d - 0.5;
 	if (nam == vbrtexp)
 		return((*ourbright)(input[fn].expos));
 	n = 3;
@@ -470,11 +487,17 @@ l_expos(			/* return picture exposure */
 static double
 l_pixaspect(char *nm)		/* return pixel aspect ratio */
 {
-	register int	fn;
+	int	fn;
+	double	d;
 
-	fn = argument(1) - .5;
-	if (fn < 0 || fn >= nfiles)
-		return(1.0);
+	d = argument(1);
+	if (d <= -0.5 || d >= nfiles+0.5) {
+		errno = EDOM;
+		return(0.0);
+	}
+	if (d < 0.5)
+		return((double)nfiles);
+	fn = d - 0.5;
 	return(input[fn].pa);
 }
 
@@ -488,11 +511,14 @@ l_colin(			/* return color value for picture */
 	register int	n, xoff, yoff;
 	double	d;
 
-	fn = argument(1) - .5;
-	if (fn < 0 || fn >= nfiles) {
+	d = argument(1);
+	if (d <= -0.5 || d >= nfiles+0.5) {
 		errno = EDOM;
 		return(0.0);
 	}
+	if (d < 0.5)
+		return((double)nfiles);
+	fn = d - 0.5;
 	xoff = yoff = 0;
 	n = nargum();
 	if (n >= 2) {
@@ -544,14 +570,18 @@ l_ray(		/* return ray origin or direction */
 	static FVECT	lorg[MAXINP], ldir[MAXINP];
 	static double	ldist[MAXINP];
 	RREAL	loc[2];
+	double	d;
 	int	fn;
 	register int	i;
 
-	fn = argument(1) - .5;
-	if (fn < 0 || fn >= nfiles) {
+	d = argument(1);
+	if (d <= -0.5 || d >= nfiles+0.5) {
 		errno = EDOM;
 		return(0.0);
 	}
+	if (d < 0.5)
+		return((double)nfiles);
+	fn = d - 0.5;
 	if (ltick[fn] != eclock) {		/* need to compute? */
 		lorg[fn][0] = lorg[fn][1] = lorg[fn][2] = 0.0;
 		ldir[fn][0] = ldir[fn][1] = ldir[fn][2] = 0.0;
@@ -588,11 +618,13 @@ l_psize(char *nm)		/* compute pixel size in steradians
 	register int	i;
 
 	d = argument(1);
-	if (d < .5 || d >= nfiles+.5) {
+	if (d <= -0.5 || d >= nfiles+0.5) {
 		errno = EDOM;
 		return(0.0);
 	}
-	fn = d - .5;
+	if (d < 0.5)
+		return((double)nfiles);
+	fn = d - 0.5;
 	if (ltick[fn] != eclock) {		/* need to compute? */
 		psize[fn] = 0.0;
 		if (input[fn].vw.type == 0)