AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-12 03:40:10 +00:00
Code Issues Projects Releases Wiki Activity

Setup libjpeg error handlers early enough

Browse Source 
See bug 606068 for details.
This commit is contained in:
Matthias Clasen 2010-01-06 22:44:16 -05:00 committed by Tristan Van Berkom
parent 95ccaa02de
commit bd5431e620
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gdk-pixbuf/io-jpeg.c
View File

@ -656,6 +656,13 @@ gdk_pixbuf__jpeg_image_begin_load (GdkPixbufModuleSizeFunc size_func,
context->src_initialized = FALSE;
context->in_output = FALSE;
/* From jpeglib.h: "NB: you must set up the error-manager
* BEFORE calling jpeg_create_xxx". */
context->cinfo.err = jpeg_std_error (&context->jerr.pub);
context->jerr.pub.error_exit = fatal_error_handler;
context->jerr.pub.output_message = output_message_handler;
context->jerr.error = error;
/* create libjpeg structures */
jpeg_create_decompress (&context->cinfo);
@ -668,14 +675,7 @@ gdk_pixbuf__jpeg_image_begin_load (GdkPixbufModuleSizeFunc size_func,
return NULL;
}
memset (context->cinfo.src, 0, sizeof (my_source_mgr));
src = (my_src_ptr) context->cinfo.src;
context->cinfo.err = jpeg_std_error (&context->jerr.pub);
context->jerr.pub.error_exit = fatal_error_handler;
context->jerr.pub.output_message = output_message_handler;
context->jerr.error = error;
src = (my_src_ptr) context->cinfo.src;
src->pub.init_source = init_source;
src->pub.fill_input_buffer = fill_input_buffer;