+2013-10-28 Paul Eggert <eggert@cs.ucla.edu>
+
+ * dispextern.h, image.c (x_bitmap_height, x_bitmap_width): Now static.
+ * xfaces.c (load_pixmap): Omit last two args, which are always NULL
+ in practice now. All callers changed.
+
2013-10-28 Dmitry Antipov <dmantipov@yandex.ru>
* dispextern.h (struct face): Use bitfields for 'underline_type'
#ifdef HAVE_WINDOW_SYSTEM
-extern int x_bitmap_height (struct frame *, ptrdiff_t);
-extern int x_bitmap_width (struct frame *, ptrdiff_t);
extern ptrdiff_t x_bitmap_pixmap (struct frame *, ptrdiff_t);
extern void x_reference_bitmap (struct frame *, ptrdiff_t);
extern ptrdiff_t x_create_bitmap_from_data (struct frame *, char *,
/* Functions to access the contents of a bitmap, given an id. */
-int
+static int
x_bitmap_height (struct frame *f, ptrdiff_t id)
{
return FRAME_DISPLAY_INFO (f)->bitmaps[id - 1].height;
}
-int
+static int
x_bitmap_width (struct frame *f, ptrdiff_t id)
{
return FRAME_DISPLAY_INFO (f)->bitmaps[id - 1].width;
pixmap spec) for use on frame F. Value is the bitmap_id (see
xfns.c). If NAME is nil, return with a bitmap id of zero. If
bitmap cannot be loaded, display a message saying so, and return
- zero. Store the bitmap width in *W_PTR and its height in *H_PTR,
- if these pointers are not null. */
+ zero. */
static ptrdiff_t
-load_pixmap (struct frame *f, Lisp_Object name, unsigned int *w_ptr,
- unsigned int *h_ptr)
+load_pixmap (struct frame *f, Lisp_Object name)
{
ptrdiff_t bitmap_id;
{
add_to_log ("Invalid or undefined bitmap `%s'", name, Qnil);
bitmap_id = 0;
-
- if (w_ptr)
- *w_ptr = 0;
- if (h_ptr)
- *h_ptr = 0;
}
else
{
#ifdef GLYPH_DEBUG
++npixmaps_allocated;
#endif
- if (w_ptr)
- *w_ptr = x_bitmap_width (f, bitmap_id);
-
- if (h_ptr)
- *h_ptr = x_bitmap_height (f, bitmap_id);
}
return bitmap_id;
&& !NILP (Fbitmap_spec_p (Vface_default_stipple)))
{
x_destroy_bitmap (f, face->stipple);
- face->stipple = load_pixmap (f, Vface_default_stipple, NULL, NULL);
+ face->stipple = load_pixmap (f, Vface_default_stipple);
}
face->background = load_color (f, face, bg, LFACE_BACKGROUND_INDEX);
stipple = attrs[LFACE_STIPPLE_INDEX];
if (!NILP (stipple))
- face->stipple = load_pixmap (f, stipple, NULL, NULL);
+ face->stipple = load_pixmap (f, stipple);
#endif /* HAVE_WINDOW_SYSTEM */
return face;