walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[layout] Speed up ClassDefFormat2 intersects

This commit is contained in:
Behdad Esfahbod 2022-12-03 13:33:48 -07:00
parent 85e7263b38
commit 5596a73087
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/hb-ot-layout-common.hh
View File

@ -1900,14 +1900,17 @@ struct ClassDefFormat2_4
bool intersects (const hb_set_t *glyphs) const bool intersects (const hb_set_t *glyphs) const
{ {
/* TODO Speed up, using hb_set_next() and bsearch()? */ if (rangeRecord.len > glyphs->get_population () * hb_bit_storage ((unsigned) rangeRecord.len) / 2)
for (auto &range : rangeRecord)
{ {
if (range.intersects (*glyphs) && range.value) for (hb_codepoint_t g = HB_SET_VALUE_INVALID; glyphs->next (&g);)
if (get_class (g))
return true; return true;
}
return false; return false;
} }
return hb_any (+ hb_iter (rangeRecord)
| hb_map ([glyphs] (const RangeRecord<Types> &range) { return range.intersects (*glyphs) && range.value; }));
}
bool intersects_class (const hb_set_t *glyphs, uint16_t klass) const bool intersects_class (const hb_set_t *glyphs, uint16_t klass) const
{ {
if (klass == 0) if (klass == 0)