src/hb-atomic-private.hh | 1 + src/hb-common.cc | 2 +- src/hb-ot-font.cc | 4 ++-- src/hb-ot-layout-gsubgpos-private.hh | 22 +++++++++++----------- 4 files changed, 15 insertions(+), 14 deletions(-)
New commits: commit f3b170bdd970e31e9dbfed94c07c3cda41269aed Author: Behdad Esfahbod <[email protected]> Date: Wed Apr 8 16:26:24 2015 -0700 Minor diff --git a/src/hb-common.cc b/src/hb-common.cc index 1516211..c0233f3 100644 --- a/src/hb-common.cc +++ b/src/hb-common.cc @@ -179,7 +179,7 @@ static const char canon_map[256] = { 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 0, 0, 0, 0, 0 }; -static hb_bool_t +static bool lang_equal (hb_language_t v1, const void *v2) { commit 2958f2c147fc6327175b51a4eaca694263e34ac9 Author: Behdad Esfahbod <[email protected]> Date: Wed Apr 8 16:26:16 2015 -0700 Fixup diff --git a/src/hb-atomic-private.hh b/src/hb-atomic-private.hh index b08e90c..e2249e9 100644 --- a/src/hb-atomic-private.hh +++ b/src/hb-atomic-private.hh @@ -63,6 +63,7 @@ static inline void _HBMemoryBarrier (void) { } typedef LONG hb_atomic_int_impl_t; +#define HB_ATOMIC_INT_IMPL_INIT(V) (V) #define hb_atomic_int_impl_add(AI, V) InterlockedExchangeAdd (&(AI), (V)) #define hb_atomic_ptr_impl_get(P) (_HBMemoryBarrier (), (void *) *(P)) commit b931e0b0ceeab0e4819d9c4b838c1a1eb87b52e4 Author: Behdad Esfahbod <[email protected]> Date: Wed Apr 8 14:39:00 2015 -0700 Fix warnings Part of https://github.com/behdad/harfbuzz/pull/68 diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc index 2af2f54..f6f979d 100644 --- a/src/hb-ot-font.cc +++ b/src/hb-ot-font.cc @@ -45,9 +45,9 @@ struct hb_ot_face_metrics_accelerator_t inline void init (hb_face_t *face, hb_tag_t _hea_tag, hb_tag_t _mtx_tag, - unsigned int default_advance) + unsigned int default_advance_) { - this->default_advance = default_advance; + this->default_advance = default_advance_; this->num_metrics = face->get_num_glyphs (); hb_blob_t *_hea_blob = OT::Sanitizer<OT::_hea>::sanitize (face->reference_table (_hea_tag)); diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh index cbc6840..842be88 100644 --- a/src/hb-ot-layout-gsubgpos-private.hh +++ b/src/hb-ot-layout-gsubgpos-private.hh @@ -516,39 +516,39 @@ struct hb_apply_context_t inline bool match_properties_mark (hb_codepoint_t glyph, unsigned int glyph_props, - unsigned int lookup_props) const + unsigned int match_props) const { /* If using mark filtering sets, the high short of - * lookup_props has the set index. + * match_props has the set index. */ - if (lookup_props & LookupFlag::UseMarkFilteringSet) - return gdef.mark_set_covers (lookup_props >> 16, glyph); + if (match_props & LookupFlag::UseMarkFilteringSet) + return gdef.mark_set_covers (match_props >> 16, glyph); - /* The second byte of lookup_props has the meaning + /* The second byte of match_props has the meaning * "ignore marks of attachment type different than * the attachment type specified." */ - if (lookup_props & LookupFlag::MarkAttachmentType) - return (lookup_props & LookupFlag::MarkAttachmentType) == (glyph_props & LookupFlag::MarkAttachmentType); + if (match_props & LookupFlag::MarkAttachmentType) + return (match_props & LookupFlag::MarkAttachmentType) == (glyph_props & LookupFlag::MarkAttachmentType); return true; } inline bool check_glyph_property (const hb_glyph_info_t *info, - unsigned int lookup_props) const + unsigned int match_props) const { hb_codepoint_t glyph = info->codepoint; unsigned int glyph_props = _hb_glyph_info_get_glyph_props (info); /* Not covered, if, for example, glyph class is ligature and - * lookup_props includes LookupFlags::IgnoreLigatures + * match_props includes LookupFlags::IgnoreLigatures */ - if (glyph_props & lookup_props & LookupFlag::IgnoreFlags) + if (glyph_props & match_props & LookupFlag::IgnoreFlags) return false; if (unlikely (glyph_props & HB_OT_LAYOUT_GLYPH_PROPS_MARK)) - return match_properties_mark (glyph, glyph_props, lookup_props); + return match_properties_mark (glyph, glyph_props, match_props); return true; } _______________________________________________ HarfBuzz mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/harfbuzz
