Commit 7812a96f authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(load_pixmap): Handle bitmap_id < 0. F is a FRAME_PTR.

parent 169e69a3
......@@ -415,7 +415,7 @@ DEFUN ("pixmap-spec-p", Fpixmap_spec_p, Spixmap_spec_p, 1, 1, 0,
static long
load_pixmap (f, name, w_ptr, h_ptr)
Lisp_Object name;
unsigned int *w_ptr, *h_ptr;
......@@ -452,8 +452,8 @@ load_pixmap (f, name, w_ptr, h_ptr)
if (! bitmap_id)
Fsignal (Qerror, Fcons (build_string ("undefined bitmap"),
if (bitmap_id < 0)
Fsignal (Qerror, Fcons (build_string ("invalid or undefined bitmap"),
Fcons (name, Qnil)));
*w_ptr = x_bitmap_width (f, bitmap_id);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment