From af61c3b10f83a00b4862cc0cb92fc9f0856e7dd6 Mon Sep 17 00:00:00 2001
From: Michiharu Ariza <ariza@adobe.com>
Date: Wed, 10 Oct 2018 18:35:12 -0700
Subject: [PATCH] added vsindex test & fixed process_vsindex

---
 src/hb-cff2-interp-cs.hh                    |  12 ++++---
 test/api/fonts/AdobeVFPrototype_vsindex.otf | Bin 0 -> 7036 bytes
 test/api/test-ot-extents-cff.c              |  33 ++++++++++++++++++++
 3 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 test/api/fonts/AdobeVFPrototype_vsindex.otf

diff --git a/src/hb-cff2-interp-cs.hh b/src/hb-cff2-interp-cs.hh
index 639a7e5c..f05b10c8 100644
--- a/src/hb-cff2-interp-cs.hh
+++ b/src/hb-cff2-interp-cs.hh
@@ -140,11 +140,14 @@ struct CFF2CSInterpEnv : CSInterpEnv<BlendArg, CFF2Subrs>
 
   inline void process_vsindex (void)
   {
-    if (do_blend)
+    unsigned int  index;
+    if (likely (argStack.check_pop_uint (index)))
     {
-      unsigned int  index;
-      if (likely (!seen_vsindex && !seen_blend && argStack.check_pop_uint (index)))
-        set_ivs (argStack.check_pop_uint (index));
+      if (do_blend)
+      {
+        if (likely (!seen_vsindex && !seen_blend))
+          set_ivs (index);
+      }
     }
     seen_vsindex = true;
   }
@@ -236,7 +239,6 @@ struct CFF2CSOpSet : CSOpSet<BlendArg, OPSET, CFF2CSInterpEnv, PARAM, PATH>
   static inline void process_vsindex (CFF2CSInterpEnv &env, PARAM& param)
   {
     env.process_vsindex ();
-    OPSET::flush_args_and_op (OpCode_vsindexcs, env, param, env.argStack.get_count ()-1);
   }
 
   private:
diff --git a/test/api/fonts/AdobeVFPrototype_vsindex.otf b/test/api/fonts/AdobeVFPrototype_vsindex.otf
new file mode 100644
index 0000000000000000000000000000000000000000..3697b46c124cf364cb25afe73e9e5235b5c50892
GIT binary patch
literal 7036
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

literal 0
HcmV?d00001

diff --git a/test/api/test-ot-extents-cff.c b/test/api/test-ot-extents-cff.c
index 244faa8f..90994658 100644
--- a/test/api/test-ot-extents-cff.c
+++ b/test/api/test-ot-extents-cff.c
@@ -106,6 +106,38 @@ test_extents_cff2 (void)
   hb_font_destroy (font);
 }
 
+static void
+test_extents_cff2_vsindex (void)
+{
+  hb_face_t *face = hb_subset_test_open_font ("fonts/AdobeVFPrototype_vsindex.otf");
+  g_assert (face);
+  hb_font_t *font = hb_font_create (face);
+  hb_face_destroy (face);
+  g_assert (font);
+  hb_ot_font_set_funcs (font);
+
+  hb_glyph_extents_t  extents;
+  float coords[2] = { 800.0f, 50.0f };
+  hb_font_set_var_coords_design (font, coords, 2);
+  bool result = hb_font_get_glyph_extents (font, 1, &extents);
+  g_assert (result);
+
+  g_assert_cmpint (extents.x_bearing, ==, 11);
+  g_assert_cmpint (extents.y_bearing, ==, 656);
+  g_assert_cmpint (extents.width, ==, 653);
+  g_assert_cmpint (extents.height, ==, -656);
+
+  result = hb_font_get_glyph_extents (font, 2, &extents);
+  g_assert (result);
+
+  g_assert_cmpint (extents.x_bearing, ==, 7);
+  g_assert_cmpint (extents.y_bearing, ==, 669);
+  g_assert_cmpint (extents.width, ==, 650);
+  g_assert_cmpint (extents.height, ==, -669);
+
+  hb_font_destroy (font);
+}
+
 int
 main (int argc, char **argv)
 {
@@ -114,6 +146,7 @@ main (int argc, char **argv)
   hb_test_add (test_extents_cff1);
   hb_test_add (test_extents_cff1_legacyops);
   hb_test_add (test_extents_cff2);
+  hb_test_add (test_extents_cff2_vsindex);
 
   return hb_test_run ();
 }
-- 
GitLab