ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/px/clrtab.c
(Generate patch)

Comparing ray/src/px/clrtab.c (file contents):
Revision 2.3 by greg, Tue Oct 13 11:36:20 1992 UTC vs.
Revision 2.5 by greg, Tue Feb 23 15:11:59 1993 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1992 Regents of the University of California */
1 > /* Copyright (c) 1993 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 32 | Line 32 | static int     CLRCUBE[3][2] = {0,NRED,0,NGRN,0,NBLU};
32                                  /* maximum propagated error during dithering */
33   #define MAXERR          20
34                                  /* define CLOSEST to get closest colors */
35 < #define CLOSEST         1
35 > #ifndef CLOSEST
36 > #ifdef SPEED
37 > #if  SPEED > 8
38 > #define CLOSEST         1       /* this step takes a little longer */
39 > #endif
40 > #endif
41 > #endif
42  
43  
44   new_histo()             /* clear our histogram */
# Line 231 | Line 237 | mktabent(p, box)       /* compute average color for box and
237   int     p;
238   register int    box[3][2];
239   {
240 <        long    sum[3];
241 <        int     r, g, n;
242 <        register int    b, c;
240 >        unsigned long   sum[3];
241 >        unsigned        r, g, n;
242 >        register unsigned       b, c;
243                                                  /* sum pixels in box */
244          n = 0;
245          sum[RED] = sum[GRN] = sum[BLU] = 0;
# Line 248 | Line 254 | register int   box[3][2];
254                      }
255                      histo[r][g][b] = p;         /* assign pixel */
256                  }
257 +        if (n >= (1<<23)/HMAX) {                /* avoid overflow */
258 +                sum[RED] /= n;
259 +                sum[GRN] /= n;
260 +                sum[BLU] /= n;
261 +                n = 1;
262 +        }
263          if (n) {                                /* compute average */
264                  clrtab[p][RED] = sum[RED]*256/NRED/n;
265                  clrtab[p][GRN] = sum[GRN]*256/NGRN/n;
# Line 335 | Line 347 | dist(col, r, g, b)             /* find distance from clrtab entry
347   register BYTE   col[3];
348   int     r, g, b;
349   {
350 <        register unsigned       tmp;
350 >        register int    tmp;
351          register unsigned       sum;
352          
353          tmp = col[RED]*NRED/256 - r;

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)