From: Dmitry Antipov <dmantipov@yandex.ru>
Date: Wed, 4 Dec 2013 13:35:41 +0000 (+0400)
Subject: * font.h (struct font_bitmap): Remove unused 'extra' member.
X-Git-Url: https://git.hcoop.net/bpt/emacs.git/commitdiff_plain/a84c99500e38d6e396b911aee69b1d58acdfa488

* 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 a7e758539f..f67c02093c 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 9928fb3196..539ebeba52 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 224b8e8250..6a2303ab4a 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;
 }