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.19 by greg, Tue Feb 25 02:47:21 2003 UTC vs.
Revision 2.31 by greg, Fri May 20 02:06:38 2011 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
8   *  three single byte mantissas and a common exponent.
9   */
10 + #ifndef _RAD_COLOR_H_
11 + #define _RAD_COLOR_H_
12  
13 – #include "copyright.h"
14 –
15 – #include <stdio.h>
13   #include <stdlib.h>
14  
15   #ifdef __cplusplus
# Line 29 | Line 26 | extern "C" {
26   #define  COLXS          128     /* excess used for exponent */
27   #define  WHT            3       /* used for RGBPRIMS type */
28  
29 < #undef  BYTE
30 < #define  BYTE   unsigned char   /* 8-bit unsigned integer */
29 > #undef uby8
30 > #define uby8  unsigned char     /* 8-bit unsigned integer */
31  
32 < typedef BYTE  COLR[4];          /* red, green, blue (or X,Y,Z), exponent */
32 > typedef uby8  COLR[4];          /* red, green, blue (or X,Y,Z), exponent */
33  
34 < typedef float  COLOR[3];        /* red, green, blue (or X,Y,Z) */
34 > typedef float COLORV;
35 > typedef COLORV  COLOR[3];       /* red, green, blue (or X,Y,Z) */
36  
37   typedef float  RGBPRIMS[4][2];  /* (x,y) chromaticities for RGBW */
38   typedef float  (*RGBPRIMP)[2];  /* pointer to RGBPRIMS array */
# Line 114 | Line 112 | typedef float  COLORMAT[3][3]; /* color coordinate con
112   #define  D65EFFICACY            203.            /* standard illuminant D65 */
113   #define  INCEFFICACY            160.            /* illuminant A (incand.) */
114   #define  SUNEFFICACY            208.            /* illuminant B (solar dir.) */
115 < #define  SKYEFFICACY            D65EFFICACY     /* skylight */
115 > #define  SKYEFFICACY            D65EFFICACY     /* skylight (should be 110) */
116   #define  DAYEFFICACY            D65EFFICACY     /* combined sky and solar */
117  
118   #define  luminance(col)         (WHTEFFICACY * bright(col))
# Line 158 | Line 156 | typedef float  COLORMAT[3][3]; /* color coordinate con
156   #define  PRIMARYSTR             "PRIMARIES="
157   #define  LPRIMARYSTR            10
158   #define  isprims(hl)            (!strncmp(hl,PRIMARYSTR,LPRIMARYSTR))
159 < #define  primsval(p,hl)         sscanf(hl+LPRIMARYSTR, \
159 > #define  primsval(p,hl)         sscanf((hl)+LPRIMARYSTR, \
160                                          "%f %f %f %f %f %f %f %f", \
161                                          &(p)[RED][CIEX],&(p)[RED][CIEY], \
162                                          &(p)[GRN][CIEX],&(p)[GRN][CIEY], \
# Line 176 | Line 174 | typedef float  COLORMAT[3][3]; /* color coordinate con
174   #define  COLCORSTR              "COLORCORR="
175   #define  LCOLCORSTR             10
176   #define  iscolcor(hl)           (!strncmp(hl,COLCORSTR,LCOLCORSTR))
177 < #define  colcorval(cc,hl)       sscanf(hl+LCOLCORSTR,"%f %f %f", \
177 > #define  colcorval(cc,hl)       sscanf((hl)+LCOLCORSTR,"%f %f %f", \
178                                          &(cc)[RED],&(cc)[GRN],&(cc)[BLU])
179   #define  fputcolcor(cc,fp)      fprintf(fp,"%s %f %f %f\n",COLCORSTR, \
180                                          (cc)[RED],(cc)[GRN],(cc)[BLU])
# Line 198 | Line 196 | extern COLOR  cblack, cwhite;  /* black (0,0,0) and whi
196  
197   #define  rgb_cie(xyz,rgb)       colortrans(xyz,rgb2xyzmat,rgb)
198  
199 < #ifdef BSD
202 < #define  cpcolormat(md,ms)      bcopy((char *)ms,(char *)md,sizeof(COLORMAT))
203 < #else
204 < #define  cpcolormat(md,ms)      memcpy((char *)md,(char *)ms,sizeof(COLORMAT))
205 < #endif
199 > #define  cpcolormat(md,ms)      memcpy((void *)md,(void *)ms,sizeof(COLORMAT))
200  
207 – #ifdef NOPROTO
201                                          /* 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 */
202   extern char     *tempbuffer(unsigned int len);
203   extern int      fwritecolrs(COLR *scanline, int len, FILE *fp);
204   extern int      freadcolrs(COLR *scanline, int len, FILE *fp);
# Line 256 | Line 216 | extern int     clipgamut(COLOR col, double brt, int gamut,
216   extern void     colortrans(COLOR c2, COLORMAT mat, COLOR c1);
217   extern void     multcolormat(COLORMAT m3, COLORMAT m2,
218                                          COLORMAT m1);
219 < extern void     compxyz2rgbmat(COLORMAT mat, RGBPRIMS pr);
220 < extern void     comprgb2xyzmat(COLORMAT mat, RGBPRIMS pr);
221 < extern void     comprgb2rgbmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2);
222 < extern void     compxyzWBmat(COLORMAT mat, float wht1[2],
219 > extern int      colorprimsOK(RGBPRIMS pr);
220 > extern int      compxyz2rgbmat(COLORMAT mat, RGBPRIMS pr);
221 > extern int      comprgb2xyzmat(COLORMAT mat, RGBPRIMS pr);
222 > extern int      comprgb2rgbmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2);
223 > extern int      compxyzWBmat(COLORMAT mat, float wht1[2],
224                                  float wht2[2]);
225 < 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);
225 > extern int      compxyz2rgbWBmat(COLORMAT mat, RGBPRIMS pr);
226 > extern int      comprgb2xyzWBmat(COLORMAT mat, RGBPRIMS pr);
227 > extern int      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