From 83c5298f33e66cfd3d84d246297683f0de80c57d Mon Sep 17 00:00:00 2001
From: Michiharu Ariza <ariza@adobe.com>
Date: Tue, 9 Oct 2018 21:59:36 -0700
Subject: [PATCH] added cff1_legacyops.otf as test-ot-extents-cff test case

fixed roll operator bugs uncovered by the test
---
 src/hb-cff-interp-common.hh       |   4 ++--
 test/api/fonts/cff1_legacyops.otf | Bin 0 -> 3104 bytes
 test/api/test-ot-extents-cff.c    |  23 +++++++++++++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 test/api/fonts/cff1_legacyops.otf

diff --git a/src/hb-cff-interp-common.hh b/src/hb-cff-interp-common.hh
index 266270cc7..52fc1ee43 100644
--- a/src/hb-cff-interp-common.hh
+++ b/src/hb-cff-interp-common.hh
@@ -603,13 +603,13 @@ struct ArgStack : Stack<ARG, 513>
 
   inline void reverse_range (int i, int j)
   {
-    assert (i >= 0 && i < j);
+    assert (i >= 0 && i <= j);
     ARG  tmp;
     while (i < j)
     {
       tmp = S::elements[i];
       S::elements[i++] = S::elements[j];
-      S::elements[j++] = tmp;
+      S::elements[j--] = tmp;
     }
   }
 
diff --git a/test/api/fonts/cff1_legacyops.otf b/test/api/fonts/cff1_legacyops.otf
new file mode 100644
index 0000000000000000000000000000000000000000..ca50dab5aa3d39e5e7845efd40efdc7eeb59d581
GIT binary patch
literal 3104
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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 607a4d303..244faa8f6 100644
--- a/test/api/test-ot-extents-cff.c
+++ b/test/api/test-ot-extents-cff.c
@@ -52,6 +52,28 @@ test_extents_cff1 (void)
   hb_font_destroy (font);
 }
 
+static void
+test_extents_cff1_legacyops (void)
+{
+  hb_face_t *face = hb_subset_test_open_font ("fonts/cff1_legacyops.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;
+  hb_bool_t result = hb_font_get_glyph_extents (font, 0, &extents);
+  g_assert (result);
+
+  g_assert_cmpint (extents.x_bearing, ==, 20);
+  g_assert_cmpint (extents.y_bearing, ==, 800);
+  g_assert_cmpint (extents.width, ==, 160);
+  g_assert_cmpint (extents.height, ==, -810);
+
+  hb_font_destroy (font);
+}
+
 static void
 test_extents_cff2 (void)
 {
@@ -90,6 +112,7 @@ main (int argc, char **argv)
   hb_test_init (&argc, &argv);
 
   hb_test_add (test_extents_cff1);
+  hb_test_add (test_extents_cff1_legacyops);
   hb_test_add (test_extents_cff2);
 
   return hb_test_run ();