diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2009-10-29 03:00:44 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2009-10-29 03:00:44 -0400 |
| commit | 44164ee60f5ef2fc4f7a03846b60d72eb67ecb0e (patch) | |
| tree | 264bd874876ff2f3fe2ca325d6d008a9c09a6cab | |
| parent | 078b2d5b20c4c9e8b3f0a11d1d40e5510ef94cf6 (diff) | |
| download | pango-44164ee60f5ef2fc4f7a03846b60d72eb67ecb0e.tar.gz | |
[HB] Fix lookup_flag ignoring
Reported by Keith Stribley on HarfBuzz list.
| -rw-r--r-- | pango/opentype/hb-ot-layout-common-private.hh | 1 | ||||
| -rw-r--r-- | pango/opentype/hb-ot-layout.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pango/opentype/hb-ot-layout-common-private.hh b/pango/opentype/hb-ot-layout-common-private.hh index bd439753..a1e625d9 100644 --- a/pango/opentype/hb-ot-layout-common-private.hh +++ b/pango/opentype/hb-ot-layout-common-private.hh @@ -244,6 +244,7 @@ struct LookupFlag : USHORT IgnoreBaseGlyphs = 0x0002u, IgnoreLigatures = 0x0004u, IgnoreMarks = 0x0008u, + IgnoreFlags = 0x000Eu, UseMarkFilteringSet = 0x0010u, Reserved = 0x00E0u, MarkAttachmentType = 0xFF00u diff --git a/pango/opentype/hb-ot-layout.cc b/pango/opentype/hb-ot-layout.cc index 3b6b8dae..67b2b9ae 100644 --- a/pango/opentype/hb-ot-layout.cc +++ b/pango/opentype/hb-ot-layout.cc @@ -148,7 +148,7 @@ _hb_ot_layout_check_glyph_property (hb_face_t *face, /* Not covered, if, for example, glyph class is ligature and * lookup_flags includes LookupFlags::IgnoreLigatures */ - if (property & lookup_flags) + if (property & lookup_flags & LookupFlag::IgnoreFlags) return false; if (property & HB_OT_LAYOUT_GLYPH_CLASS_MARK) |