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.6 by greg, Tue Feb 25 02:47:22 2003 UTC vs.
Revision 2.9 by schorsch, Tue Mar 30 16:13:01 2004 UTC

# Line 17 | Line 17 | static const char      RCSid[] = "$Id$";
17  
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 84 | 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 138 | 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 161 | 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 193 | 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