ViewVC Help

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

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

Comparing ray/src/common/tmapcolrs.c (file contents):
Revision 3.32 by greg, Thu Aug 2 18:33:42 2018 UTC vs.
Revision 3.39 by greg, Thu Nov 21 17:15:54 2024 UTC

#	Line 9 | Line 9 | static const char      RCSid[] = "$Id$";
9
10		#include "copyright.h"
11
12	–	#include        <stdio.h>
12		#include        <stdlib.h>
14	–	#include        <string.h>
13		#include        <math.h>
16	–	#include        <time.h>
14
15		#ifdef PCOND
16		#include        "paths.h"
17		#endif
18		#include        "tmprivat.h"
19	+	#include        "rtio.h"
20		#include        "resolu.h"
21
22		#define GAMTSZ  4096
#	Line 30 | Line 28 | typedef struct {
28		TMbright        inpsfb;         /* encoded tm->inpsf */
29		} COLRDATA;
30
31	<	static MEM_PTR  colrInit(TMstruct *);
31	>	static void *   colrInit(TMstruct *);
32		static void     colrNewSpace(TMstruct *);
33		static gethfunc headline;
34
#	Line 73 | Line 71 | int    len
71		returnErr(TM_E_NOMEM);
72		for (i = len; i--; ) {
73		if (tmNeedMatrix(tms)) {                /* apply color xform */
74	+	bi = 0;
75		for (j = 3; j--; ) {
76		vl =    cd->cmatb[j][RED]*(int32)scan[i][RED] +
77		cd->cmatb[j][GRN]*(int32)scan[i][GRN] +
78		cd->cmatb[j][BLU]*(int32)scan[i][BLU] ;
79	<	if (vl < 0) cmon[j] = vl/0x10000;
80	<	else cmon[j] = vl>>16;
79	>	if (vl < 0)
80	>	cmon[j] = vl/(int32)0x10000;
81	>	else if ((cmon[j] = vl>>16) > bi)
82	>	bi = cmon[j];
83		}
84		cmon[EXP] = scan[i][EXP];
85	+	while (bi >= 256) {             /* handle overflow */
86	+	cmon[EXP]++;
87	+	for (j = 3; j--; ) cmon[j] >>= 1;
88	+	bi >>= 1;
89	+	}
90		} else
91		copycolr(cmon, scan[i]);
92		/* world luminance */
#	Line 116 | Line 122 | int    len
122		}
123		}
124		} else if (tms->flags & TM_F_BW) {
125	<	cmon[RED] = cmon[GRN] = cmon[BLU] = li;
125	>	for (j = 3; j--; )
126	>	cs[3*i+j] = tms->cdiv[j]/(TM_BRES>>8);
127	>	continue;
128		} else {
129		for (j = 3; j--; )
130	<	if (cmon[j] < 0) cmon[j] = 0;
130	>	cmon[j] *= (cmon[j] > 0);
131		}
132		bi = ( (uint32)GAMTSZ*cd->clfb[RED]*cmon[RED]/li ) >> 12;
133		cs[3*i  ] = bi>=GAMTSZ ? 255 : cd->gamb[bi];
#	Line 134 | Line 142 | int    len
142
143		#define FMTRGB          1       /* Input is RGBE */
144		#define FMTCIE          2       /* Input is CIE XYZE */
145	<	#define FMTUNK          3       /* Input format is unspecified */
146	<	#define FMTBAD          4       /* Input is not a recognized format */
145	>	#define FMTSPEC         3       /* Input is N-component spectral data */
146	>	#define FMTUNK          0       /* Input format is unspecified */
147	>	#define FMTBAD          (-1)    /* Input is not a recognized format */
148
149		static struct radhead {
150		int     format;         /* FMTRGB, FMTCIE, FMTUNK, FMTBAD */
151		double  expos;          /* input exposure value */
152		RGBPRIMP        primp;  /* input primaries */
153		RGBPRIMS        mypri;  /* custom primaries */
154	<	} rhdefault = {FMTUNK, 1., stdprims, STDPRIMS};
154	>	int             ncs;    /* number of color samples */
155	>	float           wpt[4]; /* spectral partition */
156	>	} rhdefault = {FMTUNK, 1., stdprims, STDPRIMS, 3, {0,0,0,0}};
157
158
159		static int
#	Line 159 | Line 170 | headline(                      /* grok a header line */
170		rh->format = FMTRGB;
171		else if (!strcmp(fmt, CIEFMT))
172		rh->format = FMTCIE;
173	+	else if (!strcmp(fmt, SPECFMT))
174	+	rh->format = FMTSPEC;
175		else
176		rh->format = FMTBAD;
177		return(0);
#	Line 172 | Line 185 | headline(                      /* grok a header line */
185		rh->primp = rh->mypri;
186		return(0);
187		}
188	+	if (isncomp(s)) {
189	+	rh->ncs = ncompval(s);
190	+	return(0);
191	+	}
192	+	if (iswlsplit(s)) {
193	+	wlsplitval(rh->wpt, s);
194	+	return(0);
195	+	}
196		return(0);
197		}
198
#	Line 210 | Line 231 | FILE   *fp
231		fgetresolu(xp, yp, inpf) < 0) {
232		err = TM_E_BADFILE; goto done;
233		}
234	<	if (info.format == FMTUNK)              /* assume RGBE format */
234	>	if (info.format == FMTSPEC) {           /* valid spectrum? */
235	>	if (info.ncs <= 3) {
236	>	err = TM_E_BADFILE; goto done;
237	>	}
238	>	if (info.wpt[0] == 0)
239	>	memcpy(info.wpt, WLPART, sizeof(info.wpt));
240	>	} else if (info.format == FMTUNK)       /* assume RGBE format? */
241		info.format = FMTRGB;
242	<	if (info.format == FMTRGB)
243	<	info.expos /= WHTEFFICACY;
217	<	else if (info.format == FMTCIE)
242	>
243	>	if (info.format == FMTCIE)
244		info.primp = TM_XYZPRIM;
245	+	else
246	+	info.expos /= WHTEFFICACY;
247		/* prepare library */
248	<	if ((err = tmSetSpace(tms, info.primp, 1./info.expos, NULL)) != TM_E_OK)
248	>	if ((err = tmSetSpace(tms, info.primp, 1./info.expos)) != TM_E_OK)
249		goto done;
250		err = TM_E_NOMEM;                       /* allocate arrays */
251		*lpp = (TMbright *)malloc(sizeof(TMbright) * *xp * *yp);
#	Line 233 | Line 261 | FILE   *fp
261		goto done;
262		err = TM_E_BADFILE;                     /* read & convert scanlines */
263		for (i = 0; i < *yp; i++) {
264	<	if (freadcolrs(scanin, *xp, inpf) < 0) {
264	>	if (fread2colrs(scanin, *xp, inpf, info.ncs, info.wpt) < 0) {
265		err = TM_E_BADFILE; break;
266		}
267		err = tmCvColrs(tms, *lpp + (i * *xp),
#	Line 246 | Line 274 | done:                                          /* clean up */
274		if (fp == NULL)
275		fclose(inpf);
276		if (scanin != NULL)
277	<	free((MEM_PTR)scanin);
277	>	free(scanin);
278		if (err != TM_E_OK) {
279		if (*lpp != NULL)
280	<	free((MEM_PTR)*lpp);
280	>	free(*lpp);
281		if (cpp != TM_NOCHROMP && *cpp != NULL)
282	<	free((MEM_PTR)*cpp);
282	>	free(*cpp);
283		returnErr(err);
284		}
285		returnOK;
#	Line 323 | Line 351 | char   *fname;
351		for (y = 0; y < *yp; y++) {
352		if (freadcolrs(scan, *xp, infp) < 0) {
353		pclose(infp);
354	<	free((MEM_PTR)scan);
355	<	free((MEM_PTR)*psp);
354	>	free(scan);
355	>	free(*psp);
356		*psp = NULL;
357		returnErr(TM_E_BADFILE);
358		}
#	Line 339 | Line 367 | char   *fname;
367		*rp++ = scan[x][BLU];
368		}
369		}
370	<	free((MEM_PTR)scan);
370	>	free(scan);
371		pclose(infp);
372		returnOK;
373		}
#	Line 390 | Line 418 | FILE   *fp;
418		if (flags & TM_F_BW) {
419		*psp = (uby8 *)malloc(sizeof(uby8) * *xp * *yp);
420		if (*psp == NULL) {
421	<	free((MEM_PTR)lp);
421	>	free(lp);
422		tmDone(tms);
423		returnErr(TM_E_NOMEM);
424		}
#	Line 408 | Line 436 | FILE   *fp;
436		err = tmMapPixels(tms, *psp, lp, cp, *xp * *yp);
437
438		done:                                           /* clean up */
439	<	free((MEM_PTR)lp);
439	>	free(lp);
440		tmDone(tms);
441		if (err != TM_E_OK) {                   /* free memory on error */
442	<	free((MEM_PTR)*psp);
442	>	free(*psp);
443		*psp = NULL;
444		returnErr(err);
445		}
#	Line 439 | Line 467 | TMstruct       *tms;
467		}
468
469
470	<	static MEM_PTR
470	>	static void *
471		colrInit(tms)                   /* initialize private data for tone mapping */
472		TMstruct        *tms;
473		{
#	Line 449 | Line 477 | TMstruct       *tms;
477		cd = (COLRDATA *)malloc(sizeof(COLRDATA));
478		if (cd == NULL)
479		return(NULL);
480	<	tms->pd[colrReg] = (MEM_PTR)cd;
480	>	tms->pd[colrReg] = (void *)cd;
481		/* compute gamma table */
482		for (i = GAMTSZ; i--; )
483		cd->gamb[i] = 256.*pow((i+.5)/GAMTSZ, 1./tms->mongam);
484		/* compute color and scale factors */
485		colrNewSpace(tms);
486	<	return((MEM_PTR)cd);
486	>	return((void *)cd);
487		}

Diff Legend

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