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

[kern] Minor

This commit is contained in:
Behdad Esfahbod 2018-11-06 13:18:27 -05:00
parent 220a5991ba
commit 164eedd918
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/hb-ot-kern-table.hh
View File

@ -478,8 +478,11 @@ struct KernSubTable
inline unsigned int get_size (void) const { return u.header.length; } inline unsigned int get_size (void) const { return u.header.length; }
inline unsigned int get_type (void) const { return u.header.format; } inline unsigned int get_type (void) const { return u.header.format; }
inline bool is_simple (void) const inline bool is_crossStream (void) const
{ return !(u.header.coverage & (u.header.CrossStream | u.header.Variation)); } { return u.header.coverage & u.header.CrossStream; }
inline bool is_variation (void) const
{ return u.header.coverage & u.header.Variation; }
inline bool is_horizontal (void) const inline bool is_horizontal (void) const
{ return (u.header.coverage & u.header.Direction) == u.header.DirectionHorizontal; } { return (u.header.coverage & u.header.Direction) == u.header.DirectionHorizontal; }
@ -548,7 +551,7 @@ struct KernTable
unsigned int count = thiz()->nTables; unsigned int count = thiz()->nTables;
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
{ {
if (!st->is_simple () || !st->is_horizontal ()) if (!st->is_variation () || !st->is_crossStream () || !st->is_horizontal ())
continue; continue;
if (st->is_override ()) if (st->is_override ())
v = 0; v = 0;
@ -569,14 +572,15 @@ struct KernTable
unsigned int last_override = 0; unsigned int last_override = 0;
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
{ {
if (st->is_simple () && st->is_override ()) if (!st->is_variation () && !st->is_crossStream () &&
st->is_override ())
last_override = i; last_override = i;
st = &StructAfter<SubTable> (*st); st = &StructAfter<SubTable> (*st);
} }
st = CastP<SubTable> (&thiz()->dataZ); st = CastP<SubTable> (&thiz()->dataZ);
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
{ {
if (!st->is_simple ()) if (st->is_variation () || st->is_crossStream ())
goto skip; goto skip;
if (HB_DIRECTION_IS_HORIZONTAL (c->buffer->props.direction) != st->is_horizontal ()) if (HB_DIRECTION_IS_HORIZONTAL (c->buffer->props.direction) != st->is_horizontal ())