Remove intermittent_glyph()

Lets not worry about performance for now...

diff --git a/src/hb-ot-shape-normalize.cc b/src/hb-ot-shape-normalize.cc
index f6e962c..0a245b0 100644 (file)
--- a/src/hb-ot-shape-normalize.cc
+++ b/src/hb-ot-shape-normalize.cc
@@ -32,8 +32,9 @@ static bool
 get_glyph (hb_ot_shape_context_t *c, unsigned int i)
 {
   hb_buffer_t *b = c->buffer;
+  hb_codepoint_t glyph;
 
-  return hb_font_get_glyph (c->font, b->info[i].codepoint, 0, &b->info[i].intermittent_glyph());
+  return hb_font_get_glyph (c->font, b->info[i].codepoint, 0, &glyph);
 }
 
 static bool

diff --git a/src/hb-ot-shape-private.hh b/src/hb-ot-shape-private.hh
index 03dd4ed..96c436d 100644 (file)
--- a/src/hb-ot-shape-private.hh
+++ b/src/hb-ot-shape-private.hh
@@ -102,8 +102,6 @@ is_variation_selector (hb_codepoint_t unicode)
 
 HB_INTERNAL bool _hb_normalize (hb_ot_shape_context_t *c);
 
-#define intermittent_glyph() var2.u32
-
 HB_END_DECLS
 
 #endif /* HB_OT_SHAPE_PRIVATE_HH */