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

[Behdad Esfahbod]

 src/hb-ot-layout-gsubgpos.hh |    2 +-
 src/hb-subset.cc             |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5dfd6e07626a9022a995eb7fa16767eff66c6047
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Sep 10 15:45:32 2018 +0200

    Fix sanitize or Context Rule
    
    Fixes https://github.com/harfbuzz/harfbuzz/issues/1110

diff --git a/src/hb-ot-layout-gsubgpos.hh b/src/hb-ot-layout-gsubgpos.hh
index 315951a3..bd4611d2 100644
--- a/src/hb-ot-layout-gsubgpos.hh
+++ b/src/hb-ot-layout-gsubgpos.hh
@@ -1267,7 +1267,7 @@ struct Rule
     return_trace (inputCount.sanitize (c) &&
 		  lookupCount.sanitize (c) &&
 		  c->check_range (inputZ,
-				  inputZ[0].static_size * inputCount +
+				  inputZ[0].static_size * (inputCount ? inputCount - 1 : 0) +
 				  LookupRecord::static_size * lookupCount));
   }
 
commit 20a11a824d2a07a8544649477ad03e809bdd8e19
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Sep 10 13:56:28 2018 +0200

    Revert "[subset] Disable GSUB/GPOS subsetting for now"
    
    This reverts commit 616fd34a69bb69bc35c7e4ea939e71c3ea2e92cb.

diff --git a/src/hb-subset.cc b/src/hb-subset.cc
index b714f291..2bed3586 100644
--- a/src/hb-subset.cc
+++ b/src/hb-subset.cc
@@ -179,10 +179,10 @@ _subset_table (hb_subset_plan_t *plan,
       break;
 
     case HB_OT_TAG_GSUB:
-      //result = _subset2<const OT::GSUB> (plan);
+      result = _subset2<const OT::GSUB> (plan);
       break;
     case HB_OT_TAG_GPOS:
-      //result = _subset2<const OT::GPOS> (plan);
+      result = _subset2<const OT::GPOS> (plan);
       break;
 
     default: