This commit is contained in:
Qunxin Liu 2021-07-07 11:27:49 -07:00 committed by Behdad Esfahbod
parent 895acdf7c7
commit 7416faceeb
2 changed files with 15 additions and 34 deletions

View File

@ -83,32 +83,12 @@ struct CPALV1Tail
auto *out = c->allocate_size<CPALV1Tail> (static_size);
if (unlikely (!out)) return_trace (false);
const hb_array_t<const HBUINT32> paletteFlags = (base+paletteFlagsZ).as_array (palette_count);
const hb_array_t<const NameID> paletteLabels = (base+paletteLabelsZ).as_array (palette_count);
out->paletteFlagsZ.serialize_copy (c, paletteFlagsZ, base, 0, hb_serialize_context_t::Head, palette_count);
out->paletteLabelsZ.serialize_copy (c, paletteLabelsZ, base, 0, hb_serialize_context_t::Head, palette_count);
const hb_array_t<const NameID> colorLabels = (base+colorLabelsZ).as_array (color_count);
c->push ();
for (const auto _ : paletteFlags)
if (colorLabelsZ)
{
if (!c->copy<HBUINT32> (_))
{
c->pop_discard ();
return_trace (false);
}
}
c->add_link (out->paletteFlagsZ, c->pop_pack ());
c->push ();
for (const auto _ : paletteLabels)
{
if (!c->copy<NameID> (_))
{
c->pop_discard ();
return_trace (false);
}
}
c->add_link (out->paletteLabelsZ, c->pop_pack ());
c->push ();
for (const auto _ : colorLabels)
{
@ -122,6 +102,7 @@ struct CPALV1Tail
}
}
c->add_link (out->colorLabelsZ, c->pop_pack ());
}
return_trace (true);
}