1 |
– |
/* Copyright (c) 1986 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 |
|
* color.c - routines for color calculations. |
6 |
|
* |
7 |
< |
* 10/10/85 |
7 |
> |
* Externals declared in color.h |
8 |
|
*/ |
9 |
|
|
10 |
< |
#include <stdio.h> |
10 |
> |
#include "copyright.h" |
11 |
|
|
12 |
+ |
#include <stdio.h> |
13 |
+ |
#include <stdlib.h> |
14 |
+ |
#include <math.h> |
15 |
|
#include "color.h" |
16 |
|
|
17 |
< |
#ifdef SPEC_RGB |
18 |
< |
/* |
19 |
< |
* The following table contains the CIE tristimulus integrals |
20 |
< |
* for X, Y, and Z. The table is cumulative, so that |
21 |
< |
* each color coordinate integrates to 1. |
22 |
< |
*/ |
17 |
> |
#ifdef getc_unlocked /* avoid horrendous overhead of flockfile */ |
18 |
> |
#undef getc |
19 |
> |
#undef putc |
20 |
> |
#undef ferror |
21 |
> |
#define getc getc_unlocked |
22 |
> |
#define putc putc_unlocked |
23 |
> |
#define ferror ferror_unlocked |
24 |
> |
#endif |
25 |
|
|
26 |
< |
#define STARTWL 380 /* starting wavelength (nanometers) */ |
27 |
< |
#define INCWL 10 /* wavelength increment */ |
28 |
< |
#define NINC 40 /* # of values */ |
26 |
> |
#define MINELEN 8 /* minimum scanline length for encoding */ |
27 |
> |
#define MAXELEN 0x7fff /* maximum scanline length for encoding */ |
28 |
> |
#define MINRUN 4 /* minimum run length */ |
29 |
|
|
28 |
– |
static BYTE chroma[3][NINC] = { |
29 |
– |
{ /* X */ |
30 |
– |
0, 0, 0, 2, 6, 13, 22, 30, 36, 41, |
31 |
– |
42, 43, 43, 44, 46, 52, 60, 71, 87, 106, |
32 |
– |
128, 153, 178, 200, 219, 233, 243, 249, 252, 254, |
33 |
– |
255, 255, 255, 255, 255, 255, 255, 255, 255, 255 |
34 |
– |
}, { /* Y */ |
35 |
– |
0, 0, 0, 0, 0, 1, 2, 4, 7, 11, |
36 |
– |
17, 24, 34, 48, 64, 84, 105, 127, 148, 169, |
37 |
– |
188, 205, 220, 232, 240, 246, 250, 253, 254, 255, |
38 |
– |
255, 255, 255, 255, 255, 255, 255, 255, 255, 255 |
39 |
– |
}, { /* Z */ |
40 |
– |
0, 0, 2, 10, 32, 66, 118, 153, 191, 220, |
41 |
– |
237, 246, 251, 253, 254, 255, 255, 255, 255, 255, |
42 |
– |
255, 255, 255, 255, 255, 255, 255, 255, 255, 255, |
43 |
– |
255, 255, 255, 255, 255, 255, 255, 255, 255, 255 |
44 |
– |
} |
45 |
– |
}; |
30 |
|
|
31 |
< |
|
32 |
< |
spec_rgb(col, s, e) /* comput RGB color from spectral range */ |
33 |
< |
COLOR col; |
34 |
< |
int s, e; |
31 |
> |
char * |
32 |
> |
tempbuffer( /* get a temporary buffer */ |
33 |
> |
unsigned int len |
34 |
> |
) |
35 |
|
{ |
36 |
< |
COLOR ciecolor; |
36 |
> |
static char *tempbuf = NULL; |
37 |
> |
static unsigned tempbuflen = 0; |
38 |
|
|
39 |
< |
spec_cie(ciecolor, s, e); |
40 |
< |
cie_rgb(col, ciecolor); |
41 |
< |
} |
42 |
< |
|
43 |
< |
|
44 |
< |
spec_cie(col, s, e) /* compute a color from a spectral range */ |
60 |
< |
COLOR col; /* returned color */ |
61 |
< |
int s, e; /* starting and ending wavelengths */ |
62 |
< |
{ |
63 |
< |
register int i, d, r; |
64 |
< |
|
65 |
< |
s -= STARTWL; |
66 |
< |
if (s < 0) |
67 |
< |
s = 0; |
68 |
< |
|
69 |
< |
e -= STARTWL; |
70 |
< |
if (e >= INCWL*(NINC - 1)) |
71 |
< |
e = INCWL*(NINC - 1) - 1; |
72 |
< |
|
73 |
< |
d = e / INCWL; /* interpolate values */ |
74 |
< |
r = e % INCWL; |
75 |
< |
for (i = 0; i < 3; i++) |
76 |
< |
col[i] = chroma[i][d]*(INCWL - r) + chroma[i][d + 1]*r; |
77 |
< |
|
78 |
< |
d = s / INCWL; |
79 |
< |
r = s % INCWL; |
80 |
< |
for (i = 0; i < 3; i++) |
81 |
< |
col[i] -= chroma[i][d]*(INCWL - r) - chroma[i][d + 1]*r; |
82 |
< |
|
83 |
< |
col[RED] = (col[RED] + 0.5) / (256*INCWL); |
84 |
< |
col[GRN] = (col[GRN] + 0.5) / (256*INCWL); |
85 |
< |
col[BLU] = (col[BLU] + 0.5) / (256*INCWL); |
86 |
< |
} |
87 |
< |
|
88 |
< |
|
89 |
< |
cie_rgb(rgbcolor, ciecolor) /* convert CIE to RGB (NTSC) */ |
90 |
< |
register COLOR rgbcolor, ciecolor; |
91 |
< |
{ |
92 |
< |
static float cmat[3][3] = { |
93 |
< |
1.73, -.48, -.26, |
94 |
< |
-.81, 1.65, -.02, |
95 |
< |
.08, -.17, 1.28, |
96 |
< |
}; |
97 |
< |
register int i; |
98 |
< |
|
99 |
< |
for (i = 0; i < 3; i++) { |
100 |
< |
rgbcolor[i] = cmat[i][0]*ciecolor[0] + |
101 |
< |
cmat[i][1]*ciecolor[1] + |
102 |
< |
cmat[i][2]*ciecolor[2] ; |
103 |
< |
if (rgbcolor[i] < 0.0) |
104 |
< |
rgbcolor[i] = 0.0; |
39 |
> |
if (len > tempbuflen) { |
40 |
> |
if (tempbuflen > 0) |
41 |
> |
tempbuf = (char *)realloc((void *)tempbuf, len); |
42 |
> |
else |
43 |
> |
tempbuf = (char *)malloc(len); |
44 |
> |
tempbuflen = tempbuf==NULL ? 0 : len; |
45 |
|
} |
46 |
+ |
return(tempbuf); |
47 |
|
} |
107 |
– |
#endif |
48 |
|
|
49 |
|
|
50 |
< |
fwritecolrs(scanline, len, fp) /* write out a colr scanline */ |
51 |
< |
register COLR *scanline; |
52 |
< |
int len; |
53 |
< |
register FILE *fp; |
50 |
> |
int |
51 |
> |
fwritecolrs( /* write out a colr scanline */ |
52 |
> |
COLR *scanline, |
53 |
> |
int len, |
54 |
> |
FILE *fp |
55 |
> |
) |
56 |
|
{ |
57 |
< |
COLR lastcolr; |
58 |
< |
int rept; |
57 |
> |
int i, j, beg, cnt = 1; |
58 |
> |
int c2; |
59 |
|
|
60 |
< |
lastcolr[RED] = lastcolr[GRN] = lastcolr[BLU] = 1; |
61 |
< |
lastcolr[EXP] = 0; |
62 |
< |
rept = 0; |
63 |
< |
|
64 |
< |
while (len > 0) { |
65 |
< |
if (scanline[0][EXP] == lastcolr[EXP] && |
66 |
< |
scanline[0][RED] == lastcolr[RED] && |
67 |
< |
scanline[0][GRN] == lastcolr[GRN] && |
68 |
< |
scanline[0][BLU] == lastcolr[BLU]) |
69 |
< |
rept++; |
70 |
< |
else { |
71 |
< |
while (rept) { /* write out count */ |
72 |
< |
putc(1, fp); |
73 |
< |
putc(1, fp); |
74 |
< |
putc(1, fp); |
75 |
< |
putc(rept & 255, fp); |
76 |
< |
rept >>= 8; |
60 |
> |
if ((len < MINELEN) | (len > MAXELEN)) /* OOBs, write out flat */ |
61 |
> |
return(fwrite((char *)scanline,sizeof(COLR),len,fp) - len); |
62 |
> |
/* put magic header */ |
63 |
> |
putc(2, fp); |
64 |
> |
putc(2, fp); |
65 |
> |
putc(len>>8, fp); |
66 |
> |
putc(len&255, fp); |
67 |
> |
/* put components seperately */ |
68 |
> |
for (i = 0; i < 4; i++) { |
69 |
> |
for (j = 0; j < len; j += cnt) { /* find next run */ |
70 |
> |
for (beg = j; beg < len; beg += cnt) { |
71 |
> |
for (cnt = 1; cnt < 127 && beg+cnt < len && |
72 |
> |
scanline[beg+cnt][i] == scanline[beg][i]; cnt++) |
73 |
> |
; |
74 |
> |
if (cnt >= MINRUN) |
75 |
> |
break; /* long enough */ |
76 |
> |
} |
77 |
> |
if (beg-j > 1 && beg-j < MINRUN) { |
78 |
> |
c2 = j+1; |
79 |
> |
while (scanline[c2++][i] == scanline[j][i]) |
80 |
> |
if (c2 == beg) { /* short run */ |
81 |
> |
putc(128+beg-j, fp); |
82 |
> |
putc(scanline[j][i], fp); |
83 |
> |
j = beg; |
84 |
> |
break; |
85 |
|
} |
136 |
– |
putc(scanline[0][RED], fp); /* new color */ |
137 |
– |
putc(scanline[0][GRN], fp); |
138 |
– |
putc(scanline[0][BLU], fp); |
139 |
– |
putc(scanline[0][EXP], fp); |
140 |
– |
copycolr(lastcolr, scanline[0]); |
141 |
– |
rept = 0; |
86 |
|
} |
87 |
< |
scanline++; |
88 |
< |
len--; |
87 |
> |
while (j < beg) { /* write out non-run */ |
88 |
> |
if ((c2 = beg-j) > 128) c2 = 128; |
89 |
> |
putc(c2, fp); |
90 |
> |
while (c2--) |
91 |
> |
putc(scanline[j++][i], fp); |
92 |
> |
} |
93 |
> |
if (cnt >= MINRUN) { /* write out run */ |
94 |
> |
putc(128+cnt, fp); |
95 |
> |
putc(scanline[beg][i], fp); |
96 |
> |
} else |
97 |
> |
cnt = 0; |
98 |
> |
} |
99 |
|
} |
146 |
– |
while (rept) { /* write out count */ |
147 |
– |
putc(1, fp); |
148 |
– |
putc(1, fp); |
149 |
– |
putc(1, fp); |
150 |
– |
putc(rept & 255, fp); |
151 |
– |
rept >>= 8; |
152 |
– |
} |
100 |
|
return(ferror(fp) ? -1 : 0); |
101 |
|
} |
102 |
|
|
103 |
|
|
104 |
< |
freadcolrs(scanline, len, fp) /* read in a colr scanline */ |
105 |
< |
register COLR *scanline; |
106 |
< |
int len; |
107 |
< |
register FILE *fp; |
104 |
> |
static int |
105 |
> |
oldreadcolrs( /* read in an old-style colr scanline */ |
106 |
> |
COLR *scanline, |
107 |
> |
int len, |
108 |
> |
FILE *fp |
109 |
> |
) |
110 |
|
{ |
111 |
< |
int rshift; |
112 |
< |
register int i; |
111 |
> |
int rshift = 0; |
112 |
> |
int i; |
113 |
|
|
165 |
– |
rshift = 0; |
166 |
– |
|
114 |
|
while (len > 0) { |
115 |
|
scanline[0][RED] = getc(fp); |
116 |
|
scanline[0][GRN] = getc(fp); |
117 |
|
scanline[0][BLU] = getc(fp); |
118 |
< |
scanline[0][EXP] = getc(fp); |
119 |
< |
if (feof(fp) || ferror(fp)) |
118 |
> |
scanline[0][EXP] = i = getc(fp); |
119 |
> |
if (i == EOF) |
120 |
|
return(-1); |
121 |
|
if (scanline[0][RED] == 1 && |
122 |
|
scanline[0][GRN] == 1 && |
137 |
|
} |
138 |
|
|
139 |
|
|
140 |
< |
fwritescan(scanline, len, fp) /* write out a scanline */ |
141 |
< |
register COLOR *scanline; |
142 |
< |
int len; |
143 |
< |
register FILE *fp; |
140 |
> |
int |
141 |
> |
freadcolrs( /* read in an encoded colr scanline */ |
142 |
> |
COLR *scanline, |
143 |
> |
int len, |
144 |
> |
FILE *fp |
145 |
> |
) |
146 |
|
{ |
147 |
< |
COLR lastcolr, thiscolr; |
148 |
< |
int rept; |
149 |
< |
|
150 |
< |
lastcolr[RED] = lastcolr[GRN] = lastcolr[BLU] = 1; |
151 |
< |
lastcolr[EXP] = 0; |
152 |
< |
rept = 0; |
153 |
< |
|
154 |
< |
while (len > 0) { |
155 |
< |
setcolr(thiscolr, scanline[0][RED], |
147 |
> |
int i, j; |
148 |
> |
int code, val; |
149 |
> |
/* determine scanline type */ |
150 |
> |
if ((len < MINELEN) | (len > MAXELEN)) |
151 |
> |
return(oldreadcolrs(scanline, len, fp)); |
152 |
> |
if ((i = getc(fp)) == EOF) |
153 |
> |
return(-1); |
154 |
> |
if (i != 2) { |
155 |
> |
ungetc(i, fp); |
156 |
> |
return(oldreadcolrs(scanline, len, fp)); |
157 |
> |
} |
158 |
> |
scanline[0][GRN] = getc(fp); |
159 |
> |
scanline[0][BLU] = getc(fp); |
160 |
> |
if ((i = getc(fp)) == EOF) |
161 |
> |
return(-1); |
162 |
> |
if (scanline[0][GRN] != 2 || scanline[0][BLU] & 128) { |
163 |
> |
scanline[0][RED] = 2; |
164 |
> |
scanline[0][EXP] = i; |
165 |
> |
return(oldreadcolrs(scanline+1, len-1, fp)); |
166 |
> |
} |
167 |
> |
if ((scanline[0][BLU]<<8 | i) != len) |
168 |
> |
return(-1); /* length mismatch! */ |
169 |
> |
/* read each component */ |
170 |
> |
for (i = 0; i < 4; i++) |
171 |
> |
for (j = 0; j < len; ) { |
172 |
> |
if ((code = getc(fp)) == EOF) |
173 |
> |
return(-1); |
174 |
> |
if (code > 128) { /* run */ |
175 |
> |
code &= 127; |
176 |
> |
if ((val = getc(fp)) == EOF) |
177 |
> |
return -1; |
178 |
> |
if (j + code > len) |
179 |
> |
return -1; /* overrun */ |
180 |
> |
while (code--) |
181 |
> |
scanline[j++][i] = val; |
182 |
> |
} else { /* non-run */ |
183 |
> |
if (j + code > len) |
184 |
> |
return -1; /* overrun */ |
185 |
> |
while (code--) { |
186 |
> |
if ((val = getc(fp)) == EOF) |
187 |
> |
return -1; |
188 |
> |
scanline[j++][i] = val; |
189 |
> |
} |
190 |
> |
} |
191 |
> |
} |
192 |
> |
return(0); |
193 |
> |
} |
194 |
> |
|
195 |
> |
|
196 |
> |
int |
197 |
> |
fwritescan( /* write out a scanline */ |
198 |
> |
COLOR *scanline, |
199 |
> |
int len, |
200 |
> |
FILE *fp |
201 |
> |
) |
202 |
> |
{ |
203 |
> |
COLR *clrscan; |
204 |
> |
int n; |
205 |
> |
COLR *sp; |
206 |
> |
/* get scanline buffer */ |
207 |
> |
if ((sp = (COLR *)tempbuffer(len*sizeof(COLR))) == NULL) |
208 |
> |
return(-1); |
209 |
> |
clrscan = sp; |
210 |
> |
/* convert scanline */ |
211 |
> |
n = len; |
212 |
> |
while (n-- > 0) { |
213 |
> |
setcolr(sp[0], scanline[0][RED], |
214 |
|
scanline[0][GRN], |
215 |
|
scanline[0][BLU]); |
209 |
– |
if (thiscolr[EXP] == lastcolr[EXP] && |
210 |
– |
thiscolr[RED] == lastcolr[RED] && |
211 |
– |
thiscolr[GRN] == lastcolr[GRN] && |
212 |
– |
thiscolr[BLU] == lastcolr[BLU]) |
213 |
– |
rept++; |
214 |
– |
else { |
215 |
– |
while (rept) { /* write out count */ |
216 |
– |
putc(1, fp); |
217 |
– |
putc(1, fp); |
218 |
– |
putc(1, fp); |
219 |
– |
putc(rept & 255, fp); |
220 |
– |
rept >>= 8; |
221 |
– |
} |
222 |
– |
putc(thiscolr[RED], fp); /* new color */ |
223 |
– |
putc(thiscolr[GRN], fp); |
224 |
– |
putc(thiscolr[BLU], fp); |
225 |
– |
putc(thiscolr[EXP], fp); |
226 |
– |
copycolr(lastcolr, thiscolr); |
227 |
– |
rept = 0; |
228 |
– |
} |
216 |
|
scanline++; |
217 |
< |
len--; |
217 |
> |
sp++; |
218 |
|
} |
219 |
< |
while (rept) { /* write out count */ |
233 |
< |
putc(1, fp); |
234 |
< |
putc(1, fp); |
235 |
< |
putc(1, fp); |
236 |
< |
putc(rept & 255, fp); |
237 |
< |
rept >>= 8; |
238 |
< |
} |
239 |
< |
return(ferror(fp) ? -1 : 0); |
219 |
> |
return(fwritecolrs(clrscan, len, fp)); |
220 |
|
} |
221 |
|
|
222 |
|
|
223 |
< |
freadscan(scanline, len, fp) /* read in a scanline */ |
224 |
< |
register COLOR *scanline; |
225 |
< |
int len; |
226 |
< |
register FILE *fp; |
223 |
> |
int |
224 |
> |
freadscan( /* read in a scanline */ |
225 |
> |
COLOR *scanline, |
226 |
> |
int len, |
227 |
> |
FILE *fp |
228 |
> |
) |
229 |
|
{ |
230 |
< |
COLR thiscolr; |
231 |
< |
int rshift; |
232 |
< |
register int i; |
233 |
< |
|
234 |
< |
rshift = 0; |
235 |
< |
|
236 |
< |
while (len > 0) { |
237 |
< |
thiscolr[RED] = getc(fp); |
238 |
< |
thiscolr[GRN] = getc(fp); |
239 |
< |
thiscolr[BLU] = getc(fp); |
240 |
< |
thiscolr[EXP] = getc(fp); |
241 |
< |
if (feof(fp) || ferror(fp)) |
242 |
< |
return(-1); |
243 |
< |
if (thiscolr[RED] == 1 && |
244 |
< |
thiscolr[GRN] == 1 && |
245 |
< |
thiscolr[BLU] == 1) { |
246 |
< |
for (i = thiscolr[EXP] << rshift; i > 0; i--) { |
265 |
< |
copycolor(scanline[0], scanline[-1]); |
266 |
< |
scanline++; |
267 |
< |
len--; |
268 |
< |
} |
269 |
< |
rshift += 8; |
270 |
< |
} else { |
271 |
< |
colr_color(scanline[0], thiscolr); |
272 |
< |
scanline++; |
273 |
< |
len--; |
274 |
< |
rshift = 0; |
275 |
< |
} |
230 |
> |
COLR *clrscan; |
231 |
> |
|
232 |
> |
if ((clrscan = (COLR *)tempbuffer(len*sizeof(COLR))) == NULL) |
233 |
> |
return(-1); |
234 |
> |
if (freadcolrs(clrscan, len, fp) < 0) |
235 |
> |
return(-1); |
236 |
> |
/* convert scanline */ |
237 |
> |
colr_color(scanline[0], clrscan[0]); |
238 |
> |
while (--len > 0) { |
239 |
> |
scanline++; clrscan++; |
240 |
> |
if (clrscan[0][RED] == clrscan[-1][RED] && |
241 |
> |
clrscan[0][GRN] == clrscan[-1][GRN] && |
242 |
> |
clrscan[0][BLU] == clrscan[-1][BLU] && |
243 |
> |
clrscan[0][EXP] == clrscan[-1][EXP]) |
244 |
> |
copycolor(scanline[0], scanline[-1]); |
245 |
> |
else |
246 |
> |
colr_color(scanline[0], clrscan[0]); |
247 |
|
} |
248 |
|
return(0); |
249 |
|
} |
250 |
|
|
251 |
|
|
252 |
< |
setcolr(clr, r, g, b) /* assign a short color value */ |
253 |
< |
register COLR clr; |
254 |
< |
double r, g, b; |
252 |
> |
void |
253 |
> |
setcolr( /* assign a short color value */ |
254 |
> |
COLR clr, |
255 |
> |
double r, |
256 |
> |
double g, |
257 |
> |
double b |
258 |
> |
) |
259 |
|
{ |
285 |
– |
double frexp(); |
260 |
|
double d; |
261 |
|
int e; |
262 |
|
|
263 |
|
d = r > g ? r : g; |
264 |
|
if (b > d) d = b; |
265 |
|
|
266 |
< |
if (d <= 0.0) { |
266 |
> |
if (d <= 1e-32) { |
267 |
|
clr[RED] = clr[GRN] = clr[BLU] = 0; |
268 |
|
clr[EXP] = 0; |
269 |
|
return; |
270 |
|
} |
271 |
|
|
272 |
< |
d = frexp(d, &e) * 256.0 / d; |
272 |
> |
d = frexp(d, &e) * 255.9999 / d; |
273 |
|
|
274 |
< |
clr[RED] = r * d; |
275 |
< |
clr[GRN] = g * d; |
276 |
< |
clr[BLU] = b * d; |
274 |
> |
if (r > 0.0) |
275 |
> |
clr[RED] = r * d; |
276 |
> |
else |
277 |
> |
clr[RED] = 0; |
278 |
> |
if (g > 0.0) |
279 |
> |
clr[GRN] = g * d; |
280 |
> |
else |
281 |
> |
clr[GRN] = 0; |
282 |
> |
if (b > 0.0) |
283 |
> |
clr[BLU] = b * d; |
284 |
> |
else |
285 |
> |
clr[BLU] = 0; |
286 |
> |
|
287 |
|
clr[EXP] = e + COLXS; |
288 |
|
} |
289 |
|
|
290 |
|
|
291 |
< |
colr_color(col, clr) /* convert short to float color */ |
292 |
< |
register COLOR col; |
293 |
< |
register COLR clr; |
291 |
> |
void |
292 |
> |
colr_color( /* convert short to float color */ |
293 |
> |
COLOR col, |
294 |
> |
COLR clr |
295 |
> |
) |
296 |
|
{ |
297 |
< |
double ldexp(), f; |
297 |
> |
double f; |
298 |
|
|
299 |
|
if (clr[EXP] == 0) |
300 |
|
col[RED] = col[GRN] = col[BLU] = 0.0; |
307 |
|
} |
308 |
|
|
309 |
|
|
310 |
< |
#ifdef FREXP |
311 |
< |
double |
312 |
< |
frexp(x, ip) /* call it paranoia, I've seen the lib version */ |
313 |
< |
register double x; |
314 |
< |
int *ip; |
310 |
> |
int |
311 |
> |
bigdiff( /* c1 delta c2 > md? */ |
312 |
> |
COLOR c1, |
313 |
> |
COLOR c2, |
314 |
> |
double md |
315 |
> |
) |
316 |
|
{ |
317 |
< |
int neg; |
331 |
< |
register int i; |
317 |
> |
int i; |
318 |
|
|
319 |
< |
if (neg = (x < 0.0)) |
320 |
< |
x = -x; |
321 |
< |
else if (x == 0.0) { |
322 |
< |
*ip = 0; |
323 |
< |
return(0.0); |
338 |
< |
} |
339 |
< |
if (x < 0.5) |
340 |
< |
for (i = 0; x < 0.5; i--) |
341 |
< |
x *= 2.0; |
342 |
< |
else |
343 |
< |
for (i = 0; x >= 1.0; i++) |
344 |
< |
x /= 2.0; |
345 |
< |
*ip = i; |
346 |
< |
if (neg) |
347 |
< |
return(-x); |
348 |
< |
else |
349 |
< |
return(x); |
319 |
> |
for (i = 0; i < 3; i++) |
320 |
> |
if (colval(c1,i)-colval(c2,i) > md*colval(c2,i) || |
321 |
> |
colval(c2,i)-colval(c1,i) > md*colval(c1,i)) |
322 |
> |
return(1); |
323 |
> |
return(0); |
324 |
|
} |
351 |
– |
#endif |