14 |
|
#include <stdio.h> |
15 |
|
#include <stdlib.h> |
16 |
|
#include <math.h> |
17 |
+ |
#include <string.h> |
18 |
|
#include "tmprivat.h" |
19 |
|
#include "tmerrmsg.h" |
20 |
|
|
67 |
|
tmnew->mongam = gamval; |
68 |
|
/* set color divisors */ |
69 |
|
for (i = 0; i < 3; i++) |
70 |
< |
tmnew->cdiv[i] = 256.*pow(tmnew->clf[i], 1./tmnew->mongam); |
70 |
> |
tmnew->cdiv[i] = TM_BRES*pow(tmnew->clf[i], 1./tmnew->mongam); |
71 |
|
|
72 |
|
/* set input transform */ |
73 |
|
tmnew->inppri = tmnew->monpri; |
143 |
|
tms->cmat[i][j] *= tms->inpsf; |
144 |
|
/* set color divisors */ |
145 |
|
for (i = 0; i < 3; i++) |
146 |
< |
tms->cdiv[i] = 256.*pow(tms->clf[i] < .001 ? .001 : |
146 |
> |
tms->cdiv[i] = TM_BRES*pow(tms->clf[i] < .001 ? .001 : |
147 |
|
tms->clf[i], 1./tms->mongam); |
148 |
|
/* notify packages */ |
149 |
|
for (i = tmNumPkgs; i--; ) |
253 |
|
tmCvColors( /* convert float colors */ |
254 |
|
TMstruct *tms, |
255 |
|
TMbright *ls, |
256 |
< |
BYTE *cs, |
256 |
> |
uby8 *cs, |
257 |
|
COLOR *scan, |
258 |
|
int len |
259 |
|
) |
260 |
|
{ |
261 |
|
static const char funcName[] = "tmCvColors"; |
262 |
< |
static BYTE gamtab[1024]; |
262 |
> |
static uby8 gamtab[1024]; |
263 |
|
static double curgam = .0; |
264 |
|
COLOR cmon; |
265 |
|
float lum, slum, d; |
375 |
|
horig = HISTI(tms->hbrmin); |
376 |
|
hlen = HISTI(tms->hbrmax) + 1 - horig; |
377 |
|
if (hlen > oldlen) { /* (re)allocate histogram */ |
378 |
< |
int *newhist = (int *)calloc(hlen, sizeof(int)); |
378 |
> |
HIST_TYP *newhist = (HIST_TYP *)calloc(hlen, sizeof(HIST_TYP)); |
379 |
|
if (newhist == NULL) |
380 |
|
returnErr(TM_E_NOMEM); |
381 |
|
if (oldlen) { /* copy and free old */ |
382 |
< |
for (i = oldlen, j = i+oldorig-horig; i; ) |
383 |
< |
newhist[--j] = tms->histo[--i]; |
382 |
> |
memcpy((MEM_PTR)(newhist+(oldorig-horig)), |
383 |
> |
(MEM_PTR)tms->histo, oldlen*sizeof(HIST_TYP)); |
384 |
|
free((MEM_PTR)tms->histo); |
385 |
|
} |
386 |
|
tms->histo = newhist; |
436 |
|
gamval = tms->mongam; |
437 |
|
d = log(expmult/tms->inpsf); |
438 |
|
for (i = tms->mbrmax-tms->mbrmin+1; i--; ) { |
439 |
< |
double val = 256. * exp( |
439 |
> |
double val = TM_BRES * exp( |
440 |
|
( d + (tms->mbrmin+i)*(1./TM_BRTSCALE) ) |
441 |
|
/ gamval); |
442 |
|
tms->lumap[i] = val >= (double)0xffff ? 0xffff : (int)val; |
454 |
|
) |
455 |
|
{ |
456 |
|
static const char funcName[] = "tmComputeMapping"; |
457 |
< |
int *histo; |
457 |
> |
HIST_TYP *histo; |
458 |
|
float *cumf; |
459 |
< |
int brt0, histlen, threshold, ceiling, trimmings; |
459 |
> |
int brt0, histlen; |
460 |
> |
HIST_TYP threshold, ceiling, trimmings, histot; |
461 |
|
double logLddyn, Ldmin, Ldavg, Lwavg, Tr, Lw, Ld; |
460 |
– |
int32 histot; |
462 |
|
double sum; |
463 |
|
double d; |
464 |
|
int i, j; |
492 |
|
tms->hbrmax - tms->hbrmin < TM_BRTSCALE*logLddyn) |
493 |
|
goto linearmap; |
494 |
|
/* clamp histogram */ |
495 |
< |
histo = (int *)malloc(histlen*sizeof(int)); |
495 |
> |
histo = (HIST_TYP *)malloc(histlen*sizeof(HIST_TYP)); |
496 |
|
cumf = (float *)malloc((histlen+2)*sizeof(float)); |
497 |
|
if ((histo == NULL) | (cumf == NULL)) |
498 |
|
returnErr(TM_E_NOMEM); |
539 |
|
d -= (double)j; |
540 |
|
Ld = Ldmin*exp(logLddyn*((1.-d)*cumf[j]+d*cumf[j+1])); |
541 |
|
d = (Ld - Ldmin)/(Ldmax - Ldmin); |
542 |
< |
tms->lumap[i] = 256.*pow(d, 1./gamval); |
542 |
> |
tms->lumap[i] = TM_BRES*pow(d, 1./gamval); |
543 |
|
} |
544 |
|
free((MEM_PTR)histo); /* clean up and return */ |
545 |
|
free((MEM_PTR)cumf); |
556 |
|
int |
557 |
|
tmMapPixels( /* apply tone-mapping to pixel(s) */ |
558 |
|
TMstruct *tms, |
559 |
< |
BYTE *ps, |
559 |
> |
uby8 *ps, |
560 |
|
TMbright *ls, |
561 |
< |
BYTE *cs, |
561 |
> |
uby8 *cs, |
562 |
|
int len |
563 |
|
) |
564 |
|
{ |
609 |
|
*tmnew = *tms; /* copy everything */ |
610 |
|
if (tmnew->histo != NULL) { /* duplicate histogram */ |
611 |
|
len = HISTI(tmnew->hbrmax) + 1 - HISTI(tmnew->hbrmin); |
612 |
< |
tmnew->histo = (int *)malloc(len*sizeof(int)); |
612 |
> |
tmnew->histo = (HIST_TYP *)malloc(len*sizeof(HIST_TYP)); |
613 |
|
if (tmnew->histo != NULL) |
614 |
< |
for (i = len; i--; ) |
615 |
< |
tmnew->histo[i] = tms->histo[i]; |
614 |
> |
memcpy((MEM_PTR)tmnew->histo, (MEM_PTR)tms->histo, |
615 |
> |
len*sizeof(HIST_TYP)); |
616 |
|
} |
617 |
|
if (tmnew->lumap != NULL) { /* duplicate luminance mapping */ |
618 |
|
len = tmnew->mbrmax-tmnew->mbrmin+1; |
619 |
< |
tmnew->lumap = (unsigned short *)malloc( |
619 |
< |
len*sizeof(unsigned short) ); |
619 |
> |
tmnew->lumap = (TMAP_TYP *)malloc(len*sizeof(TMAP_TYP)); |
620 |
|
if (tmnew->lumap != NULL) |
621 |
< |
for (i = len; i--; ) |
622 |
< |
tmnew->lumap[i] = tms->lumap[i]; |
621 |
> |
memcpy((MEM_PTR)tmnew->lumap, (MEM_PTR)tms->lumap, |
622 |
> |
len*sizeof(TMAP_TYP)); |
623 |
|
} |
624 |
|
/* clear package data */ |
625 |
|
for (i = tmNumPkgs; i--; ) |
651 |
|
|
652 |
|
/******************** Shared but Private library routines *********************/ |
653 |
|
|
654 |
< |
BYTE tmMesofact[BMESUPPER-BMESLOWER]; |
654 |
> |
uby8 tmMesofact[BMESUPPER-BMESLOWER]; |
655 |
|
|
656 |
|
void |
657 |
|
tmMkMesofact() /* build mesopic lookup factor table */ |
683 |
|
if (tms->mbrmin > tms->mbrmax) |
684 |
|
return 0; |
685 |
|
if (tms->lumap == NULL) |
686 |
< |
tms->lumap = (unsigned short *)malloc(sizeof(unsigned short)* |
686 |
> |
tms->lumap = (TMAP_TYP *)malloc(sizeof(TMAP_TYP)* |
687 |
|
(tms->mbrmax-tms->mbrmin+1)); |
688 |
|
return(tms->lumap != NULL); |
689 |
|
} |