[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-aat-layout-kerx-table.hh |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 71b4598ea37b316571bae22ced2f1b38185c9f44
Author: Ebrahim Byagowi <ebrahim at gnu.org>
Date:   Fri Mar 2 11:04:09 2018 +0330

    [aat/kerx] Improve format 6 subtable

diff --git a/src/hb-aat-layout-kerx-table.hh b/src/hb-aat-layout-kerx-table.hh
index b3c6a11d..2414ecbf 100644
--- a/src/hb-aat-layout-kerx-table.hh
+++ b/src/hb-aat-layout-kerx-table.hh
@@ -195,17 +195,21 @@ struct KerxSubTableFormat6
   inline bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    return_trace (c->check_struct (this));
+    return_trace (c->check_struct (this) &&
+      rowIndexTable.sanitize (c, this) &&
+      columnIndexTable.sanitize (c, this) &&
+      kerningArray.sanitize (c, this) &&
+      kerningVector.sanitize (c, this));
   }
 
   protected:
   HBUINT32	flags;
   HBUINT16	rowCount;
   HBUINT16	columnCount;
-  HBUINT32	rowIndexTableOffset;
-  HBUINT32	columnIndexTableOffset;
-  HBUINT32	kerningArrayOffset;
-  HBUINT32	kerningVectorOffset;
+  LOffsetTo<Lookup<HBUINT16> >	rowIndexTable;
+  LOffsetTo<Lookup<HBUINT16> >	columnIndexTable;
+  LOffsetTo<Lookup<HBUINT16> >	kerningArray;
+  LOffsetTo<Lookup<HBUINT16> >	kerningVector;
   public:
   DEFINE_SIZE_STATIC (24);
 };