ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/colortab.c
(Generate patch)

Comparing ray/src/rt/colortab.c (file contents):
Revision 2.5 by greg, Sat Feb 22 02:07:28 2003 UTC vs.
Revision 2.9 by schorsch, Tue Mar 30 16:13:01 2004 UTC

# Line 15 | Line 15 | static const char      RCSid[] = "$Id$";
15   *  External symbols declared in drvier.h
16   */
17  
18 < /* ====================================================================
19 < * The Radiance Software License, Version 1.0
20 < *
21 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
22 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
23 < *
24 < * Redistribution and use in source and binary forms, with or without
25 < * modification, are permitted provided that the following conditions
26 < * are met:
27 < *
28 < * 1. Redistributions of source code must retain the above copyright
29 < *         notice, this list of conditions and the following disclaimer.
30 < *
31 < * 2. Redistributions in binary form must reproduce the above copyright
32 < *       notice, this list of conditions and the following disclaimer in
33 < *       the documentation and/or other materials provided with the
34 < *       distribution.
35 < *
36 < * 3. The end-user documentation included with the redistribution,
37 < *           if any, must include the following acknowledgment:
38 < *             "This product includes Radiance software
39 < *                 (http://radsite.lbl.gov/)
40 < *                 developed by the Lawrence Berkeley National Laboratory
41 < *               (http://www.lbl.gov/)."
42 < *       Alternately, this acknowledgment may appear in the software itself,
43 < *       if and wherever such third-party acknowledgments normally appear.
44 < *
45 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
46 < *       and "The Regents of the University of California" must
47 < *       not be used to endorse or promote products derived from this
48 < *       software without prior written permission. For written
49 < *       permission, please contact [email protected].
50 < *
51 < * 5. Products derived from this software may not be called "Radiance",
52 < *       nor may "Radiance" appear in their name, without prior written
53 < *       permission of Lawrence Berkeley National Laboratory.
54 < *
55 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
56 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
57 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
58 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
59 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
60 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
61 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
62 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
63 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
64 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
65 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
66 < * SUCH DAMAGE.
67 < * ====================================================================
68 < *
69 < * This software consists of voluntary contributions made by many
70 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
71 < * information on Lawrence Berkeley National Laboratory, please see
72 < * <http://www.lbl.gov/>.
73 < */
18 > #include "copyright.h"
19  
20 < #include "standard.h"
20 > #include <string.h>
21  
22 + #include "standard.h"
23   #include "color.h"
24 + #include "driver.h"
25 +
26                                  /* histogram resolution */
27   #define NRED            24
28   #define NGRN            32
# Line 139 | Line 87 | int    ncolors;
87                                  /* partition color space */
88          cut(ctree, 0, CLRCUBE, 0, ncolors);
89                                  /* clear histogram */
90 <        bzero((char *)histo, sizeof(histo));
90 >        memset((void *)histo, '\0', sizeof(histo));
91                                  /* return number of colors used */
92          return(ncolors);
93   }
94  
95  
96 < int
97 < get_pixel(col, set_pixel)       /* get pixel for color */
98 < COLOR   col;
99 < void    (*set_pixel)();
96 > extern int
97 > get_pixel(      /* get pixel for color */
98 >        COLOR   col,
99 >        dr_newcolrf_t *newcolr
100 > )
101   {
102          int     r, g, b;
103          int     cv[3];
# Line 193 | Line 142 | void   (*set_pixel)();
142                                  h, r, g, b, clrtab[h].n);
143                  eputs(errmsg);
144   #endif
145 <                (*set_pixel)(h, r, g, b);
145 >                (*newcolr)(h, r, g, b);
146          }
147          return(h);                              /* return pixel value */
148   }
# Line 216 | Line 165 | void
165   set_cmap(rmap, gmap, bmap)      /* set custom color correction map */
166   BYTE    *rmap, *gmap, *bmap;
167   {
168 <        bcopy((char *)rmap, (char *)clrmap[RED], 256);
169 <        bcopy((char *)gmap, (char *)clrmap[GRN], 256);
170 <        bcopy((char *)bmap, (char *)clrmap[BLU], 256);
168 >        memcpy((void *)clrmap[RED], (void *)rmap, 256);
169 >        memcpy((void *)clrmap[GRN], (void *)gmap, 256);
170 >        memcpy((void *)clrmap[BLU], (void *)bmap, 256);
171   }
172  
173  
# Line 248 | Line 197 | int    c0, c1;
197          }
198                                          /* split box */
199          *tree = split(box);
200 <        bcopy((char *)box, (char *)kb, sizeof(kb));
200 >        memcpy((void *)kb, (void *)box, sizeof(kb));
201                                                  /* do left (lesser) branch */
202          kb[prim(*tree)][1] = part(*tree);
203          cut(tree+(1<<level), level+1, kb, c0, (c0+c1)>>1);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines