]> git.eshelyaron.com Git - emacs.git/commitdiff
(png_load): Ignore png-supplied background color.
authorChong Yidong <cyd@stupidchicken.com>
Mon, 6 Aug 2007 16:02:12 +0000 (16:02 +0000)
committerChong Yidong <cyd@stupidchicken.com>
Mon, 6 Aug 2007 16:02:12 +0000 (16:02 +0000)
src/image.c

index 74bb1d754513fae5df3e6860b56e7b0a21bbcc37..fb0420045e27f3a55eb1f7670fcb3108a2b1677a 100644 (file)
@@ -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