[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Behdad Esfahbod]

 src/hb-coretext.cc    |    2 +-
 src/hb-set-private.hh |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 80cc0a7e3e05fb7fcfbdc0188cb60b115ad47d04
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Oct 17 11:14:48 2017 -0700

    [coretext] Fix build
    
    error: static_assert expression is not an integral constant expression

diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc
index ca548333..937822b8 100644
--- a/src/hb-coretext.cc
+++ b/src/hb-coretext.cc
@@ -678,7 +678,7 @@ _hb_coretext_shape (hb_shape_plan_t    *shape_plan,
 	      CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &active_features[j].rec.feature),
 	      CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &active_features[j].rec.setting)
 	    };
-	    static_assert ((ARRAY_LENGTH (keys) == ARRAY_LENGTH (values)), "");
+	    static_assert ((ARRAY_LENGTH_CONST (keys) == ARRAY_LENGTH_CONST (values)), "");
 	    CFDictionaryRef dict = CFDictionaryCreate (kCFAllocatorDefault,
 						       (const void **) keys,
 						       (const void **) values,
commit a11249ee93439856ea2410524b993ac1f1379961
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Oct 16 01:33:32 2017 -0400

    [set] Fix merge logic

diff --git a/src/hb-set-private.hh b/src/hb-set-private.hh
index ff428506..be0a90d7 100644
--- a/src/hb-set-private.hh
+++ b/src/hb-set-private.hh
@@ -326,7 +326,7 @@ struct hb_set_t
 	a--;
 	b--;
       }
-      else if (page_map[a].major < other->page_map[b].major)
+      else if (page_map[a].major > other->page_map[b].major)
       {
         if (Op::passthru_left)
 	  page_at (--count).v = page_at (a).v;