--- ray/src/px/pcomb.c	1989/09/14 09:20:38	1.6
+++ ray/src/px/pcomb.c	1991/04/23 15:49:53	1.12
@@ -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";
@@ -31,22 +31,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 +81,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;
 	
-	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 +106,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;
@@ -127,7 +158,12 @@ getfiles:
 		}
 		fputs(input[nfiles].name, stdout);
 		fputs(":\n", stdout);
-		getheader(input[nfiles].fp, tputs);
+		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);
@@ -146,6 +182,7 @@ getfiles:
 		nfiles++;
 	}
 	printargs(argc, argv, stdout);
+	fputformat(COLRFMT, stdout);
 	putchar('\n');
 	fputresolu(YMAJOR|YDECR, xres, yres, stdout);
 	combine();
@@ -153,15 +190,17 @@ getfiles:
 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 */
 {
-	EPNODE	*coldef[3];
+	EPNODE	*coldef[3], *brtdef;
 	COLOR	*scanout;
+	double	d;
 	register int	i, j;
 						/* check defined variables */
 	for (j = 0; j < 3; j++) {
@@ -170,39 +209,54 @@ combine()			/* combine pictures */
 		else
 			coldef[j] = NULL;
 	}
+	if (vardefined(vbrtout))
+		brtdef = eparse(vbrtout);
+	else
+		brtdef = NULL;
+						/* predefine variables */
+	varset(vnfiles, '=', (double)nfiles);
+	varset(vxres, '=', (double)xres);
+	varset(vyres, '=', (double)yres);
 						/* allocate scanline */
 	scanout = (COLOR *)emalloc(xres*sizeof(COLOR));
 						/* 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);
+		    }
+	    varset(vypos, '=', (double)ypos);
+	    for (xpos = 0; xpos < xres; xpos++) {
 		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);
+			multcolor(input[i].scan[xpos],input[i].coef);
+		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) {
+				colval(scanout[xpos],j) = evalue(coldef[j]);
+			} else {
+			    colval(scanout[xpos],j) = 0.0;
+			    for (i = 0; i < nfiles; i++)
+				colval(scanout[xpos],j) +=
+					colval(input[i].scan[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] != NULL) {
-					colval(scanout[xpos],j) =
-						evalue(coldef[j]);
-				} 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 (colval(scanout[xpos],j) < 0.0)
-					colval(scanout[xpos],j) = 0.0;
-			}
+			if (colval(scanout[xpos],j) < 0.0)
+			    colval(scanout[xpos],j) = 0.0;
+		    }
 		}
-		if (fwritescan(scanout, xres, stdout) < 0) {
-			perror("write error");
-			quit(1);
-		}
+	    }
+	    if (fwritescan(scanout, xres, stdout) < 0) {
+		    perror("write error");
+		    quit(1);
+	    }
 	}
 	efree(scanout);
 }
@@ -240,6 +294,22 @@ double
 l_bluin()			/* get blue color */
 {
 	return(colin((int)(argument(1)+.5), BLU));
+}
+
+
+double
+l_brtin()			/* get brightness value */
+{
+	register int	fn;
+
+	fn = argument(1)+.5;
+	if (fn == 0)
+		return((double)nfiles);
+	if (fn < 1 || fn > nfiles) {
+		errno = EDOM;
+		return(0.0);
+	}
+	return(bright(input[fn-1].scan[xpos]));
 }