commit f7c0b4319c6f82f1e0020a0029469d8953a7a161
author Behdad Esfahbod <behdad@behdad.org> Fri Oct 19 15:23:49 2018 -0700
committer Behdad Esfahbod <behdad@behdad.org> Fri Oct 19 15:23:49 2018 -0700
tree d1743dad42b795b95257a74d915f9f1df5eb70f7
parent 257ded1f9ec653d15e79d2ea0a83bd8c5c53d831

[aat] Implement LookupFormat10

src/hb-aat-layout-ankr-table.hh

diff --git a/src/hb-aat-layout-ankr-table.hh b/src/hb-aat-layout-ankr-table.hh
index 2e3ed27..5f7656d 100644
--- a/src/hb-aat-layout-ankr-table.hh
+++ b/src/hb-aat-layout-ankr-table.hh
@@ -63,8 +63,10 @@
 				   unsigned int num_glyphs,
 				   const char *end) const
   {
-    unsigned int offset = (this+lookupTable).get_value_or_null (glyph_id, num_glyphs);
-    const GlyphAnchors &anchors = StructAtOffset<GlyphAnchors> (&(this+anchorData), offset);
+    const Offset<HBUINT16, false> *offset = (this+lookupTable).get_value (glyph_id, num_glyphs);
+    if (!offset)
+      return Null(Anchor);
+    const GlyphAnchors &anchors = StructAtOffset<GlyphAnchors> (&(this+anchorData), *offset);
     /* TODO Use sanitizer; to avoid overflows and more. */
     if (unlikely ((const char *) &anchors + anchors.get_size () > end))
       return Null(Anchor);