[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-ot-shape-normalize.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c7dfe316f8c0fc04b7976fca5e58eb46d91b4821
Author: jfkthame <jfkthame at gmail.com>
Date:   Fri Aug 7 17:55:03 2015 +0100

    Don't rely on .cluster in _hb_ot_shape_normalize()
    
    Fixes https://github.com/behdad/harfbuzz/pull/124

diff --git a/src/hb-ot-shape-normalize.cc b/src/hb-ot-shape-normalize.cc
index 8cc64af..111b590 100644
--- a/src/hb-ot-shape-normalize.cc
+++ b/src/hb-ot-shape-normalize.cc
@@ -323,7 +323,7 @@ _hb_ot_shape_normalize (const hb_ot_shape_plan_t *plan,
   {
     unsigned int end;
     for (end = buffer->idx + 1; end < count; end++)
-      if (buffer->cur().cluster != buffer->info[end].cluster)
+      if (likely (!HB_UNICODE_GENERAL_CATEGORY_IS_MARK (_hb_glyph_info_get_general_category (&buffer->info[end]))))
         break;
 
     decompose_cluster (&c, end, might_short_circuit, always_short_circuit);