[Emacs-diffs] Changes to emacs/src/image.c,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      07/08/06 16:02:12

Index: image.c
===================================================================
RCS file: /sources/emacs/emacs/src/image.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- image.c     26 Jul 2007 05:27:52 -0000      1.75
+++ image.c     6 Aug 2007 16:02:12 -0000       1.76
@@ -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