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

[Kenichi Handa]

Index: emacs/src/xfns.c
diff -c emacs/src/xfns.c:1.588 emacs/src/xfns.c:1.589
*** emacs/src/xfns.c:1.588      Mon Jul 28 09:05:14 2003
--- emacs/src/xfns.c    Wed Jul 30 20:52:00 2003
***************
*** 623,628 ****
--- 623,629 ----
  
    id = x_allocate_bitmap_record (f);
    dpyinfo->bitmaps[id - 1].pixmap = bitmap;
+   dpyinfo->bitmaps[id - 1].have_mask = 0;
    dpyinfo->bitmaps[id - 1].file = NULL;
    dpyinfo->bitmaps[id - 1].refcount = 1;
    dpyinfo->bitmaps[id - 1].depth = 1;
***************
*** 674,679 ****
--- 675,681 ----
  
    id = x_allocate_bitmap_record (f);
    dpyinfo->bitmaps[id - 1].pixmap = bitmap;
+   dpyinfo->bitmaps[id - 1].have_mask = 0;
    dpyinfo->bitmaps[id - 1].refcount = 1;
    dpyinfo->bitmaps[id - 1].file
      = (char *) xmalloc (SBYTES (file) + 1);
***************
*** 701,707 ****
        {
          BLOCK_INPUT;
          XFreePixmap (FRAME_X_DISPLAY (f), dpyinfo->bitmaps[id - 1].pixmap);
!         XFreePixmap (FRAME_X_DISPLAY (f), dpyinfo->bitmaps[id - 1].mask);
          if (dpyinfo->bitmaps[id - 1].file)
            {
              xfree (dpyinfo->bitmaps[id - 1].file);
--- 703,710 ----
        {
          BLOCK_INPUT;
          XFreePixmap (FRAME_X_DISPLAY (f), dpyinfo->bitmaps[id - 1].pixmap);
!         if (dpyinfo->bitmaps[id - 1].have_mask)
!           XFreePixmap (FRAME_X_DISPLAY (f), dpyinfo->bitmaps[id - 1].mask);
          if (dpyinfo->bitmaps[id - 1].file)
            {
              xfree (dpyinfo->bitmaps[id - 1].file);
***************
*** 723,729 ****
      if (dpyinfo->bitmaps[i].refcount > 0)
        {
        XFreePixmap (dpyinfo->display, dpyinfo->bitmaps[i].pixmap);
!       XFreePixmap (dpyinfo->display, dpyinfo->bitmaps[i].mask);
        if (dpyinfo->bitmaps[i].file)
          xfree (dpyinfo->bitmaps[i].file);
        }
--- 726,733 ----
      if (dpyinfo->bitmaps[i].refcount > 0)
        {
        XFreePixmap (dpyinfo->display, dpyinfo->bitmaps[i].pixmap);
!       if (dpyinfo->bitmaps[i].have_mask)
!         XFreePixmap (dpyinfo->display, dpyinfo->bitmaps[i].mask);
        if (dpyinfo->bitmaps[i].file)
          xfree (dpyinfo->bitmaps[i].file);
        }
***************
*** 822,827 ****
--- 826,832 ----
             width, height);
    XFreeGC (FRAME_X_DISPLAY (f), gc);
  
+   dpyinfo->bitmaps[id - 1].have_mask = 1;
    dpyinfo->bitmaps[id - 1].mask = mask;
  
    XDestroyImage (ximg);