From e52ec3fc23c2d5a881849f047885e0423bd74740 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 11 Mar 2019 18:09:51 -0700 Subject: [PATCH] Remove redundant hb_ot_layout_lookup_would_substitute_fast --- src/hb-ot-layout.cc | 13 ------------- src/hb-ot-layout.hh | 7 ------- src/hb-ot-shape-complex-indic.cc | 2 +- src/hb-ot-shape-complex-khmer.cc | 2 +- 4 files changed, 2 insertions(+), 22 deletions(-) diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc index d32be04a8..1365a3e21 100644 --- a/src/hb-ot-layout.cc +++ b/src/hb-ot-layout.cc @@ -957,19 +957,6 @@ hb_ot_layout_lookup_would_substitute (hb_face_t *face, const hb_codepoint_t *glyphs, unsigned int glyphs_length, hb_bool_t zero_context) -{ - return hb_ot_layout_lookup_would_substitute_fast (face, - lookup_index, - glyphs, glyphs_length, - zero_context); -} - -bool -hb_ot_layout_lookup_would_substitute_fast (hb_face_t *face, - unsigned int lookup_index, - const hb_codepoint_t *glyphs, - unsigned int glyphs_length, - bool zero_context) { if (unlikely (lookup_index >= face->table.GSUB->lookup_count)) return false; OT::hb_would_apply_context_t c (face, glyphs, glyphs_length, (bool) zero_context); diff --git a/src/hb-ot-layout.hh b/src/hb-ot-layout.hh index 5125e9fa9..be7ef0263 100644 --- a/src/hb-ot-layout.hh +++ b/src/hb-ot-layout.hh @@ -96,13 +96,6 @@ HB_MARK_AS_FLAG_T (hb_ot_layout_glyph_props_flags_t); * GSUB/GPOS */ -HB_INTERNAL bool -hb_ot_layout_lookup_would_substitute_fast (hb_face_t *face, - unsigned int lookup_index, - const hb_codepoint_t *glyphs, - unsigned int glyphs_length, - bool zero_context); - /* Should be called before all the substitute_lookup's are done. */ HB_INTERNAL void diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc index 1c7bba5e8..d421555fb 100644 --- a/src/hb-ot-shape-complex-indic.cc +++ b/src/hb-ot-shape-complex-indic.cc @@ -239,7 +239,7 @@ struct would_substitute_feature_t hb_face_t *face) const { for (unsigned int i = 0; i < count; i++) - if (hb_ot_layout_lookup_would_substitute_fast (face, lookups[i].index, glyphs, glyphs_count, zero_context)) + if (hb_ot_layout_lookup_would_substitute (face, lookups[i].index, glyphs, glyphs_count, zero_context)) return true; return false; } diff --git a/src/hb-ot-shape-complex-khmer.cc b/src/hb-ot-shape-complex-khmer.cc index 0bc2309bf..5746651d6 100644 --- a/src/hb-ot-shape-complex-khmer.cc +++ b/src/hb-ot-shape-complex-khmer.cc @@ -164,7 +164,7 @@ struct would_substitute_feature_t hb_face_t *face) const { for (unsigned int i = 0; i < count; i++) - if (hb_ot_layout_lookup_would_substitute_fast (face, lookups[i].index, glyphs, glyphs_count, zero_context)) + if (hb_ot_layout_lookup_would_substitute (face, lookups[i].index, glyphs, glyphs_count, zero_context)) return true; return false; }