r2140 - trunk/gtk+

gdalziel at linuxfromscratch.org gdalziel at linuxfromscratch.org
Wed Oct 21 10:00:23 PDT 2009


Author: gdalziel
Date: 2009-10-21 11:00:23 -0600 (Wed, 21 Oct 2009)
New Revision: 2140

Added:
   trunk/gtk+/gtk+-2.18.3-jpeg7compatibility-1.patch
Log:
Added a patch for libjpeg 7 compatibility with GTK+

Added: trunk/gtk+/gtk+-2.18.3-jpeg7compatibility-1.patch
===================================================================
--- trunk/gtk+/gtk+-2.18.3-jpeg7compatibility-1.patch	                        (rev 0)
+++ trunk/gtk+/gtk+-2.18.3-jpeg7compatibility-1.patch	2009-10-21 17:00:23 UTC (rev 2140)
@@ -0,0 +1,23 @@
+Submitted By: Guy Dalziel <gdalziel at linuxfromscratch dot org> 
+Date: 2009-10-21
+Initial Package Version: 2.18.3 
+Origin: Romain Perier <mrpouet at gentoo dot org>.
+Description: Fixes compatibility with libjpeg 7 which has changed the range of allowable
+             scaling factors. The fix is designed to be backwards-compatible with libjpeg
+             6.
+
+diff -Naur gtk+-2.18.3.orig/gdk-pixbuf/io-jpeg.c gtk+-2.18.3/gdk-pixbuf/io-jpeg.c
+--- gtk+-2.18.3.orig/gdk-pixbuf/io-jpeg.c	2009-10-09 06:00:43.000000000 +0100
++++ gtk+-2.18.3/gdk-pixbuf/io-jpeg.c	2009-10-21 17:42:01.772276783 +0100
+@@ -921,7 +921,11 @@
+ 				}
+ 			}
+ 			
++#if JPEG_LIB_VERSION >= 70
++			for (cinfo->scale_denom = 2; cinfo->scale_denom <= 16; cinfo->scale_denom *= 2) {
++#else
+ 			for (cinfo->scale_denom = 2; cinfo->scale_denom <= 8; cinfo->scale_denom *= 2) {
++#endif
+ 				jpeg_calc_output_dimensions (cinfo);
+ 				if (cinfo->output_width < width || cinfo->output_height < height) {
+ 					cinfo->scale_denom /= 2;




More information about the patches mailing list