diff --git a/src/OT/Layout/GDEF/GDEF.hh b/src/OT/Layout/GDEF/GDEF.hh index 01d72b129..e48354670 100644 --- a/src/OT/Layout/GDEF/GDEF.hh +++ b/src/OT/Layout/GDEF/GDEF.hh @@ -721,7 +721,7 @@ struct GDEFVersion1_2 out->version.minor = 3; c->plan->has_gdef_varstore = true; } else if (subset_markglyphsetsdef) { - out->version.minor = 2; + out->version.minor = 2; } else { out->version.minor = 0; c->serializer->revert (snapshot_version0); @@ -1003,14 +1003,14 @@ struct GDEF } HB_ALWAYS_INLINE - bool mark_set_covers (unsigned int set_index, hb_codepoint_t glyph_id) const + bool mark_set_may_cover (unsigned int set_index, hb_codepoint_t glyph_id) const { return #ifndef HB_NO_GDEF_CACHE // We can access arrayZ directly because of sanitize_lookup_props() guarantee. mark_glyph_sets.arrayZ[set_index].may_have (glyph_id) && #endif - table->mark_set_covers (set_index, glyph_id) + true ; } diff --git a/src/hb-ot-layout-gsubgpos.hh b/src/hb-ot-layout-gsubgpos.hh index df029ae79..2c4793170 100644 --- a/src/hb-ot-layout-gsubgpos.hh +++ b/src/hb-ot-layout-gsubgpos.hh @@ -851,7 +851,11 @@ struct hb_ot_apply_context_t : * match_props has the set index. */ if (match_props & LookupFlag::UseMarkFilteringSet) - return gdef_accel.mark_set_covers (match_props >> 16, info->codepoint); + { + unsigned set_index = match_props >> 16; + return gdef_accel.mark_set_may_cover (set_index, info->codepoint) && + gdef.mark_set_covers (set_index, info->codepoint); + } /* The second byte of match_props has the meaning * "ignore marks of attachment type different than