[Pkg-sdl-commits] [SCM] Debian packaging of SDL_image 1.2 branch, master, updated. debian/1.2.11-2

[Manuel A. Fernandez Montecelo]

The following commit has been merged in the master branch:
commit 94235b08aa50104ce05e545a45dee134be658aa9
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Sun Jan 22 23:39:21 2012 +0000

    Backported patch to fix bug #656927 'libsdl-image1.2: Some corrupted images (supertux and vor)' (upstream 'Bug 1377 - SDL_image 1.2.11 corrupts png of PseudoClass type 8bit', changeset 312 7036dd36a22f)

diff --git a/debian/patches/bug_1.2.11_corrupts_png_of_PseudoClass_type_8bit.diff b/debian/patches/bug_1.2.11_corrupts_png_of_PseudoClass_type_8bit.diff
new file mode 100644
index 0000000..5ce1c5c
--- /dev/null
+++ b/debian/patches/bug_1.2.11_corrupts_png_of_PseudoClass_type_8bit.diff
@@ -0,0 +1,23 @@
+From: Sam Lantinga <slouken at libsdl.org>
+Subject: Fixed bug 1377 - SDL_image 1.2.11 corrupts png of PseudoClass type 8bit
+Origin: upstream, http://hg.libsdl.org/SDL_image/rev/7036dd36a22f
+Bug: http://bugzilla.libsdl.org/show_bug.cgi?id=1377
+Bug-Debian: http://bugs.debian.org/656927
+
+diff -r b51a5e14a456 -r 7036dd36a22f IMG_png.c
+--- a/IMG_png.c	Tue Jan 03 21:37:48 2012 -0500
++++ b/IMG_png.c	Thu Jan 19 23:19:44 2012 -0500
+@@ -453,9 +453,6 @@
+ 	/* Allocate the SDL surface to hold the image */
+ 	Rmask = Gmask = Bmask = Amask = 0 ;
+ 	num_channels = lib.png_get_channels(png_ptr, info_ptr);
+-	/* Some .png files are monochrome, with as much as 1 channel and 1 bit per pixel */
+-	if( num_channels != 3 && num_channels != 4 )
+-		num_channels = 3;
+ 	if ( color_type != PNG_COLOR_TYPE_PALETTE ) {
+ 		if ( SDL_BYTEORDER == SDL_LIL_ENDIAN ) {
+ 			Rmask = 0x000000FF;
+
+
+
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..c2ce660 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+bug_1.2.11_corrupts_png_of_PseudoClass_type_8bit.diff

-- 
Debian packaging of SDL_image 1.2