X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fjpeg.c;h=24bf2edf06836efc52f00f8c91c45cdf0d3e5735;hp=dee4dfa6383b51add209c4c6211d9f296a22ab93;hb=b6ebc39257e2814f08a17d8c179c3991c16053ba;hpb=f37e8f18c9aabe6b7298ef037df26a02bfc4f361

diff --git a/lib/jpeg.c b/lib/jpeg.c
index dee4dfa..24bf2ed 100644
--- a/lib/jpeg.c
+++ b/lib/jpeg.c
@@ -313,13 +313,13 @@ int jpeg_load(const char*filename, unsigned char**dest, int*_width, int*_height)
 
     int width = *_width = cinfo.output_width;
     int height = *_height = cinfo.output_height;
-    *dest = malloc(width*height*4);
+    *dest = (unsigned char*)malloc(width*height*4);
 
     int y;
     for (y=0;y<height;y++) {
 	int x;
 	U8 *js = scanline;
-	RGBA*line = (RGBA*)&(*dest)[y*width];
+        RGBA*line = &((RGBA*)(*dest))[y*width];
 
 	jpeg_read_scanlines(&cinfo, &js, 1);
 	if (cinfo.out_color_space == JCS_GRAYSCALE) {
@@ -362,6 +362,7 @@ int jpeg_load(const char*filename, unsigned char**dest, int*_width, int*_height)
 
     jpeg_finish_decompress(&cinfo);
     jpeg_destroy_decompress(&cinfo);
+    fclose(fi);
     return 1;
 }