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

Refactor subset glyf to remove multiple calls to glyf.fini()

This commit is contained in:
Garret Rieger 2018-02-07 13:28:11 -08:00 committed by Behdad Esfahbod
parent 0a5d1440f8
commit 4e1abe2ce0
1 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/hb-subset-glyf.cc
View File

@ -74,6 +74,38 @@ write_glyf_prime (const OT::glyf::accelerator_t &glyf,
return true; return true;
} }
bool
_hb_subset_glyf (const OT::glyf::accelerator_t &glyf,
const char *glyf_data,
hb_set_t *glyphs_to_retain,
hb_blob_t **glyf_prime /* OUT */)
{
// TODO(grieger): Sanity check writes to make sure they are in-bounds.
// TODO(grieger): Sanity check allocation size for the new table.
// TODO(grieger): Subset loca simultaneously.
unsigned int glyf_prime_size;
if (!calculate_glyf_prime_size (glyf,
glyphs_to_retain,
&glyf_prime_size)) {
return false;
}
char *glyf_prime_data = (char *) calloc (glyf_prime_size, 1);
if (!write_glyf_prime (glyf, glyf_data, glyphs_to_retain, glyf_prime_size,
glyf_prime_data)) {
free (glyf_prime_data);
return false;
}
*glyf_prime = hb_blob_create (glyf_prime_data,
glyf_prime_size,
HB_MEMORY_MODE_READONLY,
glyf_prime_data,
free);
return true;
}
/** /**
* hb_subset_glyf: * hb_subset_glyf:
* Subsets the glyph table according to a provided plan. * Subsets the glyph table according to a provided plan.
@ -87,37 +119,13 @@ hb_subset_glyf (hb_subset_plan_t *plan,
hb_face_t *face, hb_face_t *face,
hb_blob_t **glyf_prime /* OUT */) hb_blob_t **glyf_prime /* OUT */)
{ {
// TODO(grieger): Sanity check writes to make sure they are in-bounds.
// TODO(grieger): Sanity check allocation size for the new table.
// TODO(grieger): Subset loca simultaneously.
hb_blob_t *glyf_blob = OT::Sanitizer<OT::glyf>().sanitize (face->reference_table (HB_OT_TAG_glyf)); hb_blob_t *glyf_blob = OT::Sanitizer<OT::glyf>().sanitize (face->reference_table (HB_OT_TAG_glyf));
const char *glyf_data = hb_blob_get_data(glyf_blob, nullptr); const char *glyf_data = hb_blob_get_data(glyf_blob, nullptr);
OT::glyf::accelerator_t glyf; OT::glyf::accelerator_t glyf;
glyf.init(face); glyf.init(face);
bool result = _hb_subset_glyf (glyf, glyf_data, plan->glyphs_to_retain, glyf_prime);
unsigned int glyf_prime_size;
if (!calculate_glyf_prime_size (glyf,
plan->glyphs_to_retain,
&glyf_prime_size)) {
glyf.fini(); glyf.fini();
return false;
}
char *glyf_prime_data = (char *) calloc (glyf_prime_size, 1); return result;
if (!write_glyf_prime (glyf, glyf_data, plan->glyphs_to_retain, glyf_prime_size,
glyf_prime_data)) {
glyf.fini();
free (glyf_prime_data);
return false;
}
glyf.fini();
*glyf_prime = hb_blob_create (glyf_prime_data,
glyf_prime_size,
HB_MEMORY_MODE_READONLY,
glyf_prime_data,
free);
return true;
} }