ViewVC Help

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

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

Comparing ray/src/common/tmap16bit.c (file contents):
Revision 1.4 by schorsch, Sun Jul 27 22:12:01 2003 UTC vs.
Revision 1.9 by greg, Mon Mar 7 20:49:19 2011 UTC

#	Line 59 | Line 59 | mkGamTable(double gv)
59
60		/* Fill our monitor gamma table */
61		static void
62	<	mkMonGamTable()
62	>	mkMonGamTable(TMstruct *tms)
63		{
64		int     i;
65
66	<	if (tmTop->mongam == cur_mongam)
66	>	if (tms->mongam == cur_mongam)
67		return;
68		for (i = MONGAMTSZ; i--; )
69	<	mongamtab[i] = 256.*pow((i+.5)*(1./MONGAMTSZ), 1./tmTop->mongam);
70	<	cur_mongam = tmTop->mongam;
69	>	mongamtab[i] = 256.*pow((i+.5)*(1./MONGAMTSZ), 1./tms->mongam);
70	>	cur_mongam = tms->mongam;
71		}
72
73
#	Line 131 | Line 131 | rgb48_color(COLOR col, uint16 clr48[3], double gv)
131
132		/* Convert 16-bit gray scanline to encoded luminance */
133		int
134	<	tmCvGray16(TMbright *ls, uint16 *scan, int len, double gv)
134	>	tmCvGray16(TMstruct *tms, TMbright *ls, uint16 *scan, int len, double gv)
135		{
136	<	static char     funcName[] = "tmCvGray16";
136	>	static const char       funcName[] = "tmCvGray16";
137		static double   cur_inpsf = 1.;
138		static double   log_inpsf = 0.;
139		int             nshft;
140		double          d;
141
142	<	if (tmTop == NULL)
142	>	if (tms == NULL)
143		returnErr(TM_E_TMINVAL);
144		if ((ls == NULL) | (scan == NULL) | (len < 0))
145		returnErr(TM_E_ILLEGAL);
#	Line 148 | Line 148 | tmCvGray16(TMbright *ls, uint16 *scan, int len, double
148		/* initialize log table */
149		if (logtab[0] == 0.f)
150		mkLogTable();
151	<	if (cur_inpsf != tmTop->inpsf)
152	<	log_inpsf = log(cur_inpsf = tmTop->inpsf);
151	>	if (cur_inpsf != tms->inpsf)
152	>	log_inpsf = log(cur_inpsf = tms->inpsf);
153		/* convert 16-bit grays */
154		while (len--) {
155		nshft = normShift16(*scan);
#	Line 170 | Line 170 | tmCvGray16(TMbright *ls, uint16 *scan, int len, double
170
171		/* Convert a 48-bit RGB scanline to encoded luminance/chrominance */
172		int
173	<	tmCvRGB48(TMbright *ls, BYTE *cs, uint16 (*scan)[3], int len, double gv)
173	>	tmCvRGB48(TMstruct *tms, TMbright *ls, BYTE *cs,
174	>	uint16 (*scan)[3], int len, double gv)
175		{
176	<	static char     funcName[] = "tmCvRGB48";
176	>	static const char       funcName[] = "tmCvRGB48";
177		static double   cur_inpsf = 1.;
178		static double   log_inpsf = 0.;
179		int             i;
180
181	<	if (tmTop == NULL)
181	>	if (tms == NULL)
182		returnErr(TM_E_TMINVAL);
183		if ((ls == NULL) | (scan == NULL) | (len < 0))
184		returnErr(TM_E_ILLEGAL);
185		if (gv <= 0.)
186		gv = DEFGAM;
187		/* sync input gamma table */
188	<	if ((gv != 1.) & (gv != cur_gam))
188	>	if (gv != cur_gam)
189		mkGamTable(gv);
190	<	if (tmNeedMatrix(tmTop)) {              /* need floating point */
190	>	if (tmNeedMatrix(tms)) {                /* need floating point */
191		COLOR   *newscan;
192		newscan = (COLOR *)tempbuffer(len*sizeof(COLOR));
193		if (newscan == NULL)
194		returnErr(TM_E_NOMEM);
195		for (i = len; i--; )
196		rgb48_color(newscan[i], scan[i], gv);
197	<	return(tmCvColors(ls, cs, newscan, len));
197	>	return(tmCvColors(tms, ls, cs, newscan, len));
198		}
199		/* sync monitor gamma table */
200	<	if (cs != TM_NOCHROM && tmTop->mongam != cur_mongam)
201	<	mkMonGamTable();
200	>	if (cs != TM_NOCHROM && tms->mongam != cur_mongam)
201	>	mkMonGamTable(tms);
202		/* initialize log table */
203		if (logtab[0] == 0.f)
204		mkLogTable();
205	<	if (cur_inpsf != tmTop->inpsf)
206	<	log_inpsf = log(cur_inpsf = tmTop->inpsf);
207	<	if (tmTop->flags & TM_F_MESOPIC)
205	>	if (cur_inpsf != tms->inpsf)
206	>	log_inpsf = log(cur_inpsf = tms->inpsf);
207	>	if (tms->flags & TM_F_MESOPIC)
208		tmMkMesofact();
209		/* convert scanline */
210		for (i = len; i--; ) {
#	Line 215 | Line 216 | tmCvRGB48(TMbright *ls, BYTE *cs, uint16 (*scan)[3], i
216		if (nshft < 0) {
217		bi = TM_NOBRT;                  /* bogus value */
218		lum = 1.;
219	+	setcolor(cmon, 1., 1., 1.);
220		} else {
221		int     j = GAMTABBITS-16+nshft;
222		int     nshft2;
#	Line 223 | Line 225 | tmCvRGB48(TMbright *ls, BYTE *cs, uint16 (*scan)[3], i
225		setcolor(cmon,  gamtab[imultpow2(scan[i][0],j)],
226		gamtab[imultpow2(scan[i][1],j)],
227		gamtab[imultpow2(scan[i][2],j)] );
228	<	lum =   tmTop->clf[RED]*cmon[RED];
229	<	lum +=  tmTop->clf[GRN]*cmon[GRN];
230	<	lum +=  tmTop->clf[BLU]*cmon[BLU];
228	>	lum =   tms->clf[RED]*cmon[RED];
229	>	lum +=  tms->clf[GRN]*cmon[GRN];
230	>	lum +=  tms->clf[BLU]*cmon[BLU];
231		/* convert to log Y */
232		j = lum * (double)(1L<<16);
233		nshft2 = normShift16(j);
#	Line 233 | Line 235 | tmCvRGB48(TMbright *ls, BYTE *cs, uint16 (*scan)[3], i
235		((1L<<LOGTABBITS)-1) ];
236		d -= M_LN2*(gv*nshft + nshft2);
237		d = (double)TM_BRTSCALE*(d + log_inpsf);
238	<	bi = (int)(d>0. ? d+.5 : d-.5);
238	>	bi = (int)(d + .5 - (d < 0.));
239		}
240		/* world luminance */
241		ls[i] = bi;
242		if (cs == TM_NOCHROM)                   /* no color? */
243		continue;
244		/* mesopic adj. */
245	<	if (tmTop->flags & TM_F_MESOPIC && bi < BMESUPPER) {
245	>	if (tms->flags & TM_F_MESOPIC && bi < BMESUPPER) {
246		double  slum = scotlum(cmon);
247		if (bi < BMESLOWER)
248		setcolor(cmon, slum, slum, slum);
249		else {
250		double  pf;
251		pf = (1./256.)*tmMesofact[bi-BMESLOWER];
252	<	if (tmTop->flags & TM_F_BW)
252	>	if (tms->flags & TM_F_BW)
253		cmon[RED] = cmon[GRN] = cmon[BLU] = lum;
254		slum *= 1. - pf;
255		cmon[RED] = slum + pf*cmon[RED];
256		cmon[GRN] = slum + pf*cmon[GRN];
257		cmon[BLU] = slum + pf*cmon[BLU];
258		}
259	<	} else if (tmTop->flags & TM_F_BW) {
259	>	} else if (tms->flags & TM_F_BW) {
260		cmon[RED] = cmon[GRN] = cmon[BLU] = lum;
261		}
262	<	bi = (double)MONGAMTSZ*tmTop->clf[RED]*cmon[RED]/lum;
262	>	bi = (double)MONGAMTSZ*tms->clf[RED]*cmon[RED]/lum;
263		cs[3*i  ] = bi>=MONGAMTSZ ? 255 : mongamtab[bi];
264	<	bi = (double)MONGAMTSZ*tmTop->clf[GRN]*cmon[GRN]/lum;
264	>	bi = (double)MONGAMTSZ*tms->clf[GRN]*cmon[GRN]/lum;
265		cs[3*i+1] = bi>=MONGAMTSZ ? 255 : mongamtab[bi];
266	<	bi = (double)MONGAMTSZ*tmTop->clf[BLU]*cmon[BLU]/lum;
266	>	bi = (double)MONGAMTSZ*tms->clf[BLU]*cmon[BLU]/lum;
267		cs[3*i+2] = bi>=MONGAMTSZ ? 255 : mongamtab[bi];
268		}
269		returnOK;

Diff Legend

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