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

[aat] Minor

This commit is contained in:
Behdad Esfahbod 2018-11-07 12:08:44 -05:00
parent e72e041c3c
commit d5c0ca210f
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/hb-aat-layout-common.hh
View File

@ -436,7 +436,7 @@ struct StateTable
inline unsigned int get_class (hb_codepoint_t glyph_id, unsigned int num_glyphs) const inline unsigned int get_class (hb_codepoint_t glyph_id, unsigned int num_glyphs) const
{ {
if (unlikely (glyph_id == DELETED_GLYPH)) return CLASS_DELETED_GLYPH; if (unlikely (glyph_id == DELETED_GLYPH)) return CLASS_DELETED_GLYPH;
return (this+classTable).get_class (glyph_id, num_glyphs); return (this+classTable).get_class (glyph_id, num_glyphs, 1);
} }
inline const Entry<Extra> *get_entries () const inline const Entry<Extra> *get_entries () const
@ -528,7 +528,7 @@ struct StateTable
struct ClassTable struct ClassTable
{ {
inline unsigned int get_class (hb_codepoint_t glyph_id, unsigned int outOfRange=0) const inline unsigned int get_class (hb_codepoint_t glyph_id, unsigned int outOfRange) const
{ {
unsigned int i = glyph_id - firstGlyph; unsigned int i = glyph_id - firstGlyph;
return i >= classArray.len ? outOfRange : classArray.arrayZ[i]; return i >= classArray.len ? outOfRange : classArray.arrayZ[i];
@ -553,9 +553,11 @@ struct ObsoleteTypes
typedef HBUINT8 HBUSHORT; typedef HBUINT8 HBUSHORT;
struct ClassType : ClassTable struct ClassType : ClassTable
{ {
inline unsigned int get_class (hb_codepoint_t glyph_id, unsigned int num_glyphs HB_UNUSED) const inline unsigned int get_class (hb_codepoint_t glyph_id,
unsigned int num_glyphs HB_UNUSED,
unsigned int outOfRange) const
{ {
return ClassTable::get_class (glyph_id, 1); return ClassTable::get_class (glyph_id, outOfRange);
} }
}; };
template <typename T> template <typename T>
@ -580,10 +582,12 @@ struct ExtendedTypes
typedef HBUINT16 HBUSHORT; typedef HBUINT16 HBUSHORT;
struct ClassType : Lookup<HBUINT16> struct ClassType : Lookup<HBUINT16>
{ {
inline unsigned int get_class (hb_codepoint_t glyph_id, unsigned int num_glyphs) const inline unsigned int get_class (hb_codepoint_t glyph_id,
unsigned int num_glyphs,
unsigned int outOfRange) const
{ {
const HBUINT16 *v = get_value (glyph_id, num_glyphs); const HBUINT16 *v = get_value (glyph_id, num_glyphs);
return v ? *v : 1; return v ? *v : outOfRange;
} }
}; };
template <typename T> template <typename T>

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

@ -51,8 +51,8 @@ struct KernSubTableFormat2
* different ClassTable. OT's has 16bit entries, while AAT has 8bit entries. * different ClassTable. OT's has 16bit entries, while AAT has 8bit entries.
* I've not seen any in the wild. */ * I've not seen any in the wild. */
return 0; return 0;
unsigned int l = (this+leftClassTable).get_class (left); unsigned int l = (this+leftClassTable).get_class (left, 0);
unsigned int r = (this+rightClassTable).get_class (right); unsigned int r = (this+rightClassTable).get_class (right, 0);
unsigned int offset = l + r; unsigned int offset = l + r;
const FWORD *v = &StructAtOffset<FWORD> (&(this+array), offset); const FWORD *v = &StructAtOffset<FWORD> (&(this+array), offset);
if (unlikely (!v->sanitize (&c->sanitizer))) return 0; if (unlikely (!v->sanitize (&c->sanitizer))) return 0;