12 |
|
#include "copyright.h" |
13 |
|
|
14 |
|
#include <stdio.h> |
15 |
+ |
#include <stdlib.h> |
16 |
|
#include <math.h> |
17 |
|
#include "tmprivat.h" |
18 |
|
#include "tmerrmsg.h" |
134 |
|
if (tms->inppri != tms->monpri && |
135 |
|
PRIMEQ(tms->inppri, tms->monpri)) |
136 |
|
tms->inppri = tms->monpri; /* no xform */ |
137 |
< |
comprgb2rgbWBmat(tms->cmat, tms->inppri, tms->monpri); |
137 |
> |
if (!comprgb2rgbWBmat(tms->cmat, tms->inppri, tms->monpri)) |
138 |
> |
returnErr(TM_E_ILLEGAL); |
139 |
|
} |
140 |
|
for (i = 0; i < 3; i++) |
141 |
|
for (j = 0; j < 3; j++) |
142 |
|
tms->cmat[i][j] *= tms->inpsf; |
143 |
|
/* set color divisors */ |
144 |
|
for (i = 0; i < 3; i++) |
145 |
< |
if (tms->clf[i] > .001) |
146 |
< |
tms->cdiv[i] = |
145 |
< |
256.*pow(tms->clf[i], 1./tms->mongam); |
146 |
< |
else |
147 |
< |
tms->cdiv[i] = 1; |
145 |
> |
tms->cdiv[i] = 256.*pow(tms->clf[i] < .001 ? .001 : |
146 |
> |
tms->clf[i], 1./tms->mongam); |
147 |
|
/* notify packages */ |
148 |
|
for (i = tmNumPkgs; i--; ) |
149 |
|
if (tms->pd[i] != NULL && tmPkg[i]->NewSpace != NULL) |
178 |
|
#endif |
179 |
|
return(TM_NOBRT); |
180 |
|
d = TM_BRTSCALE*log(lum); |
181 |
< |
if (d > 0.) |
183 |
< |
return((TMbright)(d+.5)); |
184 |
< |
return((TMbright)(d-.5)); |
181 |
> |
return((TMbright)(d + .5 - (d < 0.))); |
182 |
|
} |
183 |
|
|
184 |
|
|
360 |
|
tms->hbrmin = tms->hbrmax = ls[i]; |
361 |
|
oldlen = 0; |
362 |
|
} else { |
363 |
< |
oldorig = (tms->hbrmin-MINBRT)/HISTEP; |
364 |
< |
oldlen = (tms->hbrmax-MINBRT)/HISTEP + 1 - oldorig; |
363 |
> |
oldorig = HISTI(tms->hbrmin); |
364 |
> |
oldlen = HISTI(tms->hbrmax) + 1 - oldorig; |
365 |
|
} |
366 |
|
for (i = len; i--; ) { |
367 |
|
if ((j = ls[i]) < MINBRT) |
371 |
|
else if (j > tms->hbrmax) |
372 |
|
tms->hbrmax = j; |
373 |
|
} |
374 |
< |
horig = (tms->hbrmin-MINBRT)/HISTEP; |
375 |
< |
hlen = (tms->hbrmax-MINBRT)/HISTEP + 1 - horig; |
374 |
> |
horig = HISTI(tms->hbrmin); |
375 |
> |
hlen = HISTI(tms->hbrmax) + 1 - horig; |
376 |
|
if (hlen > oldlen) { /* (re)allocate histogram */ |
377 |
|
int *newhist = (int *)calloc(hlen, sizeof(int)); |
378 |
|
if (newhist == NULL) |
388 |
|
returnOK; |
389 |
|
for (i = len; i--; ) /* add in new counts */ |
390 |
|
if (ls[i] >= MINBRT) |
391 |
< |
tms->histo[ (ls[i]-MINBRT)/HISTEP - horig ] += wt; |
391 |
> |
tms->histo[ HISTI(ls[i]) - horig ] += wt; |
392 |
|
returnOK; |
393 |
|
} |
394 |
|
|
416 |
|
} |
417 |
|
|
418 |
|
|
422 |
– |
static int |
423 |
– |
tmNewMap( /* allocate new tone-mapping array */ |
424 |
– |
TMstruct *tms |
425 |
– |
) |
426 |
– |
{ |
427 |
– |
if (tms->lumap != NULL && (tms->mbrmax - tms->mbrmin) != |
428 |
– |
(tms->hbrmax - tms->hbrmin)) { |
429 |
– |
free((MEM_PTR)tms->lumap); |
430 |
– |
tms->lumap = NULL; |
431 |
– |
} |
432 |
– |
tms->mbrmin = tms->hbrmin; |
433 |
– |
tms->mbrmax = tms->hbrmax; |
434 |
– |
if (tms->mbrmin > tms->mbrmax) |
435 |
– |
return 0; |
436 |
– |
if (tms->lumap == NULL) |
437 |
– |
tms->lumap = (unsigned short *)malloc(sizeof(unsigned short)* |
438 |
– |
(tms->mbrmax-tms->mbrmin+1)); |
439 |
– |
return(tms->lumap != NULL); |
440 |
– |
} |
441 |
– |
|
442 |
– |
|
419 |
|
int |
420 |
|
tmFixedMapping( /* compute fixed, linear tone-mapping */ |
421 |
|
TMstruct *tms, |
472 |
|
Ldmin = Ldmax/Lddyn; |
473 |
|
logLddyn = log(Lddyn); |
474 |
|
Ldavg = sqrt(Ldmax*Ldmin); |
475 |
< |
i = (tms->hbrmin-MINBRT)/HISTEP; |
476 |
< |
brt0 = MINBRT + HISTEP/2 + i*HISTEP; |
477 |
< |
histlen = (tms->hbrmax-MINBRT)/HISTEP + 1 - i; |
475 |
> |
i = HISTI(tms->hbrmin); |
476 |
> |
brt0 = HISTV(i); |
477 |
> |
histlen = HISTI(tms->hbrmax) + 1 - i; |
478 |
|
/* histogram total and mean */ |
479 |
|
histot = 0; sum = 0; |
480 |
|
j = brt0 + histlen*HISTEP; |
591 |
|
} |
592 |
|
|
593 |
|
|
618 |
– |
|
619 |
– |
|
594 |
|
TMstruct * |
595 |
|
tmDup( /* duplicate top tone mapping */ |
596 |
|
TMstruct *tms |
607 |
|
return(NULL); |
608 |
|
*tmnew = *tms; /* copy everything */ |
609 |
|
if (tmnew->histo != NULL) { /* duplicate histogram */ |
610 |
< |
len = (tmnew->hbrmax-MINBRT)/HISTEP + 1 - |
637 |
< |
(tmnew->hbrmin-MINBRT)/HISTEP; |
610 |
> |
len = HISTI(tmnew->hbrmax) + 1 - HISTI(tmnew->hbrmin); |
611 |
|
tmnew->histo = (int *)malloc(len*sizeof(int)); |
612 |
|
if (tmnew->histo != NULL) |
613 |
|
for (i = len; i--; ) |
665 |
|
tmMesofact[i-BMESLOWER] = 256. * |
666 |
|
(tmLuminance(i) - LMESLOWER) / |
667 |
|
(LMESUPPER - LMESLOWER); |
668 |
+ |
} |
669 |
+ |
|
670 |
+ |
|
671 |
+ |
int |
672 |
+ |
tmNewMap( /* allocate new tone-mapping array */ |
673 |
+ |
TMstruct *tms |
674 |
+ |
) |
675 |
+ |
{ |
676 |
+ |
if (tms->lumap != NULL && (tms->mbrmax - tms->mbrmin) != |
677 |
+ |
(tms->hbrmax - tms->hbrmin)) { |
678 |
+ |
free((MEM_PTR)tms->lumap); |
679 |
+ |
tms->lumap = NULL; |
680 |
+ |
} |
681 |
+ |
tms->mbrmin = tms->hbrmin; |
682 |
+ |
tms->mbrmax = tms->hbrmax; |
683 |
+ |
if (tms->mbrmin > tms->mbrmax) |
684 |
+ |
return 0; |
685 |
+ |
if (tms->lumap == NULL) |
686 |
+ |
tms->lumap = (unsigned short *)malloc(sizeof(unsigned short)* |
687 |
+ |
(tms->mbrmax-tms->mbrmin+1)); |
688 |
+ |
return(tms->lumap != NULL); |
689 |
|
} |
690 |
|
|
691 |
|
|