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.5 by greg, Fri Jan 7 20:33:02 2005 UTC vs.
Revision 1.8 by greg, Thu May 15 22:15:16 2008 UTC

#	Line 133 | Line 133 | rgb48_color(COLOR col, uint16 clr48[3], double gv)
133		int
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;
#	Line 173 | Line 173 | int
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;
#	Line 185 | Line 185 | tmCvRGB48(TMstruct *tms, TMbright *ls, BYTE *cs,
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(tms)) {                /* need floating point */
191		COLOR   *newscan;
#	Line 216 | Line 216 | tmCvRGB48(TMstruct *tms, TMbright *ls, BYTE *cs,
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;

Diff Legend

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