[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/image.c
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/src/image.c |
Date: |
Thu, 17 Nov 2005 22:57:37 -0500 |
Index: emacs/src/image.c
diff -c emacs/src/image.c:1.43 emacs/src/image.c:1.44
*** emacs/src/image.c:1.43 Wed Nov 16 13:38:25 2005
--- emacs/src/image.c Fri Nov 18 03:57:36 2005
***************
*** 3737,3746 ****
rc = XpmCreatePixmapFromData (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
bits, &bitmap, &mask, &attrs);
if (rc != XpmSuccess)
! return -1;
id = x_allocate_bitmap_record (f);
-
dpyinfo->bitmaps[id - 1].pixmap = bitmap;
dpyinfo->bitmaps[id - 1].have_mask = 1;
dpyinfo->bitmaps[id - 1].mask = mask;
--- 3737,3748 ----
rc = XpmCreatePixmapFromData (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
bits, &bitmap, &mask, &attrs);
if (rc != XpmSuccess)
! {
! XpmFreeAttributes (&attrs);
! return -1;
! }
id = x_allocate_bitmap_record (f);
dpyinfo->bitmaps[id - 1].pixmap = bitmap;
dpyinfo->bitmaps[id - 1].have_mask = 1;
dpyinfo->bitmaps[id - 1].mask = mask;