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

Formatting for hb-subset-plan.

This commit is contained in:
Garret Rieger 2018-02-09 16:06:33 -08:00
parent 86aa4b3ba7
commit 3bc81558d8
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,15 +29,16 @@
#include "hb-subset-plan.hh" #include "hb-subset-plan.hh"
#include "hb-ot-cmap-table.hh" #include "hb-ot-cmap-table.hh"
int hb_codepoint_t_cmp(const void *l, const void *r) { int
hb_codepoint_t_cmp (const void *l, const void *r) {
return *((hb_codepoint_t *) l) - *((hb_codepoint_t *) r); return *((hb_codepoint_t *) l) - *((hb_codepoint_t *) r);
} }
hb_bool_t hb_bool_t
hb_subset_plan_new_gid_for_old_id(hb_subset_plan_t *plan, hb_subset_plan_new_gid_for_old_id (hb_subset_plan_t *plan,
hb_codepoint_t old_gid, hb_codepoint_t old_gid,
hb_codepoint_t *new_gid) { hb_codepoint_t *new_gid)
{
// the index in old_gids is the new gid; only up to codepoints.len are valid // the index in old_gids is the new gid; only up to codepoints.len are valid
for (unsigned int i = 0; i < plan->codepoints.len; i++) { for (unsigned int i = 0; i < plan->codepoints.len; i++) {
if (plan->gids_to_retain[i] == old_gid) { if (plan->gids_to_retain[i] == old_gid) {
@ -48,43 +49,45 @@ hb_subset_plan_new_gid_for_old_id(hb_subset_plan_t *plan,
return false; return false;
} }
void populate_codepoints(hb_set_t *input_codepoints, void
hb_auto_array_t<hb_codepoint_t>& plan_codepoints) { _populate_codepoints (hb_set_t *input_codepoints,
plan_codepoints.alloc(hb_set_get_population(input_codepoints)); hb_auto_array_t<hb_codepoint_t>& plan_codepoints)
{
plan_codepoints.alloc (hb_set_get_population (input_codepoints));
hb_codepoint_t cp = -1; hb_codepoint_t cp = -1;
while (hb_set_next(input_codepoints, &cp)) { while (hb_set_next (input_codepoints, &cp)) {
hb_codepoint_t *wr = plan_codepoints.push(); hb_codepoint_t *wr = plan_codepoints.push();
*wr = cp; *wr = cp;
} }
plan_codepoints.qsort(hb_codepoint_t_cmp); plan_codepoints.qsort (hb_codepoint_t_cmp);
} }
void void
populate_gids_to_retain (hb_face_t *face, _populate_gids_to_retain (hb_face_t *face,
hb_auto_array_t<hb_codepoint_t>& codepoints, hb_auto_array_t<hb_codepoint_t>& codepoints,
hb_auto_array_t<hb_codepoint_t>& old_gids) hb_auto_array_t<hb_codepoint_t>& old_gids)
{ {
OT::cmap::accelerator_t cmap; OT::cmap::accelerator_t cmap;
cmap.init (face); cmap.init (face);
hb_auto_array_t<unsigned int> bad_indices; hb_auto_array_t<unsigned int> bad_indices;
old_gids.alloc(codepoints.len); old_gids.alloc (codepoints.len);
for (unsigned int i = 0; i < codepoints.len; i++) { for (unsigned int i = 0; i < codepoints.len; i++) {
hb_codepoint_t gid; hb_codepoint_t gid;
if (!cmap.get_nominal_glyph(codepoints[i], &gid)) { if (!cmap.get_nominal_glyph (codepoints[i], &gid)) {
gid = -1; gid = -1;
*(bad_indices.push()) = i; *(bad_indices.push ()) = i;
} }
*(old_gids.push()) = gid; *(old_gids.push ()) = gid;
} }
while (bad_indices.len > 0) { while (bad_indices.len > 0) {
unsigned int i = bad_indices[bad_indices.len - 1]; unsigned int i = bad_indices[bad_indices.len - 1];
bad_indices.pop(); bad_indices.pop ();
DEBUG_MSG(SUBSET, nullptr, "Drop U+%04X; no gid", codepoints[i]); DEBUG_MSG(SUBSET, nullptr, "Drop U+%04X; no gid", codepoints[i]);
codepoints.remove(i); codepoints.remove (i);
old_gids.remove(i); old_gids.remove (i);
} }
for (unsigned int i = 0; i < codepoints.len; i++) { for (unsigned int i = 0; i < codepoints.len; i++) {
@ -116,8 +119,8 @@ hb_subset_plan_create (hb_face_t *face,
hb_subset_input_t *input) hb_subset_input_t *input)
{ {
hb_subset_plan_t *plan = hb_object_create<hb_subset_plan_t> (); hb_subset_plan_t *plan = hb_object_create<hb_subset_plan_t> ();
populate_codepoints(input->codepoints, plan->codepoints); _populate_codepoints (input->codepoints, plan->codepoints);
populate_gids_to_retain(face, plan->codepoints, plan->gids_to_retain); _populate_gids_to_retain (face, plan->codepoints, plan->gids_to_retain);
return plan; return plan;
} }
@ -138,7 +141,7 @@ hb_subset_plan_destroy (hb_subset_plan_t *plan)
{ {
if (!hb_object_destroy (plan)) return; if (!hb_object_destroy (plan)) return;
plan->codepoints.finish(); plan->codepoints.finish ();
plan->gids_to_retain.finish(); plan->gids_to_retain.finish ();
free (plan); free (plan);
} }