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

Comparing ray/src/px/pcond.h (file contents):
Revision 3.6 by greg, Wed Feb 5 16:08:16 1997 UTC vs.
Revision 3.9 by gwlarson, Thu Mar 12 15:47:33 1998 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1997 Regents of the University of California */
1 > /* Copyright (c) 1998 Silicon Graphics, Inc. */
2  
3 < /* SCCSid "$SunId$ LBL" */
3 > /* SCCSid "$SunId$ SGI" */
4  
5   /*
6   * Header file for picture file conditioning.
# Line 24 | Line 24
24   #define FOVDIA          (1.0*PI/180.)   /* foveal diameter (radians) */
25  
26   #define HISTRES         100             /* histogram resolution */
27 + #define MAXPREHIST      1024            /* maximum precomputed histogram */
28  
29 < #define LMIN            1e-4            /* minimum visible world luminance */
29 > #define LMIN            1e-7            /* minimum visible world luminance */
30   #define LMAX            1e5             /* maximum visible world luminance */
31  
32   #define Bl(Lw)          log(Lw)         /* brightness function */
# Line 40 | Line 41
41   #define DO_COLOR        010
42   #define DO_CWEIGHT      020
43   #define DO_FIXHIST      040
44 < #define DO_LINEAR       0100
44 > #define DO_PREHIST      0100
45 > #define DO_LINEAR       0200
46  
47   #define DO_HUMAN        (DO_ACUITY|DO_VEIL|DO_HSENS|DO_COLOR)
48  
49   extern int      what2do;                /* desired adjustments */
50  
51   extern double   ldmax;                  /* maximum output luminance */
52 < extern double   ldmin;                  /* minimum output luminance */
53 < extern double   Bldmin, Bldmax;         /* Bl(ldmin) and Bl(ldmax) */
52 > extern double   lddyn;                  /* display dynamic range */
53 > extern double   Bldmin, Bldmax;         /* Bl(ldmax/lddyn) and Bl(ldmax) */
54  
55   extern char     *progname;              /* global argv[0] */
56  
# Line 60 | Line 62 | extern double  inpexp;                 /* input exposure value */
62  
63   #define plum(clr)       ((*lumf)(clr,0)/inpexp)
64   #define slum(clr)       ((*lumf)(clr,1)/inpexp)
65 +
66 + #define ldmin           (ldmax/lddyn)
67  
68   extern COLOR    *fovimg;                /* foveal (1 degree) averaged image */
69   extern short    fvxr, fvyr;             /* foveal image resolution */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines