walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[graphite] Stop creating unused gr_face 

It is unused after previous commit, hb_graphite2_font_get_gr_font()
makes no sense now so deprecating it.
This commit is contained in:
Khaled Hosny 2016-11-11 02:16:39 +02:00
parent 1b00a3b048
commit b435c7c46a
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/hb-graphite2.cc
View File

@ -27,7 +27,6 @@
*/ */
#define HB_SHAPER graphite2 #define HB_SHAPER graphite2
#define hb_graphite2_shaper_font_data_t gr_font
#include "hb-shaper-impl-private.hh" #include "hb-shaper-impl-private.hh"
#include "hb-graphite2.h" #include "hb-graphite2.h"
@ -153,27 +152,17 @@ hb_graphite2_face_get_gr_face (hb_face_t *face)
* shaper font data * shaper font data
*/ */
static float hb_graphite2_get_advance (const void *hb_font, unsigned short gid) struct hb_graphite2_shaper_font_data_t {};
{
return ((hb_font_t *) hb_font)->get_glyph_h_advance (gid);
}
hb_graphite2_shaper_font_data_t * hb_graphite2_shaper_font_data_t *
_hb_graphite2_shaper_font_data_create (hb_font_t *font) _hb_graphite2_shaper_font_data_create (hb_font_t *font HB_UNUSED)
{ {
if (unlikely (!hb_graphite2_shaper_face_data_ensure (font->face))) return NULL; return (hb_graphite2_shaper_font_data_t *) HB_SHAPER_DATA_SUCCEEDED;
hb_face_t *face = font->face;
unsigned int upem = hb_face_get_upem (face);
hb_graphite2_shaper_face_data_t *face_data = HB_SHAPER_DATA_GET (face);
return gr_make_font_with_advance_fn (upem, font, &hb_graphite2_get_advance, face_data->grface);
} }
void void
_hb_graphite2_shaper_font_data_destroy (hb_graphite2_shaper_font_data_t *data) _hb_graphite2_shaper_font_data_destroy (hb_graphite2_shaper_font_data_t *data HB_UNUSED)
{ {
gr_font_destroy (data);
} }
/* /*
@ -182,8 +171,7 @@ _hb_graphite2_shaper_font_data_destroy (hb_graphite2_shaper_font_data_t *data)
gr_font * gr_font *
hb_graphite2_font_get_gr_font (hb_font_t *font) hb_graphite2_font_get_gr_font (hb_font_t *font)
{ {
if (unlikely (!hb_graphite2_shaper_font_data_ensure (font))) return NULL; return NULL;
return HB_SHAPER_DATA_GET (font);
} }

4
src/hb-graphite2.h
View File

@ -39,9 +39,13 @@ HB_BEGIN_DECLS
HB_EXTERN gr_face * HB_EXTERN gr_face *
hb_graphite2_face_get_gr_face (hb_face_t *face); hb_graphite2_face_get_gr_face (hb_face_t *face);
#ifndef HB_DISABLE_DEPRECATED
HB_EXTERN gr_font * HB_EXTERN gr_font *
hb_graphite2_font_get_gr_font (hb_font_t *font); hb_graphite2_font_get_gr_font (hb_font_t *font);
#endif
HB_END_DECLS HB_END_DECLS