[gpos] minor

This commit is contained in:
Ebrahim Byagowi 2019-09-21 23:30:52 +04:30
parent d87d38998a
commit c1a585fab0
1 changed files with 7 additions and 15 deletions

View File

@ -510,9 +510,7 @@ struct SinglePosFormat1
if (unlikely (!c->extend_min (*this))) return;
if (unlikely (!c->check_assign (valueFormat, valFormat))) return;
auto vals = hb_second (*it);
for (const Value& _ : vals)
for (const Value& _ : hb_second (*it))
c->copy (_);
auto glyphs =
@ -600,9 +598,8 @@ struct SinglePosFormat2
if (unlikely (!c->check_assign (valueFormat, valFormat))) return;
if (unlikely (!c->check_assign (valueCount, it.len ()))) return;
for (hb_array_t<const Value> val_iter : + it
| hb_map (hb_second))
for (const Value& _ : val_iter)
for (auto val_iter : it)
for (const Value& _ : val_iter.second)
c->copy (_);
auto glyphs =
@ -666,19 +663,14 @@ struct SinglePos
hb_requires (hb_is_iterator (Iterator))>
unsigned get_format (Iterator glyph_val_iter_pairs)
{
unsigned subset_format = 1;
hb_array_t<const Value> first_val_iter = hb_second (*glyph_val_iter_pairs);
for (hb_array_t<const Value> val_iter : + glyph_val_iter_pairs
| hb_map (hb_second))
for (const hb_pair_t<Value, Value> _ : hb_zip (val_iter, first_val_iter))
for (auto val_iter : glyph_val_iter_pairs)
for (const hb_pair_t<Value, Value> _ : hb_zip (val_iter.second, first_val_iter))
if (_.first != _.second)
{
subset_format = 2;
continue;
}
return 2;
return subset_format;
return 1;
}