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

* ftfont.c (ftfont_get_bitmap): Adjust users.

diff --git a/src/ChangeLog b/src/ChangeLog
index a7e7585..f67c020 100644 (file)
--- 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 9928fb3..539ebeb 100644 (file)
--- 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 224b8e8..6a2303a 100644 (file)
--- 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;
 }