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.30 by greg, Thu May 21 18:08:43 2009 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 36 | 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 116 | 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 160 | Line 158 | typedef float  COLORMAT[3][3]; /* color coordinate con
158   #define  PRIMARYSTR             "PRIMARIES="
159   #define  LPRIMARYSTR            10
160   #define  isprims(hl)            (!strncmp(hl,PRIMARYSTR,LPRIMARYSTR))
161 < #define  primsval(p,hl)         sscanf(hl+LPRIMARYSTR, \
161 > #define  primsval(p,hl)         sscanf((hl)+LPRIMARYSTR, \
162                                          "%f %f %f %f %f %f %f %f", \
163                                          &(p)[RED][CIEX],&(p)[RED][CIEY], \
164                                          &(p)[GRN][CIEX],&(p)[GRN][CIEY], \
# Line 178 | Line 176 | typedef float  COLORMAT[3][3]; /* color coordinate con
176   #define  COLCORSTR              "COLORCORR="
177   #define  LCOLCORSTR             10
178   #define  iscolcor(hl)           (!strncmp(hl,COLCORSTR,LCOLCORSTR))
179 < #define  colcorval(cc,hl)       sscanf(hl+LCOLCORSTR,"%f %f %f", \
179 > #define  colcorval(cc,hl)       sscanf((hl)+LCOLCORSTR,"%f %f %f", \
180                                          &(cc)[RED],&(cc)[GRN],&(cc)[BLU])
181   #define  fputcolcor(cc,fp)      fprintf(fp,"%s %f %f %f\n",COLCORSTR, \
182                                          (cc)[RED],(cc)[GRN],(cc)[BLU])
# Line 200 | Line 198 | extern COLOR  cblack, cwhite;  /* black (0,0,0) and whi
198  
199   #define  rgb_cie(xyz,rgb)       colortrans(xyz,rgb2xyzmat,rgb)
200  
203 – #ifdef BSD
204 – #define  cpcolormat(md,ms)      bcopy((void *)ms,(void *)md,sizeof(COLORMAT))
205 – #else
201   #define  cpcolormat(md,ms)      memcpy((void *)md,(void *)ms,sizeof(COLORMAT))
207 – #endif
202  
203                                          /* defined in color.c */
204   extern char     *tempbuffer(unsigned int len);
# Line 224 | Line 218 | extern int     clipgamut(COLOR col, double brt, int gamut,
218   extern void     colortrans(COLOR c2, COLORMAT mat, COLOR c1);
219   extern void     multcolormat(COLORMAT m3, COLORMAT m2,
220                                          COLORMAT m1);
221 < extern void     compxyz2rgbmat(COLORMAT mat, RGBPRIMS pr);
222 < extern void     comprgb2xyzmat(COLORMAT mat, RGBPRIMS pr);
223 < extern void     comprgb2rgbmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2);
224 < extern void     compxyzWBmat(COLORMAT mat, float wht1[2],
221 > extern int      colorprimsOK(RGBPRIMS pr);
222 > extern int      compxyz2rgbmat(COLORMAT mat, RGBPRIMS pr);
223 > extern int      comprgb2xyzmat(COLORMAT mat, RGBPRIMS pr);
224 > extern int      comprgb2rgbmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2);
225 > extern int      compxyzWBmat(COLORMAT mat, float wht1[2],
226                                  float wht2[2]);
227 < extern void     compxyz2rgbWBmat(COLORMAT mat, RGBPRIMS pr);
228 < extern void     comprgb2xyzWBmat(COLORMAT mat, RGBPRIMS pr);
229 < extern void     comprgb2rgbWBmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2);
227 > extern int      compxyz2rgbWBmat(COLORMAT mat, RGBPRIMS pr);
228 > extern int      comprgb2xyzWBmat(COLORMAT mat, RGBPRIMS pr);
229 > extern int      comprgb2rgbWBmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2);
230                                          /* defined in colrops.c */
231 < extern int      setcolrcor(double (*f)(), double a2);
232 < extern int      setcolrinv(double (*f)(), double a2);
231 > extern int      setcolrcor(double (*f)(double, double), double a2);
232 > extern int      setcolrinv(double (*f)(double, double), double a2);
233   extern int      setcolrgam(double g);
234   extern int      colrs_gambs(COLR *scan, int len);
235   extern int      gambs_colrs(COLR *scan, int len);

Diff Legend

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