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

Comparing ray/src/common/color.h (file contents):
Revision 2.23 by schorsch, Mon Jun 30 14:59:10 2003 UTC vs.
Revision 2.27 by greg, Sat Oct 18 04:46:24 2003 UTC

# Line 11 | Line 11
11   */
12   #ifndef _RAD_COLOR_H_
13   #define _RAD_COLOR_H_
14 +
15 + #include <stdlib.h>
16 +
17   #ifdef __cplusplus
18   extern "C" {
19   #endif
20  
18 #include <stdio.h>
19 #include <stdlib.h>
20
21   #define  RED            0
22   #define  GRN            1
23   #define  BLU            2
# Line 113 | Line 113 | typedef float  COLORMAT[3][3]; /* color coordinate con
113   #define  D65EFFICACY            203.            /* standard illuminant D65 */
114   #define  INCEFFICACY            160.            /* illuminant A (incand.) */
115   #define  SUNEFFICACY            208.            /* illuminant B (solar dir.) */
116 < #define  SKYEFFICACY            D65EFFICACY     /* skylight */
116 > #define  SKYEFFICACY            D65EFFICACY     /* skylight (should be 110) */
117   #define  DAYEFFICACY            D65EFFICACY     /* combined sky and solar */
118  
119   #define  luminance(col)         (WHTEFFICACY * bright(col))
# Line 226 | Line 226 | extern void    compxyz2rgbWBmat(COLORMAT mat, RGBPRIMS pr
226   extern void     comprgb2xyzWBmat(COLORMAT mat, RGBPRIMS pr);
227   extern void     comprgb2rgbWBmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2);
228                                          /* defined in colrops.c */
229 < extern int      setcolrcor(double (*f)(), double a2);
230 < extern int      setcolrinv(double (*f)(), double a2);
229 > extern int      setcolrcor(double (*f)(double, double), double a2);
230 > extern int      setcolrinv(double (*f)(double, double), double a2);
231   extern int      setcolrgam(double g);
232   extern int      colrs_gambs(COLR *scan, int len);
233   extern int      gambs_colrs(COLR *scan, int len);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines