storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fix bug with bad album art.

Browse Source
This commit is contained in:
Justin Maggard
2009-03-27 22:22:23 +00:00
parent 9854e35533
commit 0a415861e7
4 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
image_utils.c
View File

@ -31,6 +31,7 @@
#include <string.h>
#include <unistd.h>
#include <sys/types.h>
#include <setjmp.h>
#include <jpeglib.h>
#include "image_utils.h"
@ -175,11 +176,13 @@ jpeg_memory_src(j_decompress_ptr cinfo, const unsigned char * buffer, size_t buf
src->pub.bytes_in_buffer = bufsize;
}
jmp_buf setjmp_buffer;
/* Don't exit on error like libjpeg likes to do */
static void
libjpeg_error_handler(j_common_ptr cinfo)
{
cinfo->err->output_message(cinfo);
longjmp(setjmp_buffer, 1);
return;
}
@ -258,6 +261,13 @@ image_new_from_jpeg(const char * path, int is_file, const char * buf, int size)
{
jpeg_memory_src(&cinfo, (const unsigned char *)buf, size);
}
if( setjmp(setjmp_buffer) )
{
jpeg_destroy_decompress(&cinfo);
if( is_file && file )
fclose(file);
return NULL;
}
jpeg_read_header(&cinfo, TRUE);
cinfo.do_fancy_upsampling = FALSE;
cinfo.do_block_smoothing = FALSE;