ViewVC Help

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

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

Comparing ray/src/common/tmaptiff.c (file contents):
Revision 3.5 by greg, Fri Jan 7 20:33:02 2005 UTC vs.
Revision 3.7 by greg, Sat May 31 18:28:35 2008 UTC

#	Line 10 | Line 10 | static const char      RCSid[] = "$Id$";
10		#include "copyright.h"
11
12		#include <stdio.h>
13	–	#include "tiffio.h"
13		#include "tmprivat.h"
14	+	#include "tiffio.h"
15		#include "tmaptiff.h"
16
17		/* input cases we handle */
#	Line 133 | Line 133 | tmLoadTIFF(TMstruct *tms, TMbright **lpp, BYTE **cpp,
133		case TC_LOGLUV24:
134		TIFFSetField(tif, TIFFTAG_SGILOGDATAFMT, SGILOGDATAFMT_RAW);
135		sl.l = (uint32 *)malloc(width*sizeof(uint32));
136	<	tmSetSpace(tms, TM_XYZPRIM, stonits);
136	>	tmSetSpace(tms, TM_XYZPRIM, stonits, NULL);
137		break;
138		case TC_LOGL16:
139		TIFFSetField(tif, TIFFTAG_SGILOGDATAFMT, SGILOGDATAFMT_16BIT);
140		sl.w = (uint16 *)malloc(width*sizeof(uint16));
141	<	tmSetSpace(tms, tms->monpri, stonits);
141	>	tmSetSpace(tms, tms->monpri, stonits, NULL);
142		break;
143		case TC_RGBFLOAT:
144		sl.f = (float *)malloc(width*3*sizeof(float));
145	<	tmSetSpace(tms, inppri, stonits);
145	>	tmSetSpace(tms, inppri, stonits, NULL);
146		break;
147		case TC_GRYFLOAT:
148		sl.f = (float *)malloc(width*sizeof(float));
149	<	tmSetSpace(tms, tms->monpri, stonits);
149	>	tmSetSpace(tms, tms->monpri, stonits, NULL);
150		break;
151		case TC_RGBSHORT:
152		sl.w = (uint16 *)malloc(width*3*sizeof(uint16));
153	<	tmSetSpace(tms, inppri, stonits);
153	>	tmSetSpace(tms, inppri, stonits, NULL);
154		break;
155		case TC_GRYSHORT:
156		sl.w = (uint16 *)malloc(width*sizeof(uint16));
157	<	tmSetSpace(tms, tms->monpri, stonits);
157	>	tmSetSpace(tms, tms->monpri, stonits, NULL);
158		break;
159		default:
160		err = TM_E_CODERR1;

Diff Legend

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