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

[subset] consider all value formats when computing effective format.

Browse Source
This commit is contained in:
Garret Rieger 2021-04-23 19:09:37 -07:00
parent 84dbfacfec
commit e25efb31f2
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/hb-ot-layout-gpos-table.hh
View File

@ -165,10 +165,10 @@ struct ValueFormat : HBUINT16
unsigned int get_effective_format (const Value *values) const unsigned int get_effective_format (const Value *values) const
{ {
unsigned int format = *this; unsigned int format = *this;
if (format & xPlacement) should_drop (*values++, xPlacement, &format); for (unsigned flag = xPlacement; flag <= yAdvDevice; flag = flag << 1) {
if (format & yPlacement) should_drop (*values++, yPlacement, &format); if (format & flag) should_drop (*values++, (Flags) flag, &format);
if (format & xAdvance) should_drop (*values++, xAdvance, &format); }
if (format & yAdvance) should_drop (*values++, yAdvance, &format);
return format; return format;
} }
@ -1390,7 +1390,6 @@ struct PairPosFormat1
auto *o = out->pairSet.serialize_append (c->serializer); auto *o = out->pairSet.serialize_append (c->serializer);
if (unlikely (!o)) return false; if (unlikely (!o)) return false;
auto snap = c->serializer->snapshot (); auto snap = c->serializer->snapshot ();
// TODO(grieger): compute new format
bool ret = o->serialize_subset (c, _, this, valueFormat, out->valueFormat); bool ret = o->serialize_subset (c, _, this, valueFormat, out->valueFormat);
if (!ret) if (!ret)
{ {