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

[dagger] Minor cleanup using hb_enumerate

This commit is contained in:
Behdad Esfahbod 2020-06-28 02:59:47 -07:00
parent fd8b0a44c4
commit 26111a11ad
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/hb-ot-layout-gsubgpos.hh
View File

@ -1753,10 +1753,12 @@ struct ContextFormat2
};
return
+ hb_enumerate (ruleSet)
| hb_map ([&] (const hb_pair_t<unsigned, const OffsetTo<RuleSet> &> p)
+ hb_iter (ruleSet)
| hb_map (hb_add (this))
| hb_enumerate
| hb_map ([&] (const hb_pair_t<unsigned, const RuleSet &> p)
{ return class_def.intersects_class (glyphs, p.first) &&
(this+p.second).intersects (glyphs, lookup_context); })
p.second.intersects (glyphs, lookup_context); })
| hb_any
;
}
@ -2001,7 +2003,7 @@ struct ContextFormat3
out->glyphCount = glyphCount;
out->lookupCount = lookupCount;
const hb_array_t<const OffsetTo<Coverage>> coverages = coverageZ.as_array (glyphCount);
auto coverages = coverageZ.as_array (glyphCount);
for (const OffsetTo<Coverage>& offset : coverages)
{
@ -2658,10 +2660,12 @@ struct ChainContextFormat2
};
return
+ hb_enumerate (ruleSet)
| hb_map ([&] (const hb_pair_t<unsigned, const OffsetTo<ChainRuleSet> &> p)
+ hb_iter (ruleSet)
| hb_map (hb_add (this))
| hb_enumerate
| hb_map ([&] (const hb_pair_t<unsigned, const ChainRuleSet &> p)
{ return input_class_def.intersects_class (glyphs, p.first) &&
(this+p.second).intersects (glyphs, lookup_context); })
p.second.intersects (glyphs, lookup_context); })
| hb_any
;
}