From cc5d3a33882b52f906ee4346707700f5e846d2ac Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 4 Nov 2015 13:21:25 -0800 Subject: [PATCH] Towards using top-byte of unicode-props for more things --- src/hb-ot-layout-gsubgpos-private.hh | 1 - src/hb-ot-layout-private.hh | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh index 1390a2ed7..aeaaefa45 100644 --- a/src/hb-ot-layout-gsubgpos-private.hh +++ b/src/hb-ot-layout-gsubgpos-private.hh @@ -835,7 +835,6 @@ static inline bool ligate_input (hb_apply_context_t *c, _hb_glyph_info_set_lig_props_for_ligature (&buffer->cur(), lig_id, total_component_count); if (_hb_glyph_info_get_general_category (&buffer->cur()) == HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK) { - _hb_glyph_info_set_modified_combining_class (&buffer->cur(), 0); _hb_glyph_info_set_general_category (&buffer->cur(), HB_UNICODE_GENERAL_CATEGORY_OTHER_LETTER); } } diff --git a/src/hb-ot-layout-private.hh b/src/hb-ot-layout-private.hh index 8e6164e27..43a8bc10f 100644 --- a/src/hb-ot-layout-private.hh +++ b/src/hb-ot-layout-private.hh @@ -258,7 +258,8 @@ static inline void _hb_glyph_info_set_general_category (hb_glyph_info_t *info, hb_unicode_general_category_t gen_cat) { - info->unicode_props() = (unsigned int) gen_cat | (info->unicode_props() & ~UPROPS_MASK_GEN_CAT); + /* Clears top-byte. */ + info->unicode_props() = (unsigned int) gen_cat | (info->unicode_props() & (0xFF & ~UPROPS_MASK_GEN_CAT)); } static inline hb_unicode_general_category_t