--- ray/src/px/pcond.c	1997/03/19 13:04:09	3.11
+++ ray/src/px/pcond.c	2003/07/21 22:30:18	3.16
@@ -1,13 +1,12 @@
-/* Copyright (c) 1997 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: pcond.c,v 3.16 2003/07/21 22:30:18 schorsch Exp $";
 #endif
-
 /*
  * Condition Radiance picture for display/output
+ *  Added white-balance adjustment 10/01 (GW).
  */
 
+#include "platform.h"
 #include "pcond.h"
 
 
@@ -32,10 +31,11 @@ double	fixfrac = 0.;			/* histogram share due to fixat
 RESOLU	inpres;				/* input picture resolution */
 
 COLOR	*fovimg;			/* foveal (1 degree) averaged image */
-short	fvxr, fvyr;			/* foveal image resolution */
+int	fvxr, fvyr;			/* foveal image resolution */
+float	*crfimg;			/* contrast reduction factors */
 short	(*fixlst)[2];			/* fixation history list */
 int	nfixations;			/* number of fixation points */
-float	bwhist[HISTRES];		/* luminance histogram */
+double	bwhist[HISTRES];		/* luminance histogram */
 double	histot;				/* total count of histogram */
 double	bwmin, bwmax;			/* histogram limits */
 double	bwavg;				/* mean brightness */
@@ -85,6 +85,9 @@ char	*argv[];
 			if (fixfrac > FTINY) what2do |= DO_FIXHIST;
 			else what2do &= ~DO_FIXHIST;
 			break;
+		case 'I':
+			bool(DO_PREHIST);
+			break;
 		case 'l':
 			bool(DO_LINEAR);
 			break;
@@ -137,6 +140,10 @@ char	*argv[];
 		default:
 			goto userr;
 		}
+	if ((what2do & (DO_FIXHIST|DO_PREHIST)) == (DO_FIXHIST|DO_PREHIST)) {
+		fprintf(stderr, "%s: only one of -i or -I option\n", progname);
+		exit(1);
+	}
 	if ((mbcalfile != NULL) + (cwarpfile != NULL) +
 			(outprims != stdprims) > 1) {
 		fprintf(stderr,
@@ -156,23 +163,24 @@ char	*argv[];
 					/* open output file */
 	if (i+2 == argc && freopen(argv[i+1], "w", stdout) == NULL)
 		syserror(argv[i+1]);
-#ifdef MSDOS
-	setmode(fileno(infp), O_BINARY);
-	setmode(fileno(stdout), O_BINARY);
-#endif
+	SET_FILE_BINARY(infp);
+	SET_FILE_BINARY(stdout);
 	getahead();			/* load input header */
 	printargs(argc, argv, stdout);	/* add to output header */
 	if (mbcalfile == NULL & outprims != stdprims)
 		fputprims(outprims, stdout);
-	getfovimg();			/* get foveal sample image */
-	if (what2do&DO_FIXHIST)		/* get fixation history? */
+	if ((what2do & (DO_PREHIST|DO_VEIL|DO_ACUITY)) != DO_PREHIST)
+		getfovimg();		/* get foveal sample image? */
+	if (what2do&DO_PREHIST)		/* get histogram? */
+		gethisto(stdin);
+	else if (what2do&DO_FIXHIST)	/* get fixation history? */
 		getfixations(stdin);
 	mapimage();			/* map the picture */
 	if (mapfp != NULL)		/* write out basic mapping */
 		putmapping(mapfp);
 	exit(0);
 userr:
-	fprintf(stderr, "Usage: %s [-{h|a|v|s|c|l|w}[+-]][-i ffrac][-e ev][-p xr yr xg yg xb yb xw yw|-f mbf.cal|-m rgb.cwp][-u Ldmax][-d Lddyn][-x mapfile] inpic [outpic]\n",
+	fprintf(stderr, "Usage: %s [-{h|a|v|s|c|l|w}[+-]][-I|-i ffrac][-e ev][-p xr yr xg yg xb yb xw yw|-f mbf.cal|-m rgb.cwp][-u Ldmax][-d Lddyn][-x mapfile] inpic [outpic]\n",
 			progname);
 	exit(1);
 #undef bool
@@ -198,22 +206,22 @@ char	*s;
 		if (!strcmp(fmt,COLRFMT)) lumf = rgblum;
 		else if (!strcmp(fmt,CIEFMT)) lumf = cielum;
 		else lumf = NULL;
-		return;			/* don't echo */
+		return(0);		/* don't echo */
 	}
 	if (isprims(s)) {		/* get input primaries */
 		primsval(inprimS, s);
 		inprims= inprimS;
-		return;			/* don't echo */
+		return(0);		/* don't echo */
 	}
 	if (isexpos(s)) {		/* picture exposure */
 		inpexp *= exposval(s);
-		return;			/* don't echo */
+		return(0);		/* don't echo */
 	}
 	if (isaspect(s))		/* pixel aspect ratio */
 		pixaspect *= aspectval(s);
 	if (isview(s))			/* image view */
 		gotview += sscanview(&ourview, s);
-	fputs(s, stdout);
+	return(fputs(s, stdout));
 }
 
 
@@ -228,14 +236,14 @@ getahead()			/* load picture header */
 		exit(1);
 	}
 	if (lumf == rgblum)
-		comprgb2xyzmat(inrgb2xyz, inprims);
+		comprgb2xyzWBmat(inrgb2xyz, inprims);
 	else if (mbcalfile != NULL) {
 		fprintf(stderr, "%s: macbethcal only works with RGB pictures\n",
 				progname);
 		exit(1);
 	}
 	if (!gotview || ourview.type == VT_PAR) {
-		copystruct(&ourview, &stdview);
+		ourview = stdview;
 		ourview.type = VT_PER;
 		if (pixaspect*inpres.yr < inpres.xr) {
 			ourview.horiz = 40.0;
@@ -262,9 +270,14 @@ mapimage()				/* map picture and send to stdout */
 	comphist();			/* generate adaptation histogram */
 	check2do();			/* modify what2do flags */
 	if (what2do&DO_VEIL)
-		compveil();
-	if (!(what2do&DO_LINEAR) && mkbrmap() < 0)	/* make tone map */
-		what2do |= DO_LINEAR;	/* failed! -- use linear scaling */
+		compveil();		/* compute veil image */
+	if (!(what2do&DO_LINEAR))
+		if (mkbrmap() < 0)	/* make tone map */
+			what2do |= DO_LINEAR;	/* failed! -- use linear */
+#if ADJ_VEIL
+		else if (what2do&DO_VEIL)
+			adjveil();	/* else adjust veil image */
+#endif
 	if (what2do&DO_LINEAR) {
 		if (scalef <= FTINY) {
 			if (what2do&DO_HSENS)
@@ -301,7 +314,7 @@ getfovimg()			/* load foveal sampled image */
 	if (fvxr < 2) fvxr = 2;
 	fvyr = sqrt(ourview.vn2)/FOVDIA + 0.5;
 	if (fvyr < 2) fvyr = 2;
-	if (!(inpres.or & YMAJOR)) {		/* picture is rotated? */
+	if (!(inpres.rt & YMAJOR)) {		/* picture is rotated? */
 		y = fvyr;
 		fvyr = fvxr;
 		fvxr = y;