Imported Upstream version 3.4.0

[platform/upstream/harfbuzz.git] / test / api / test-subset-gpos.c

diff --git a/test/api/test-subset-gpos.c b/test/api/test-subset-gpos.c
index 5c2fe2e..ff7defb 100644 (file)
--- a/test/api/test-subset-gpos.c
+++ b/test/api/test-subset-gpos.c
@@ -32,7 +32,6 @@
 static void
 test_subset_gpos_lookup_subtable (void)
 {
-#ifdef HB_EXPERIMENTAL_API
   hb_face_t *face_pwa = hb_test_open_font_file ("fonts/Roboto-Regular-gpos-.aw.ttf");
   hb_face_t *face_wa = hb_test_open_font_file ("fonts/Roboto-Regular-gpos-aw.ttf");
 
@@ -43,7 +42,8 @@ test_subset_gpos_lookup_subtable (void)
 
   hb_subset_input_t *input = hb_subset_test_create_input (codepoints);
 
-  hb_set_del (hb_subset_input_drop_tables_set (input), HB_TAG ('G', 'P', 'O', 'S'));
+  hb_set_del (hb_subset_input_set (input, HB_SUBSET_SETS_DROP_TABLE_TAG),
+              HB_TAG ('G', 'P', 'O', 'S'));
 
   face_pwa_subset = hb_subset_test_create_subset (face_pwa, input);
   hb_set_destroy (codepoints);
@@ -53,14 +53,11 @@ test_subset_gpos_lookup_subtable (void)
   hb_face_destroy (face_pwa_subset);
   hb_face_destroy (face_pwa);
   hb_face_destroy (face_wa);
-#endif
 }
 
-/* TODO: Once GDEF subsetting is implemented, this test may fail & expected result need update. */
 static void
 test_subset_gpos_pairpos1_vf (void)
 {
-#ifdef HB_EXPERIMENTAL_API
   hb_face_t *face_wav = hb_test_open_font_file ("fonts/AdobeVFPrototype.WAV.gpos.otf");
   hb_face_t *face_wa = hb_test_open_font_file ("fonts/AdobeVFPrototype.WA.gpos.otf");
 
@@ -71,7 +68,8 @@ test_subset_gpos_pairpos1_vf (void)
 
   hb_subset_input_t *input = hb_subset_test_create_input (codepoints);
 
-  hb_set_del (hb_subset_input_drop_tables_set (input), HB_TAG ('G', 'P', 'O', 'S'));
+  hb_set_del (hb_subset_input_set (input, HB_SUBSET_SETS_DROP_TABLE_TAG),
+              HB_TAG ('G', 'P', 'O', 'S'));
 
   face_wav_subset = hb_subset_test_create_subset (face_wav, input);
   hb_set_destroy (codepoints);
@@ -81,7 +79,6 @@ test_subset_gpos_pairpos1_vf (void)
   hb_face_destroy (face_wav_subset);
   hb_face_destroy (face_wav);
   hb_face_destroy (face_wa);
-#endif
 }
 
 int