sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix for tiff 16bit saving commit, had memory leak.

Browse Source
This commit is contained in:
Brecht Van Lommel 2008-03-10 17:11:18 +00:00
parent d5773b5c64
commit 59195b3e18
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/imbuf/intern/tiff.c
View File

@ -312,7 +312,7 @@ struct ImBuf *imb_loadtiff(unsigned char *mem, int size, int flags)
struct ImBuf *ibuf = NULL; struct ImBuf *ibuf = NULL;
struct ImbTIFFMemFile memFile; struct ImbTIFFMemFile memFile;
uint32 width, height; uint32 width, height;
int bytesperpixel; int bytesperpixel, bitspersample;
int success; int success;
unsigned int pixel_i, byte_i; unsigned int pixel_i, byte_i;
uint32 *raster = NULL; uint32 *raster = NULL;
@ -324,7 +324,7 @@ struct ImBuf *imb_loadtiff(unsigned char *mem, int size, int flags)
memFile.size = size; memFile.size = size;
/* check whether or not we have a TIFF file */ /* check whether or not we have a TIFF file */
if (size < IMB_TIFF_NCB) { if (size < IMB_TIFF_NCB) {
fprintf(stderr, "imb_loadtiff: size < IMB_TIFF_NCB\n"); fprintf(stderr, "imb_loadtiff: size < IMB_TIFF_NCB\n");
return NULL; return NULL;
} }
@ -346,6 +346,7 @@ struct ImBuf *imb_loadtiff(unsigned char *mem, int size, int flags)
bytesperpixel = 4; /* 1 byte per channel, 4 channels */ bytesperpixel = 4; /* 1 byte per channel, 4 channels */
libtiff_TIFFGetField(image, TIFFTAG_IMAGEWIDTH, &width); libtiff_TIFFGetField(image, TIFFTAG_IMAGEWIDTH, &width);
libtiff_TIFFGetField(image, TIFFTAG_IMAGELENGTH, &height); libtiff_TIFFGetField(image, TIFFTAG_IMAGELENGTH, &height);
libtiff_TIFFGetField(image, TIFFTAG_BITSPERSAMPLE, &bitspersample);
ibuf = IMB_allocImBuf(width, height, 8*bytesperpixel, 0, 0); ibuf = IMB_allocImBuf(width, height, 8*bytesperpixel, 0, 0);
if (ibuf) { if (ibuf) {
ibuf->ftype = TIF; ibuf->ftype = TIF;
@ -562,13 +563,15 @@ short imb_savetiff(struct ImBuf *ibuf, char *name, int flags)
fprintf(stderr, fprintf(stderr,
"imb_savetiff: Could not write encoded TIFF.\n"); "imb_savetiff: Could not write encoded TIFF.\n");
libtiff_TIFFClose(image); libtiff_TIFFClose(image);
libtiff__TIFFfree(pixels); if(pixels) libtiff__TIFFfree(pixels);
if(pixels16) libtiff__TIFFfree(pixels16);
return (1); return (1);
} }
/* close the TIFF file */ /* close the TIFF file */
libtiff_TIFFClose(image); libtiff_TIFFClose(image);
libtiff__TIFFfree(pixels); if(pixels) libtiff__TIFFfree(pixels);
if(pixels16) libtiff__TIFFfree(pixels16);
return (1); return (1);
} }