From 8bf5d4d4f787600e5e290bb8d59ee13f3a0d2515 Mon Sep 17 00:00:00 2001 From: Garret Rieger Date: Wed, 9 Jun 2021 14:05:17 -0700 Subject: [PATCH] [subset] Remove hb_subset_input_get/set_drop_hints. --- src/hb-subset-input.cc | 13 ------------- src/hb-subset-plan.cc | 2 +- src/hb-subset.h | 6 +----- test/api/test-subset-cff1.c | 10 +++++----- test/api/test-subset-cff2.c | 4 ++-- test/api/test-subset-glyf.c | 6 +++--- test/fuzzing/hb-subset-fuzzer.cc | 2 +- 7 files changed, 13 insertions(+), 30 deletions(-) diff --git a/src/hb-subset-input.cc b/src/hb-subset-input.cc index 647621d54..9907351de 100644 --- a/src/hb-subset-input.cc +++ b/src/hb-subset-input.cc @@ -326,19 +326,6 @@ hb_subset_input_set_flag (hb_subset_input_t *input, } } -HB_EXTERN void -hb_subset_input_set_drop_hints (hb_subset_input_t *subset_input, - hb_bool_t drop_hints) -{ - subset_input->drop_hints = drop_hints; -} - -HB_EXTERN hb_bool_t -hb_subset_input_get_drop_hints (hb_subset_input_t *subset_input) -{ - return subset_input->drop_hints; -} - HB_EXTERN void hb_subset_input_set_desubroutinize (hb_subset_input_t *subset_input, hb_bool_t desubroutinize) diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc index b13ec2862..1e3ea3d3d 100644 --- a/src/hb-subset-plan.cc +++ b/src/hb-subset-plan.cc @@ -428,7 +428,7 @@ hb_subset_plan_create (hb_face_t *face, plan->prune_unicode_ranges = !input->no_prune_unicode_ranges; plan->retain_all_layout_features = input->retain_all_layout_features; plan->unicodes = hb_set_create (); - plan->name_ids = hb_set_copy (plan->name_ids); + plan->name_ids = hb_set_copy (input->name_ids); _nameid_closure (face, plan->name_ids); plan->name_languages = hb_set_copy (input->name_languages); plan->layout_features = hb_set_copy (input->layout_features); diff --git a/src/hb-subset.h b/src/hb-subset.h index 6be93d28d..1c461d868 100644 --- a/src/hb-subset.h +++ b/src/hb-subset.h @@ -93,11 +93,7 @@ hb_subset_input_set_flag (hb_subset_input_t *input, // TODO(garretrieger): remove bool property get/set methods. -HB_EXTERN void -hb_subset_input_set_drop_hints (hb_subset_input_t *subset_input, - hb_bool_t drop_hints); -HB_EXTERN hb_bool_t -hb_subset_input_get_drop_hints (hb_subset_input_t *subset_input); + HB_EXTERN void hb_subset_input_set_desubroutinize (hb_subset_input_t *subset_input, diff --git a/test/api/test-subset-cff1.c b/test/api/test-subset-cff1.c index 8b4025d68..49ae97c4f 100644 --- a/test/api/test-subset-cff1.c +++ b/test/api/test-subset-cff1.c @@ -80,7 +80,7 @@ test_subset_cff1_strip_hints (void) hb_set_add (codepoints, 'a'); hb_set_add (codepoints, 'c'); input = hb_subset_test_create_input (codepoints); - hb_subset_input_set_drop_hints (input, true); + hb_subset_input_set_flag (input, HB_SUBSET_FLAG_HINTING, false); face_abc_subset = hb_subset_test_create_subset (face_abc, input); hb_set_destroy (codepoints); @@ -126,7 +126,7 @@ test_subset_cff1_desubr_strip_hints (void) hb_set_add (codepoints, 'a'); hb_set_add (codepoints, 'c'); input = hb_subset_test_create_input (codepoints); - hb_subset_input_set_drop_hints (input, true); + hb_subset_input_set_flag (input, HB_SUBSET_FLAG_HINTING, false); hb_subset_input_set_desubroutinize (input, true); face_abc_subset = hb_subset_test_create_subset (face_abc, input); hb_set_destroy (codepoints); @@ -170,7 +170,7 @@ test_subset_cff1_j_strip_hints (void) hb_set_add (codepoints, 0x41); hb_set_add (codepoints, 0x4C2E); input = hb_subset_test_create_input (codepoints); - hb_subset_input_set_drop_hints (input, true); + hb_subset_input_set_flag (input, HB_SUBSET_FLAG_HINTING, false); face_41_3041_4c2e_subset = hb_subset_test_create_subset (face_41_3041_4c2e, input); hb_set_destroy (codepoints); @@ -216,7 +216,7 @@ test_subset_cff1_j_desubr_strip_hints (void) hb_set_add (codepoints, 0x41); hb_set_add (codepoints, 0x4C2E); input = hb_subset_test_create_input (codepoints); - hb_subset_input_set_drop_hints (input, true); + hb_subset_input_set_flag (input, HB_SUBSET_FLAG_HINTING, false); hb_subset_input_set_desubroutinize (input, true); face_41_3041_4c2e_subset = hb_subset_test_create_subset (face_41_3041_4c2e, input); hb_set_destroy (codepoints); @@ -279,7 +279,7 @@ test_subset_cff1_dotsection (void) hb_face_t *face_test; hb_set_add (codepoints, 0x69); /* i */ input = hb_subset_test_create_input (codepoints); - hb_subset_input_set_drop_hints (input, true); + hb_subset_input_set_flag (input, HB_SUBSET_FLAG_HINTING, false); face_test = hb_subset_test_create_subset (face, input); hb_set_destroy (codepoints); diff --git a/test/api/test-subset-cff2.c b/test/api/test-subset-cff2.c index 7ffcf5ea7..f7cba4fc3 100644 --- a/test/api/test-subset-cff2.c +++ b/test/api/test-subset-cff2.c @@ -80,7 +80,7 @@ test_subset_cff2_strip_hints (void) hb_set_add (codepoints, 'a'); hb_set_add (codepoints, 'c'); input = hb_subset_test_create_input (codepoints); - hb_subset_input_set_drop_hints (input, true); + hb_subset_input_set_flag (input, HB_SUBSET_FLAG_HINTING, false); face_abc_subset = hb_subset_test_create_subset (face_abc, input); hb_set_destroy (codepoints); @@ -127,7 +127,7 @@ test_subset_cff2_desubr_strip_hints (void) hb_set_add (codepoints, 'c'); input = hb_subset_test_create_input (codepoints); hb_subset_input_set_desubroutinize (input, true); - hb_subset_input_set_drop_hints (input, true); + hb_subset_input_set_flag (input, HB_SUBSET_FLAG_HINTING, false); face_abc_subset = hb_subset_test_create_subset (face_abc, input); hb_set_destroy (codepoints); diff --git a/test/api/test-subset-glyf.c b/test/api/test-subset-glyf.c index 6be19e7c5..5f9f2507d 100644 --- a/test/api/test-subset-glyf.c +++ b/test/api/test-subset-glyf.c @@ -239,7 +239,7 @@ test_subset_glyf_strip_hints_simple (void) hb_set_add (codepoints, 'a'); hb_set_add (codepoints, 'c'); input = hb_subset_test_create_input (codepoints); - hb_subset_input_set_drop_hints (input, true); + hb_subset_input_set_flag (input, HB_SUBSET_FLAG_HINTING, false); face_abc_subset = hb_subset_test_create_subset (face_abc, input); hb_set_destroy (codepoints); @@ -263,7 +263,7 @@ test_subset_glyf_strip_hints_composite (void) hb_face_t *face_generated_subset; hb_set_add (codepoints, 0x1fc); input = hb_subset_test_create_input (codepoints); - hb_subset_input_set_drop_hints (input, true); + hb_subset_input_set_flag (input, HB_SUBSET_FLAG_HINTING, false); face_generated_subset = hb_subset_test_create_subset (face_components, input); hb_set_destroy (codepoints); @@ -298,7 +298,7 @@ test_subset_glyf_strip_hints_invalid (void) } input = hb_subset_test_create_input (codepoints); - hb_subset_input_set_drop_hints (input, true); + hb_subset_input_set_flag (input, HB_SUBSET_FLAG_HINTING, false); hb_set_destroy (codepoints); face_subset = hb_subset_test_create_subset (face, input); diff --git a/test/fuzzing/hb-subset-fuzzer.cc b/test/fuzzing/hb-subset-fuzzer.cc index f89d2f49b..e5a12c19d 100644 --- a/test/fuzzing/hb-subset-fuzzer.cc +++ b/test/fuzzing/hb-subset-fuzzer.cc @@ -17,7 +17,7 @@ trySubset (hb_face_t *face, { hb_subset_input_t *input = hb_subset_input_create_or_fail (); if (!input) return; - hb_subset_input_set_drop_hints (input, drop_hints); + hb_subset_input_set_flag (input, HB_SUBSET_FLAG_HINTING, !drop_hints); hb_subset_input_set_retain_gids (input, retain_gids); hb_set_t *codepoints = hb_subset_input_unicode_set (input);