commit 2840a104c1288af79cbda720afa9e37aec6fb29d
author Michiharu Ariza <ariza@adobe.com> Thu Nov 01 16:18:13 2018 -0700
committer Michiharu Ariza <ariza@adobe.com> Thu Nov 01 16:18:13 2018 -0700
tree 7bbb79344b19bc14ec1995047cea2305e546e23c
parent e600e5440b3b77294df47fae947758137ea02501

tweaks to build with new merge

src/hb-ot-cff2-table.hh

diff --git a/src/hb-ot-cff2-table.hh b/src/hb-ot-cff2-table.hh
index a12ef56..04d9e2b 100644
--- a/src/hb-ot-cff2-table.hh
+++ b/src/hb-ot-cff2-table.hh
@@ -534,10 +534,9 @@
 
   struct accelerator_t : accelerator_templ_t<CFF2PrivateDictOpSet, CFF2PrivateDictValues>
   {
-    HB_INTERNAL bool get_extents (hb_codepoint_t glyph,
-                                  hb_glyph_extents_t *extents,
-                                  const int *coords,
-                                  unsigned int num_coords) const;
+    HB_INTERNAL bool get_extents (hb_font_t *font,
+                                  hb_codepoint_t glyph,
+                                  hb_glyph_extents_t *extents) const;
   };
 
   typedef accelerator_templ_t<CFF2PrivateDictOpSet_Subset, CFF2PrivateDictValues_Subset> accelerator_subset_t;