--- ray/src/px/pcond2.c	1996/10/03 16:52:49	3.1
+++ ray/src/px/pcond2.c	2003/07/27 22:12:03	3.11
@@ -1,14 +1,13 @@
-/* Copyright (c) 1996 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: pcond2.c,v 3.11 2003/07/27 22:12:03 schorsch Exp $";
 #endif
-
 /*
  * Input and output conditioning routines for pcond.
+ *  Added white-balance adjustment 10/01 (GW).
  */
 
 #include "pcond.h"
+#include "warp3d.h"
 
 
 RGBPRIMP	inprims = stdprims;	/* input primaries */
@@ -19,9 +18,16 @@ double	(*lumf)() = rgblum;		/* input luminance functio
 double	inpexp = 1.0;			/* input exposure value */
 
 char	*mbcalfile = NULL;		/* macbethcal mapping file */
+char	*cwarpfile = NULL;		/* color space warping file */
 
-static struct mbc	mbcond;		/* macbethcal conditioning struct */
+static struct mbc {
+	COLORMAT	cmat;
+	float	xa[3][6], ya[3][6];
+	COLOR	cmin, cmax;
+}	mbcond;				/* macbethcal conditioning struct */
 
+static WARP3D	*cwarp;			/* color warping structure */
+
 static COLOR	*scanbuf;		/* scanline processing buffer */
 static int	nread;			/* number of scanlines processed */
 
@@ -57,19 +63,20 @@ COLOR *
 nextscan()				/* read and condition next scanline */
 {
 	if (nread >= numscans(&inpres)) {
-#ifdef DEBUG
-		fputs("done\n", stderr);
-#endif
-		return(NULL);
+		if (cwarpfile != NULL)
+			free3dw(cwarp);
+		free((void *)scanbuf);
+		return(scanbuf = NULL);
 	}
-	if (freadscan(scanbuf, scanlen(&inpres), infp) < 0) {
+	if (what2do&DO_ACUITY)
+		acuscan(scanbuf, nread);
+	else if (freadscan(scanbuf, scanlen(&inpres), infp) < 0) {
 		fprintf(stderr, "%s: %s: scanline read error\n",
 				progname, infn);
 		exit(1);
 	}
-	nread++;
 	if (what2do&DO_VEIL)			/* add veiling */
-		addveil(scanbuf, nread-1);
+		addveil(scanbuf, nread);
 	if (what2do&DO_COLOR)			/* scotopic color loss */
 		scotscan(scanbuf, scanlen(&inpres));
 	if (what2do&DO_LINEAR)			/* map luminances */
@@ -78,8 +85,11 @@ nextscan()				/* read and condition next scanline */
 		mapscan(scanbuf, scanlen(&inpres));
 	if (mbcalfile != NULL)			/* device color correction */
 		mbscan(scanbuf, scanlen(&inpres), &mbcond);
-	else if (lumf == cielum | inprims != outprims)
+	else if (cwarpfile != NULL)		/* device color space warp */
+		cwscan(scanbuf, scanlen(&inpres), cwarp);
+	else if ((lumf == cielum) | (inprims != outprims))
 		matscan(scanbuf, scanlen(&inpres), mbcond.cmat);
+	nread++;
 	return(scanbuf);
 }
 
@@ -89,18 +99,20 @@ firstscan()				/* return first processed scanline */
 {
 	if (mbcalfile != NULL)		/* load macbethcal file */
 		getmbcalfile(mbcalfile, &mbcond);
-	else
+	else if (cwarpfile != NULL) {
+		if ((cwarp = load3dw(cwarpfile, NULL)) == NULL)
+			syserror(cwarpfile);
+	} else
 		if (lumf == rgblum)
-			comprgb2rgbmat(mbcond.cmat, inprims, outprims);
+			comprgb2rgbWBmat(mbcond.cmat, inprims, outprims);
 		else
-			compxyz2rgbmat(mbcond.cmat, outprims);
+			compxyz2rgbWBmat(mbcond.cmat, outprims);
+	if (what2do&DO_ACUITY)
+		initacuity();
 	scanbuf = (COLOR *)malloc(scanlen(&inpres)*sizeof(COLOR));
 	if (scanbuf == NULL)
 		syserror("malloc");
 	nread = 0;
-#ifdef DEBUG
-	fprintf(stderr, "%s: processing image...", progname);
-#endif
 	return(nextscan());
 }
 
@@ -124,6 +136,7 @@ COLORMAT	mat;
 {
 	while (len--) {
 		colortrans(sl[0], mat, sl[0]);
+		clipgamut(sl[0], bright(sl[0]), CGAMUT, cblack, cwhite);
 		sl++;
 	}
 }
@@ -138,6 +151,8 @@ register struct mbc	*mb;
 	register int	i, j;
 
 	while (len--) {
+		colortrans(sl[0], mb->cmat, sl[0]);
+		clipgamut(sl[0], bright(sl[0]), CGAMUT, mb->cmin, mb->cmax);
 		for (i = 0; i < 3; i++) {
 			d = colval(sl[0],i);
 			for (j = 0; j < 4 && mb->xa[i][j+1] <= d; j++)
@@ -146,12 +161,33 @@ register struct mbc	*mb;
 					(d - mb->xa[i][j])*mb->ya[i][j+1] ) /
 					(mb->xa[i][j+1] - mb->xa[i][j]);
 		}
-		colortrans(sl[0], mb->cmat, sl[0]);
 		sl++;
 	}
 }
 
 
+cwscan(sl, len, wp)			/* apply color space warp to scaline */
+COLOR	*sl;
+int	len;
+WARP3D	*wp;
+{
+	int	rval;
+
+	while (len--) {
+		rval = warp3d(sl[0], sl[0], wp);
+		if (rval & W3ERROR)
+			syserror("warp3d");
+		if (rval & W3BADMAP) {
+			fprintf(stderr, "%s: %s: bad color space map\n",
+					progname, cwarpfile);
+			exit(1);
+		}
+		clipgamut(sl[0], bright(sl[0]), CGAMUT, cblack, cwhite);
+		sl++;
+	}
+}
+
+
 getmbcalfile(fn, mb)			/* load macbethcal file */
 char	*fn;
 register struct mbc	*mb;
@@ -160,6 +196,7 @@ register struct mbc	*mb;
 	char	buf[128];
 	FILE	*fp;
 	int	inpflags = 0;
+	register int	i;
 
 	if ((fp = fopen(fn, "r")) == NULL)
 		syserror(fn);
@@ -238,4 +275,15 @@ register struct mbc	*mb;
 		exit(1);
 	}
 	fclose(fp);
+					/* compute gamut */
+	for (i = 0; i < 3; i++) {
+		colval(mb->cmin,i) = mb->xa[i][0] -
+				mb->ya[i][0] *
+				(mb->xa[i][1]-mb->xa[i][0]) /
+				(mb->ya[i][1]-mb->ya[i][0]);
+		colval(mb->cmax,i) = mb->xa[i][4] +
+				(1.-mb->ya[i][4]) *
+				(mb->xa[i][5] - mb->xa[i][4]) /
+				(mb->ya[i][5] - mb->ya[i][4]);
+	}
 }