diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-12-04 17:35:41 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-12-04 17:35:41 +0400 |
| commit | a84c99500e38d6e396b911aee69b1d58acdfa488 (patch) | |
| tree | ca1765d58ffa608007d1d465c9df0d53a7dc5d3d | |
| parent | a378aa9de73b402c231b562a16c6e46c91f420cf (diff) | |
| download | emacs-a84c99500e38d6e396b911aee69b1d58acdfa488.tar.gz | |
* font.h (struct font_bitmap): Remove unused 'extra' member.
* ftfont.c (ftfont_get_bitmap): Adjust users.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/font.h | 1 | ||||
| -rw-r--r-- | src/ftfont.c | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a7e758539f4..f67c02093ce 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -3,8 +3,10 @@ * font.c (font_list_entities): Remove dummy assignment. * font.h (struct font) [HAVE_WINDOW_SYSTEM]: Group members which are used on graphic displays only. Remove unused 'font_encoder' member. + (struct font_bitmap): Remove unused 'extra' member. * nsfont.m (nsfont_open): - * w32font.c (w32font_open_internal): Adjust users. + * w32font.c (w32font_open_internal): + * ftfont.c (ftfont_get_bitmap): Adjust users. 2013-12-03 Paul Eggert <eggert@cs.ucla.edu> diff --git a/src/font.h b/src/font.h index 9928fb3196d..539ebeba52a 100644 --- a/src/font.h +++ b/src/font.h @@ -420,7 +420,6 @@ struct font_bitmap int left; int top; int advance; - void *extra; }; /* Predicates to check various font-related objects. */ diff --git a/src/ftfont.c b/src/ftfont.c index 224b8e82500..6a2303ab4a7 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -1478,7 +1478,6 @@ ftfont_get_bitmap (struct font *font, unsigned int code, struct font_bitmap *bit bitmap->left = ft_face->glyph->bitmap_left; bitmap->top = ft_face->glyph->bitmap_top; bitmap->advance = ft_face->glyph->metrics.horiAdvance >> 6; - bitmap->extra = NULL; return 0; } |