107 |
|
register COLR *cs; |
108 |
|
int n; |
109 |
|
{ |
110 |
< |
static short (*cerr)[3]; |
110 |
> |
static short (*cerr)[3] = NULL; |
111 |
|
static int N = 0; |
112 |
|
int err[3], errp[3]; |
113 |
|
register int x, i; |
114 |
|
|
115 |
|
if (n != N) { /* get error propogation array */ |
116 |
< |
if (N) |
117 |
< |
cerr = (short (*)[3])realloc((char *)cerr, |
118 |
< |
3*n*sizeof(short)); |
119 |
< |
else |
116 |
> |
if (N) { |
117 |
> |
free((char *)cerr); |
118 |
> |
cerr = NULL; |
119 |
> |
} |
120 |
> |
if (n) |
121 |
|
cerr = (short (*)[3])malloc(3*n*sizeof(short)); |
122 |
|
if (cerr == NULL) { |
123 |
|
N = 0; |
182 |
|
#define c0 r |
183 |
|
register int r, g, b; |
184 |
|
int pri; |
185 |
< |
int t[HMAX], med; |
185 |
> |
long t[HMAX], med; |
186 |
|
/* find dominant axis */ |
187 |
|
pri = RED; |
188 |
|
if (box[GRN][1]-box[GRN][0] > box[pri][1]-box[pri][0]) |
239 |
|
register int box[3][2]; |
240 |
|
{ |
241 |
|
unsigned long sum[3]; |
242 |
< |
unsigned r, g, n; |
242 |
> |
unsigned r, g; |
243 |
> |
unsigned long n; |
244 |
|
register unsigned b, c; |
245 |
|
/* sum pixels in box */ |
246 |
|
n = 0; |
256 |
|
} |
257 |
|
histo[r][g][b] = p; /* assign pixel */ |
258 |
|
} |
259 |
< |
if (n >= (1<<23)/HMAX) { /* avoid overflow */ |
259 |
> |
if (n >= (1L<<23)/HMAX) { /* avoid overflow */ |
260 |
|
sum[RED] /= n; |
261 |
|
sum[GRN] /= n; |
262 |
|
sum[BLU] /= n; |