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.3 by greg, Mon Mar 8 12:37:21 1993 UTC vs.
Revision 2.6 by greg, Tue Feb 25 02:47:22 2003 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1992 Regents of the University of California */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5   * colortab.c - allocate and control dynamic color table.
6   *
# Line 14 | Line 11 | static char SCCSid[] = "$SunId$ LBL";
11   *      histogram is cleared.  This algorithm
12   *      performs only as well as the next drawing's color
13   *      distribution is correlated to the last.
14 + *
15 + *  External symbols declared in drvier.h
16   */
17  
18 + #include "copyright.h"
19 +
20   #include "standard.h"
21  
22   #include "color.h"
# Line 55 | Line 56 | static unsigned short  histo[NRED][NGRN][NBLU];
56                                  /* initial color cube boundary */
57   static int      CLRCUBE[3][2] = {{0,NRED},{0,NGRN},{0,NBLU}};
58  
59 < static int      split(), cut();
59 > static int      split();
60 > static void     cut();
61  
62  
63   int
# Line 68 | Line 70 | int    ncolors;
70                  return(0);
71                                  /* free old tables */
72          if (clrtab != NULL)
73 <                free((char *)clrtab);
73 >                free((void *)clrtab);
74          if (ctree != NULL)
75 <                free((char *)ctree);
75 >                free((void *)ctree);
76                                  /* get new tables */
77          for (treesize = 1; treesize < ncolors; treesize <<= 1)
78                  ;
# Line 91 | Line 93 | int    ncolors;
93   int
94   get_pixel(col, set_pixel)       /* get pixel for color */
95   COLOR   col;
96 < int     (*set_pixel)();
96 > void    (*set_pixel)();
97   {
96        extern char     errmsg[];
98          int     r, g, b;
99          int     cv[3];
100          register CNODE  *tp;
# Line 143 | Line 144 | int    (*set_pixel)();
144   }
145  
146  
147 + void
148   make_gmap(gam)                  /* make gamma correction map */
149   double  gam;
150   {
# Line 155 | Line 157 | double gam;
157   }
158  
159  
160 + void
161   set_cmap(rmap, gmap, bmap)      /* set custom color correction map */
162   BYTE    *rmap, *gmap, *bmap;
163   {
# Line 164 | Line 167 | BYTE   *rmap, *gmap, *bmap;
167   }
168  
169  
170 + void
171   map_color(rgb, col)             /* map a color to a byte triplet */
172   BYTE    rgb[3];
173   COLOR   col;
# Line 174 | Line 178 | COLOR  col;
178   }
179  
180  
181 < static
181 > static void
182   cut(tree, level, box, c0, c1)           /* partition color space */
183   register CNODE  *tree;
184   int     level;
# Line 207 | Line 211 | register int   box[3][2];
211   #define c0      r
212          register int    r, g, b;
213          int     pri;
214 <        int     t[HMAX], med;
214 >        long    t[HMAX], med;
215                                          /* find dominant axis */
216          pri = RED;
217          if (box[GRN][1]-box[GRN][0] > box[pri][1]-box[pri][0])

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines