mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Redirect non-fatal errors to the NetSurf log 

svn path=/trunk/netsurf/; revision=12633
This commit is contained in:
Chris Young 2011-07-31 11:19:52 +00:00
parent e0590ba4da
commit d7d48c34e6
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
image/jpeg.c
View File

@ -149,6 +149,21 @@ static void nsjpeg_term_source(j_decompress_ptr cinfo)
}
/**
* Error output handler for JPEG library.
*
* This logs to NetSurf log instead of stderr.
* Warnings only - fatal errors are trapped by nsjpeg_error_exit
* and do not call the output handler.
*/
static void nsjpeg_error_log(j_common_ptr cinfo)
{
struct nsjpeg_error_mgr *err = (struct nsjpeg_error_mgr *) cinfo->err;
err->pub.format_message(cinfo, nsjpeg_error_buffer);
LOG(("%s", nsjpeg_error_buffer));
}
/**
* Fatal error handler for JPEG library.
*
@ -187,6 +202,7 @@ static bool nsjpeg_convert(struct content *c)
cinfo.err = jpeg_std_error(&jerr.pub);
jerr.pub.error_exit = nsjpeg_error_exit;
jerr.pub.output_message = nsjpeg_error_log;
if (setjmp(jerr.setjmp_buffer)) {
jpeg_destroy_decompress(&cinfo);
if (bitmap)