[maemo-commits] [maemo-commits] r19306 - in projects/haf/trunk/gtk+: . gdk-pixbuf

[From: subversion at stage.maemo.org]

Author: kris
Date: 2009-09-08 12:03:00 +0300 (Tue, 08 Sep 2009)
New Revision: 19306

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gdk-pixbuf/io-jpeg.c
Log:
2009-09-08  Christian Dywan  <christian at lanedo.com>

	Fixes: NB#134639 - Image viewer quits for non-jpeg images or saving
	fails for jpegs, while saving image larger than 65500x1

	* gdk-pixbuf/io-jpeg.c (gdk_pixbuf__jpeg_image_load), (real_save_jpeg):
	Initialize the JPEG error structure early enough.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-09-08 08:52:40 UTC (rev 19305)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-09-08 09:03:00 UTC (rev 19306)
@@ -1,3 +1,11 @@
+2009-09-08  Christian Dywan  <christian at lanedo.com>
+
+	Fixes: NB#134639 - Image viewer quits for non-jpeg images or saving
+	fails for jpegs, while saving image larger than 65500x1
+
+	* gdk-pixbuf/io-jpeg.c (gdk_pixbuf__jpeg_image_load), (real_save_jpeg):
+	Initialize the JPEG error structure early enough.
+
 2009-09-08  Kristian Rietveld  <kris at lanedo.com>
 
 	Fixes: NB#129022 - CSM is not proper while rotating from portrait mode

Modified: projects/haf/trunk/gtk+/gdk-pixbuf/io-jpeg.c
===================================================================
--- projects/haf/trunk/gtk+/gdk-pixbuf/io-jpeg.c	2009-09-08 08:52:40 UTC (rev 19305)
+++ projects/haf/trunk/gtk+/gdk-pixbuf/io-jpeg.c	2009-09-08 09:03:00 UTC (rev 19306)
@@ -468,7 +468,6 @@
 	cinfo.err = jpeg_std_error (&jerr.pub);
 	jerr.pub.error_exit = fatal_error_handler;
         jerr.pub.output_message = output_message_handler;
-
         jerr.error = error;
         
 	if (sigsetjmp (jerr.setjmp_buffer, 1)) {
@@ -1189,11 +1188,11 @@
        }
 
        /* set up error handling */
+       cinfo.err = jpeg_std_error (&(jerr.pub));
        jerr.pub.error_exit = fatal_error_handler;
        jerr.pub.output_message = output_message_handler;
        jerr.error = error;
        
-       cinfo.err = jpeg_std_error (&(jerr.pub));
        if (sigsetjmp (jerr.setjmp_buffer, 1)) {
                jpeg_destroy_compress (&cinfo);
                g_free (buf);