Commit a84c9950 authored by Dmitry Antipov's avatar Dmitry Antipov
Browse files

* font.h (struct font_bitmap): Remove unused 'extra' member.

* ftfont.c (ftfont_get_bitmap): Adjust users.
parent a378aa9d
...@@ -3,8 +3,10 @@ ...@@ -3,8 +3,10 @@
* font.c (font_list_entities): Remove dummy assignment. * font.c (font_list_entities): Remove dummy assignment.
* font.h (struct font) [HAVE_WINDOW_SYSTEM]: Group members which are * font.h (struct font) [HAVE_WINDOW_SYSTEM]: Group members which are
used on graphic displays only. Remove unused 'font_encoder' member. used on graphic displays only. Remove unused 'font_encoder' member.
(struct font_bitmap): Remove unused 'extra' member.
* nsfont.m (nsfont_open): * 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> 2013-12-03 Paul Eggert <eggert@cs.ucla.edu>
......
...@@ -420,7 +420,6 @@ struct font_bitmap ...@@ -420,7 +420,6 @@ struct font_bitmap
int left; int left;
int top; int top;
int advance; int advance;
void *extra;
}; };
/* Predicates to check various font-related objects. */ /* Predicates to check various font-related objects. */
......
...@@ -1478,7 +1478,6 @@ ftfont_get_bitmap (struct font *font, unsigned int code, struct font_bitmap *bit ...@@ -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->left = ft_face->glyph->bitmap_left;
bitmap->top = ft_face->glyph->bitmap_top; bitmap->top = ft_face->glyph->bitmap_top;
bitmap->advance = ft_face->glyph->metrics.horiAdvance >> 6; bitmap->advance = ft_face->glyph->metrics.horiAdvance >> 6;
bitmap->extra = NULL;
return 0; return 0;
} }
......
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