[Emacs-diffs] trunk r115372: * font.h (struct font_bitmap): Remove unused 'extra' member.

[Dmitry Antipov]

------------------------------------------------------------
revno: 115372
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Wed 2013-12-04 17:35:41 +0400
message:
  * font.h (struct font_bitmap): Remove unused 'extra' member.
  * ftfont.c (ftfont_get_bitmap): Adjust users.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/font.h                     font.h-20091113204419-o5vbwnq5f7feedwu-8541
  src/ftfont.c                   ftfont.c-20091113204419-o5vbwnq5f7feedwu-8542

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-04 13:08:30 +0000
+++ b/src/ChangeLog     2013-12-04 13:35:41 +0000
@@ -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  <address@hidden>
 

=== modified file 'src/font.h'
--- a/src/font.h        2013-12-04 13:08:30 +0000
+++ b/src/font.h        2013-12-04 13:35:41 +0000
@@ -420,7 +420,6 @@
   int left;
   int top;
   int advance;
-  void *extra;
 };
 
 /* Predicates to check various font-related objects.  */

=== modified file 'src/ftfont.c'
--- a/src/ftfont.c      2013-10-25 06:55:36 +0000
+++ b/src/ftfont.c      2013-12-04 13:35:41 +0000
@@ -1478,7 +1478,6 @@
   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;
 }