--- ray/src/px/pcomb.c	1991/05/24 17:14:49	1.17
+++ ray/src/px/pcomb.c	2005/01/24 19:29:39	2.35
@@ -1,32 +1,29 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: pcomb.c,v 2.35 2005/01/24 19:29:39 greg Exp $";
 #endif
-
 /*
  *  Combine picture files according to calcomp functions.
  *
  *	1/4/89
  */
 
-#include <stdio.h>
-
-#include <errno.h>
-
+#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 WINSIZ		9		/* scanline window size */
-#define MIDSCN		4		/* current scan position */
+#define WINSIZ		64		/* scanline window size */
+#define MIDSCN		((WINSIZ-1)/2+1)
 
-#define BRT		(-1)		/* special index for brightness */
-
 struct {
-	char	*name;		/* file name */
+	char	*name;		/* file or command name */
 	FILE	*fp;		/* stream pointer */
+	VIEW	vw;		/* view for picture */
+	RESOLU	rs;		/* image resolution and orientation */
+	float	pa;		/* pixel aspect ratio */
 	COLOR	*scan[WINSIZ];	/* input scanline window */
 	COLOR	coef;		/* coefficient */
 	COLOR	expos;		/* recorded exposure */
@@ -34,45 +31,81 @@ struct {
 
 int	nfiles;				/* number of input files */
 
-char	*vcolin[3] = {"ri", "gi", "bi"};
-char	*vcolout[3] = {"ro", "go", "bo"};
+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"};
 char	vbrtin[] = "li";
 char	vbrtout[] = "lo";
-char	*vcolexp[3] = {"re", "ge", "be"};
+char	vcolexp[3][4] = {"re", "ge", "be"};
 char	vbrtexp[] = "le";
+char	vpixaspect[] = "pa";
 
-#define vnfiles		"nfiles"
-#define vxres		"xres"
-#define vyres		"yres"
-#define vxpos		"x"
-#define vypos		"y"
+char	vray[7][4] = {"Ox", "Oy", "Oz", "Dx", "Dy", "Dz", "T"};
 
+char	vpsize[] = "S";
+
+char	vnfiles[] = "nfiles";
+char	vwhteff[] = "WE";
+char	vxmax[] = "xmax";
+char	vymax[] = "ymax";
+char	vxres[] = "xres";
+char	vyres[] = "yres";
+char	vxpos[] = "x";
+char	vypos[] = "y";
+
 int	nowarn = 0;			/* no warning messages? */
 
-int	original = 0;			/* origninal values? */
+int	xmax = 0, ymax = 0;		/* input resolution */
 
-int	xres=0, yres=0;			/* picture resolution */
+int	xscan, yscan;			/* input position */
 
-int	xpos, ypos;			/* picture position */
+int	xres, yres;			/* output resolution */
 
+int	xpos, ypos;			/* output position */
+
+char	*progname;			/* global argv[0] */
+
 int	wrongformat = 0;
+int	gotview;
 
 
-main(argc, argv)
-int	argc;
-char	*argv[];
+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);
+
+
+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);
+	progname = argv[0];
 						/* scan options */
 	for (a = 1; a < argc; a++) {
 		if (argv[a][0] == '-')
 			switch (argv[a][1]) {
 			case 'x':
-				xres = atoi(argv[++a]);
-				continue;
 			case 'y':
-				yres = atoi(argv[++a]);
+				a++;
 				continue;
 			case 'w':
 				nowarn = !nowarn;
@@ -84,12 +117,17 @@ char	*argv[];
 			}
 		break;
 	}
+	newheader("RADIANCE", stdout);	/* start header */
+	fputnow(stdout);
 					/* process files */
 	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);
+		input[nfiles].vw = stdview;
+		input[nfiles].pa = 1.0;
 	}
 	nfiles = 0;
+	original = 0;
 	for ( ; a < argc; a++) {
 		if (nfiles >= MAXINP) {
 			eputs(argv[0]);
@@ -99,12 +137,12 @@ 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':
 				original++;
-				break;
+				continue;
 			case 's':
 				f = atof(argv[++a]);
 				scalecolor(input[nfiles].coef, f);
@@ -118,25 +156,41 @@ char	*argv[];
 				goto usage;
 			}
 		else {
-			input[nfiles].name = argv[a];
-			input[nfiles].fp = fopen(argv[a], "r");
+			if (argv[a][0] == '!') {
+				input[nfiles].name = Command;
+				input[nfiles].fp = popen(argv[a]+1, "r");
+			} else {
+				input[nfiles].name = argv[a];
+				input[nfiles].fp = fopen(argv[a], "r");
+			}
 			if (input[nfiles].fp == NULL) {
 				perror(argv[a]);
 				quit(1);
 			}
 		}
 		checkfile();
-		original = 0;
+		if (original) {
+			colval(input[nfiles].coef,RED) /=
+					colval(input[nfiles].expos,RED);
+			colval(input[nfiles].coef,GRN) /=
+					colval(input[nfiles].expos,GRN);
+			colval(input[nfiles].coef,BLU) /=
+					colval(input[nfiles].expos,BLU);
+			setcolor(input[nfiles].expos, 1.0, 1.0, 1.0);
+		}
 		nfiles++;
+		original = 0;
 	}
-	init();				/* set constant expressions */
+	init();				/* set constants */
 					/* go back and get expressions */
 	for (a = 1; a < argc; a++) {
 		if (argv[a][0] == '-')
 			switch (argv[a][1]) {
 			case 'x':
+				varset(vxres, ':', eval(argv[++a]));
+				continue;
 			case 'y':
-				a++;
+				varset(vyres, ':', eval(argv[++a]));
 				continue;
 			case 'w':
 				continue;
@@ -149,11 +203,24 @@ char	*argv[];
 			}
 		break;
 	}
+						/* set/get output resolution */
+	if (!vardefined(vxres))
+		varset(vxres, ':', (double)xmax);
+	if (!vardefined(vyres))
+		varset(vyres, ':', (double)ymax);
+	xres = varvalue(vxres) + .5;
+	yres = varvalue(vyres) + .5;
+	if (xres <= 0 || yres <= 0) {
+		eputs(argv[0]);
+		eputs(": illegal output resolution\n");
+		quit(1);
+	}
 						/* complete header */
 	printargs(argc, argv, stdout);
-	fputformat(COLRFMT, stdout);
+	if (strcmp(ourfmt, PICFMT))
+		fputformat(ourfmt, stdout);	/* print format if known */
 	putchar('\n');
-	fputresolu(YMAJOR|YDECR, xres, yres, stdout);
+	fprtresolu(xres, yres, stdout);
 						/* combine pictures */
 	combine();
 	quit(0);
@@ -161,85 +228,118 @@ usage:
 	eputs("Usage: ");
 	eputs(argv[0]);
 	eputs(
-" [-w][-h][-x xr][-y yr][-e expr][-f file] [ [-s f][-c r g b] pic ..]\n");
+" [-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 */
 }
 
 
-tputs(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;
 	COLOR	ctmp;
 
-	if (isformat(s)) {			/* check format */
-		formatval(fmt, s);
-		wrongformat = strcmp(fmt, COLRFMT);
-		return;		/* don't echo */
+	if (isheadid(s))			/* header id */
+		return(0);	/* don't echo */
+	if (formatval(fmt, s)) {		/* check format */
+		if (globmatch(ourfmt, fmt)) {
+			wrongformat = 0;
+			strcpy(ourfmt, fmt);
+		} else
+			wrongformat = globmatch(PICFMT, fmt) ? 1 : -1;
+		return(0);	/* don't echo */
 	}
 	if (isexpos(s)) {			/* exposure */
 		d = exposval(s);
 		scalecolor(input[nfiles].expos, d);
-		if (original)
-			scalecolor(input[nfiles].coef, 1.0/d);
 	} else if (iscolcor(s)) {		/* color correction */
 		colcorval(ctmp, s);
 		multcolor(input[nfiles].expos, ctmp);
-		if (original) {
-			colval(input[nfiles].coef,RED) /= colval(ctmp,RED);
-			colval(input[nfiles].coef,GRN) /= colval(ctmp,GRN);
-			colval(input[nfiles].coef,BLU) /= colval(ctmp,BLU);
-		}
-	}
+	} else if (isaspect(s))
+		input[nfiles].pa *= aspectval(s);
+	else if (isview(s) && sscanview(&input[nfiles].vw, s) > 0)
+		gotview++;
 						/* echo line */
 	putchar('\t');
-	fputs(s, stdout);
+	return(fputs(s, stdout));
 }
 
 
-checkfile()			/* ready a file */
+static void
+checkfile(void)			/* ready a file */
 {
 	register int	i;
 					/* process header */
+	gotview = 0;
 	fputs(input[nfiles].name, stdout);
 	fputs(":\n", stdout);
-	getheader(input[nfiles].fp, tputs, NULL);
-	if (wrongformat) {
+	getheader(input[nfiles].fp, tabputs, NULL);
+	if (wrongformat < 0) {
 		eputs(input[nfiles].name);
-		eputs(": not in Radiance picture format\n");
+		eputs(": not a Radiance picture\n");
 		quit(1);
 	}
-	if (fgetresolu(&xpos, &ypos, input[nfiles].fp) != (YMAJOR|YDECR)) {
+	if (wrongformat > 0) {
+		wputs(input[nfiles].name);
+		wputs(": warning -- incompatible picture format\n");
+	}
+	if (!gotview || setview(&input[nfiles].vw) != NULL)
+		input[nfiles].vw.type = 0;
+	if (!fgetsresolu(&input[nfiles].rs, input[nfiles].fp)) {
 		eputs(input[nfiles].name);
 		eputs(": bad picture size\n");
 		quit(1);
 	}
-	if (xres == 0 && yres == 0) {
-		xres = xpos;
-		yres = ypos;
-	} else if (xpos != xres || ypos != yres) {
+	if (xmax == 0 && ymax == 0) {
+		xmax = scanlen(&input[nfiles].rs);
+		ymax = numscans(&input[nfiles].rs);
+	} else if (scanlen(&input[nfiles].rs) != xmax ||
+			numscans(&input[nfiles].rs) != ymax) {
 		eputs(input[nfiles].name);
 		eputs(": resolution mismatch\n");
 		quit(1);
 	}
 					/* allocate scanlines */
 	for (i = 0; i < WINSIZ; i++)
-		input[nfiles].scan[i] = (COLOR *)emalloc(xres*sizeof(COLOR));
+		input[nfiles].scan[i] = (COLOR *)emalloc(xmax*sizeof(COLOR));
 }
 
 
-init()				/* perform final setup */
+static double
+rgb_bright(
+	COLOR  clr
+)
 {
-	double	l_colin(), l_expos();
+	return(bright(clr));
+}
+
+
+static double
+xyz_bright(
+	COLOR  clr
+)
+{
+	return(clr[CIEY]);
+}
+
+
+double	(*ourbright)() = rgb_bright;
+
+
+static void
+init(void)					/* perform final setup */
+{
 	register int	i;
-						/* prime input */
-	for (ypos = yres+(MIDSCN-1); ypos >= yres; ypos--)
-		advance();
 						/* define constants */
+	varset("PI", ':', PI);
 	varset(vnfiles, ':', (double)nfiles);
-	varset(vxres, ':', (double)xres);
-	varset(vyres, ':', (double)yres);
+	varset(vxmax, ':', (double)xmax);
+	varset(vymax, ':', (double)ymax);
 						/* set functions */
 	for (i = 0; i < 3; i++) {
 		funset(vcolexp[i], 1, ':', l_expos);
@@ -247,10 +347,21 @@ init()				/* perform final setup */
 	}
 	funset(vbrtexp, 1, ':', l_expos);
 	funset(vbrtin, 1, '=', l_colin);
+	funset(vpixaspect, 1, ':', l_pixaspect);
+	for (i = 0; i < 7; i++)
+		funset(vray[i], 1, '=', l_ray);
+	funset(vpsize, 1, '=', l_psize);
+						/* set brightness function */
+	if (!strcmp(ourfmt, CIEFMT)) {
+		varset(vwhteff, ':', 1.0);
+		ourbright = xyz_bright;
+	} else
+		varset(vwhteff, ':', WHTEFFICACY);
 }
 
 
-combine()			/* combine pictures */
+static void
+combine(void)			/* combine pictures */
 {
 	EPNODE	*coldef[3], *brtdef;
 	COLOR	*scanout;
@@ -269,11 +380,14 @@ combine()			/* combine pictures */
 		brtdef = NULL;
 						/* allocate scanline */
 	scanout = (COLOR *)emalloc(xres*sizeof(COLOR));
+						/* set input position */
+	yscan = ymax+MIDSCN;
 						/* combine files */
 	for (ypos = yres-1; ypos >= 0; ypos--) {
 	    advance();
 	    varset(vypos, '=', (double)ypos);
 	    for (xpos = 0; xpos < xres; xpos++) {
+		xscan = (long)xpos*xmax/xres;
 		varset(vxpos, '=', (double)xpos);
 		eclock++;
 		if (brtdef != NULL) {
@@ -288,7 +402,7 @@ combine()			/* combine pictures */
 			} else {
 			    d = 0.0;
 			    for (i = 0; i < nfiles; i++)
-				d += colval(input[i].scan[MIDSCN][xpos],j);
+				d += colval(input[i].scan[MIDSCN][xscan],j);
 			}
 			if (d < 0.0)
 			    d = 0.0;
@@ -301,71 +415,83 @@ combine()			/* combine pictures */
 		    quit(1);
 	    }
 	}
-	efree(scanout);
+	efree((char *)scanout);
 }
 
 
-advance()			/* read in next scanline */
+static void
+advance(void)			/* read in data for next scanline */
 {
+	int	ytarget;
 	register COLOR	*st;
 	register int	i, j;
 
-	for (i = 0; i < nfiles; i++) {
-		st = input[i].scan[WINSIZ-1];
-		for (j = WINSIZ-1; j > 0; j--)	/* rotate window */
-			input[i].scan[j] = input[i].scan[j-1];
-		input[i].scan[0] = st;
-		if (ypos < MIDSCN)		/* hit bottom */
-			continue;
-		if (freadscan(st, xres, input[i].fp) < 0) {
-			eputs(input[i].name);
-			eputs(": read error\n");
-			quit(1);
+	for (ytarget = (long)ypos*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 */
+				input[i].scan[j] = input[i].scan[j-1];
+			input[i].scan[0] = st;
+			if (yscan <= MIDSCN)		/* hit bottom? */
+				continue;
+			if (freadscan(st, xmax, input[i].fp) < 0) {  /* read */
+				eputs(input[i].name);
+				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 < xres; 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;
-	double	d;
 
-	d = argument(1);
-	if (d > -.5 && d < .5)
-		return((double)nfiles);
-	fn = d - .5;
-	if (fn < 0 || fn >= nfiles) {
-		errno = EDOM;
-		return(0.0);
-	}
+	fn = argument(1) - .5;
+	if (fn < 0 || fn >= nfiles)
+		return(1.0);
 	if (nam == vbrtexp)
-		return(bright(input[fn].expos));
+		return((*ourbright)(input[fn].expos));
 	n = 3;
 	while (n--)
 		if (nam == vcolexp[n])
 			return(colval(input[fn].expos,n));
 	eputs("Bad call to l_expos()!\n");
 	quit(1);
+	return 1; /* pro forma return */
 }
 
 
-double
-l_colin(nam)			/* return color value for picture */
-register char	*nam;
+static double
+l_pixaspect(char *nm)		/* return pixel aspect ratio */
 {
+	register int	fn;
+
+	fn = argument(1) - .5;
+	if (fn < 0 || fn >= nfiles)
+		return(1.0);
+	return(input[fn].pa);
+}
+
+
+static double
+l_colin(			/* return color value for picture */
+	register char	*nam
+)
+{
 	int	fn;
 	register int	n, xoff, yoff;
 	double	d;
 
-	d = argument(1);
-	if (d > -.5 && d < .5)
-		return((double)nfiles);
-	fn = d - .5;
+	fn = argument(1) - .5;
 	if (fn < 0 || fn >= nfiles) {
 		errno = EDOM;
 		return(0.0);
@@ -376,12 +502,12 @@ register char	*nam;
 		d = argument(2);
 		if (d < 0.0) {
 			xoff = d-.5;
-			if (xpos+xoff < 0)
-				xoff = -xpos;
+			if (xscan+xoff < 0)
+				xoff = -xscan;
 		} else {
 			xoff = d+.5;
-			if (xpos+xoff >= xres)
-				xoff = xres-1-xpos;
+			if (xscan+xoff >= xmax)
+				xoff = xmax-1-xscan;
 		}
 	}
 	if (n >= 3) {
@@ -390,44 +516,139 @@ register char	*nam;
 			yoff = d-.5;
 			if (yoff+MIDSCN < 0)
 				yoff = -MIDSCN;
-			if (ypos+yoff < 0)
-				yoff = -ypos;
+			if (yscan+yoff < 0)
+				yoff = -yscan;
 		} else {
 			yoff = d+.5;
 			if (yoff+MIDSCN >= WINSIZ)
 				yoff = WINSIZ-1-MIDSCN;
-			if (ypos+yoff >= yres)
-				yoff = yres-1-ypos;
+			if (yscan+yoff >= ymax)
+				yoff = ymax-1-yscan;
 		}
 	}
 	if (nam == vbrtin)
-		return(bright(input[fn].scan[MIDSCN+yoff][xpos+xoff]));
+		return((*ourbright)(input[fn].scan[MIDSCN+yoff][xscan+xoff]));
 	n = 3;
 	while (n--)
 	    if (nam == vcolin[n])
-		return(colval(input[fn].scan[MIDSCN+yoff][xpos+xoff],n));
+		return(colval(input[fn].scan[MIDSCN+yoff][xscan+xoff],n));
 	eputs("Bad call to l_colin()!\n");
 	quit(1);
+	return 1; /* pro forma return */
 }
 
 
-wputs(msg)
-char	*msg;
+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];
+	RREAL	loc[2];
+	int	fn;
+	register int	i;
+
+	fn = argument(1) - .5;
+	if (fn < 0 || fn >= nfiles) {
+		errno = EDOM;
+		return(0.0);
+	}
+	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;
+		ldist[fn] = -1.0;
+		if (input[fn].vw.type == 0)
+			errno = EDOM;
+		else {
+			pix2loc(loc, &input[fn].rs, xscan, ymax-1-yscan);
+			ldist[fn] = viewray(lorg[fn], ldir[fn],
+					&input[fn].vw, loc[0], loc[1]);
+		}
+		ltick[fn] = eclock;
+	}
+	if (nam == vray[i=6])
+		return(ldist[fn]);
+	while (i--)
+		if (nam == vray[i])
+			return(i < 3 ? lorg[fn][i] : ldir[fn][i-3]);
+	eputs("Bad call to l_ray()!\n");
+	quit(1);
+	return 1; /* pro forma return */
+}
+
+
+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;
+	RREAL	locx[2], locy[2];
+	double	d;
+	int	fn;
+	register int	i;
+
+	d = argument(1);
+	if (d < .5 || d >= nfiles+.5) {
+		errno = EDOM;
+		return(0.0);
+	}
+	fn = d - .5;
+	if (ltick[fn] != eclock) {		/* need to compute? */
+		psize[fn] = 0.0;
+		if (input[fn].vw.type == 0)
+			errno = EDOM;
+		else if (input[fn].vw.type != VT_PAR &&
+				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]) >= -FTINY &&
+					viewray(org, diry, &input[fn].vw,
+					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] = VLEN(dir0);
+			}
+		}
+		ltick[fn] = eclock;
+	}
+	return(psize[fn]);
+}
+
+
+extern void
+wputs(char	*msg)
+{
 	if (!nowarn)
 		eputs(msg);
 }
 
 
-eputs(msg)
-char	*msg;
+extern void
+eputs(char *msg)
 {
 	fputs(msg, stderr);
 }
 
 
-quit(code)
-int	code;
+extern void
+quit(int code)		/* exit gracefully */
 {
+	register int  i;
+				/* close input files */
+	for (i = 0; i < nfiles; i++)
+		if (input[i].name == Command)
+			pclose(input[i].fp);
+		else
+			fclose(input[i].fp);
 	exit(code);
 }