--- ray/src/px/pcond.h	1996/10/11 10:46:59	3.3
+++ ray/src/px/pcond.h	2003/02/22 02:07:27	3.10
@@ -1,7 +1,4 @@
-/* Copyright (c) 1996 Regents of the University of California */
-
-/* SCCSid "$SunId$ LBL" */
-
+/* RCSid: $Id: pcond.h,v 3.10 2003/02/22 02:07:27 greg Exp $ */
 /*
  * Header file for picture file conditioning.
  */
@@ -12,8 +9,10 @@
 
 #include "view.h"
 
-#include "resolu.h"
 
+#ifndef ADJ_VEIL
+#define ADJ_VEIL	0		/* adjust veil to preserve contrast? */
+#endif
 
 #define SWNORM		2.26		/* scotopic/photopic ratio for white */
 #define WHTSEFFICACY	(SWNORM*WHTEFFICACY)
@@ -21,11 +20,12 @@
 #define BotMesopic	5.62e-3		/* top of scotopic range */
 #define TopMesopic	5.62		/* bottom of photopic range */
 
-#define FOVDIA		(1.0*PI/180.)	/* foveal diameter (radians) */
+#define FOVDIA		(1.0*PI/180.0)	/* foveal diameter (radians) */
 
 #define	HISTRES		100		/* histogram resolution */
+#define MAXPREHIST	1024		/* maximum precomputed histogram */
 
-#define LMIN		1e-4		/* minimum visible world luminance */
+#define LMIN		1e-7		/* minimum visible world luminance */
 #define LMAX		1e5		/* maximum visible world luminance */
 
 #define Bl(Lw)		log(Lw)		/* brightness function */
@@ -39,15 +39,17 @@
 #define DO_HSENS	04
 #define DO_COLOR	010
 #define DO_CWEIGHT	020
-#define DO_LINEAR	040
+#define DO_FIXHIST	040
+#define DO_PREHIST	0100
+#define DO_LINEAR	0200
 
 #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,17 +62,25 @@ 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 */
+extern int	fvxr, fvyr;		/* foveal image resolution */
+extern float	*crfimg;		/* contrast reduction factors */
 
 #define fovscan(y)	(fovimg+(y)*fvxr)
+#define crfscan(y)	(crfimg+(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 double	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,9 +94,12 @@ 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. */
+extern double	clampf();		/* histogram clamping function */
+extern double	crfactor();		/* contrast reduction factor */
 
 extern COLOR	*firstscan();		/* first processed scanline */
 extern COLOR	*nextscan();		/* next processed scanline */