mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00
Code Issues Releases Activity

* image.c (x_create_bitmap_from_xpm_data): Free attributes on

Browse Source 
fail.
This commit is contained in:
Chong Yidong 2005-11-18 03:57:36 +00:00
parent 05338727a8
commit fe45ad152a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ChangeLog
View File

@ -1,5 +1,8 @@
2005-11-17 Chong Yidong <cyd@stupidchicken.com>
* image.c (x_create_bitmap_from_xpm_data): Free attributes on
fail.
* xfaces.c (Qignore_defface): New variable.
(syms_of_xfaces): Provide `:ignore-defface'.
(IGNORE_DEFFACE_P): New macro.

6
src/image.c
View File

@ -3737,10 +3737,12 @@ x_create_bitmap_from_xpm_data (f, bits)
rc = XpmCreatePixmapFromData (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
bits, &bitmap, &mask, &attrs);
if (rc != XpmSuccess)
return -1;
{
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;