--- ray/src/px/pcond.h	1997/01/09 13:56:26	3.4
+++ ray/src/px/pcond.h	1997/03/19 13:03:11	3.7
@@ -1,4 +1,4 @@
-/* Copyright (c) 1996 Regents of the University of California */
+/* Copyright (c) 1997 Regents of the University of California */
 
 /* SCCSid "$SunId$ LBL" */
 
@@ -39,15 +39,16 @@
 #define DO_HSENS	04
 #define DO_COLOR	010
 #define DO_CWEIGHT	020
-#define DO_LINEAR	040
+#define DO_FIXHIST	040
+#define DO_LINEAR	0100
 
 #define DO_HUMAN	(DO_ACUITY|DO_VEIL|DO_HSENS|DO_COLOR)
 
 extern int	what2do;		/* desired adjustments */
 
 extern double	ldmax;			/* maximum output luminance */
-extern double	ldmin;			/* minimum output luminance */
-extern double	Bldmin, Bldmax;		/* Bl(ldmin) and Bl(ldmax) */
+extern double	lddyn;			/* display dynamic range */
+extern double	Bldmin, Bldmax;		/* Bl(ldmax/lddyn) and Bl(ldmax) */
 
 extern char	*progname;		/* global argv[0] */
 
@@ -60,11 +61,17 @@ extern double	inpexp;			/* input exposure value */
 #define	plum(clr)	((*lumf)(clr,0)/inpexp)
 #define slum(clr)	((*lumf)(clr,1)/inpexp)
 
+#define ldmin		(ldmax/lddyn)
+
 extern COLOR	*fovimg;		/* foveal (1 degree) averaged image */
 extern short	fvxr, fvyr;		/* foveal image resolution */
 
 #define fovscan(y)	(fovimg+(y)*fvxr)
 
+extern double	fixfrac;		/* histogram share due to fixations */
+extern short	(*fixlst)[2];		/* fixation history list */
+extern int	nfixations;		/* number of fixation points */
+
 extern float	bwhist[HISTRES];	/* luminance histogram */
 extern double	histot;			/* total count of histogram */
 extern double	bwmin, bwmax;		/* histogram limits */
@@ -84,6 +91,7 @@ extern double	pixaspect;		/* pixel aspect ratio */
 extern RESOLU	inpres;			/* input picture resolution */
 
 extern char	*mbcalfile;		/* macbethcal mapping file */
+extern char	*cwarpfile;		/* color warp mapping file */
 
 extern double	hacuity();		/* human acuity func. (cycles/deg.) */
 extern double	htcontrs();		/* human contrast sens. func. */