--- ray/src/px/pcomb.c	1991/04/18 08:05:57	1.8
+++ ray/src/px/pcomb.c	1991/04/18 14:35:17	1.10
@@ -42,16 +42,38 @@ char	*vcolout[3] = {"ro", "go", "bo"};
 
 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);
+	}
+
 }
 
 
@@ -84,6 +106,9 @@ char	*argv[];
 			case 'w':
 				nowarn = !nowarn;
 				break;
+			case 'o':
+				original = !original;
+				break;
 			case 'f':
 				fcompile(argv[++a]);
 				break;
@@ -133,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);
@@ -152,6 +182,7 @@ getfiles:
 		nfiles++;
 	}
 	printargs(argc, argv, stdout);
+	fputformat(COLRFMT, stdout);
 	putchar('\n');
 	fputresolu(YMAJOR|YDECR, xres, yres, stdout);
 	combine();
@@ -159,7 +190,8 @@ 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);
 }
 
@@ -197,6 +229,8 @@ combine()			/* combine pictures */
 		    }
 	    varset(vypos, (double)ypos);
 	    for (xpos = 0; xpos < xres; xpos++) {
+		for (i = 0; i < nfiles; i++)
+			multcolor(input[i].scan[xpos],input[i].coef);
 		varset(vxpos, (double)xpos);
 		eclock++;
 		if (brtdef != NULL) {
@@ -212,7 +246,6 @@ combine()			/* combine pictures */
 			    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)