From 731a430cd36caabcef04e099b21ebc6daedd536f Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 2 Mar 2016 13:32:42 -0800 Subject: [PATCH] Fix requiredFeature stage handling logic Originally the way Jonathan had written this was correct in "continue"ing: https://github.com/jfkthame/harfbuzz/commit/35e28c7a733eaffcd9f062b18d7db9fbb3d990fc#diff-ead86a33a5cc9ad7f6e6381031a0baddR199 When I rewrote his patch, I messed it up: https://github.com/behdad/harfbuzz/commit/da132937989acb4d8ca9bd41c79f98750e7dda30#diff-ead86a33a5cc9ad7f6e6381031a0baddR209 the intended behavior was NOT to set found=TRUE and NOT to continue. This was resulting in feature_index[table_index] being left unset. Oops! --- src/hb-ot-map.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/hb-ot-map.cc b/src/hb-ot-map.cc index 7bdeddbe1..7822cef8b 100644 --- a/src/hb-ot-map.cc +++ b/src/hb-ot-map.cc @@ -204,11 +204,8 @@ hb_ot_map_builder_t::compile (hb_ot_map_t &m) for (unsigned int table_index = 0; table_index < 2; table_index++) { if (required_feature_tag[table_index] == info->tag) - { required_feature_stage[table_index] = info->stage[table_index]; - found = true; - continue; - } + found |= hb_ot_layout_language_find_feature (face, table_tags[table_index], script_index[table_index],