diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2014-08-25 11:00:42 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2014-08-25 11:00:42 +0400 |
| commit | 8661ebaa6c0ef3f9517c5288855657b274c723d6 (patch) | |
| tree | 98c72571f410d28d3228cb30ea68dadf49f36860 /src/w32font.h | |
| parent | 90c5c87753fb69dafd664615558fa3fdce3ba5b1 (diff) | |
| download | emacs-8661ebaa6c0ef3f9517c5288855657b274c723d6.tar.gz | |
One more minor cleanup of font subsystem.
* font.h (struct font_driver): Convert text_extents to
return void because returned value is never actually used.
* macfont.c (macfont_text_extents):
* w32font.c (w32font_text_extents):
* xftfont.c (xftfont_text_extents): Adjust to return void
and assume that 'metrics' argument is always non-NULL.
* ftfont.c (ftfont_text_extents):
* xfont.c (xfont_text_extents): Likewise. Avoid redundant memset.
Diffstat (limited to 'src/w32font.h')
| -rw-r--r-- | src/w32font.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/w32font.h b/src/w32font.h index 1be49bb91c2..5ce3ac7a5f9 100644 --- a/src/w32font.h +++ b/src/w32font.h @@ -74,8 +74,8 @@ int w32font_open_internal (struct frame *f, Lisp_Object font_entity, int pixel_size, Lisp_Object font_object); void w32font_close (struct font *font); int w32font_has_char (Lisp_Object entity, int c); -int w32font_text_extents (struct font *font, unsigned *code, int nglyphs, - struct font_metrics *metrics); +void w32font_text_extents (struct font *font, unsigned *code, int nglyphs, + struct font_metrics *metrics); int w32font_draw (struct glyph_string *s, int from, int to, int x, int y, bool with_background); |