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

Comparing ray/src/common/ccolor.h (file contents):
Revision 3.6 by greg, Tue Jun 26 17:59:16 2012 UTC vs.
Revision 3.7 by greg, Thu Mar 26 15:57:19 2015 UTC

# Line 33 | Line 33 | typedef struct {
33          float   eff;            /* efficacy (lumens/watt) */
34   } C_COLOR;
35  
36 + typedef unsigned short  C_CHROMA;       /* encoded (x,y) chromaticity */
37 +
38   #define C_DEFCOLOR      { 1, NULL, C_CDXY|C_CSXY|C_CSSPEC|C_CSEFF,\
39                          {C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
40                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
# Line 70 | Line 72 | extern double  c_cmult(C_COLOR *cres, C_COLOR *c1, doub
72   extern void     c_toSharpRGB(C_COLOR *cin, double cieY, float cout[3]);
73                                                  /* convert from sharpened RGB */
74   extern double   c_fromSharpRGB(float cin[3], C_COLOR *cout);
75 +                                                /* encode (x,y) chromaticity */
76 + extern C_CHROMA c_encodeChroma(C_COLOR *clr);
77 +                                                /* decode (x,y) chromaticity */
78 + extern void     c_decodeChroma(C_COLOR *cres, C_CHROMA ccode);
79  
80   /* The following two routines are not defined in ccolor.c */
81                                                  /* convert to RGB color */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines