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

Comparing ray/src/cv/mgflib/parser.h (file contents):
Revision 1.18 by greg, Tue Mar 7 14:53:17 1995 UTC vs.
Revision 1.19 by greg, Fri Mar 10 15:16:42 1995 UTC

# Line 206 | Line 206 | extern double  normalize(FVECT);       /* normalize a vector
206  
207   typedef struct {
208          int     clock;                  /* incremented each change */
209 <        unsigned short  flags;          /* what's been set */
210 <        unsigned short  ssamp[C_CNSS];  /* spectral samples, min wl to max */
211 <        unsigned long   ssum;           /* straight sum of spectral values */
209 >        short   flags;                  /* what's been set */
210 >        short   ssamp[C_CNSS];          /* spectral samples, min wl to max */
211 >        long    ssum;                   /* straight sum of spectral values */
212          float   cx, cy;                 /* xy chromaticity value */
213          float   eff;                    /* efficacy (lumens/watt) */
214   } C_COLOR;
# Line 222 | Line 222 | typedef struct {
222                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
223                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV},\
224                          (long)C_CNSS*C_CMAXV, 1./3., 1./3., 178.006 }
225 –
226 – #define C_CIEX          { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,\
227 –                        {14,42,143,435,1344,2839,3483,3362,2908,1954,956,\
228 –                        320,49,93,633,1655,2904,4334,5945,7621,9163,10263,\
229 –                        10622,10026,8544,6424,4479,2835,1649,874,468,227,\
230 –                        114,58,29,14,7,3,2,1,0}, 106836L, .467, .368, 362.230 }
231 –
232 – #define C_CIEY          { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,\
233 –                        {0,1,4,12,40,116,230,380,600,910,1390,2080,3230,\
234 –                        5030,7100,8620,9540,9950,9950,9520,8700,7570,6310,\
235 –                        5030,3810,2650,1750,1070,610,320,170,82,41,21,10,\
236 –                        5,2,1,1,0,0}, 106856L, .398, .542, 493.525 }
237 –
238 – #define C_CIEZ          { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,\
239 –                        {65,201,679,2074,6456,13856,17471,17721,16692,\
240 –                        12876,8130,4652,2720,1582,782,422,203,87,39,21,17,\
241 –                        11,8,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},\
242 –                        106770L, .147, .077, 54.363 }
225  
226   #define c_cval(c,l)     ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->ssum)
227  

Diff Legend

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