--- ray/src/px/pcomb.c	1989/07/11 17:13:44	1.3
+++ ray/src/px/pcomb.c	1991/05/23 13:46:05	1.14
@@ -1,4 +1,4 @@
-/* Copyright (c) 1989 Regents of the University of California */
+/* Copyright (c) 1991 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -18,12 +18,16 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include "calcomp.h"
 
-#define MAXINP		16		/* maximum number of input files */
+#define MAXINP		32		/* maximum number of input files */
+#define WINSIZ		9		/* scanline window size */
+#define MIDSCN		4		/* current scan position */
 
+#define BRT		(-1)		/* special index for brightness */
+
 struct {
 	char	*name;		/* file name */
 	FILE	*fp;		/* stream pointer */
-	COLOR	*scan;		/* input scanline */
+	COLOR	*scan[WINSIZ];	/* input scanline window */
 	COLOR	coef;		/* coefficient */
 }	input[MAXINP];			/* input pictures */
 
@@ -31,22 +35,49 @@ int	nfiles;				/* number of input files */
 
 char	*vcolin[3] = {"ri", "gi", "bi"};
 char	*vcolout[3] = {"ro", "go", "bo"};
+#define	vbrtin		"li"
+#define vbrtout		"lo"
 
+#define vnfiles		"nfiles"
+#define vxres		"xres"
+#define vyres		"yres"
 #define vxpos		"x"
 #define vypos		"y"
 
 int	nowarn = 0;			/* no warning messages? */
 
+int	original = 0;			/* origninal values? */
+
 int	xres=0, yres=0;			/* picture resolution */
 
 int	xpos, ypos;			/* picture position */
 
+int	wrongformat = 0;
 
+
 tputs(s)			/* put out string preceded by a tab */
 char	*s;
 {
-	putchar('\t');
-	fputs(s, stdout);
+	char	fmt[32];
+	double	d;
+	COLOR	ctmp;
+
+	if (isformat(s)) {			/* check format */
+		formatval(fmt, s);
+		wrongformat = strcmp(fmt, COLRFMT);
+	} else if (original && isexpos(s)) {	/* exposure */
+		d = 1.0/exposval(s);
+		scalecolor(input[nfiles].coef, d);
+	} else if (original && iscolcor(s)) {	/* color correction */
+		colcorval(ctmp, s);
+		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 {				/* echo unaffected line */
+		putchar('\t');
+		fputs(s, stdout);
+	}
+
 }
 
 
@@ -54,13 +85,14 @@ main(argc, argv)
 int	argc;
 char	*argv[];
 {
-	extern double	l_redin(), l_grnin(), l_bluin(), atof();
+	extern double	l_redin(), l_grnin(), l_bluin(), l_brtin(), atof();
 	double	f;
-	int	a;
+	int	a, i;
 	
-	funset(vcolin[RED], 1, l_redin);
-	funset(vcolin[GRN], 1, l_grnin);
-	funset(vcolin[BLU], 1, l_bluin);
+	funset(vcolin[RED], 1, '=', l_redin);
+	funset(vcolin[GRN], 1, '=', l_grnin);
+	funset(vcolin[BLU], 1, '=', l_bluin);
+	funset(vbrtin, 1, '=', l_brtin);
 	
 	for (a = 1; a < argc; a++)
 		if (argv[a][0] == '-')
@@ -78,11 +110,14 @@ char	*argv[];
 			case 'w':
 				nowarn = !nowarn;
 				break;
+			case 'o':
+				original = !original;
+				break;
 			case 'f':
 				fcompile(argv[++a]);
 				break;
 			case 'e':
-				scompile(NULL, argv[++a]);
+				scompile(argv[++a], NULL, 0);
 				break;
  			default:
 				goto usage;
@@ -121,16 +156,21 @@ getfiles:
 			input[nfiles].name = argv[a];
 			input[nfiles].fp = fopen(argv[a], "r");
 			if (input[nfiles].fp == NULL) {
-				eputs(argv[a]);
-				eputs(": cannot open\n");
+				perror(argv[a]);
 				quit(1);
 			}
 		}
 		fputs(input[nfiles].name, stdout);
 		fputs(":\n", stdout);
-		getheader(input[nfiles].fp, tputs);
-		if (fscanf(input[nfiles].fp, "-Y %d +X %d\n", &ypos, &xpos) != 2) {
+		getheader(input[nfiles].fp, tputs, NULL);
+		if (wrongformat) {
 			eputs(input[nfiles].name);
+			eputs(": not in Radiance picture format\n");
+			quit(1);
+		}
+		if (fgetresolu(&xpos, &ypos, input[nfiles].fp) !=
+				(YMAJOR|YDECR)) {
+			eputs(input[nfiles].name);
 			eputs(": bad picture size\n");
 			quit(1);
 		}
@@ -142,99 +182,193 @@ getfiles:
 			eputs(": resolution mismatch\n");
 			quit(1);
 		}
-		input[nfiles].scan = (COLOR *)emalloc(xres*sizeof(COLOR));
+		for (i = 0; i < WINSIZ; i++)
+			input[nfiles].scan[i] =
+					(COLOR *)emalloc(xres*sizeof(COLOR));
 		nfiles++;
 	}
 	printargs(argc, argv, stdout);
+	fputformat(COLRFMT, stdout);
 	putchar('\n');
-	printf("-Y %d +X %d\n", yres, xres);
+	fputresolu(YMAJOR|YDECR, xres, yres, stdout);
 	combine();
 	quit(0);
 usage:
 	eputs("Usage: ");
 	eputs(argv[0]);
-eputs(" [-w][-x xr][-y yr][-e expr][-f file] [ [-s f][-c r g b] picture ..]\n");
+	eputs(
+" [-w][-h][-x xr][-y yr][-e expr][-f file] [ [-s f][-c r g b] pic ..]\n");
 	quit(1);
 }
 
 
 combine()			/* combine pictures */
 {
-	int	coldef[3];
+	EPNODE	*coldef[3], *brtdef;
 	COLOR	*scanout;
+	double	d;
 	register int	i, j;
 						/* check defined variables */
-	for (j = 0; j < 3; j++)
-		coldef[j] = vardefined(vcolout[j]);
+	for (j = 0; j < 3; j++) {
+		if (vardefined(vcolout[j]))
+			coldef[j] = eparse(vcolout[j]);
+		else
+			coldef[j] = NULL;
+	}
+	if (vardefined(vbrtout))
+		brtdef = eparse(vbrtout);
+	else
+		brtdef = NULL;
+						/* define constants */
+	varset(vnfiles, ':', (double)nfiles);
+	varset(vxres, ':', (double)xres);
+	varset(vyres, ':', (double)yres);
 						/* allocate scanline */
 	scanout = (COLOR *)emalloc(xres*sizeof(COLOR));
+						/* initialize input */
+	initinp();
 						/* combine files */
 	for (ypos = yres-1; ypos >= 0; ypos--) {
-		for (i = 0; i < nfiles; i++)
-			if (freadscan(input[i].scan, xres, input[i].fp) < 0) {
-				eputs(input[i].name);
-				eputs(": read error\n");
-				quit(1);
+	    advance();
+	    varset(vypos, '=', (double)ypos);
+	    for (xpos = 0; xpos < xres; xpos++) {
+		varset(vxpos, '=', (double)xpos);
+		eclock++;
+		if (brtdef != NULL) {
+		    d = evalue(brtdef);
+		    if (d < 0.0)
+			d = 0.0;
+		    setcolor(scanout[xpos], d, d, d);
+		} else {
+		    for (j = 0; j < 3; j++) {
+			if (coldef[j] != NULL) {
+				d = evalue(coldef[j]);
+			} else {
+			    d = 0.0;
+			    for (i = 0; i < nfiles; i++)
+				d += colval(input[i].scan[MIDSCN][xpos],j);
 			}
-		varset(vypos, (double)ypos);
-		for (xpos = 0; xpos < xres; xpos++) {
-			varset(vxpos, (double)xpos);
-			eclock++;
-			for (j = 0; j < 3; j++)
-				if (coldef[j]) {
-					colval(scanout[xpos],j) =
-						varvalue(vcolout[j]);
-					if (colval(scanout[xpos],j) < 0.0)
-						colval(scanout[xpos],j) = 0.0;
-				} else {
-					colval(scanout[xpos],j) = 0.0;
-					for (i = 0; i < nfiles; i++)
-						colval(scanout[xpos],j) +=
-						colval(input[i].coef,j) *
-						colval(input[i].scan[xpos],j);
-				}
+			if (d < 0.0)
+			    d = 0.0;
+			colval(scanout[xpos],j) = d;
+		    }
 		}
-		if (fwritescan(scanout, xres, stdout) < 0) {
-			eputs("write error\n");
+	    }
+	    if (fwritescan(scanout, xres, stdout) < 0) {
+		    perror("write error");
+		    quit(1);
+	    }
+	}
+	efree(scanout);
+}
+
+
+initinp()			/* initilize scan windows */
+{
+	for (ypos = yres+(MIDSCN-1); ypos >= yres; ypos--)
+		advance();
+}
+
+
+advance()			/* read in next scanline */
+{
+	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 (j = 0; j < xres; j++)	/* adjust color */
+			multcolor(st[j], input[i].coef);
 	}
-	efree(scanout);
 }
 
 
 double
-colin(fn, ci)			/* return color value for picture */
-register int	fn, ci;
+colin(ci)			/* return color value for picture */
+register int	ci;
 {
-	if (fn == 0)
-		return((double)nfiles);
-	if (fn < 1 || fn > nfiles) {
+	int	n, fn;
+	register int	xoff, yoff;
+	double	d;
+
+	fn = (d = argument(1)) - .5;
+	if (d <= -.5 || fn >= nfiles) {
 		errno = EDOM;
 		return(0.0);
 	}
-	return(colval(input[fn-1].scan[xpos],ci));
+	if (d < .5)
+		return((double)nfiles);
+	xoff = yoff = 0;
+	n = nargum();
+	if (n >= 2) {
+		d = argument(2);
+		if (d < 0.0) {
+			xoff = d-.5;
+			if (xpos+xoff < 0)
+				xoff = -xpos;
+		} else {
+			xoff = d+.5;
+			if (xpos+xoff >= xres)
+				xoff = xres-1-xpos;
+		}
+	}
+	if (n >= 3) {
+		d = argument(3);
+		if (d < 0.0) {
+			yoff = d-.5;
+			if (yoff+MIDSCN < 0)
+				yoff = -MIDSCN;
+			if (ypos+yoff < 0)
+				yoff = -ypos;
+		} else {
+			yoff = d+.5;
+			if (yoff+MIDSCN >= WINSIZ)
+				yoff = WINSIZ-1-MIDSCN;
+			if (ypos+yoff >= yres)
+				yoff = yres-1-ypos;
+		}
+	}
+	if (ci == BRT)
+		return(bright(input[fn].scan[MIDSCN+yoff][xpos+xoff]));
+	return(colval(input[fn].scan[MIDSCN+yoff][xpos+xoff],ci));
 }
 
 
 double
 l_redin()			/* get red color */
 {
-	return(colin((int)(argument(1)+.5), RED));
+	return(colin(RED));
 }
 
 
 double
 l_grnin()			/* get green color */
 {
-	return(colin((int)(argument(1)+.5), GRN));
+	return(colin(GRN));
 }
 
 
 double
 l_bluin()			/* get blue color */
 {
-	return(colin((int)(argument(1)+.5), BLU));
+	return(colin(BLU));
+}
+
+
+double
+l_brtin()			/* get brightness value */
+{
+	return(colin(BRT));
 }