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.20 by greg, Tue May 13 17:58:32 2003 UTC vs.
Revision 2.28 by schorsch, Sun Mar 28 20:33:12 2004 UTC

# Line 9 | Line 9
9   *  for speed.  Stored color values use 4 bytes which contain
10   *  three single byte mantissas and a common exponent.
11   */
12 + #ifndef _RAD_COLOR_H_
13 + #define _RAD_COLOR_H_
14  
13 #include "copyright.h"
14
15 #include <stdio.h>
15   #include <stdlib.h>
16  
17   #ifdef __cplusplus
# Line 34 | 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 114 | 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 198 | Line 198 | extern COLOR  cblack, cwhite;  /* black (0,0,0) and whi
198  
199   #define  rgb_cie(xyz,rgb)       colortrans(xyz,rgb2xyzmat,rgb)
200  
201 #ifdef BSD
202 #define  cpcolormat(md,ms)      bcopy((void *)ms,(void *)md,sizeof(COLORMAT))
203 #else
201   #define  cpcolormat(md,ms)      memcpy((void *)md,(void *)ms,sizeof(COLORMAT))
205 #endif
202  
207 #ifdef NOPROTO
203                                          /* defined in color.c */
209 extern char     *tempbuffer();
210 extern int      fwritecolrs();
211 extern int      freadcolrs();
212 extern int      fwritescan();
213 extern int      freadscan();
214 extern void     setcolr();
215 extern void     colr_color();
216 extern int      bigdiff();
217                                        /* defined in spec_rgb.c */
218 extern void     spec_rgb();
219 extern void     spec_cie();
220 extern void     cie_rgb();
221 extern int      clipgamut();
222 extern void     colortrans();
223 extern void     multcolormat();
224 extern void     compxyz2rgbmat();
225 extern void     comprgb2xyzmat();
226 extern void     comprgb2rgbmat();
227 extern void     compxyzWBmat();
228 extern void     compxyz2rgbWBmat();
229 extern void     comprgb2xyzWBmat();
230 extern void     comprgb2rgbWBmat();
231                                        /* defined in colrops.c */
232 extern int      setcolrcor();
233 extern int      setcolrinv();
234 extern int      setcolrgam();
235 extern int      colrs_gambs();
236 extern int      gambs_colrs();
237 extern void     shiftcolrs();
238 extern void     normcolrs();
239
240 #else
241                                        /* defined in color.c */
204   extern char     *tempbuffer(unsigned int len);
205   extern int      fwritecolrs(COLR *scanline, int len, FILE *fp);
206   extern int      freadcolrs(COLR *scanline, int len, FILE *fp);
# Line 265 | 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);
235   extern void     shiftcolrs(COLR *scan, int len, int adjust);
236   extern void     normcolrs(COLR *scan, int len, int adjust);
237  
276 #endif
238  
239   #ifdef __cplusplus
240   }
241   #endif
242 + #endif /* _RAD_COLOR_H_ */
243 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines