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

[Behdad Esfahbod]

 src/hb-open-type.hh     |    6 +++---
 src/hb-ot-kern-table.hh |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit fffea5aff7a631eedd13c38c1fb7ea4f5f950930
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Nov 22 01:25:34 2018 -0500

    Minor

diff --git a/src/hb-open-type.hh b/src/hb-open-type.hh
index b1fcd687..c5d1aa84 100644
--- a/src/hb-open-type.hh
+++ b/src/hb-open-type.hh
@@ -231,13 +231,13 @@ struct FixedVersion
  * Use: (base+offset)
  */
 
-template <typename Type, bool has_null_> struct assert_has_min_size { static_assert (Type::min_size > 0, ""); };
-template <typename Type> struct assert_has_min_size<Type, false> {};
+template <typename Type, bool has_null_> struct assert_has_null_size { static_assert (Type::null_size > 0, ""); };
+template <typename Type> struct assert_has_null_size<Type, false> {};
 
 template <typename Type, typename OffsetType=HBUINT16, bool has_null=true>
 struct OffsetTo : Offset<OffsetType, has_null>
 {
-  static_assert (sizeof (assert_has_min_size<Type, has_null>) || true, "");
+  static_assert (sizeof (assert_has_null_size<Type, has_null>) || true, "");
 
   inline const Type& operator () (const void *base) const
   {
commit 209b58ef731f102b92179ed76551e2fd6b5ed075
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Nov 22 01:22:33 2018 -0500

    Minor

diff --git a/src/hb-ot-kern-table.hh b/src/hb-ot-kern-table.hh
index ebb231a1..b2d57140 100644
--- a/src/hb-ot-kern-table.hh
+++ b/src/hb-ot-kern-table.hh
@@ -154,7 +154,7 @@ struct KernSubTable
   KernSubTableFormat3<KernSubTableHeader>	format3;
   } u;
   public:
-  DEFINE_SIZE_UNBOUNDED (KernSubTableHeader::static_size);
+  DEFINE_SIZE_MIN (KernSubTableHeader::static_size);
 };