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" |
54 |
|
tmnew->clf[GRN] = rgb2xyzmat[1][1]; |
55 |
|
tmnew->clf[BLU] = rgb2xyzmat[1][2]; |
56 |
|
} else { |
57 |
< |
comprgb2xyzWBmat(cmat, tmnew->monpri=monpri); |
57 |
> |
comprgb2xyzmat(cmat, tmnew->monpri=monpri); |
58 |
|
tmnew->clf[RED] = cmat[1][0]; |
59 |
|
tmnew->clf[GRN] = cmat[1][1]; |
60 |
|
tmnew->clf[BLU] = cmat[1][2]; |
117 |
|
tms->clf[CIEX] = tms->clf[CIEZ] = 0.; |
118 |
|
tms->clf[CIEY] = 1.; |
119 |
|
} else { |
120 |
< |
comprgb2xyzWBmat(tms->cmat, tms->monpri); |
120 |
> |
comprgb2xyzmat(tms->cmat, tms->monpri); |
121 |
|
tms->clf[RED] = tms->cmat[1][0]; |
122 |
|
tms->clf[GRN] = tms->cmat[1][1]; |
123 |
|
tms->clf[BLU] = tms->cmat[1][2]; |
180 |
|
#endif |
181 |
|
return(TM_NOBRT); |
182 |
|
d = TM_BRTSCALE*log(lum); |
183 |
< |
if (d > 0.) |
183 |
< |
return((TMbright)(d+.5)); |
184 |
< |
return((TMbright)(d-.5)); |
183 |
> |
return((TMbright)(d + .5 - (d < 0.))); |
184 |
|
} |
185 |
|
|
186 |
|
|
231 |
|
) |
232 |
|
{ |
233 |
|
static const char funcName[] = "tmCvGrays"; |
235 |
– |
double d; |
234 |
|
int i; |
235 |
|
|
236 |
|
if (tms == NULL) |
362 |
|
tms->hbrmin = tms->hbrmax = ls[i]; |
363 |
|
oldlen = 0; |
364 |
|
} else { |
365 |
< |
oldorig = (tms->hbrmin-MINBRT)/HISTEP; |
366 |
< |
oldlen = (tms->hbrmax-MINBRT)/HISTEP + 1 - oldorig; |
365 |
> |
oldorig = HISTI(tms->hbrmin); |
366 |
> |
oldlen = HISTI(tms->hbrmax) + 1 - oldorig; |
367 |
|
} |
368 |
|
for (i = len; i--; ) { |
369 |
|
if ((j = ls[i]) < MINBRT) |
373 |
|
else if (j > tms->hbrmax) |
374 |
|
tms->hbrmax = j; |
375 |
|
} |
376 |
< |
horig = (tms->hbrmin-MINBRT)/HISTEP; |
377 |
< |
hlen = (tms->hbrmax-MINBRT)/HISTEP + 1 - horig; |
376 |
> |
horig = HISTI(tms->hbrmin); |
377 |
> |
hlen = HISTI(tms->hbrmax) + 1 - horig; |
378 |
|
if (hlen > oldlen) { /* (re)allocate histogram */ |
379 |
|
int *newhist = (int *)calloc(hlen, sizeof(int)); |
380 |
|
if (newhist == NULL) |
390 |
|
returnOK; |
391 |
|
for (i = len; i--; ) /* add in new counts */ |
392 |
|
if (ls[i] >= MINBRT) |
393 |
< |
tms->histo[ (ls[i]-MINBRT)/HISTEP - horig ] += wt; |
393 |
> |
tms->histo[ HISTI(ls[i]) - horig ] += wt; |
394 |
|
returnOK; |
395 |
|
} |
396 |
|
|
418 |
|
} |
419 |
|
|
420 |
|
|
423 |
– |
static int |
424 |
– |
tmNewMap( /* allocate new tone-mapping array */ |
425 |
– |
TMstruct *tms |
426 |
– |
) |
427 |
– |
{ |
428 |
– |
if (tms->lumap != NULL && (tms->mbrmax - tms->mbrmin) != |
429 |
– |
(tms->hbrmax - tms->hbrmin)) { |
430 |
– |
free((MEM_PTR)tms->lumap); |
431 |
– |
tms->lumap = NULL; |
432 |
– |
} |
433 |
– |
tms->mbrmin = tms->hbrmin; |
434 |
– |
tms->mbrmax = tms->hbrmax; |
435 |
– |
if (tms->mbrmin > tms->mbrmax) |
436 |
– |
return 0; |
437 |
– |
if (tms->lumap == NULL) |
438 |
– |
tms->lumap = (unsigned short *)malloc(sizeof(unsigned short)* |
439 |
– |
(tms->mbrmax-tms->mbrmin+1)); |
440 |
– |
return(tms->lumap != NULL); |
441 |
– |
} |
442 |
– |
|
443 |
– |
|
421 |
|
int |
422 |
|
tmFixedMapping( /* compute fixed, linear tone-mapping */ |
423 |
|
TMstruct *tms, |
436 |
|
if (gamval < MINGAM) |
437 |
|
gamval = tms->mongam; |
438 |
|
d = log(expmult/tms->inpsf); |
439 |
< |
for (i = tms->mbrmax-tms->mbrmin+1; i--; ) |
440 |
< |
tms->lumap[i] = 256. * exp( |
439 |
> |
for (i = tms->mbrmax-tms->mbrmin+1; i--; ) { |
440 |
> |
double val = 256. * exp( |
441 |
|
( d + (tms->mbrmin+i)*(1./TM_BRTSCALE) ) |
442 |
< |
/ gamval ); |
442 |
> |
/ gamval); |
443 |
> |
tms->lumap[i] = val >= (double)0xffff ? 0xffff : (int)val; |
444 |
> |
} |
445 |
|
returnOK; |
446 |
|
} |
447 |
|
|
474 |
|
Ldmin = Ldmax/Lddyn; |
475 |
|
logLddyn = log(Lddyn); |
476 |
|
Ldavg = sqrt(Ldmax*Ldmin); |
477 |
< |
i = (tms->hbrmin-MINBRT)/HISTEP; |
478 |
< |
brt0 = MINBRT + HISTEP/2 + i*HISTEP; |
479 |
< |
histlen = (tms->hbrmax-MINBRT)/HISTEP + 1 - i; |
477 |
> |
i = HISTI(tms->hbrmin); |
478 |
> |
brt0 = HISTV(i); |
479 |
> |
histlen = HISTI(tms->hbrmax) + 1 - i; |
480 |
|
/* histogram total and mean */ |
481 |
|
histot = 0; sum = 0; |
482 |
|
j = brt0 + histlen*HISTEP; |
483 |
|
for (i = histlen; i--; ) { |
484 |
|
histot += tms->histo[i]; |
485 |
< |
sum += (j -= HISTEP) * tms->histo[i]; |
485 |
> |
sum += (double)(j -= HISTEP) * tms->histo[i]; |
486 |
|
} |
487 |
|
threshold = histot*0.005 + .5; |
488 |
< |
if (threshold < 4) |
488 |
> |
if (!histot) |
489 |
|
returnErr(TM_E_TMFAIL); |
490 |
|
Lwavg = tmLuminance( (double)sum / histot ); |
512 |
– |
/* allocate space for mapping */ |
513 |
– |
if (!tmNewMap(tms)) |
514 |
– |
returnErr(TM_E_NOMEM); |
491 |
|
/* use linear tone mapping? */ |
492 |
< |
if (tms->flags & TM_F_LINEAR) |
492 |
> |
if (tms->flags & TM_F_LINEAR || threshold < 4 || |
493 |
> |
tms->hbrmax - tms->hbrmin < TM_BRTSCALE*logLddyn) |
494 |
|
goto linearmap; |
495 |
|
/* clamp histogram */ |
496 |
|
histo = (int *)malloc(histlen*sizeof(int)); |
531 |
|
goto linearmap; |
532 |
|
} |
533 |
|
} while (trimmings > threshold); |
534 |
+ |
/* allocate space for mapping */ |
535 |
+ |
if (!tmNewMap(tms)) |
536 |
+ |
returnErr(TM_E_NOMEM); |
537 |
|
/* assign tone-mapping */ |
538 |
|
for (i = tms->mbrmax-tms->mbrmin+1; i--; ) { |
539 |
|
j = d = (double)i/(tms->mbrmax-tms->mbrmin)*histlen; |
593 |
|
} |
594 |
|
|
595 |
|
|
616 |
– |
|
617 |
– |
|
596 |
|
TMstruct * |
597 |
|
tmDup( /* duplicate top tone mapping */ |
598 |
|
TMstruct *tms |
609 |
|
return(NULL); |
610 |
|
*tmnew = *tms; /* copy everything */ |
611 |
|
if (tmnew->histo != NULL) { /* duplicate histogram */ |
612 |
< |
len = (tmnew->hbrmax-MINBRT)/HISTEP + 1 - |
635 |
< |
(tmnew->hbrmin-MINBRT)/HISTEP; |
612 |
> |
len = HISTI(tmnew->hbrmax) + 1 - HISTI(tmnew->hbrmin); |
613 |
|
tmnew->histo = (int *)malloc(len*sizeof(int)); |
614 |
|
if (tmnew->histo != NULL) |
615 |
|
for (i = len; i--; ) |
667 |
|
tmMesofact[i-BMESLOWER] = 256. * |
668 |
|
(tmLuminance(i) - LMESLOWER) / |
669 |
|
(LMESUPPER - LMESLOWER); |
670 |
+ |
} |
671 |
+ |
|
672 |
+ |
|
673 |
+ |
int |
674 |
+ |
tmNewMap( /* allocate new tone-mapping array */ |
675 |
+ |
TMstruct *tms |
676 |
+ |
) |
677 |
+ |
{ |
678 |
+ |
if (tms->lumap != NULL && (tms->mbrmax - tms->mbrmin) != |
679 |
+ |
(tms->hbrmax - tms->hbrmin)) { |
680 |
+ |
free((MEM_PTR)tms->lumap); |
681 |
+ |
tms->lumap = NULL; |
682 |
+ |
} |
683 |
+ |
tms->mbrmin = tms->hbrmin; |
684 |
+ |
tms->mbrmax = tms->hbrmax; |
685 |
+ |
if (tms->mbrmin > tms->mbrmax) |
686 |
+ |
return 0; |
687 |
+ |
if (tms->lumap == NULL) |
688 |
+ |
tms->lumap = (unsigned short *)malloc(sizeof(unsigned short)* |
689 |
+ |
(tms->mbrmax-tms->mbrmin+1)); |
690 |
+ |
return(tms->lumap != NULL); |
691 |
|
} |
692 |
|
|
693 |
|
|