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.25 by schorsch, Mon Jul 14 22:23:59 2003 UTC vs.
Revision 2.33 by greg, Wed Sep 11 16:00:13 2013 UTC

# Line 2 | Line 2
2   /*
3   *  color.h - header for routines using pixel color values.
4   *
5 – *  Must be included after X11 headers, since they declare a BYTE type.
6 – *
5   *  Two color representations are used, one for calculation and
6   *  another for storage.  Calculation is done with three floats
7   *  for speed.  Stored color values use 4 bytes which contain
# Line 12 | Line 10
10   #ifndef _RAD_COLOR_H_
11   #define _RAD_COLOR_H_
12  
13 + #include <stdio.h>
14   #include <stdlib.h>
15  
16   #ifdef __cplusplus
# Line 28 | Line 27 | extern "C" {
27   #define  COLXS          128     /* excess used for exponent */
28   #define  WHT            3       /* used for RGBPRIMS type */
29  
30 < #undef  BYTE
31 < #define  BYTE   unsigned char   /* 8-bit unsigned integer */
30 > #undef uby8
31 > #define uby8  unsigned char     /* 8-bit unsigned integer */
32  
33 < typedef BYTE  COLR[4];          /* red, green, blue (or X,Y,Z), exponent */
33 > typedef uby8  COLR[4];          /* red, green, blue (or X,Y,Z), exponent */
34  
35 < typedef float  COLOR[3];        /* red, green, blue (or X,Y,Z) */
35 > typedef float COLORV;
36 > typedef COLORV  COLOR[3];       /* red, green, blue (or X,Y,Z) */
37  
38   typedef float  RGBPRIMS[4][2];  /* (x,y) chromaticities for RGBW */
39   typedef float  (*RGBPRIMP)[2];  /* pointer to RGBPRIMS array */
# Line 113 | 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 157 | Line 157 | typedef float  COLORMAT[3][3]; /* color coordinate con
157   #define  PRIMARYSTR             "PRIMARIES="
158   #define  LPRIMARYSTR            10
159   #define  isprims(hl)            (!strncmp(hl,PRIMARYSTR,LPRIMARYSTR))
160 < #define  primsval(p,hl)         sscanf(hl+LPRIMARYSTR, \
160 > #define  primsval(p,hl)         (sscanf((hl)+LPRIMARYSTR, \
161                                          "%f %f %f %f %f %f %f %f", \
162                                          &(p)[RED][CIEX],&(p)[RED][CIEY], \
163                                          &(p)[GRN][CIEX],&(p)[GRN][CIEY], \
164                                          &(p)[BLU][CIEX],&(p)[BLU][CIEY], \
165 <                                        &(p)[WHT][CIEX],&(p)[WHT][CIEY])
165 >                                        &(p)[WHT][CIEX],&(p)[WHT][CIEY]) == 8)
166   #define  fputprims(p,fp)        fprintf(fp, \
167                                  "%s %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f\n",\
168                                          PRIMARYSTR, \
# Line 175 | Line 175 | typedef float  COLORMAT[3][3]; /* color coordinate con
175   #define  COLCORSTR              "COLORCORR="
176   #define  LCOLCORSTR             10
177   #define  iscolcor(hl)           (!strncmp(hl,COLCORSTR,LCOLCORSTR))
178 < #define  colcorval(cc,hl)       sscanf(hl+LCOLCORSTR,"%f %f %f", \
178 > #define  colcorval(cc,hl)       sscanf((hl)+LCOLCORSTR,"%f %f %f", \
179                                          &(cc)[RED],&(cc)[GRN],&(cc)[BLU])
180   #define  fputcolcor(cc,fp)      fprintf(fp,"%s %f %f %f\n",COLCORSTR, \
181                                          (cc)[RED],(cc)[GRN],(cc)[BLU])
# Line 217 | Line 217 | extern int     clipgamut(COLOR col, double brt, int gamut,
217   extern void     colortrans(COLOR c2, COLORMAT mat, COLOR c1);
218   extern void     multcolormat(COLORMAT m3, COLORMAT m2,
219                                          COLORMAT m1);
220 < extern void     compxyz2rgbmat(COLORMAT mat, RGBPRIMS pr);
221 < extern void     comprgb2xyzmat(COLORMAT mat, RGBPRIMS pr);
222 < extern void     comprgb2rgbmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2);
223 < extern void     compxyzWBmat(COLORMAT mat, float wht1[2],
220 > extern int      colorprimsOK(RGBPRIMS pr);
221 > extern int      compxyz2rgbmat(COLORMAT mat, RGBPRIMS pr);
222 > extern int      comprgb2xyzmat(COLORMAT mat, RGBPRIMS pr);
223 > extern int      comprgb2rgbmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2);
224 > extern int      compxyzWBmat(COLORMAT mat, float wht1[2],
225                                  float wht2[2]);
226 < 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);
226 > extern int      compxyz2rgbWBmat(COLORMAT mat, RGBPRIMS pr);
227 > extern int      comprgb2xyzWBmat(COLORMAT mat, RGBPRIMS pr);
228 > extern int      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