From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 6 Aug 2007 16:02:12 +0000 (+0000)
Subject: (png_load): Ignore png-supplied background color.
X-Git-Tag: emacs-pretest-23.0.90~11574
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=465d8f275afb360dcc4b8231c9658e299d47a551;p=emacs.git

(png_load): Ignore png-supplied background color.
---

diff --git a/src/image.c b/src/image.c
index 74bb1d75451..fb0420045e2 100644
--- a/src/image.c
+++ b/src/image.c
@@ -6359,11 +6359,15 @@ png_load (f, img)
 				     PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
 	    }
 	}
+      /* The commented-out code checked if the png specifies a default
+	 background color, and uses that.  Since we rely on the
+	 current frame background, it is actually OK for us to ignore
+	 this part.
+
       else if (fn_png_get_bKGD (png_ptr, info_ptr, &image_bg))
-	/* Image contains a background color with which to
-	   combine the image.  */
 	fn_png_set_background (png_ptr, image_bg,
 			       PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
+	*/
       else
 	{
 	  /* Image does not contain a background color with which