--- ray/src/px/pvalue.c	1990/01/05 17:52:54	1.3
+++ ray/src/px/pvalue.c	1990/12/14 16:33:19	1.5
@@ -33,7 +33,7 @@ int  format = 'a';		/* input/output format */
 
 int  header = 1;		/* do header */
 
-double  exposure = 1.0;
+COLOR  exposure = WHTCOLOR;
 
 char  *progname;
 
@@ -156,10 +156,20 @@ unkopt:
 checkhead(line)				/* deal with line from header */
 char  *line;
 {
+	double	d;
+	COLOR	ctmp;
+
 	if (header)
 		fputs(line, stdout);
-	if (isexpos(line))
-		exposure *= exposval(line);
+	if (isexpos(line)) {
+		d = 1.0/exposval(line);
+		scalecolor(exposure, d);
+	} else if (iscolcor(line)) {
+		colcorval(ctmp, line);
+		colval(exposure,RED) /= colval(ctmp,RED);
+		colval(exposure,GRN) /= colval(ctmp,GRN);
+		colval(exposure,BLU) /= colval(ctmp,BLU);
+	}
 }
 
 
@@ -190,7 +200,7 @@ pixtoval()				/* convert picture to values */
 				else
 					copycolor(lastc, scanln[x]);
 			if (original)
-				scalecolor(scanln[x], 1.0/exposure);
+				multcolor(scanln[x], exposure);
 			if (!dataonly)
 				printf("%7d %7d ", x, y);
 			if ((*putval)(scanln[x], stdout) < 0) {
@@ -259,7 +269,7 @@ FILE  *fp;
 {
 	double  vd[3];
 
-	if (fread(vd, sizeof(double), 3, fp) != 3)
+	if (fread((char *)vd, sizeof(double), 3, fp) != 3)
 		return(-1);
 	setcolor(col, vd[0], vd[1], vd[2]);
 	return(0);
@@ -272,7 +282,7 @@ FILE  *fp;
 {
 	float  vf[3];
 
-	if (fread(vf, sizeof(float), 3, fp) != 3)
+	if (fread((char *)vf, sizeof(float), 3, fp) != 3)
 		return(-1);
 	setcolor(col, vf[0], vf[1], vf[2]);
 	return(0);
@@ -298,7 +308,7 @@ FILE  *fp;
 {
 	BYTE  vb[3];
 
-	if (fread(vb, sizeof(BYTE), 3, fp) != 3)
+	if (fread((char *)vb, sizeof(BYTE), 3, fp) != 3)
 		return(-1);
 	setcolor(col,(vb[0]+.5)/256.,(vb[1]+.5)/256.,(vb[2]+.5)/256.);
 	return(0);
@@ -324,7 +334,7 @@ FILE  *fp;
 {
 	double  vd;
 
-	if (fread(&vd, sizeof(double), 1, fp) != 1)
+	if (fread((char *)&vd, sizeof(double), 1, fp) != 1)
 		return(-1);
 	setcolor(col, vd, vd, vd);
 	return(0);
@@ -337,7 +347,7 @@ FILE  *fp;
 {
 	float  vf;
 
-	if (fread(&vf, sizeof(float), 1, fp) != 1)
+	if (fread((char *)&vf, sizeof(float), 1, fp) != 1)
 		return(-1);
 	setcolor(col, vf, vf, vf);
 	return(0);
@@ -366,7 +376,7 @@ FILE  *fp;
 	BYTE  vb;
 	double  d;
 
-	if (fread(&vb, sizeof(BYTE), 1, fp) != 1)
+	if (fread((char *)&vb, sizeof(BYTE), 1, fp) != 1)
 		return(-1);
 	d = (vb+.5)/256.;
 	setcolor(col, d, d, d);
@@ -396,7 +406,7 @@ FILE  *fp;
 	vf[0] = colval(col,RED);
 	vf[1] = colval(col,GRN);
 	vf[2] = colval(col,BLU);
-	fwrite(vf, sizeof(float), 3, fp);
+	fwrite((char *)vf, sizeof(float), 3, fp);
 
 	return(ferror(fp) ? -1 : 0);
 }
@@ -411,7 +421,7 @@ FILE  *fp;
 	vd[0] = colval(col,RED);
 	vd[1] = colval(col,GRN);
 	vd[2] = colval(col,BLU);
-	fwrite(vd, sizeof(double), 3, fp);
+	fwrite((char *)vd, sizeof(double), 3, fp);
 
 	return(ferror(fp) ? -1 : 0);
 }
@@ -443,7 +453,7 @@ FILE  *fp;
 	vb[1] = min(i,255);
 	i = colval(col,BLU)*256.;
 	vb[2] = min(i,255);
-	fwrite(vb, sizeof(BYTE), 3, fp);
+	fwrite((char *)vb, sizeof(BYTE), 3, fp);
 
 	return(ferror(fp) ? -1 : 0);
 }
@@ -466,7 +476,7 @@ FILE  *fp;
 	float  vf;
 
 	vf = bright(col);
-	fwrite(&vf, sizeof(float), 1, fp);
+	fwrite((char *)&vf, sizeof(float), 1, fp);
 
 	return(ferror(fp) ? -1 : 0);
 }
@@ -479,7 +489,7 @@ FILE  *fp;
 	double  vd;
 
 	vd = bright(col);
-	fwrite(&vd, sizeof(double), 1, fp);
+	fwrite((char *)&vd, sizeof(double), 1, fp);
 
 	return(ferror(fp) ? -1 : 0);
 }
@@ -504,7 +514,7 @@ FILE  *fp;
 
 	i = bright(col)*256.;
 	vb = min(i,255);
-	fwrite(&vb, sizeof(BYTE), 1, fp);
+	fwrite((char *)&vb, sizeof(BYTE), 1, fp);
 
 	return(ferror(fp) ? -1 : 0);
 }