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.10 by greg, Fri May 20 02:06:38 2011 UTC vs.
Revision 3.13 by greg, Thu Nov 21 17:15:54 2024 UTC

#	Line 88 | Line 88 | tmLoadTIFF(TMstruct *tms, TMbright **lpp, uby8 **cpp,
88		float   *fa;
89		TIFF    *tif;
90		int     err;
91	<	union {uint16 *w; uint32 *l; float *f; MEM_PTR p;} sl;
91	>	union {uint16 *w; uint32 *l; float *f; void *p;} sl;
92		uint32  width, height;
93		int     tcase;
94		double  stonits;
#	Line 134 | Line 134 | tmLoadTIFF(TMstruct *tms, TMbright **lpp, uby8 **cpp,
134		case TC_LOGLUV24:
135		TIFFSetField(tif, TIFFTAG_SGILOGDATAFMT, SGILOGDATAFMT_RAW);
136		sl.l = (uint32 *)malloc(width*sizeof(uint32));
137	<	tmSetSpace(tms, TM_XYZPRIM, stonits, NULL);
137	>	tmSetSpace(tms, TM_XYZPRIM, stonits);
138		break;
139		case TC_LOGL16:
140		TIFFSetField(tif, TIFFTAG_SGILOGDATAFMT, SGILOGDATAFMT_16BIT);
141		sl.w = (uint16 *)malloc(width*sizeof(uint16));
142	<	tmSetSpace(tms, tms->monpri, stonits, NULL);
142	>	tmSetSpace(tms, tms->monpri, stonits);
143		break;
144		case TC_RGBFLOAT:
145		sl.f = (float *)malloc(width*3*sizeof(float));
146	<	tmSetSpace(tms, inppri, stonits, NULL);
146	>	tmSetSpace(tms, inppri, stonits);
147		break;
148		case TC_GRYFLOAT:
149		sl.f = (float *)malloc(width*sizeof(float));
150	<	tmSetSpace(tms, tms->monpri, stonits, NULL);
150	>	tmSetSpace(tms, tms->monpri, stonits);
151		break;
152		case TC_RGBSHORT:
153		sl.w = (uint16 *)malloc(width*3*sizeof(uint16));
154	<	tmSetSpace(tms, inppri, stonits, NULL);
154	>	tmSetSpace(tms, inppri, stonits);
155		break;
156		case TC_GRYSHORT:
157		sl.w = (uint16 *)malloc(width*sizeof(uint16));
158	<	tmSetSpace(tms, tms->monpri, stonits, NULL);
158	>	tmSetSpace(tms, tms->monpri, stonits);
159		break;
160		default:
161		err = TM_E_CODERR1;
#	Line 231 | Line 231 | done:                                  /* clean up */
231		free(sl.p);
232		if (err != TM_E_OK) {           /* free buffers on error */
233		if (*lpp != NULL)
234	<	free((MEM_PTR)*lpp);
234	>	free(*lpp);
235		*lpp = NULL;
236		if (cpp != TM_NOCHROMP) {
237		if (*cpp != TM_NOCHROM)
238	<	free((MEM_PTR)*cpp);
238	>	free(*cpp);
239		*cpp = NULL;
240		}
241		*xp = *yp = 0;
#	Line 256 | Line 256 | tmMapTIFF(uby8 **psp, int *xp, int *yp, int flags, RGB
256		double gamval, double Lddyn, double Ldmax, char *fname, TIFF *tp)
257		{
258		char    *funcName = fname==NULL ? "tmMapTIFF" : fname;
259	<	TMstruct        *tms;
259	>	TMstruct        *tms = NULL;
260		TMbright        *lp;
261		uby8    *cp;
262		int     err;
#	Line 282 | Line 282 | tmMapTIFF(uby8 **psp, int *xp, int *yp, int flags, RGB
282		if (cp == TM_NOCHROM) {
283		*psp = (uby8 *)malloc(*xp * *yp * sizeof(uby8));
284		if (*psp == NULL) {
285	<	free((MEM_PTR)lp);
285	>	free(lp);
286		tmDone(tms);
287		returnErr(TM_E_NOMEM);
288		}
#	Line 299 | Line 299 | tmMapTIFF(uby8 **psp, int *xp, int *yp, int flags, RGB
299		err = tmMapPixels(tms, *psp, lp, cp, *xp * *yp);
300
301		done:                                   /* clean up */
302	<	free((MEM_PTR)lp);
302	>	free(lp);
303		tmDone(tms);
304		if (err != TM_E_OK) {           /* free memory on error */
305	<	free((MEM_PTR)*psp);
305	>	free(*psp);
306		*psp = NULL;
307		*xp = *yp = 0;
308		returnErr(err);

Diff Legend

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