X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fhb-cff2-interp-cs.hh;h=8d9bb2689bb8c8376a17d3789fdf4be5fc14a970;hb=fe65a6a32ba3654c532639ba656bd66b041d7dc6;hp=a72100e1aba07c293c38f41a488639e49a7e5b6a;hpb=a280f8312cc9b27515efbab292b95b9d147a2b73;p=platform%2Fupstream%2Fharfbuzz.git

diff --git a/src/hb-cff2-interp-cs.hh b/src/hb-cff2-interp-cs.hh
index a72100e..8d9bb26 100644
--- a/src/hb-cff2-interp-cs.hh
+++ b/src/hb-cff2-interp-cs.hh
@@ -80,7 +80,7 @@ struct cff2_cs_interp_env_t : cs_interp_env_t<blend_arg_t, CFF2Subrs>
 {
   template <typename ACC>
   void init (const byte_str_t &str, ACC &acc, unsigned int fd,
-		    const int *coords_=nullptr, unsigned int num_coords_=0)
+	     const int *coords_=nullptr, unsigned int num_coords_=0)
   {
     SUPER::init (str, acc.globalSubrs, acc.privateDicts[fd].localSubrs);
 
@@ -90,7 +90,7 @@ struct cff2_cs_interp_env_t : cs_interp_env_t<blend_arg_t, CFF2Subrs>
     seen_blend = false;
     seen_vsindex_ = false;
     scalars.init ();
-    do_blend = (coords != nullptr) && num_coords && (varStore != &Null(CFF2VariationStore));
+    do_blend = num_coords && coords && varStore->size;
     set_ivs (acc.privateDicts[fd].ivs);
   }
 
@@ -134,8 +134,7 @@ struct cff2_cs_interp_env_t : cs_interp_env_t<blend_arg_t, CFF2Subrs>
       if (do_blend)
       {
 	scalars.resize (region_count);
-	varStore->varStore.get_scalars (get_ivs (),
-					(int *)coords, num_coords,
+	varStore->varStore.get_scalars (get_ivs (), coords, num_coords,
 					&scalars[0], region_count);
       }
       seen_blend = true;