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.21 by schorsch, Fri Jun 6 16:38:47 2003 UTC vs.
Revision 2.26 by schorsch, Wed Jul 30 10:11:06 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
19 #include "copyright.h"
20
21 #include <stdio.h>
22 #include <stdlib.h>
23
21   #define  RED            0
22   #define  GRN            1
23   #define  BLU            2
# Line 200 | Line 197 | extern COLOR  cblack, cwhite;  /* black (0,0,0) and whi
197  
198   #define  rgb_cie(xyz,rgb)       colortrans(xyz,rgb2xyzmat,rgb)
199  
203 #ifdef BSD
204 #define  cpcolormat(md,ms)      bcopy((void *)ms,(void *)md,sizeof(COLORMAT))
205 #else
200   #define  cpcolormat(md,ms)      memcpy((void *)md,(void *)ms,sizeof(COLORMAT))
207 #endif
201  
202                                          /* defined in color.c */
203   extern char     *tempbuffer(unsigned int len);
# Line 233 | 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