r14013 - in /desktop/unstable/gtk+2.0/debian: changelog patches/094_fix-jpeg-loader-big-buffers.patch patches/series

[lool at users.alioth.debian.org]

Author: lool
Date: Sun Dec 30 22:07:19 2007
New Revision: 14013

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14013
Log:
* New patch, 094_fix-jpeg-loader-big-buffers, fixes spinguard logic for big
  buffers in the JPEG pixbuf loader; GNOME #494667; from SVN r19135.

Added:
    desktop/unstable/gtk+2.0/debian/patches/094_fix-jpeg-loader-big-buffers.patch
Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/patches/series

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=14013&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Sun Dec 30 22:07:19 2007
@@ -3,6 +3,8 @@
   * Drop the version in the libgtk2.0-0 -> libgtk2.0-common dependency; the
     translations and gtkrc files aren't critical to libgtk's working and have
     been compatible with other libgtk versions since years.
+  * New patch, 094_fix-jpeg-loader-big-buffers, fixes spinguard logic for big
+    buffers in the JPEG pixbuf loader; GNOME #494667; from SVN r19135.
 
  -- Loic Minier <lool at dooz.org>  Wed, 12 Dec 2007 14:39:26 +0100
 

Added: desktop/unstable/gtk+2.0/debian/patches/094_fix-jpeg-loader-big-buffers.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/094_fix-jpeg-loader-big-buffers.patch?rev=14013&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/094_fix-jpeg-loader-big-buffers.patch (added)
+++ desktop/unstable/gtk+2.0/debian/patches/094_fix-jpeg-loader-big-buffers.patch Sun Dec 30 22:07:19 2007
@@ -1,0 +1,42 @@
+From SVN r19135
+
+2007-12-09  Matthias Clasen  <mclasen at redhat.com>
+
+	* io-jpeg.c: Fix the spinguard logic for big buffers.
+	(#494667, Ed Catmur)
+
+--- gdk-pixbuf/io-jpeg.c.orig	2007-12-04 17:52:17.000000000 +0100
++++ gdk-pixbuf/io-jpeg.c	2007-12-30 23:06:07.000000000 +0100
+@@ -812,7 +812,7 @@
+ 	struct           jpeg_decompress_struct *cinfo;
+ 	my_src_ptr       src;
+ 	guint            num_left, num_copy;
+-	guint            last_bytes_left;
++	guint            last_num_left, last_bytes_left;
+ 	guint            spinguard;
+ 	gboolean         first;
+ 	const guchar    *bufhd;
+@@ -853,6 +853,7 @@
+ 	if (num_left == 0)
+ 		return TRUE;
+ 
++	last_num_left = num_left;
+ 	last_bytes_left = 0;
+ 	spinguard = 0;
+ 	first = TRUE;
+@@ -880,10 +881,13 @@
+                 if (first) {
+                         last_bytes_left = src->pub.bytes_in_buffer;
+                         first = FALSE;
+-                } else if (src->pub.bytes_in_buffer == last_bytes_left)
++                } else if (src->pub.bytes_in_buffer == last_bytes_left
++			   && num_left == last_num_left) {
+                         spinguard++;
+-                else
++		} else {
+                         last_bytes_left = src->pub.bytes_in_buffer;
++			last_num_left = num_left;
++		}
+ 
+ 		/* should not go through twice and not pull bytes out of buf */
+ 		if (spinguard > 2)

Modified: desktop/unstable/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/series?rev=14013&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/series (original)
+++ desktop/unstable/gtk+2.0/debian/patches/series Sun Dec 30 22:07:19 2007
@@ -22,3 +22,4 @@
 091_workaround_no_gtk_init_incorrect_display.patch
 092_notebook-critical-warnings.patch
 093_directfb-type-changes.patch
+094_fix-jpeg-loader-big-buffers.patch -p0