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.27 by greg, Sat Oct 18 04:46:24 2003 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 114 | 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 198 | Line 197 | extern COLOR  cblack, cwhite;  /* black (0,0,0) and whi
197  
198   #define  rgb_cie(xyz,rgb)       colortrans(xyz,rgb2xyzmat,rgb)
199  
201 #ifdef BSD
202 #define  cpcolormat(md,ms)      bcopy((void *)ms,(void *)md,sizeof(COLORMAT))
203 #else
200   #define  cpcolormat(md,ms)      memcpy((void *)md,(void *)ms,sizeof(COLORMAT))
205 #endif
201  
207 #ifdef NOPROTO
202                                          /* 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 */
203   extern char     *tempbuffer(unsigned int len);
204   extern int      fwritecolrs(COLR *scanline, int len, FILE *fp);
205   extern int      freadcolrs(COLR *scanline, int len, FILE *fp);
# Line 265 | 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);
234   extern void     shiftcolrs(COLR *scan, int len, int adjust);
235   extern void     normcolrs(COLR *scan, int len, int adjust);
236  
276 #endif
237  
238   #ifdef __cplusplus
239   }
240   #endif
241 + #endif /* _RAD_COLOR_H_ */
242 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines