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

[Chong Yidong]

Index: emacs/src/image.c
diff -c emacs/src/image.c:1.42 emacs/src/image.c:1.43
*** emacs/src/image.c:1.42      Wed Nov 16 05:49:18 2005
--- emacs/src/image.c   Wed Nov 16 13:38:25 2005
***************
*** 3729,3734 ****
--- 3729,3739 ----
  
    bzero (&attrs, sizeof attrs);
  
+   attrs.visual = FRAME_X_VISUAL (f);
+   attrs.colormap = FRAME_X_COLORMAP (f);
+   attrs.valuemask |= XpmVisual;
+   attrs.valuemask |= XpmColormap;
+ 
    rc = XpmCreatePixmapFromData (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
                                bits, &bitmap, &mask, &attrs);
    if (rc != XpmSuccess)
***************
*** 3797,3802 ****
--- 3802,3810 ----
    attrs.valuemask |= XpmCloseness;
  #endif /* not XpmAllocCloseColors */
  #endif /* ALLOC_XPM_COLORS */
+ #ifdef ALLOC_XPM_COLORS
+   xpm_init_color_cache (f, &attrs);
+ #endif
  
    /* If image specification contains symbolic color definitions, add
       these to `attrs'.  */