From 44164ee60f5ef2fc4f7a03846b60d72eb67ecb0e Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 29 Oct 2009 03:00:44 -0400 Subject: [PATCH] [HB] Fix lookup_flag ignoring Reported by Keith Stribley on HarfBuzz list. --- pango/opentype/hb-ot-layout-common-private.hh | 1 + pango/opentype/hb-ot-layout.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pango/opentype/hb-ot-layout-common-private.hh b/pango/opentype/hb-ot-layout-common-private.hh index bd43975..a1e625d 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 3b6b8da..67b2b9a 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) -- 2.7.4