walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[subset] Change subset plan create to be or_fail.

This commit is contained in:
Garret Rieger 2022-02-11 16:01:33 -08:00
parent ae8d373bcf
commit 670ef070bd
4 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/hb-subset-plan.cc
View File

@ -458,7 +458,7 @@ _nameid_closure (hb_face_t *face,
} }
/** /**
* hb_subset_plan_create: * hb_subset_plan_create_or_fail:
* @face: font face to create the plan for. * @face: font face to create the plan for.
* @input: a #hb_subset_input_t input. * @input: a #hb_subset_input_t input.
* *
@ -467,17 +467,18 @@ _nameid_closure (hb_face_t *face,
* which tables and glyphs should be retained. * which tables and glyphs should be retained.
* *
* Return value: (transfer full): New subset plan. Destroy with * Return value: (transfer full): New subset plan. Destroy with
* hb_subset_plan_destroy(). * hb_subset_plan_destroy(). If there is a failure creating the plan
* nullptr will be returned.
* *
* Since: REPLACEME * Since: REPLACEME
**/ **/
hb_subset_plan_t * hb_subset_plan_t *
hb_subset_plan_create (hb_face_t *face, hb_subset_plan_create_or_fail (hb_face_t *face,
const hb_subset_input_t *input) const hb_subset_input_t *input)
{ {
hb_subset_plan_t *plan; hb_subset_plan_t *plan;
if (unlikely (!(plan = hb_object_create<hb_subset_plan_t> ()))) if (unlikely (!(plan = hb_object_create<hb_subset_plan_t> ())))
return const_cast<hb_subset_plan_t *> (&Null (hb_subset_plan_t)); return nullptr;
plan->successful = true; plan->successful = true;
plan->flags = input->flags; plan->flags = input->flags;
@ -514,8 +515,8 @@ hb_subset_plan_create (hb_face_t *face,
plan->layout_variation_indices = hb_set_create (); plan->layout_variation_indices = hb_set_create ();
plan->layout_variation_idx_map = hb_map_create (); plan->layout_variation_idx_map = hb_map_create ();
if (plan->in_error ()) { if (unlikely (plan->in_error ())) {
return plan; return nullptr;
} }
_populate_unicodes_to_retain (input->sets.unicodes, input->sets.glyphs, plan); _populate_unicodes_to_retain (input->sets.unicodes, input->sets.glyphs, plan);
@ -532,6 +533,9 @@ hb_subset_plan_create (hb_face_t *face,
plan->reverse_glyph_map, plan->reverse_glyph_map,
&plan->_num_output_glyphs); &plan->_num_output_glyphs);
if (unlikely (plan->in_error ())) {
return nullptr;
}
return plan; return plan;
} }

7
src/hb-subset.cc
View File

@ -343,9 +343,8 @@ hb_subset_or_fail (hb_face_t *source, const hb_subset_input_t *input)
{ {
if (unlikely (!input || !source)) return hb_face_get_empty (); if (unlikely (!input || !source)) return hb_face_get_empty ();
hb_subset_plan_t *plan = hb_subset_plan_create (source, input); hb_subset_plan_t *plan = hb_subset_plan_create_or_fail (source, input);
if (unlikely (plan->in_error ())) { if (unlikely (!plan)) {
hb_subset_plan_destroy (plan);
return nullptr; return nullptr;
} }
@ -367,7 +366,7 @@ hb_subset_or_fail (hb_face_t *source, const hb_subset_input_t *input)
hb_face_t * hb_face_t *
hb_subset_plan_execute_or_fail (hb_subset_plan_t *plan) hb_subset_plan_execute_or_fail (hb_subset_plan_t *plan)
{ {
if (unlikely (plan->in_error ())) { if (unlikely (!plan || plan->in_error ())) {
return nullptr; return nullptr;
} }

4
src/hb-subset.h
View File

@ -158,8 +158,8 @@ HB_EXTERN hb_face_t *
hb_subset_plan_execute_or_fail (hb_subset_plan_t *plan); hb_subset_plan_execute_or_fail (hb_subset_plan_t *plan);
HB_EXTERN hb_subset_plan_t * HB_EXTERN hb_subset_plan_t *
hb_subset_plan_create (hb_face_t *face, hb_subset_plan_create_or_fail (hb_face_t *face,
const hb_subset_input_t *input); const hb_subset_input_t *input);
HB_EXTERN void HB_EXTERN void
hb_subset_plan_destroy (hb_subset_plan_t *plan); hb_subset_plan_destroy (hb_subset_plan_t *plan);

3
test/api/test-subset.c
View File

@ -167,7 +167,8 @@ test_subset_plan (void)
hb_subset_input_t* input = hb_subset_test_create_input (codepoints); hb_subset_input_t* input = hb_subset_test_create_input (codepoints);
hb_set_destroy (codepoints); hb_set_destroy (codepoints);
hb_subset_plan_t* plan = hb_subset_plan_create (face_abc, input); hb_subset_plan_t* plan = hb_subset_plan_create_or_fail (face_abc, input);
g_assert (plan);
const hb_map_t* mapping = hb_subset_plan_old_to_new_glyph_mapping (plan); const hb_map_t* mapping = hb_subset_plan_old_to_new_glyph_mapping (plan);
g_assert (hb_map_get (mapping, 1) == 1); g_assert (hb_map_get (mapping, 1) == 1);