Imported Upstream version 2.6.7

[platform/upstream/harfbuzz.git] / src / hb-ot-shape-normalize.cc

diff --git a/src/hb-ot-shape-normalize.cc b/src/hb-ot-shape-normalize.cc
index 553d532..50b5829 100644 (file)
--- a/src/hb-ot-shape-normalize.cc
+++ b/src/hb-ot-shape-normalize.cc
@@ -334,7 +334,7 @@ _hb_ot_shape_normalize (const hb_ot_shape_plan_t *plan,
     {
       unsigned int end;
       for (end = buffer->idx + 1; end < count; end++)
-       if (unlikely (HB_UNICODE_GENERAL_CATEGORY_IS_MARK (_hb_glyph_info_get_general_category (&buffer->info[end]))))
+       if (unlikely (_hb_glyph_info_is_unicode_mark (&buffer->info[end])))
          break;
 
       if (end < count)
@@ -360,7 +360,7 @@ _hb_ot_shape_normalize (const hb_ot_shape_plan_t *plan,
 
       /* Find all the marks now. */
       for (end = buffer->idx + 1; end < count; end++)
-       if (!HB_UNICODE_GENERAL_CATEGORY_IS_MARK (_hb_glyph_info_get_general_category (&buffer->info[end])))
+       if (!_hb_glyph_info_is_unicode_mark(&buffer->info[end]))
          break;
 
       /* idx to end is one non-simple cluster. */
@@ -435,7 +435,7 @@ _hb_ot_shape_normalize (const hb_ot_shape_plan_t *plan,
           * This is both an optimization to avoid trying to compose every two neighboring
           * glyphs in most scripts AND a desired feature for Hangul.  Apparently Hangul
           * fonts are not designed to mix-and-match pre-composed syllables and Jamo. */
-         HB_UNICODE_GENERAL_CATEGORY_IS_MARK (_hb_glyph_info_get_general_category (&buffer->cur())))
+         _hb_glyph_info_is_unicode_mark(&buffer->cur()))
       {
        if (/* If there's anything between the starter and this char, they should have CCC
             * smaller than this character's. */