Imported Upstream version 2.6.7

[platform/upstream/harfbuzz.git] / src / hb-aat-layout-morx-table.hh

diff --git a/src/hb-aat-layout-morx-table.hh b/src/hb-aat-layout-morx-table.hh
index d8df579..9d04c71 100644 (file)
--- a/src/hb-aat-layout-morx-table.hh
+++ b/src/hb-aat-layout-morx-table.hh
@@ -948,8 +948,10 @@ struct Chain
        hb_aat_layout_feature_type_t type = (hb_aat_layout_feature_type_t) (unsigned int) feature.featureType;
        hb_aat_layout_feature_selector_t setting = (hb_aat_layout_feature_selector_t) (unsigned int) feature.featureSetting;
       retry:
-       const hb_aat_map_builder_t::feature_info_t *info = map->features.bsearch (type);
-       if (info && info->setting == setting)
+       // Check whether this type/setting pair was requested in the map, and if so, apply its flags.
+       // (The search here only looks at the type and setting fields of feature_info_t.)
+       hb_aat_map_builder_t::feature_info_t info = { type, setting, false, 0 };
+       if (map->features.bsearch (info))
        {
          flags &= feature.disableFlags;
          flags |= feature.enableFlags;