# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1186416132 0
# Node ID 51a0886252f19973c41bbbb0c51c5ee9b21602ad
# Parent  54c32215085b12d365a4bf1cd14bd6a8ae47a9b0
(png_load): Ignore png-supplied background color.

diff -r 54c32215085b -r 51a0886252f1 src/image.c
--- a/src/image.c	Mon Aug 06 16:02:02 2007 +0000
+++ b/src/image.c	Mon Aug 06 16:02:12 2007 +0000
@@ -6359,11 +6359,15 @@
 				     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