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 1.14 by greg, Thu Mar 29 12:43:07 1990 UTC vs.
Revision 2.6 by greg, Tue Feb 25 02:47:22 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1989 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 "color.h"
18 > #include "copyright.h"
19  
20 < #define NULL            0
20 > #include "standard.h"
21 >
22 > #include "color.h"
23                                  /* histogram resolution */
24   #define NRED            24
25   #define NGRN            32
# Line 33 | Line 34 | static char SCCSid[] = "$SunId$ LBL";
34                                  (int)(colval(c,p)*256.) : 255 ]
35                                  /* color partition tree */
36   #define CNODE           short
37 < #define set_branch(p,c) ((c)<<2|(p))
37 > #define set_branch(p,c) ((c)<<2|(p))
38   #define set_pval(pv)    ((pv)<<2|3)
39   #define is_branch(cn)   (((cn)&3)!=3)
40   #define is_pval(cn)     (((cn)&3)==3)
# Line 43 | Line 44 | static char SCCSid[] = "$SunId$ LBL";
44                                  /* our color table */
45   static struct tabent {
46          long    sum[3];         /* sum of colors using this entry */
47 <        long    n;              /* number of colors */
48 <        short   ent[3];         /* current table value */
47 >        int     n;              /* number of colors */
48 >        BYTE    ent[3];         /* current table value */
49   }       *clrtab = NULL;
50                                  /* color cube partition */
51   static CNODE    *ctree = NULL;
# Line 53 | Line 54 | static BYTE    clrmap[3][256];
54                                  /* histogram of colors used */
55   static unsigned short   histo[NRED][NGRN][NBLU];
56                                  /* initial color cube boundary */
57 < static int      CLRCUBE[3][2] = {0,NRED,0,NGRN,0,NBLU};
57 > static int      CLRCUBE[3][2] = {{0,NRED},{0,NGRN},{0,NBLU}};
58  
59 + static int      split();
60 + static void     cut();
61  
62 +
63   int
64   new_ctab(ncolors)               /* start new color table with max ncolors */
65   int     ncolors;
# Line 66 | 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 89 | 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   {
94 –        extern char     errmsg[];
98          int     r, g, b;
99          int     cv[3];
100          register CNODE  *tp;
# Line 111 | Line 114 | int    (*set_pixel)();
114                  if (cv[prim(*tp)] < part(*tp))
115                          tp += 1<<h;             /* left branch */
116                  else
117 <                        tp += 1<<(h+1); /* right branch */
117 >                        tp += 1<<(h+1);         /* right branch */
118          h = pval(*tp);
119                                                  /* add to color table */
120          clrtab[h].sum[RED] += r;
# Line 128 | Line 131 | int    (*set_pixel)();
131                          (g-clrtab[h].ent[GRN])*(g-clrtab[h].ent[GRN]) +
132                          (b-clrtab[h].ent[BLU])*(b-clrtab[h].ent[BLU]) > MAXDST2) {
133                  clrtab[h].ent[RED] = r;
134 <                clrtab[h].ent[GRN] = g; /* reassign pixel */
134 >                clrtab[h].ent[GRN] = g; /* reassign pixel */
135                  clrtab[h].ent[BLU] = b;
136   #ifdef DEBUG
137                  sprintf(errmsg, "pixel %d = (%d,%d,%d) (%d refs)\n",
# Line 141 | Line 144 | int    (*set_pixel)();
144   }
145  
146  
147 + void
148   make_gmap(gam)                  /* make gamma correction map */
149 < double  gam;
149 > double  gam;
150   {
147 –        extern double   pow();
151          register int    i;
152          
153          for (i = 0; i < 256; i++)
154                  clrmap[RED][i] =
155                  clrmap[GRN][i] =
156 <                clrmap[BLU][i] = 256.0 * pow(i/256.0, 1.0/gam);
156 >                clrmap[BLU][i] = 256.0 * pow((i+0.5)/256.0, 1.0/gam);
157   }
158  
159  
160 + void
161   set_cmap(rmap, gmap, bmap)      /* set custom color correction map */
162   BYTE    *rmap, *gmap, *bmap;
163   {
# Line 163 | 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 173 | 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 206 | 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