From d2a0149c2999eab315a0582a5e1fa31a2511b869 Mon Sep 17 00:00:00 2001
From: Michiharu Ariza <ariza@adobe.com>
Date: Thu, 21 Mar 2019 18:09:37 -0700
Subject: [PATCH] added api test for subset VVAR & bug fix

added a mod copy of SourceSerifVariable-Roman.ttf with VVAR as a test font
---
 src/hb-ot-var-hvar-table.hh                   |   7 +-
 test/api/Makefile.am                          |   2 +
 .../SourceSerifVariable-Roman-VVAR.abc.ttf    | Bin 0 -> 5632 bytes
 ...SerifVariable-Roman-VVAR.ac.retaingids.ttf | Bin 0 -> 5288 bytes
 .../SourceSerifVariable-Roman-VVAR.ac.ttf     | Bin 0 -> 3224 bytes
 test/api/test-subset-vvar.c                   | 103 ++++++++++++++++++
 6 files changed, 108 insertions(+), 4 deletions(-)
 create mode 100644 test/api/fonts/SourceSerifVariable-Roman-VVAR.abc.ttf
 create mode 100644 test/api/fonts/SourceSerifVariable-Roman-VVAR.ac.retaingids.ttf
 create mode 100644 test/api/fonts/SourceSerifVariable-Roman-VVAR.ac.ttf
 create mode 100644 test/api/test-subset-vvar.c

diff --git a/src/hb-ot-var-hvar-table.hh b/src/hb-ot-var-hvar-table.hh
index 19257f6d0..bf2c1c165 100644
--- a/src/hb-ot-var-hvar-table.hh
+++ b/src/hb-ot-var-hvar-table.hh
@@ -123,9 +123,8 @@ struct index_map_subset_plan_t
 {
   enum index_map_index_t {
     ADV_INDEX,
-    LSB_INDEX,
-    RSB_INDEX,
-    TSB_INDEX,
+    LSB_INDEX,	/* dual as TSB */
+    RSB_INDEX,	/* dual as BSB */
     VORG_INDEX
   };
 
@@ -217,7 +216,7 @@ struct index_map_subset_plan_t
     for (unsigned int i = 0; i < max_inners.length; i++)
     {
       if (inner_remaps[i].get_count () == 0) continue;
-      unsigned int bit_count = hb_bit_storage (inner_remaps[i][max_inners[i]]);
+      unsigned int bit_count = (max_inners[i]==0)? 1: hb_bit_storage (inner_remaps[i][max_inners[i]]);
       if (bit_count > inner_bit_count) inner_bit_count = bit_count;
     }
 
diff --git a/test/api/Makefile.am b/test/api/Makefile.am
index c5f1f6d8b..eb033811c 100644
--- a/test/api/Makefile.am
+++ b/test/api/Makefile.am
@@ -52,6 +52,7 @@ TEST_PROGS = \
 	test-subset-cff2 \
 	test-subset-gvar \
 	test-subset-hvar \
+	test-subset-vvar \
 	test-unicode \
 	test-version \
 	$(NULL)
@@ -68,6 +69,7 @@ test_subset_cff1_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la
 test_subset_cff2_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la
 test_subset_gvar_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la
 test_subset_hvar_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la
+test_subset_vvar_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la
 
 test_unicode_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
diff --git a/test/api/fonts/SourceSerifVariable-Roman-VVAR.abc.ttf b/test/api/fonts/SourceSerifVariable-Roman-VVAR.abc.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..7d94abcb0b2cd08e99adcc2d59f51cb3371c12e3
GIT binary patch
literal 5632
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
GME?UX$xK!N

literal 0
HcmV?d00001

diff --git a/test/api/fonts/SourceSerifVariable-Roman-VVAR.ac.retaingids.ttf b/test/api/fonts/SourceSerifVariable-Roman-VVAR.ac.retaingids.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..60ff3215413bfbf6ac14b80d50abdaaf24f6ca12
GIT binary patch
literal 5288
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

literal 0
HcmV?d00001

diff --git a/test/api/fonts/SourceSerifVariable-Roman-VVAR.ac.ttf b/test/api/fonts/SourceSerifVariable-Roman-VVAR.ac.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..b6b9e9715c72364613d919364e629b76a61f8ffc
GIT binary patch
literal 3224
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

literal 0
HcmV?d00001

diff --git a/test/api/test-subset-vvar.c b/test/api/test-subset-vvar.c
new file mode 100644
index 000000000..2b829a33f
--- /dev/null
+++ b/test/api/test-subset-vvar.c
@@ -0,0 +1,103 @@
+/*
+ * Copyright © 2019 Adobe Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Adobe Author(s): Michiharu Ariza
+ */
+
+#include "hb-test.h"
+#include "hb-subset-test.h"
+
+/* Unit tests for VVAR subsetting */
+
+static void
+test_subset_VVAR_noop (void)
+{
+  hb_face_t *face_abc = hb_test_open_font_file("fonts/SourceSerifVariable-Roman-VVAR.abc.ttf");
+
+  hb_set_t *codepoints = hb_set_create ();
+  hb_face_t *face_abc_subset;
+  hb_set_add (codepoints, 'a');
+  hb_set_add (codepoints, 'b');
+  hb_set_add (codepoints, 'c');
+  face_abc_subset = hb_subset_test_create_subset (face_abc, hb_subset_test_create_input (codepoints));
+  hb_set_destroy (codepoints);
+
+  hb_subset_test_check (face_abc, face_abc_subset, HB_TAG ('V','V','A','R'));
+
+  hb_face_destroy (face_abc_subset);
+  hb_face_destroy (face_abc);
+}
+
+static void
+test_subset_VVAR (void)
+{
+  hb_face_t *face_abc = hb_test_open_font_file ("fonts/SourceSerifVariable-Roman-VVAR.abc.ttf");
+  hb_face_t *face_ac = hb_test_open_font_file ("fonts/SourceSerifVariable-Roman-VVAR.ac.ttf");
+
+  hb_set_t *codepoints = hb_set_create ();
+  hb_face_t *face_abc_subset;
+  hb_set_add (codepoints, 'a');
+  hb_set_add (codepoints, 'c');
+  face_abc_subset = hb_subset_test_create_subset (face_abc, hb_subset_test_create_input (codepoints));
+  hb_set_destroy (codepoints);
+
+  hb_subset_test_check (face_ac, face_abc_subset, HB_TAG ('V','V','A','R'));
+
+  hb_face_destroy (face_abc_subset);
+  hb_face_destroy (face_abc);
+  hb_face_destroy (face_ac);
+}
+
+static void
+test_subset_VVAR_retaingids (void)
+{
+  hb_face_t *face_abc = hb_test_open_font_file ("fonts/SourceSerifVariable-Roman-VVAR.abc.ttf");
+  hb_face_t *face_ac = hb_test_open_font_file ("fonts/SourceSerifVariable-Roman-VVAR.ac.retaingids.ttf");
+
+  hb_set_t *codepoints = hb_set_create ();
+  hb_face_t *face_abc_subset;
+  hb_set_add (codepoints, 'a');
+  hb_set_add (codepoints, 'c');
+  hb_subset_input_t *input = hb_subset_test_create_input (codepoints);
+  hb_subset_input_set_retain_gids (input, true);
+  face_abc_subset = hb_subset_test_create_subset (face_abc, input);
+  hb_set_destroy (codepoints);
+
+  hb_subset_test_check (face_ac, face_abc_subset, HB_TAG ('V','V','A','R'));
+
+  hb_face_destroy (face_abc_subset);
+  hb_face_destroy (face_abc);
+  hb_face_destroy (face_ac);
+}
+
+int
+main (int argc, char **argv)
+{
+  hb_test_init (&argc, &argv);
+
+  hb_test_add (test_subset_VVAR_noop);
+  hb_test_add (test_subset_VVAR);
+  hb_test_add (test_subset_VVAR_retaingids);
+
+  return hb_test_run ();
+}