--- ray/src/px/pcomb.c	1991/05/23 13:46:05	1.14
+++ ray/src/px/pcomb.c	1991/05/24 17:14:49	1.17
@@ -29,14 +29,17 @@ struct {
 	FILE	*fp;		/* stream pointer */
 	COLOR	*scan[WINSIZ];	/* input scanline window */
 	COLOR	coef;		/* coefficient */
+	COLOR	expos;		/* recorded exposure */
 }	input[MAXINP];			/* input pictures */
 
 int	nfiles;				/* number of input files */
 
 char	*vcolin[3] = {"ri", "gi", "bi"};
 char	*vcolout[3] = {"ro", "go", "bo"};
-#define	vbrtin		"li"
-#define vbrtout		"lo"
+char	vbrtin[] = "li";
+char	vbrtout[] = "lo";
+char	*vcolexp[3] = {"re", "ge", "be"};
+char	vbrtexp[] = "le";
 
 #define vnfiles		"nfiles"
 #define vxres		"xres"
@@ -55,78 +58,37 @@ int	xpos, ypos;			/* picture position */
 int	wrongformat = 0;
 
 
-tputs(s)			/* put out string preceded by a tab */
-char	*s;
-{
-	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);
-	}
-
-}
-
-
 main(argc, argv)
 int	argc;
 char	*argv[];
 {
-	extern double	l_redin(), l_grnin(), l_bluin(), l_brtin(), atof();
 	double	f;
 	int	a, i;
-	
-	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++)
+						/* scan options */
+	for (a = 1; a < argc; a++) {
 		if (argv[a][0] == '-')
 			switch (argv[a][1]) {
-			case '\0':
-			case 's':
-			case 'c':
-				goto getfiles;
 			case 'x':
 				xres = atoi(argv[++a]);
-				break;
+				continue;
 			case 'y':
 				yres = atoi(argv[++a]);
-				break;
+				continue;
 			case 'w':
 				nowarn = !nowarn;
-				break;
-			case 'o':
-				original = !original;
-				break;
+				continue;
 			case 'f':
-				fcompile(argv[++a]);
-				break;
 			case 'e':
-				scompile(argv[++a], NULL, 0);
-				break;
- 			default:
-				goto usage;
+				a++;
+				continue;
 			}
-		else
-			break;
-getfiles:
-	for (nfiles = 0; nfiles < MAXINP; nfiles++)
+		break;
+	}
+					/* 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);
+	}
 	nfiles = 0;
 	for ( ; a < argc; a++) {
 		if (nfiles >= MAXINP) {
@@ -140,6 +102,9 @@ getfiles:
 				input[nfiles].name = "<stdin>";
 				input[nfiles].fp = stdin;
 				break;
+			case 'o':
+				original++;
+				break;
 			case 's':
 				f = atof(argv[++a]);
 				scalecolor(input[nfiles].coef, f);
@@ -160,37 +125,36 @@ getfiles:
 				quit(1);
 			}
 		}
-		fputs(input[nfiles].name, stdout);
-		fputs(":\n", stdout);
-		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);
-		}
-		if (xres == 0 && yres == 0) {
-			xres = xpos;
-			yres = ypos;
-		} else if (xpos != xres || ypos != yres) {
-			eputs(argv[0]);
-			eputs(": resolution mismatch\n");
-			quit(1);
-		}
-		for (i = 0; i < WINSIZ; i++)
-			input[nfiles].scan[i] =
-					(COLOR *)emalloc(xres*sizeof(COLOR));
+		checkfile();
+		original = 0;
 		nfiles++;
 	}
+	init();				/* set constant expressions */
+					/* go back and get expressions */
+	for (a = 1; a < argc; a++) {
+		if (argv[a][0] == '-')
+			switch (argv[a][1]) {
+			case 'x':
+			case 'y':
+				a++;
+				continue;
+			case 'w':
+				continue;
+			case 'f':
+				fcompile(argv[++a]);
+				continue;
+			case 'e':
+				scompile(argv[++a], NULL, 0);
+				continue;
+			}
+		break;
+	}
+						/* complete header */
 	printargs(argc, argv, stdout);
 	fputformat(COLRFMT, stdout);
 	putchar('\n');
 	fputresolu(YMAJOR|YDECR, xres, yres, stdout);
+						/* combine pictures */
 	combine();
 	quit(0);
 usage:
@@ -202,6 +166,90 @@ usage:
 }
 
 
+tputs(s)			/* put out string preceded by a tab */
+char	*s;
+{
+	char	fmt[32];
+	double	d;
+	COLOR	ctmp;
+
+	if (isformat(s)) {			/* check format */
+		formatval(fmt, s);
+		wrongformat = strcmp(fmt, COLRFMT);
+		return;		/* 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);
+		}
+	}
+						/* echo line */
+	putchar('\t');
+	fputs(s, stdout);
+}
+
+
+checkfile()			/* ready a file */
+{
+	register int	i;
+					/* process header */
+	fputs(input[nfiles].name, stdout);
+	fputs(":\n", stdout);
+	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);
+	}
+	if (xres == 0 && yres == 0) {
+		xres = xpos;
+		yres = ypos;
+	} else if (xpos != xres || ypos != yres) {
+		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));
+}
+
+
+init()				/* perform final setup */
+{
+	double	l_colin(), l_expos();
+	register int	i;
+						/* prime input */
+	for (ypos = yres+(MIDSCN-1); ypos >= yres; ypos--)
+		advance();
+						/* define constants */
+	varset(vnfiles, ':', (double)nfiles);
+	varset(vxres, ':', (double)xres);
+	varset(vyres, ':', (double)yres);
+						/* set functions */
+	for (i = 0; i < 3; i++) {
+		funset(vcolexp[i], 1, ':', l_expos);
+		funset(vcolin[i], 1, '=', l_colin);
+	}
+	funset(vbrtexp, 1, ':', l_expos);
+	funset(vbrtin, 1, '=', l_colin);
+}
+
+
 combine()			/* combine pictures */
 {
 	EPNODE	*coldef[3], *brtdef;
@@ -219,14 +267,8 @@ combine()			/* combine pictures */
 		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--) {
 	    advance();
@@ -263,13 +305,6 @@ combine()			/* combine pictures */
 }
 
 
-initinp()			/* initilize scan windows */
-{
-	for (ypos = yres+(MIDSCN-1); ypos >= yres; ypos--)
-		advance();
-}
-
-
 advance()			/* read in next scanline */
 {
 	register COLOR	*st;
@@ -294,20 +329,47 @@ advance()			/* read in next scanline */
 
 
 double
-colin(ci)			/* return color value for picture */
-register int	ci;
+l_expos(nam)			/* return picture exposure */
+register char	*nam;
 {
-	int	n, fn;
-	register int	xoff, yoff;
+	register int	fn, n;
 	double	d;
 
-	fn = (d = argument(1)) - .5;
-	if (d <= -.5 || fn >= nfiles) {
+	d = argument(1);
+	if (d > -.5 && d < .5)
+		return((double)nfiles);
+	fn = d - .5;
+	if (fn < 0 || fn >= nfiles) {
 		errno = EDOM;
 		return(0.0);
 	}
-	if (d < .5)
+	if (nam == vbrtexp)
+		return(bright(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);
+}
+
+
+double
+l_colin(nam)			/* 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;
+	if (fn < 0 || fn >= nfiles) {
+		errno = EDOM;
+		return(0.0);
+	}
 	xoff = yoff = 0;
 	n = nargum();
 	if (n >= 2) {
@@ -338,37 +400,14 @@ register int	ci;
 				yoff = yres-1-ypos;
 		}
 	}
-	if (ci == BRT)
+	if (nam == vbrtin)
 		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(RED));
-}
-
-
-double
-l_grnin()			/* get green color */
-{
-	return(colin(GRN));
-}
-
-
-double
-l_bluin()			/* get blue color */
-{
-	return(colin(BLU));
-}
-
-
-double
-l_brtin()			/* get brightness value */
-{
-	return(colin(BRT));
+	n = 3;
+	while (n--)
+	    if (nam == vcolin[n])
+		return(colval(input[fn].scan[MIDSCN+yoff][xpos+xoff],n));
+	eputs("Bad call to l_colin()!\n");
+	quit(1);
 }