diff options
author | Behdad Esfahbod <behdad@behdad.org> | 2010-06-15 10:54:36 -0400 |
---|---|---|
committer | Behdad Esfahbod <behdad@behdad.org> | 2010-06-15 10:54:36 -0400 |
commit | 7dc0bb2b5aab78d8d7a299b54351bb0e9a4e888d (patch) | |
tree | c31624dce33d214a55d4d999146d6c80645c5a2b /pango/pango-ot-info.c | |
parent | a4ebb72cfb8814a4d3aee9fd0a02a56e998fe6c6 (diff) | |
parent | cf1022c02c89d50a64743b1cf8d989817e4e1fd1 (diff) | |
download | pango-7dc0bb2b5aab78d8d7a299b54351bb0e9a4e888d.tar.gz |
Merge branch 'master' into 1.28
Conflicts:
pango/Makefile.am
Diffstat (limited to 'pango/pango-ot-info.c')
-rw-r--r-- | pango/pango-ot-info.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pango/pango-ot-info.c b/pango/pango-ot-info.c index 4216611a..f98229a4 100644 --- a/pango/pango-ot-info.c +++ b/pango/pango-ot-info.c @@ -211,14 +211,14 @@ get_glyph_class (gunichar charcode, case G_UNICODE_COMBINING_MARK: case G_UNICODE_ENCLOSING_MARK: case G_UNICODE_NON_SPACING_MARK: - *class = 3; /* Mark glyph (non-spacing combining glyph) */ + *class = HB_OT_LAYOUT_GLYPH_CLASS_MARK; /* Mark glyph (non-spacing combining glyph) */ return TRUE; case G_UNICODE_UNASSIGNED: case G_UNICODE_PRIVATE_USE: return FALSE; /* Unknown, don't assign a class; classes get * propagated during GSUB application */ default: - *class = 1; /* Base glyph (single character, spacing glyph) */ + *class = HB_OT_LAYOUT_GLYPH_CLASS_BASE_GLYPH; /* Base glyph (single character, spacing glyph) */ return TRUE; } } |