ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/tmaptiff.c
(Generate patch)

Comparing ray/src/common/tmaptiff.c (file contents):
Revision 3.5 by greg, Fri Jan 7 20:33:02 2005 UTC vs.
Revision 3.9 by greg, Thu Dec 2 18:10:40 2010 UTC

# Line 10 | Line 10 | static const char      RCSid[] = "$Id$";
10   #include "copyright.h"
11  
12   #include <stdio.h>
13 + #include <stdlib.h>
14   #include "tiffio.h"
15   #include "tmprivat.h"
16   #include "tmaptiff.h"
# Line 133 | Line 134 | tmLoadTIFF(TMstruct *tms, TMbright **lpp, BYTE **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);
137 >                tmSetSpace(tms, TM_XYZPRIM, stonits, NULL);
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);
142 >                tmSetSpace(tms, tms->monpri, stonits, NULL);
143                  break;
144          case TC_RGBFLOAT:
145                  sl.f = (float *)malloc(width*3*sizeof(float));
146 <                tmSetSpace(tms, inppri, stonits);
146 >                tmSetSpace(tms, inppri, stonits, NULL);
147                  break;
148          case TC_GRYFLOAT:
149                  sl.f = (float *)malloc(width*sizeof(float));
150 <                tmSetSpace(tms, tms->monpri, stonits);
150 >                tmSetSpace(tms, tms->monpri, stonits, NULL);
151                  break;
152          case TC_RGBSHORT:
153                  sl.w = (uint16 *)malloc(width*3*sizeof(uint16));
154 <                tmSetSpace(tms, inppri, stonits);
154 >                tmSetSpace(tms, inppri, stonits, NULL);
155                  break;
156          case TC_GRYSHORT:
157                  sl.w = (uint16 *)malloc(width*sizeof(uint16));
158 <                tmSetSpace(tms, tms->monpri, stonits);
158 >                tmSetSpace(tms, tms->monpri, stonits, NULL);
159                  break;
160          default:
161                  err = TM_E_CODERR1;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines