diff --git a/src/hb-aat-layout-morx-table.hh b/src/hb-aat-layout-morx-table.hh index 8e782ac2b..f5c986349 100644 --- a/src/hb-aat-layout-morx-table.hh +++ b/src/hb-aat-layout-morx-table.hh @@ -172,7 +172,7 @@ struct RearrangementSubtable StateTableDriver driver (machine, c->face); if (driver.is_idempotent_on_all_out_of_bounds (&dc, c) && - !c->buffer_digest.may_have (c->machine_glyph_set)) + !c->buffer_digest.intersects (c->machine_glyph_set)) { (void) c->buffer->message (c->font, "skipped chainsubtable because no glyph matches"); return_trace (false); @@ -340,7 +340,7 @@ struct ContextualSubtable StateTableDriver driver (machine, c->face); if (driver.is_idempotent_on_all_out_of_bounds (&dc, c) && - !c->buffer_digest.may_have (c->machine_glyph_set)) + !c->buffer_digest.intersects (c->machine_glyph_set)) { (void) c->buffer->message (c->font, "skipped chainsubtable because no glyph matches"); return_trace (false); @@ -606,7 +606,7 @@ struct LigatureSubtable StateTableDriver driver (machine, c->face); if (driver.is_idempotent_on_all_out_of_bounds (&dc, c) && - !c->buffer_digest.may_have (c->machine_glyph_set)) + !c->buffer_digest.intersects (c->machine_glyph_set)) { (void) c->buffer->message (c->font, "skipped chainsubtable because no glyph matches"); return_trace (false); @@ -885,7 +885,7 @@ struct InsertionSubtable StateTableDriver driver (machine, c->face); if (driver.is_idempotent_on_all_out_of_bounds (&dc, c) && - !c->buffer_digest.may_have (c->machine_glyph_set)) + !c->buffer_digest.intersects (c->machine_glyph_set)) { (void) c->buffer->message (c->font, "skipped chainsubtable because no glyph matches"); return_trace (false); diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc index d26f094ba..16f41d108 100644 --- a/src/hb-ot-layout.cc +++ b/src/hb-ot-layout.cc @@ -2033,7 +2033,7 @@ inline void hb_ot_map_t::apply (const Proxy &proxy, * (plus some past glyphs). * * Only try applying the lookup if there is any overlap. */ - if (accel->digest.may_have (c.digest)) + if (accel->digest.intersects (c.digest)) { c.set_lookup_index (lookup_index); c.set_lookup_mask (lookup.mask, false); diff --git a/src/hb-set-digest.hh b/src/hb-set-digest.hh index c4b45af55..429af8092 100644 --- a/src/hb-set-digest.hh +++ b/src/hb-set-digest.hh @@ -158,7 +158,7 @@ struct hb_set_digest_t return true; } - bool may_have (const hb_set_digest_t &o) const + bool intersects (const hb_set_digest_t &o) const { for (unsigned i = 0; i < n; i++) if (!(masks[i] & o.masks[i]))