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

[ClassDef] Write a couple loops as range for

This commit is contained in:
Behdad Esfahbod 2022-11-29 21:18:48 -07:00
parent ccd40c842c
commit 87b12aee13
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1946,21 +1946,20 @@ struct ClassDefFormat2_4
void intersected_class_glyphs (const hb_set_t *glyphs, unsigned klass, hb_set_t *intersect_glyphs) const void intersected_class_glyphs (const hb_set_t *glyphs, unsigned klass, hb_set_t *intersect_glyphs) const
{ {
unsigned count = rangeRecord.len;
if (klass == 0) if (klass == 0)
{ {
hb_codepoint_t g = HB_SET_VALUE_INVALID; hb_codepoint_t g = HB_SET_VALUE_INVALID;
for (unsigned int i = 0; i < count; i++) for (auto &range : rangeRecord)
{ {
if (!glyphs->next (&g)) if (!glyphs->next (&g))
goto done; goto done;
while (g < rangeRecord.arrayZ[i].first) while (g < range.first)
{ {
intersect_glyphs->add (g); intersect_glyphs->add (g);
if (!glyphs->next (&g)) if (!glyphs->next (&g))
goto done; goto done;
} }
g = rangeRecord.arrayZ[i].last; g = range.last;
} }
while (glyphs->next (&g)) while (glyphs->next (&g))
intersect_glyphs->add (g); intersect_glyphs->add (g);
@ -1969,6 +1968,7 @@ struct ClassDefFormat2_4
return; return;
} }
unsigned count = rangeRecord.len;
if (count > glyphs->get_population () * hb_bit_storage (count) * 8) if (count > glyphs->get_population () * hb_bit_storage (count) * 8)
{ {
for (hb_codepoint_t g = HB_SET_VALUE_INVALID; for (hb_codepoint_t g = HB_SET_VALUE_INVALID;
@ -1982,12 +1982,12 @@ struct ClassDefFormat2_4
return; return;
} }
for (unsigned int i = 0; i < count; i++) for (auto &range : rangeRecord)
{ {
if (rangeRecord.arrayZ[i].value != klass) continue; if (range.value != klass) continue;
unsigned end = rangeRecord.arrayZ[i].last + 1; unsigned end = range.last + 1;
for (hb_codepoint_t g = rangeRecord.arrayZ[i].first - 1; for (hb_codepoint_t g = range.first - 1;
glyphs->next (&g) && g < end;) glyphs->next (&g) && g < end;)
intersect_glyphs->add (g); intersect_glyphs->add (g);
} }