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.22 by greg, Fri Jun 27 06:53:21 2003 UTC vs.
Revision 2.28 by schorsch, Sun Mar 28 20:33:12 2004 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 33 | Line 33 | extern "C" {
33  
34   typedef BYTE  COLR[4];          /* red, green, blue (or X,Y,Z), exponent */
35  
36 < typedef float  COLOR[3];        /* red, green, blue (or X,Y,Z) */
36 > typedef float COLORV;
37 > typedef COLORV  COLOR[3];       /* red, green, blue (or X,Y,Z) */
38  
39   typedef float  RGBPRIMS[4][2];  /* (x,y) chromaticities for RGBW */
40   typedef float  (*RGBPRIMP)[2];  /* pointer to RGBPRIMS array */
# Line 113 | Line 114 | typedef float  COLORMAT[3][3]; /* color coordinate con
114   #define  D65EFFICACY            203.            /* standard illuminant D65 */
115   #define  INCEFFICACY            160.            /* illuminant A (incand.) */
116   #define  SUNEFFICACY            208.            /* illuminant B (solar dir.) */
117 < #define  SKYEFFICACY            D65EFFICACY     /* skylight */
117 > #define  SKYEFFICACY            D65EFFICACY     /* skylight (should be 110) */
118   #define  DAYEFFICACY            D65EFFICACY     /* combined sky and solar */
119  
120   #define  luminance(col)         (WHTEFFICACY * bright(col))
# Line 197 | Line 198 | extern COLOR  cblack, cwhite;  /* black (0,0,0) and whi
198  
199   #define  rgb_cie(xyz,rgb)       colortrans(xyz,rgb2xyzmat,rgb)
200  
200 – #ifdef BSD
201 – #define  cpcolormat(md,ms)      bcopy((void *)ms,(void *)md,sizeof(COLORMAT))
202 – #else
201   #define  cpcolormat(md,ms)      memcpy((void *)md,(void *)ms,sizeof(COLORMAT))
204 – #endif
202  
203                                          /* defined in color.c */
204   extern char     *tempbuffer(unsigned int len);
# Line 230 | Line 227 | extern void    compxyz2rgbWBmat(COLORMAT mat, RGBPRIMS pr
227   extern void     comprgb2xyzWBmat(COLORMAT mat, RGBPRIMS pr);
228   extern void     comprgb2rgbWBmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2);
229                                          /* defined in colrops.c */
230 < extern int      setcolrcor(double (*f)(), double a2);
231 < extern int      setcolrinv(double (*f)(), double a2);
230 > extern int      setcolrcor(double (*f)(double, double), double a2);
231 > extern int      setcolrinv(double (*f)(double, double), double a2);
232   extern int      setcolrgam(double g);
233   extern int      colrs_gambs(COLR *scan, int len);
234   extern int      gambs_colrs(COLR *scan, int len);

Diff Legend

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