changeset 82297:51a0886252f1

(png_load): Ignore png-supplied background color.
author Chong Yidong <cyd@stupidchicken.com>
date Mon, 06 Aug 2007 16:02:12 +0000
parents 54c32215085b
children 0b0e460b400a
files src/image.c
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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