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

[Behdad Esfahbod]

 src/hb-face.cc |    1 -
 src/hb-null.hh |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 55c66c7c56c1ecd493f51fe66fd434b28addfb41
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sun Nov 11 16:09:38 2018 -0500

    Revert "Declare Null() constexpr"
    
    This reverts commit 442a72d95ab1fb3a47b486d8d1eb68e909d0ffb8.
    
    Doesn't make sense.  No idea how my local compilers where happy with it!

diff --git a/src/hb-null.hh b/src/hb-null.hh
index 5b9c7db7..25a24f05 100644
--- a/src/hb-null.hh
+++ b/src/hb-null.hh
@@ -43,7 +43,7 @@ hb_vector_size_impl_t const _hb_NullPool[(HB_NULL_POOL_SIZE + sizeof (hb_vector_
 
 /* Generic nul-content Null objects. */
 template <typename Type>
-static inline constexpr Type const & Null (void) {
+static inline Type const & Null (void) {
   static_assert (sizeof (Type) <= HB_NULL_POOL_SIZE, "Increase HB_NULL_POOL_SIZE.");
   return *reinterpret_cast<Type const *> (_hb_NullPool);
 }
commit 98c6f03ccdd0630282ea0b166f66dcfb2a9c1f51
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sun Nov 11 15:54:20 2018 -0500

    Minor

diff --git a/src/hb-face.cc b/src/hb-face.cc
index 8e731052..952e6a6a 100644
--- a/src/hb-face.cc
+++ b/src/hb-face.cc
@@ -129,7 +129,6 @@ hb_face_create_for_tables (hb_reference_table_func_t  reference_table_func,
   face->user_data = user_data;
   face->destroy = destroy;
 
-  face->upem = 0;
   face->num_glyphs = (unsigned int) -1;
 
   face->table.init0 (face);