ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/px/clrtab.c

Comparing ray/src/px/clrtab.c (file contents):
Revision 2.3 by greg, Tue Oct 13 11:36:20 1992 UTC vs.
Revision 2.10 by greg, Fri Jun 10 12:51:16 1994 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 23 | Line 23 | static char SCCSid[] = "$SunId$ LBL";
23		#define part(cn)        ((cn)>>2)
24		#define prim(cn)        ((cn)&3)
25		/* our color table (global) */
26	<	BYTE    clrtab[256][3];
26	>	extern BYTE     clrtab[256][3];
27		/* histogram of colors / color assignments */
28		static unsigned histo[NRED][NGRN][NBLU];
29		#define cndx(c)         histo[((c)[RED]*NRED)>>8][((c)[GRN]*NGRN)>>8][((c)[BLU]*NBLU)>>8]
#	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 */
44	>	new_histo(n)            /* clear our histogram */
45	>	int     n;
46		{
47		bzero((char *)histo, sizeof(histo));
48	+	return(0);
49		}
50
51
#	Line 71 | Line 79 | int    ncolors;
79		#ifdef CLOSEST
80		closest(ncolors);       /* ensure colors picked are closest */
81		#endif
82	+	/* reset dithering function */
83	+	dith_colrs((BYTE *)NULL, (COLR *)NULL, 0);
84		/* return new color table size */
85		return(ncolors);
86		}
#	Line 101 | Line 111 | register BYTE  *bs;
111		register COLR   *cs;
112		int     n;
113		{
114	<	static short    (*cerr)[3];
114	>	static short    (*cerr)[3] = NULL;
115		static int      N = 0;
116		int     err[3], errp[3];
117		register int    x, i;
118
119		if (n != N) {           /* get error propogation array */
120	<	if (N)
121	<	cerr = (short (*)[3])realloc((char *)cerr,
122	<	3*n*sizeof(short));
123	<	else
120	>	if (N) {
121	>	free((char *)cerr);
122	>	cerr = NULL;
123	>	}
124	>	if (n)
125		cerr = (short (*)[3])malloc(3*n*sizeof(short));
126		if (cerr == NULL) {
127		N = 0;
#	Line 175 | Line 186 | register int   box[3][2];
186		#define c0      r
187		register int    r, g, b;
188		int     pri;
189	<	int     t[HMAX], med;
189	>	long    t[HMAX], med;
190		/* find dominant axis */
191		pri = RED;
192		if (box[GRN][1]-box[GRN][0] > box[pri][1]-box[pri][0])
#	Line 231 | Line 242 | mktabent(p, box)       /* compute average color for box and
242		int     p;
243		register int    box[3][2];
244		{
245	<	long    sum[3];
246	<	int     r, g, n;
247	<	register int    b, c;
245	>	unsigned long   sum[3];
246	>	unsigned        r, g;
247	>	unsigned long   n;
248	>	register unsigned       b, c;
249		/* sum pixels in box */
250		n = 0;
251		sum[RED] = sum[GRN] = sum[BLU] = 0;
#	Line 248 | Line 260 | register int   box[3][2];
260		}
261		histo[r][g][b] = p;         /* assign pixel */
262		}
263	+	if (n >= (1L<<23)/HMAX) {               /* avoid overflow */
264	+	sum[RED] /= n;
265	+	sum[GRN] /= n;
266	+	sum[BLU] /= n;
267	+	n = 1;
268	+	}
269		if (n) {                                /* compute average */
270		clrtab[p][RED] = sum[RED]*256/NRED/n;
271		clrtab[p][GRN] = sum[GRN]*256/NGRN/n;
#	Line 335 | Line 353 | dist(col, r, g, b)             /* find distance from clrtab entry
353		register BYTE   col[3];
354		int     r, g, b;
355		{
356	<	register unsigned       tmp;
356	>	register int    tmp;
357		register unsigned       sum;
358
359		tmp = col[RED]*NRED/256 - r;

Diff Legend

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