| 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 |
|
|
| 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; |
| 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; |
| 461 |
|
double logLddyn, Ldmin, Ldavg, Lwavg, Tr, Lw, Ld; |
| 462 |
< |
int32 histot; |
| 462 |
> |
HIST_TYP histot; |
| 463 |
|
double sum; |
| 464 |
|
double d; |
| 465 |
|
int i, j; |
| 493 |
|
tms->hbrmax - tms->hbrmin < TM_BRTSCALE*logLddyn) |
| 494 |
|
goto linearmap; |
| 495 |
|
/* clamp histogram */ |
| 496 |
< |
histo = (int *)malloc(histlen*sizeof(int)); |
| 496 |
> |
histo = (HIST_TYP *)malloc(histlen*sizeof(HIST_TYP)); |
| 497 |
|
cumf = (float *)malloc((histlen+2)*sizeof(float)); |
| 498 |
|
if ((histo == NULL) | (cumf == NULL)) |
| 499 |
|
returnErr(TM_E_NOMEM); |
| 610 |
|
*tmnew = *tms; /* copy everything */ |
| 611 |
|
if (tmnew->histo != NULL) { /* duplicate histogram */ |
| 612 |
|
len = HISTI(tmnew->hbrmax) + 1 - HISTI(tmnew->hbrmin); |
| 613 |
< |
tmnew->histo = (int *)malloc(len*sizeof(int)); |
| 613 |
> |
tmnew->histo = (HIST_TYP *)malloc(len*sizeof(HIST_TYP)); |
| 614 |
|
if (tmnew->histo != NULL) |
| 615 |
< |
for (i = len; i--; ) |
| 616 |
< |
tmnew->histo[i] = tms->histo[i]; |
| 615 |
> |
memcpy((MEM_PTR)tmnew->histo, (MEM_PTR)tms->histo, |
| 616 |
> |
len*sizeof(HIST_TYP)); |
| 617 |
|
} |
| 618 |
|
if (tmnew->lumap != NULL) { /* duplicate luminance mapping */ |
| 619 |
|
len = tmnew->mbrmax-tmnew->mbrmin+1; |
| 620 |
< |
tmnew->lumap = (unsigned short *)malloc( |
| 619 |
< |
len*sizeof(unsigned short) ); |
| 620 |
> |
tmnew->lumap = (TMAP_TYP *)malloc(len*sizeof(TMAP_TYP)); |
| 621 |
|
if (tmnew->lumap != NULL) |
| 622 |
< |
for (i = len; i--; ) |
| 623 |
< |
tmnew->lumap[i] = tms->lumap[i]; |
| 622 |
> |
memcpy((MEM_PTR)tmnew->lumap, (MEM_PTR)tms->lumap, |
| 623 |
> |
len*sizeof(TMAP_TYP)); |
| 624 |
|
} |
| 625 |
|
/* clear package data */ |
| 626 |
|
for (i = tmNumPkgs; i--; ) |
| 684 |
|
if (tms->mbrmin > tms->mbrmax) |
| 685 |
|
return 0; |
| 686 |
|
if (tms->lumap == NULL) |
| 687 |
< |
tms->lumap = (unsigned short *)malloc(sizeof(unsigned short)* |
| 687 |
> |
tms->lumap = (TMAP_TYP *)malloc(sizeof(TMAP_TYP)* |
| 688 |
|
(tms->mbrmax-tms->mbrmin+1)); |
| 689 |
|
return(tms->lumap != NULL); |
| 690 |
|
} |
