ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/px/pcond.h
(Generate patch)

Comparing ray/src/px/pcond.h (file contents):
Revision 3.3 by greg, Fri Oct 11 10:46:59 1996 UTC vs.
Revision 3.6 by greg, Wed Feb 5 16:08:16 1997 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1996 Regents of the University of California */
1 > /* Copyright (c) 1997 Regents of the University of California */
2  
3   /* SCCSid "$SunId$ LBL" */
4  
# Line 39 | Line 39
39   #define DO_HSENS        04
40   #define DO_COLOR        010
41   #define DO_CWEIGHT      020
42 < #define DO_LINEAR       040
42 > #define DO_FIXHIST      040
43 > #define DO_LINEAR       0100
44  
45   #define DO_HUMAN        (DO_ACUITY|DO_VEIL|DO_HSENS|DO_COLOR)
46  
# Line 65 | Line 66 | extern short   fvxr, fvyr;             /* foveal image resolution *
66  
67   #define fovscan(y)      (fovimg+(y)*fvxr)
68  
69 < extern int      bwhist[HISTRES];        /* luminance histogram */
70 < extern long     histot;                 /* total count of histogram */
69 > extern double   fixfrac;                /* histogram share due to fixations */
70 > extern short    (*fixlst)[2];           /* fixation history list */
71 > extern int      nfixations;             /* number of fixation points */
72 >
73 > extern float    bwhist[HISTRES];        /* luminance histogram */
74 > extern double   histot;                 /* total count of histogram */
75   extern double   bwmin, bwmax;           /* histogram limits */
76   extern double   bwavg;                  /* mean brightness */
77  
78 < #define bwhc(B)         bwhist[(int)(HISTRES*((B)-bwmin)/(bwmax-bwmin))]
78 > #define bwhi(B)         (int)(HISTRES*((B)-bwmin)/(bwmax-bwmin))
79  
80   extern RGBPRIMP inprims;                /* input primaries */
81   extern COLORMAT inrgb2xyz;              /* convert input RGB to XYZ */
# Line 84 | Line 89 | extern double  pixaspect;              /* pixel aspect ratio */
89   extern RESOLU   inpres;                 /* input picture resolution */
90  
91   extern char     *mbcalfile;             /* macbethcal mapping file */
92 + extern char     *cwarpfile;             /* color warp mapping file */
93  
94   extern double   hacuity();              /* human acuity func. (cycles/deg.) */
95   extern double   htcontrs();             /* human contrast sens. func. */

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)