ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/common/tonemap.c

Comparing ray/src/common/tonemap.c (file contents):
Revision 3.37 by greg, Fri May 20 02:06:38 2011 UTC vs.
Revision 3.39 by greg, Wed Jan 6 20:34:10 2021 UTC

#	Line 14 | Line 14 | static const char      RCSid[] = "$Id$";
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
#	Line 374 | Line 375 | int    wt
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;
#	Line 453 | Line 454 | double Ldmax
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;
#	Line 491 | Line 492 | double Ldmax
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);
#	Line 608 | Line 609 | TMstruct       *tms
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--; )
#	Line 683 | Line 683 | TMstruct       *tms
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		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)