changeset 66924:53960d1c1f2f

initialize XpmAttributes
author Chong Yidong <cyd@stupidchicken.com>
date Wed, 16 Nov 2005 13:38:25 +0000
parents 830bec4c85bb
children 979706786da3
files src/ChangeLog src/image.c
diffstat 2 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Wed Nov 16 11:26:34 2005 +0000
+++ b/src/ChangeLog	Wed Nov 16 13:38:25 2005 +0000
@@ -5,6 +5,7 @@
 	* xterm.c (x_bitmap_icon): Use the xpm if available.
 
 	* image.c (x_create_bitmap_from_xpm_data): New function.
+	(x_create_bitmap_from_xpm_data): Initialize XpmAttributes.
 
 2005-11-15  Luc Teirlinck  <teirllm@auburn.edu>
 
--- a/src/image.c	Wed Nov 16 11:26:34 2005 +0000
+++ b/src/image.c	Wed Nov 16 13:38:25 2005 +0000
@@ -3729,6 +3729,11 @@
 
   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,6 +3802,9 @@
   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'.  */