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.18 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.28 by schorsch, Sun Mar 28 20:33:12 2004 UTC

# Line 1 | Line 1
1 < /* RCSid: $Id$ */
1 > /* RCSid $Id$ */
2   /*
3   *  color.h - header for routines using pixel color values.
4   *
# Line 9 | Line 9
9   *  for speed.  Stored color values use 4 bytes which contain
10   *  three single byte mantissas and a common exponent.
11   */
12 + #ifndef _RAD_COLOR_H_
13 + #define _RAD_COLOR_H_
14  
13 – /* ====================================================================
14 – * The Radiance Software License, Version 1.0
15 – *
16 – * Copyright (c) 1990 - 2002 The Regents of the University of California,
17 – * through Lawrence Berkeley National Laboratory.   All rights reserved.
18 – *
19 – * Redistribution and use in source and binary forms, with or without
20 – * modification, are permitted provided that the following conditions
21 – * are met:
22 – *
23 – * 1. Redistributions of source code must retain the above copyright
24 – *         notice, this list of conditions and the following disclaimer.
25 – *
26 – * 2. Redistributions in binary form must reproduce the above copyright
27 – *       notice, this list of conditions and the following disclaimer in
28 – *       the documentation and/or other materials provided with the
29 – *       distribution.
30 – *
31 – * 3. The end-user documentation included with the redistribution,
32 – *           if any, must include the following acknowledgment:
33 – *             "This product includes Radiance software
34 – *                 (http://radsite.lbl.gov/)
35 – *                 developed by the Lawrence Berkeley National Laboratory
36 – *               (http://www.lbl.gov/)."
37 – *       Alternately, this acknowledgment may appear in the software itself,
38 – *       if and wherever such third-party acknowledgments normally appear.
39 – *
40 – * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
41 – *       and "The Regents of the University of California" must
42 – *       not be used to endorse or promote products derived from this
43 – *       software without prior written permission. For written
44 – *       permission, please contact [email protected].
45 – *
46 – * 5. Products derived from this software may not be called "Radiance",
47 – *       nor may "Radiance" appear in their name, without prior written
48 – *       permission of Lawrence Berkeley National Laboratory.
49 – *
50 – * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
51 – * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
52 – * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
53 – * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
54 – * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
55 – * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
56 – * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
57 – * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
58 – * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
59 – * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
60 – * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
61 – * SUCH DAMAGE.
62 – * ====================================================================
63 – *
64 – * This software consists of voluntary contributions made by many
65 – * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
66 – * information on Lawrence Berkeley National Laboratory, please see
67 – * <http://www.lbl.gov/>.
68 – */
69 –
70 – #include <stdio.h>
15   #include <stdlib.h>
16  
17   #ifdef __cplusplus
# Line 89 | 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 169 | 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 253 | Line 198 | extern COLOR  cblack, cwhite;  /* black (0,0,0) and whi
198  
199   #define  rgb_cie(xyz,rgb)       colortrans(xyz,rgb2xyzmat,rgb)
200  
201 < #ifdef BSD
257 < #define  cpcolormat(md,ms)      bcopy((char *)ms,(char *)md,sizeof(COLORMAT))
258 < #else
259 < #define  cpcolormat(md,ms)      memcpy((char *)md,(char *)ms,sizeof(COLORMAT))
260 < #endif
201 > #define  cpcolormat(md,ms)      memcpy((void *)md,(void *)ms,sizeof(COLORMAT))
202  
262 – #ifdef NOPROTO
203                                          /* defined in color.c */
264 – extern char     *tempbuffer();
265 – extern int      fwritecolrs();
266 – extern int      freadcolrs();
267 – extern int      fwritescan();
268 – extern int      freadscan();
269 – extern void     setcolr();
270 – extern void     colr_color();
271 – extern int      bigdiff();
272 –                                        /* defined in spec_rgb.c */
273 – extern void     spec_rgb();
274 – extern void     spec_cie();
275 – extern void     cie_rgb();
276 – extern int      clipgamut();
277 – extern void     colortrans();
278 – extern void     multcolormat();
279 – extern void     compxyz2rgbmat();
280 – extern void     comprgb2xyzmat();
281 – extern void     comprgb2rgbmat();
282 – extern void     compxyzWBmat();
283 – extern void     compxyz2rgbWBmat();
284 – extern void     comprgb2xyzWBmat();
285 – extern void     comprgb2rgbWBmat();
286 –                                        /* defined in colrops.c */
287 – extern int      setcolrcor();
288 – extern int      setcolrinv();
289 – extern int      setcolrgam();
290 – extern int      colrs_gambs();
291 – extern int      gambs_colrs();
292 – extern void     shiftcolrs();
293 – extern void     normcolrs();
294 –
295 – #else
296 –                                        /* defined in color.c */
204   extern char     *tempbuffer(unsigned int len);
205   extern int      fwritecolrs(COLR *scanline, int len, FILE *fp);
206   extern int      freadcolrs(COLR *scanline, int len, FILE *fp);
# Line 320 | Line 227 | 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);
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);
235   extern void     shiftcolrs(COLR *scan, int len, int adjust);
236   extern void     normcolrs(COLR *scan, int len, int adjust);
237  
331 – #endif
238  
239   #ifdef __cplusplus
240   }
241   #endif
242 + #endif /* _RAD_COLOR_H_ */
243 +

Diff Legend

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