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

[Behdad Esfahbod]

 src/hb-machinery.hh                        |    2 +-
 src/hb-ot-shape-complex-arabic-fallback.hh |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 4674655841bb810e7b68f03431d7b5a7c34c6f20
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sat Nov 10 20:11:10 2018 -0500

    Minor

diff --git a/src/hb-ot-shape-complex-arabic-fallback.hh b/src/hb-ot-shape-complex-arabic-fallback.hh
index eeb2da85..0fb3793e 100644
--- a/src/hb-ot-shape-complex-arabic-fallback.hh
+++ b/src/hb-ot-shape-complex-arabic-fallback.hh
@@ -212,8 +212,11 @@ struct arabic_fallback_plan_t
 
 struct ManifestLookup
 {
+  public:
   OT::Tag tag;
   OT::OffsetTo<OT::SubstLookup> lookupOffset;
+  public:
+  DEFINE_SIZE_STATIC (6);
 };
 typedef OT::ArrayOf<ManifestLookup> Manifest;
 
commit a953b647507fe2ae8f5187fbfb04e69d2a2952e4
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sat Nov 10 20:10:03 2018 -0500

    Revert parts of previous commit that made clang unhappy

diff --git a/src/hb-machinery.hh b/src/hb-machinery.hh
index f8f1a5b5..d0e1271c 100644
--- a/src/hb-machinery.hh
+++ b/src/hb-machinery.hh
@@ -110,7 +110,7 @@ static inline Type& StructAfter(TObject &X)
   static const unsigned int min_size = (size)
 
 #define DEFINE_SIZE_ARRAY(size, array) \
-  DEFINE_INSTANCE_ASSERTION (sizeof (*this) == (size) + VAR * (array).item_size); \
+  DEFINE_INSTANCE_ASSERTION (sizeof (*this) == (size) + VAR * sizeof ((array)[0])); \
   DEFINE_COMPILES_ASSERTION ((void) (array)[0].static_size) \
   enum { min_size = (size) }