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

[Behdad Esfahbod]

 src/hb-icu.cc       |    4 ++--
 test/api/test-set.c |    4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit b2fbe55b828ea5864bc0aed54db7109a2e189de2
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Oct 9 01:07:36 2018 -0400

    [icu] Unbreak

diff --git a/src/hb-icu.cc b/src/hb-icu.cc
index 83a15e7f..e012314b 100644
--- a/src/hb-icu.cc
+++ b/src/hb-icu.cc
@@ -311,8 +311,8 @@ static struct hb_icu_unicode_funcs_lazy_loader_t : hb_unicode_funcs_lazy_loader_
     hb_unicode_funcs_set_general_category_func (funcs, hb_icu_unicode_general_category, nullptr, nullptr);
     hb_unicode_funcs_set_mirroring_func (funcs, hb_icu_unicode_mirroring, nullptr, nullptr);
     hb_unicode_funcs_set_script_func (funcs, hb_icu_unicode_script, nullptr, nullptr);
-    hb_unicode_funcs_set_compose_func (funcs, hb_icu_unicode_compose, nullptr, nullptr);
-    hb_unicode_funcs_set_decompose_func (funcs, hb_icu_unicode_decompose, nullptr, nullptr);
+    hb_unicode_funcs_set_compose_func (funcs, hb_icu_unicode_compose, user_data, nullptr);
+    hb_unicode_funcs_set_decompose_func (funcs, hb_icu_unicode_decompose, user_data, nullptr);
 
     hb_unicode_funcs_make_immutable (funcs);
 
commit a353c1768dc1d7934b8ac293761620f561304bb2
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Oct 9 01:05:28 2018 -0400

    Remove test for deprecated hb_set_invert()

diff --git a/test/api/test-set.c b/test/api/test-set.c
index eb2f22ec..1382adaa 100644
--- a/test/api/test-set.c
+++ b/test/api/test-set.c
@@ -381,10 +381,6 @@ test_set_empty (void)
 
   test_empty (b);
 
-  hb_set_invert (b);
-
-  test_empty (b);
-
   g_assert (!hb_set_allocation_successful (b));
 
   hb_set_clear (b);