1 |
– |
/* Copyright (c) 1997 Silicon Graphics, Inc. */ |
2 |
– |
|
1 |
|
#ifndef lint |
2 |
< |
static char SCCSid[] = "$SunId$ SGI"; |
2 |
> |
static const char RCSid[] = "$Id$"; |
3 |
|
#endif |
6 |
– |
|
4 |
|
/* |
5 |
|
* Quadtree driver support routines. |
6 |
|
*/ |
7 |
|
|
8 |
+ |
#include <string.h> |
9 |
+ |
|
10 |
|
#include "standard.h" |
11 |
|
#include "rhd_qtree.h" |
12 |
|
/* quantity of leaves to free at a time */ |
15 |
|
#endif |
16 |
|
/* maximum allowed angle difference (deg.) */ |
17 |
|
#ifndef MAXANG |
18 |
< |
#define MAXANG 20. |
18 |
> |
#define MAXANG 20 |
19 |
|
#endif |
20 |
+ |
#if MAXANG>0 |
21 |
+ |
#define MAXDIFF2 ( MAXANG*MAXANG * (PI*PI/180./180.)) |
22 |
+ |
#endif |
23 |
|
|
22 |
– |
#define MAXDIFF2 (long)( MAXANG*MAXANG /90./90.*(1L<<15)*(1L<<15)) |
23 |
– |
|
24 |
|
#define abs(i) ((i) < 0 ? -(i) : (i)) |
25 |
|
|
26 |
|
RTREE qtrunk; /* our quadtree trunk */ |
28 |
|
int qtMinNodesiz = 2; /* minimum node dimension (pixels) */ |
29 |
|
struct rleaves qtL; /* our pile of leaves */ |
30 |
|
|
31 |
+ |
int rayqleft = 0; /* rays left to queue before flush */ |
32 |
+ |
|
33 |
+ |
static int32 falleaves; /* our list of fallen leaves */ |
34 |
+ |
|
35 |
+ |
#define composted(li) (qtL.bl <= qtL.tl ? \ |
36 |
+ |
((li) < qtL.bl || (li) >= qtL.tl) : \ |
37 |
+ |
((li) < qtL.bl && (li) >= qtL.tl)) |
38 |
+ |
|
39 |
|
#define TBUNDLESIZ 409 /* number of twigs in a bundle */ |
40 |
|
|
41 |
|
static RTREE **twigbundle; /* free twig blocks (NULL term.) */ |
42 |
|
static int nexttwig; /* next free twig */ |
43 |
|
|
44 |
< |
#define ungetleaf(li) (qtL.tl=(li)) /* dangerous if used improperly */ |
44 |
> |
static RTREE *newtwig(void); |
45 |
> |
static void qtFreeTree(int really); |
46 |
> |
static void shaketree(RTREE *tp); |
47 |
> |
static int putleaf(int li, int drop); |
48 |
|
|
49 |
|
|
50 |
|
static RTREE * |
51 |
< |
newtwig() /* allocate a twig */ |
51 |
> |
newtwig(void) /* allocate a twig */ |
52 |
|
{ |
53 |
< |
register int bi; |
53 |
> |
int bi; |
54 |
|
|
55 |
|
if (twigbundle == NULL) { /* initialize */ |
56 |
|
twigbundle = (RTREE **)malloc(sizeof(RTREE *)); |
60 |
|
} |
61 |
|
bi = nexttwig / TBUNDLESIZ; |
62 |
|
if (twigbundle[bi] == NULL) { /* new block */ |
63 |
< |
twigbundle = (RTREE **)realloc((char *)twigbundle, |
63 |
> |
twigbundle = (RTREE **)realloc((void *)twigbundle, |
64 |
|
(bi+2)*sizeof(RTREE *)); |
65 |
|
if (twigbundle == NULL) |
66 |
|
goto memerr; |
73 |
|
return(twigbundle[bi] + (nexttwig++ - bi*TBUNDLESIZ)); |
74 |
|
memerr: |
75 |
|
error(SYSTEM, "out of memory in newtwig"); |
76 |
+ |
return NULL; /* pro forma return */ |
77 |
|
} |
78 |
|
|
79 |
|
|
80 |
< |
qtFreeTree(really) /* free allocated twigs */ |
81 |
< |
int really; |
80 |
> |
static void |
81 |
> |
qtFreeTree( /* free allocated twigs */ |
82 |
> |
int really |
83 |
> |
) |
84 |
|
{ |
85 |
< |
register int i; |
85 |
> |
int i; |
86 |
|
|
87 |
|
qtrunk.flgs = CH_ANY; /* chop down tree */ |
88 |
|
if (twigbundle == NULL) |
91 |
|
nexttwig = 0; |
92 |
|
if (!really) { /* just clear allocated blocks */ |
93 |
|
while (i--) |
94 |
< |
bzero((char *)twigbundle[i], TBUNDLESIZ*sizeof(RTREE)); |
94 |
> |
memset((char *)twigbundle[i], '\0', TBUNDLESIZ*sizeof(RTREE)); |
95 |
|
return; |
96 |
|
} |
97 |
|
/* else "really" means free up memory */ |
98 |
|
for (i = 0; twigbundle[i] != NULL; i++) |
99 |
< |
free((char *)twigbundle[i]); |
100 |
< |
free((char *)twigbundle); |
99 |
> |
free((void *)twigbundle[i]); |
100 |
> |
free((void *)twigbundle); |
101 |
|
twigbundle = NULL; |
102 |
|
} |
103 |
|
|
104 |
|
|
105 |
< |
static int |
106 |
< |
newleaf() /* allocate a leaf from our pile */ |
93 |
< |
{ |
94 |
< |
int li; |
95 |
< |
|
96 |
< |
li = qtL.tl++; |
97 |
< |
if (qtL.tl >= qtL.nl) /* get next leaf in ring */ |
98 |
< |
qtL.tl = 0; |
99 |
< |
if (qtL.tl == qtL.bl) /* need to shake some free */ |
100 |
< |
qtCompost(LFREEPCT); |
101 |
< |
return(li); |
102 |
< |
} |
105 |
> |
#define LEAFSIZ (3*sizeof(float)+sizeof(int32)+\ |
106 |
> |
sizeof(TMbright)+6*sizeof(uby8)) |
107 |
|
|
104 |
– |
|
105 |
– |
#define LEAFSIZ (3*sizeof(float)+2*sizeof(short)+\ |
106 |
– |
sizeof(TMbright)+6*sizeof(BYTE)) |
107 |
– |
|
108 |
|
int |
109 |
< |
qtAllocLeaves(n) /* allocate space for n leaves */ |
110 |
< |
register int n; |
109 |
> |
qtAllocLeaves( /* allocate space for n leaves */ |
110 |
> |
int n |
111 |
> |
) |
112 |
|
{ |
113 |
|
unsigned nbytes; |
114 |
< |
register unsigned i; |
114 |
> |
unsigned i; |
115 |
|
|
116 |
|
qtFreeTree(0); /* make sure tree is empty */ |
117 |
|
if (n <= 0) |
130 |
|
return(0); |
131 |
|
/* assign larger alignment types earlier */ |
132 |
|
qtL.wp = (float (*)[3])qtL.base; |
133 |
< |
qtL.wd = (short (*)[2])(qtL.wp + n); |
133 |
> |
qtL.wd = (int32 *)(qtL.wp + n); |
134 |
|
qtL.brt = (TMbright *)(qtL.wd + n); |
135 |
< |
qtL.chr = (BYTE (*)[3])(qtL.brt + n); |
136 |
< |
qtL.rgb = (BYTE (*)[3])(qtL.chr + n); |
135 |
> |
qtL.chr = (uby8 (*)[3])(qtL.brt + n); |
136 |
> |
qtL.rgb = (uby8 (*)[3])(qtL.chr + n); |
137 |
|
qtL.nl = n; |
138 |
|
qtL.tml = qtL.bl = qtL.tl = 0; |
139 |
+ |
falleaves = -1; |
140 |
|
return(n); |
141 |
|
} |
142 |
|
|
143 |
|
#undef LEAFSIZ |
144 |
|
|
145 |
|
|
146 |
< |
qtFreeLeaves() /* free our allocated leaves and twigs */ |
146 |
> |
void |
147 |
> |
qtFreeLeaves(void) /* free our allocated leaves and twigs */ |
148 |
|
{ |
149 |
|
qtFreeTree(1); /* free tree also */ |
150 |
|
if (qtL.nl <= 0) |
155 |
|
} |
156 |
|
|
157 |
|
|
158 |
< |
static |
159 |
< |
shaketree(tp) /* shake dead leaves from tree */ |
160 |
< |
register RTREE *tp; |
158 |
> |
static void |
159 |
> |
shaketree( /* shake dead leaves from tree */ |
160 |
> |
RTREE *tp |
161 |
> |
) |
162 |
|
{ |
163 |
< |
register int i, li; |
163 |
> |
int i, li; |
164 |
|
|
165 |
|
for (i = 0; i < 4; i++) |
166 |
|
if (tp->flgs & BRF(i)) { |
169 |
|
tp->flgs &= ~BRF(i); |
170 |
|
} else if (tp->flgs & LFF(i)) { |
171 |
|
li = tp->k[i].li; |
172 |
< |
if (qtL.bl < qtL.tl ? |
169 |
< |
(li < qtL.bl || li >= qtL.tl) : |
170 |
< |
(li < qtL.bl && li >= qtL.tl)) |
172 |
> |
if (composted(li)) |
173 |
|
tp->flgs &= ~LFF(i); |
174 |
|
} |
175 |
|
} |
176 |
|
|
177 |
|
|
178 |
|
int |
179 |
< |
qtCompost(pct) /* free up some leaves */ |
180 |
< |
int pct; |
179 |
> |
qtCompost( /* free up some leaves */ |
180 |
> |
int pct |
181 |
> |
) |
182 |
|
{ |
183 |
+ |
int32 *fl; |
184 |
|
int nused, nclear, nmapped; |
181 |
– |
|
185 |
|
/* figure out how many leaves to clear */ |
186 |
|
nclear = qtL.nl * pct / 100; |
187 |
|
nused = qtL.tl - qtL.bl; |
192 |
|
if (nclear >= nused) { /* clear them all */ |
193 |
|
qtFreeTree(0); |
194 |
|
qtL.tml = qtL.bl = qtL.tl = 0; |
195 |
+ |
falleaves = -1; |
196 |
|
return(nused); |
197 |
|
} |
198 |
|
/* else clear leaves from bottom */ |
201 |
|
qtL.bl += nclear; |
202 |
|
if (qtL.bl >= qtL.nl) qtL.bl -= qtL.nl; |
203 |
|
if (nmapped <= nclear) qtL.tml = qtL.bl; |
204 |
< |
shaketree(&qtrunk); |
204 |
> |
shaketree(&qtrunk); /* dereference composted leaves */ |
205 |
> |
for (fl = &falleaves; *fl >= 0; fl = qtL.wd + *fl) |
206 |
> |
while (composted(*fl)) |
207 |
> |
if ((*fl = qtL.wd[*fl]) < 0) |
208 |
> |
return(nclear); |
209 |
|
return(nclear); |
210 |
|
} |
211 |
|
|
212 |
|
|
205 |
– |
static |
206 |
– |
encodedir(pa, dv) /* encode a normalized direction vector */ |
207 |
– |
short pa[2]; |
208 |
– |
FVECT dv; |
209 |
– |
{ |
210 |
– |
pa[1] = 0; |
211 |
– |
if (dv[2] >= 1.) |
212 |
– |
pa[0] = (1L<<15)-1; |
213 |
– |
else if (dv[2] <= -1.) |
214 |
– |
pa[0] = -((1L<<15)-1); |
215 |
– |
else { |
216 |
– |
pa[0] = ((1L<<15)-1)/(PI/2.) * asin(dv[2]); |
217 |
– |
pa[1] = ((1L<<15)-1)/PI * atan2(dv[1], dv[0]); |
218 |
– |
} |
219 |
– |
} |
220 |
– |
|
221 |
– |
|
222 |
– |
#define ALTSHFT 5 |
223 |
– |
#define NALT (1<<ALTSHFT) |
224 |
– |
#define azisft(alt) azisftab[abs(alt)>>(15-ALTSHFT)] |
225 |
– |
|
226 |
– |
static unsigned short azisftab[NALT]; |
227 |
– |
|
228 |
– |
static |
229 |
– |
azisftinit(alt) /* initialize azimuth scale factor table */ |
230 |
– |
int alt; |
231 |
– |
{ |
232 |
– |
register int i; |
233 |
– |
|
234 |
– |
for (i = NALT; i--; ) |
235 |
– |
azisftab[i] = 2.*(1L<<15) * cos(PI/2.*(i+.5)/NALT); |
236 |
– |
return(azisft(alt)); |
237 |
– |
} |
238 |
– |
|
239 |
– |
#define azisf(alt) (azisftab[0] ? azisft(alt) : azisftinit(alt)) >> 15 |
240 |
– |
|
241 |
– |
static long |
242 |
– |
dir2diff(pa1, pa2) /* relative distance^2 between directions */ |
243 |
– |
short pa1[2], pa2[2]; |
244 |
– |
{ |
245 |
– |
long altd2, azid2; |
246 |
– |
int alt; |
247 |
– |
|
248 |
– |
altd2 = pa1[0] - pa2[0]; /* get altitude difference^2 */ |
249 |
– |
altd2 *= altd2; |
250 |
– |
if (altd2 > MAXDIFF2) |
251 |
– |
return(altd2); /* too large already */ |
252 |
– |
azid2 = pa1[1] - pa2[1]; /* get adjusted azimuth difference^2 */ |
253 |
– |
if (azid2 < 0) azid2 = -azid2; |
254 |
– |
if (azid2 >= 1L<<15) { /* wrap sphere */ |
255 |
– |
azid2 -= 1L<<16; |
256 |
– |
if (azid2 < 0) azid2 = -azid2; |
257 |
– |
} |
258 |
– |
alt = (pa1[0]+pa2[0])/2; |
259 |
– |
azid2 = azid2*azisf(alt); /* evaluation order is important */ |
260 |
– |
azid2 *= azid2; |
261 |
– |
return(altd2 + azid2); |
262 |
– |
} |
263 |
– |
|
264 |
– |
|
213 |
|
int |
214 |
< |
qtFindLeaf(x, y) /* find closest leaf to (x,y) */ |
215 |
< |
int x, y; |
214 |
> |
qtFindLeaf( /* find closest leaf to (x,y) */ |
215 |
> |
int x, |
216 |
> |
int y |
217 |
> |
) |
218 |
|
{ |
219 |
< |
register RTREE *tp = &qtrunk; |
219 |
> |
RTREE *tp = &qtrunk; |
220 |
|
int li = -1; |
221 |
|
int x0=0, y0=0, x1=odev.hres, y1=odev.vres; |
222 |
|
int mx, my; |
223 |
< |
register int q; |
223 |
> |
int q; |
224 |
|
/* check limits */ |
225 |
|
if (x < 0 || x >= odev.hres || y < 0 || y >= odev.vres) |
226 |
|
return(-1); |
249 |
|
} |
250 |
|
|
251 |
|
|
252 |
< |
static |
253 |
< |
addleaf(li) /* add a leaf to our tree */ |
254 |
< |
int li; |
252 |
> |
static int |
253 |
> |
putleaf( /* put a leaf in our tree */ |
254 |
> |
int li, |
255 |
> |
int drop |
256 |
> |
) |
257 |
|
{ |
258 |
< |
register RTREE *tp = &qtrunk; |
258 |
> |
RTREE *tp = &qtrunk; |
259 |
|
int x0=0, y0=0, x1=odev.hres, y1=odev.vres; |
260 |
|
int lo = -1; |
261 |
< |
long d2; |
310 |
< |
short dc[2]; |
261 |
> |
double d2; |
262 |
|
int x, y, mx, my; |
263 |
|
double z; |
264 |
< |
FVECT ip, wp; |
265 |
< |
register int q; |
264 |
> |
FVECT ip, wp, vd; |
265 |
> |
int q; |
266 |
> |
/* check for dead leaf */ |
267 |
> |
if (!qtL.chr[li][1] && !(qtL.chr[li][0] | qtL.chr[li][2])) |
268 |
> |
return(0); |
269 |
|
/* compute leaf location in view */ |
270 |
|
VCOPY(wp, qtL.wp[li]); |
271 |
< |
viewloc(ip, &odev.v, wp); |
272 |
< |
if (ip[2] <= 0. || ip[0] < 0. || ip[0] >= 1. |
319 |
< |
|| ip[1] < 0. || ip[1] >= 1.) |
320 |
< |
return(0); /* behind or outside view */ |
271 |
> |
if (viewloc(ip, &odev.v, wp) != VL_GOOD) |
272 |
> |
goto dropit; /* behind or outside view */ |
273 |
|
#ifdef DEBUG |
274 |
|
if (odev.v.type == VT_PAR | odev.v.vfore > FTINY) |
275 |
< |
error(INTERNAL, "bad view assumption in addleaf"); |
275 |
> |
error(INTERNAL, "bad view assumption in putleaf"); |
276 |
|
#endif |
277 |
|
for (q = 0; q < 3; q++) |
278 |
< |
wp[q] = (wp[q] - odev.v.vp[q])/ip[2]; |
279 |
< |
encodedir(dc, wp); /* compute pixel direction */ |
280 |
< |
d2 = dir2diff(dc, qtL.wd[li]); |
278 |
> |
vd[q] = (wp[q] - odev.v.vp[q])/ip[2]; |
279 |
> |
d2 = fdir2diff(qtL.wd[li], vd); |
280 |
> |
#ifdef MAXDIFF2 |
281 |
|
if (d2 > MAXDIFF2) |
282 |
< |
return(0); /* leaf dir. too far off */ |
282 |
> |
goto dropit; /* leaf dir. too far off */ |
283 |
> |
#endif |
284 |
|
x = ip[0] * odev.hres; |
285 |
|
y = ip[1] * odev.vres; |
286 |
|
z = ip[2]; |
301 |
|
if (!(tp->flgs & LFF(q))) { /* found stem for leaf */ |
302 |
|
tp->k[q].li = li; |
303 |
|
tp->flgs |= CHLFF(q); |
304 |
< |
break; |
304 |
> |
return(1); |
305 |
|
} |
306 |
|
if (lo != tp->k[q].li) { /* check old leaf */ |
307 |
|
lo = tp->k[q].li; |
311 |
|
/* is node minimum size? */ |
312 |
|
if (y1-y0 <= qtMinNodesiz || x1-x0 <= qtMinNodesiz) { |
313 |
|
if (z > (1.+qtDepthEps)*ip[2]) |
314 |
< |
return(0); /* old one closer */ |
314 |
> |
break; /* old one closer */ |
315 |
|
if (z >= (1.-qtDepthEps)*ip[2] && |
316 |
< |
dir2diff(dc, qtL.wd[lo]) < d2) |
317 |
< |
return(0); /* old one better */ |
318 |
< |
tp->k[q].li = li; /* else new one is */ |
316 |
> |
fdir2diff(qtL.wd[lo], vd) < d2) |
317 |
> |
break; /* old one better */ |
318 |
> |
tp->k[q].li = li; /* attach new */ |
319 |
|
tp->flgs |= CHF(q); |
320 |
+ |
li = lo; /* drop old... */ |
321 |
|
break; |
322 |
|
} |
323 |
|
tp->flgs &= ~LFF(q); /* else grow tree */ |
328 |
|
my = ip[1] * odev.vres; |
329 |
|
if (mx >= (x0 + x1) >> 1) q |= 01; |
330 |
|
if (my >= (y0 + y1) >> 1) q |= 02; |
331 |
+ |
tp->flgs = CH_ANY|LFF(q); /* all new */ |
332 |
|
tp->k[q].li = lo; |
378 |
– |
tp->flgs |= LFF(q)|CH_ANY; /* all new */ |
333 |
|
} |
334 |
< |
return(1); /* done */ |
334 |
> |
dropit: |
335 |
> |
if (drop) { |
336 |
> |
if (li+1 == (qtL.tl ? qtL.tl : qtL.nl)) |
337 |
> |
qtL.tl = li; /* special case */ |
338 |
> |
else { |
339 |
> |
qtL.chr[li][0] = qtL.chr[li][1] = qtL.chr[li][2] = 0; |
340 |
> |
qtL.wd[li] = falleaves; |
341 |
> |
falleaves = li; |
342 |
> |
} |
343 |
> |
} |
344 |
> |
return(li == lo); |
345 |
|
} |
346 |
|
|
347 |
|
|
348 |
< |
dev_value(c, p, v) /* add a pixel value to our quadtree */ |
349 |
< |
COLR c; |
350 |
< |
FVECT p, v; |
348 |
> |
void |
349 |
> |
dev_value( /* add a pixel value to our quadtree */ |
350 |
> |
COLR c, |
351 |
> |
FVECT d, |
352 |
> |
FVECT p |
353 |
> |
) |
354 |
|
{ |
355 |
< |
register int li; |
356 |
< |
|
357 |
< |
li = newleaf(); |
358 |
< |
VCOPY(qtL.wp[li], p); |
359 |
< |
encodedir(qtL.wd[li], v); |
360 |
< |
tmCvColrs(&qtL.brt[li], qtL.chr[li], c, 1); |
361 |
< |
if (!addleaf(li)) |
362 |
< |
ungetleaf(li); |
355 |
> |
int li; |
356 |
> |
int mapit; |
357 |
> |
/* grab a leaf */ |
358 |
> |
if (!imm_mode && falleaves >= 0) { /* check for fallen leaves */ |
359 |
> |
li = falleaves; |
360 |
> |
falleaves = qtL.wd[li]; |
361 |
> |
mapit = qtL.tml <= qtL.tl ? |
362 |
> |
(li < qtL.tml || li >= qtL.tl) : |
363 |
> |
(li < qtL.tml && li >= qtL.tl) ; |
364 |
> |
} else { /* else allocate new one */ |
365 |
> |
li = qtL.tl++; |
366 |
> |
if (qtL.tl >= qtL.nl) /* next leaf in ring */ |
367 |
> |
qtL.tl = 0; |
368 |
> |
if (qtL.tl == qtL.bl) /* need to shake some free */ |
369 |
> |
qtCompost(LFREEPCT); |
370 |
> |
mapit = 0; /* we'll map it later */ |
371 |
> |
} |
372 |
> |
if (p == NULL) |
373 |
> |
VSUM(qtL.wp[li], odev.v.vp, d, FHUGE); |
374 |
> |
else |
375 |
> |
VCOPY(qtL.wp[li], p); |
376 |
> |
qtL.wd[li] = encodedir(d); |
377 |
> |
tmCvColrs(tmGlobal, &qtL.brt[li], qtL.chr[li], (COLR *)c, 1); |
378 |
> |
if (putleaf(li, 1)) { |
379 |
> |
if (mapit) |
380 |
> |
tmMapPixels(tmGlobal, (uby8 *)(qtL.rgb+li), qtL.brt+li, |
381 |
> |
(uby8 *)(qtL.chr+li), 1); |
382 |
> |
if (--rayqleft == 0) |
383 |
> |
dev_flush(); /* flush output */ |
384 |
> |
} |
385 |
|
} |
386 |
|
|
387 |
|
|
388 |
< |
qtReplant() /* replant our tree using new view */ |
388 |
> |
void |
389 |
> |
qtReplant(void) /* replant our tree using new view */ |
390 |
|
{ |
391 |
< |
register int i; |
391 |
> |
int i; |
392 |
|
/* anything to replant? */ |
393 |
|
if (qtL.bl == qtL.tl) |
394 |
|
return; |
395 |
|
qtFreeTree(0); /* blow the old tree away */ |
396 |
|
/* regrow it in new place */ |
397 |
|
for (i = qtL.bl; i != qtL.tl; ) { |
398 |
< |
addleaf(i); |
398 |
> |
putleaf(i, 0); |
399 |
|
if (++i >= qtL.nl) i = 0; |
400 |
|
} |
401 |
|
} |
402 |
|
|
403 |
|
|
404 |
< |
qtMapLeaves(redo) /* map our leaves to RGB */ |
405 |
< |
int redo; |
404 |
> |
int |
405 |
> |
qtMapLeaves( /* map our leaves to RGB */ |
406 |
> |
int redo |
407 |
> |
) |
408 |
|
{ |
409 |
|
int aorg, alen, borg, blen; |
410 |
|
/* recompute mapping? */ |
425 |
|
} |
426 |
|
/* (re)compute tone mapping? */ |
427 |
|
if (qtL.tml == qtL.bl) { |
428 |
< |
tmClearHisto(); |
429 |
< |
tmAddHisto(qtL.brt+aorg, alen, 1); |
428 |
> |
tmClearHisto(tmGlobal); |
429 |
> |
tmAddHisto(tmGlobal, qtL.brt+aorg, alen, 1); |
430 |
|
if (blen > 0) |
431 |
< |
tmAddHisto(qtL.brt+borg, blen, 1); |
432 |
< |
if (tmComputeMapping(0., 0., 0.) != TM_E_OK) |
431 |
> |
tmAddHisto(tmGlobal, qtL.brt+borg, blen, 1); |
432 |
> |
if (tmComputeMapping(tmGlobal, 0., 0., 0.) != TM_E_OK) |
433 |
|
return(0); |
434 |
|
} |
435 |
< |
if (tmMapPixels(qtL.rgb+aorg, qtL.brt+aorg, |
436 |
< |
qtL.chr+aorg, alen) != TM_E_OK) |
435 |
> |
if (tmMapPixels(tmGlobal, (uby8 *)(qtL.rgb+aorg), qtL.brt+aorg, |
436 |
> |
(uby8 *)(qtL.chr+aorg), alen) != TM_E_OK) |
437 |
|
return(0); |
438 |
|
if (blen > 0) |
439 |
< |
tmMapPixels(qtL.rgb+borg, qtL.brt+borg, |
440 |
< |
qtL.chr+borg, blen); |
439 |
> |
tmMapPixels(tmGlobal, (uby8 *)(qtL.rgb+borg), qtL.brt+borg, |
440 |
> |
(uby8 *)(qtL.chr+borg), blen); |
441 |
|
qtL.tml = qtL.tl; |
442 |
|
return(1); |
443 |
|
} |