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

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      07/08/07 16:25:27

Index: image.c
===================================================================
RCS file: /sources/emacs/emacs/src/image.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- image.c     6 Aug 2007 16:02:12 -0000       1.76
+++ image.c     7 Aug 2007 16:25:26 -0000       1.77
@@ -1644,6 +1644,8 @@
   struct image_cache *c = FRAME_X_IMAGE_CACHE (f);
   int i = hash % IMAGE_CACHE_BUCKETS_SIZE;
 
+  if (!c) return NULL;
+
   /* If the image spec does not specify a background color, the cached
      image must have the same background color as the current frame.
      The foreground color must also match, for the sake of monochrome
@@ -1655,13 +1657,10 @@
      for formats that don't use transparency (such as jpeg), or if the
      image spec specifies :background.  However, the extra memory
      usage is probably negligible in practice, so we don't bother.  */
-  if (!c) return NULL;
 
   for (img = c->buckets[i]; img; img = img->next)
     if (img->hash == hash
        && !NILP (Fequal (img->spec, spec))
-       /* If the image spec specifies a background, it doesn't matter
-          what the frame background is.  */
        && img->frame_foreground == FRAME_FOREGROUND_PIXEL (f)
        && img->frame_background == FRAME_BACKGROUND_PIXEL (f))
       break;
@@ -6360,9 +6359,8 @@
            }
        }
       /* 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.
+        background color, and uses that.  Since we use the current
+        frame background, it is OK for us to ignore this.
 
       else if (fn_png_get_bKGD (png_ptr, info_ptr, &image_bg))
        fn_png_set_background (png_ptr, image_bg,