fixed test-subset-cff2

src/hb-cff2-interp-cs.hh

@@ -79,14 +79,13 @@ struct CFF2CSInterpEnv : CSInterpEnv<BlendArg, CFF2Subrs>
 {
   template <typename ACC>
   inline void init (const ByteStr &str, ACC &acc, unsigned int fd,
-                    const int *coords_=nullptr, unsigned int coords_count_=0,
-                    const CFF2VariationStore *varStore_=nullptr)
+                    const int *coords_=nullptr, unsigned int num_coords_=0)
   {
     SUPER::init (str, *acc.globalSubrs, *acc.privateDicts[fd].localSubrs);
     
     coords = coords_;
-    num_coords = coords_count_;
-    varStore = varStore_;
+    num_coords = num_coords_;
+    varStore = acc.varStore;
     seen_blend = false;
     seen_vsindex = false;
     scalars.init ();

src/hb-ot-cff2-table.cc

@@ -105,7 +105,7 @@ bool OT::cff2::accelerator_t::get_extents (hb_codepoint_t glyph,
   unsigned int fd = fdSelect->get_fd (glyph);
   CFF2CSInterpreter<CFF2CSOpSet_Extents, ExtentsParam> interp;
   const ByteStr str = (*charStrings)[glyph];
-  interp.env.init (str, *this, fd, coords, num_coords, varStore);
+  interp.env.init (str, *this, fd, coords, num_coords);
   ExtentsParam  param;
   param.init ();
   if (unlikely (!interp.interpret (param))) return false;