From 942636ae1300e56dfe599b5f961719f044bdf828 Mon Sep 17 00:00:00 2001 From: Garret Rieger Date: Wed, 9 Jun 2021 16:18:39 -0700 Subject: [PATCH] [subset] Remove hb_subset_input_get/set_retain_gids. --- src/hb-subset-input.cc | 24 ------------------------ src/hb-subset.h | 7 ------- test/api/test-subset-cff1.c | 4 ++-- test/api/test-subset-cff2.c | 2 +- test/api/test-subset-glyf.c | 4 ++-- test/api/test-subset-gvar.c | 2 +- test/api/test-subset-hvar.c | 4 ++-- test/api/test-subset-vvar.c | 2 +- test/fuzzing/hb-subset-fuzzer.cc | 2 +- 9 files changed, 10 insertions(+), 41 deletions(-) diff --git a/src/hb-subset-input.cc b/src/hb-subset-input.cc index c6fe54b2a..cff0c0347 100644 --- a/src/hb-subset-input.cc +++ b/src/hb-subset-input.cc @@ -326,30 +326,6 @@ hb_subset_input_set_flag (hb_subset_input_t *input, } } -/** - * hb_subset_input_set_retain_gids: - * @subset_input: a subset_input. - * @retain_gids: If true the subsetter will not renumber glyph ids. - * Since: 2.4.0 - **/ -HB_EXTERN void -hb_subset_input_set_retain_gids (hb_subset_input_t *subset_input, - hb_bool_t retain_gids) -{ - subset_input->retain_gids = retain_gids; -} - -/** - * hb_subset_input_get_retain_gids: - * Returns: value of retain_gids. - * Since: 2.4.0 - **/ -HB_EXTERN hb_bool_t -hb_subset_input_get_retain_gids (hb_subset_input_t *subset_input) -{ - return subset_input->retain_gids; -} - HB_EXTERN void hb_subset_input_set_name_legacy (hb_subset_input_t *subset_input, hb_bool_t name_legacy) diff --git a/src/hb-subset.h b/src/hb-subset.h index 31c69503f..0f918b19a 100644 --- a/src/hb-subset.h +++ b/src/hb-subset.h @@ -94,13 +94,6 @@ 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_retain_gids (hb_subset_input_t *subset_input, - hb_bool_t retain_gids); -HB_EXTERN hb_bool_t -hb_subset_input_get_retain_gids (hb_subset_input_t *subset_input); - HB_EXTERN void hb_subset_input_set_name_legacy (hb_subset_input_t *subset_input, hb_bool_t name_legacy); diff --git a/test/api/test-subset-cff1.c b/test/api/test-subset-cff1.c index 19f2ad6f6..4f70f2d3b 100644 --- a/test/api/test-subset-cff1.c +++ b/test/api/test-subset-cff1.c @@ -302,7 +302,7 @@ test_subset_cff1_retaingids (void) hb_set_add (codepoints, 'a'); hb_set_add (codepoints, 'c'); input = hb_subset_test_create_input (codepoints); - hb_subset_input_set_retain_gids (input, true); + hb_subset_input_set_flag (input, HB_SUBSET_FLAG_RETAIN_GIDS, true); face_abc_subset = hb_subset_test_create_subset (face_abc, input); hb_set_destroy (codepoints); @@ -325,7 +325,7 @@ test_subset_cff1_j_retaingids (void) hb_set_add (codepoints, 0x41); hb_set_add (codepoints, 0x4C2E); input = hb_subset_test_create_input (codepoints); - hb_subset_input_set_retain_gids (input, true); + hb_subset_input_set_flag (input, HB_SUBSET_FLAG_RETAIN_GIDS, true); face_41_3041_4c2e_subset = hb_subset_test_create_subset (face_41_3041_4c2e, input); hb_set_destroy (codepoints); diff --git a/test/api/test-subset-cff2.c b/test/api/test-subset-cff2.c index 72ebf0932..835bdf3fc 100644 --- a/test/api/test-subset-cff2.c +++ b/test/api/test-subset-cff2.c @@ -150,7 +150,7 @@ test_subset_cff2_retaingids (void) hb_set_add (codepoints, 'a'); hb_set_add (codepoints, 'c'); input = hb_subset_test_create_input (codepoints); - hb_subset_input_set_retain_gids (input, true); + hb_subset_input_set_flag (input, HB_SUBSET_FLAG_RETAIN_GIDS, true); 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 5f9f2507d..73226437a 100644 --- a/test/api/test-subset-glyf.c +++ b/test/api/test-subset-glyf.c @@ -321,7 +321,7 @@ test_subset_glyf_retain_gids (void) hb_set_add (codepoints, 99); hb_subset_input_t *input = hb_subset_test_create_input (codepoints); - hb_subset_input_set_retain_gids (input, true); + hb_subset_input_set_flag (input, HB_SUBSET_FLAG_RETAIN_GIDS, true); face_abc_subset = hb_subset_test_create_subset (face_abc, input); hb_set_destroy (codepoints); @@ -345,7 +345,7 @@ test_subset_glyf_retain_gids_truncates (void) hb_set_add (codepoints, 97); hb_subset_input_t *input = hb_subset_test_create_input (codepoints); - hb_subset_input_set_retain_gids (input, true); + hb_subset_input_set_flag (input, HB_SUBSET_FLAG_RETAIN_GIDS, true); face_abc_subset = hb_subset_test_create_subset (face_abc, input); hb_set_destroy (codepoints); diff --git a/test/api/test-subset-gvar.c b/test/api/test-subset-gvar.c index 991be8f83..fc5f7064c 100644 --- a/test/api/test-subset-gvar.c +++ b/test/api/test-subset-gvar.c @@ -79,7 +79,7 @@ test_subset_gvar_retaingids (void) 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); + hb_subset_input_set_flag (input, HB_SUBSET_FLAG_RETAIN_GIDS, true); face_abc_subset = hb_subset_test_create_subset (face_abc, input); hb_set_destroy (codepoints); diff --git a/test/api/test-subset-hvar.c b/test/api/test-subset-hvar.c index 2a6c2a977..847e61adc 100644 --- a/test/api/test-subset-hvar.c +++ b/test/api/test-subset-hvar.c @@ -79,7 +79,7 @@ test_subset_map_HVAR_retaingids (void) 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); + hb_subset_input_set_flag (input, HB_SUBSET_FLAG_RETAIN_GIDS, true); face_abc_subset = hb_subset_test_create_subset (face_abc, input); hb_set_destroy (codepoints); @@ -160,7 +160,7 @@ test_subset_identity_HVAR_retaingids (void) 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); + hb_subset_input_set_flag (input, HB_SUBSET_FLAG_RETAIN_GIDS, true); face_abc_subset = hb_subset_test_create_subset (face_abc, input); hb_set_destroy (codepoints); diff --git a/test/api/test-subset-vvar.c b/test/api/test-subset-vvar.c index 2b829a33f..6f4c9ade6 100644 --- a/test/api/test-subset-vvar.c +++ b/test/api/test-subset-vvar.c @@ -79,7 +79,7 @@ test_subset_VVAR_retaingids (void) 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); + hb_subset_input_set_flag (input, HB_SUBSET_FLAG_RETAIN_GIDS, true); face_abc_subset = hb_subset_test_create_subset (face_abc, input); hb_set_destroy (codepoints); diff --git a/test/fuzzing/hb-subset-fuzzer.cc b/test/fuzzing/hb-subset-fuzzer.cc index e5a12c19d..692d18496 100644 --- a/test/fuzzing/hb-subset-fuzzer.cc +++ b/test/fuzzing/hb-subset-fuzzer.cc @@ -18,7 +18,7 @@ trySubset (hb_face_t *face, hb_subset_input_t *input = hb_subset_input_create_or_fail (); if (!input) return; hb_subset_input_set_flag (input, HB_SUBSET_FLAG_HINTING, !drop_hints); - hb_subset_input_set_retain_gids (input, retain_gids); + hb_subset_input_set_flag (input, HB_SUBSET_FLAG_RETAIN_GIDS, retain_gids); hb_set_t *codepoints = hb_subset_input_unicode_set (input); if (!drop_layout)