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.29 by greg, Tue Sep 5 21:54:32 2006 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 COLORV;
36   typedef COLORV  COLOR[3];       /* red, green, blue (or X,Y,Z) */
# Line 158 | 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 176 | 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])

Diff Legend

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