--- ray/src/px/pcond.h	1996/10/11 10:46:59	3.3
+++ ray/src/px/pcond.h	1997/02/05 16:08:16	3.6
@@ -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,7 +39,8 @@
 #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)
 
@@ -65,12 +66,16 @@ extern short	fvxr, fvyr;		/* foveal image resolution *
 
 #define fovscan(y)	(fovimg+(y)*fvxr)
 
-extern int	bwhist[HISTRES];	/* luminance histogram */
-extern long	histot;			/* total count of histogram */
+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 */
 extern double	bwavg;			/* mean brightness */
 
-#define bwhc(B)		bwhist[(int)(HISTRES*((B)-bwmin)/(bwmax-bwmin))]
+#define bwhi(B)		(int)(HISTRES*((B)-bwmin)/(bwmax-bwmin))
 
 extern RGBPRIMP	inprims;		/* input primaries */
 extern COLORMAT	inrgb2xyz;		/* convert input RGB to XYZ */
@@ -84,6 +89,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. */