Formatting for hb-subset-plan.

pull/769/head^2
Garret Rieger 7 years ago
parent 86aa4b3ba7
commit 3bc81558d8
  1. 51
      src/hb-subset-plan.cc

@ -29,15 +29,16 @@
#include "hb-subset-plan.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);
}
hb_bool_t
hb_subset_plan_new_gid_for_old_id(hb_subset_plan_t *plan,
hb_codepoint_t old_gid,
hb_codepoint_t *new_gid) {
hb_subset_plan_new_gid_for_old_id (hb_subset_plan_t *plan,
hb_codepoint_t old_gid,
hb_codepoint_t *new_gid)
{
// 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++) {
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;
}
void populate_codepoints(hb_set_t *input_codepoints,
hb_auto_array_t<hb_codepoint_t>& plan_codepoints) {
plan_codepoints.alloc(hb_set_get_population(input_codepoints));
void
_populate_codepoints (hb_set_t *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;
while (hb_set_next(input_codepoints, &cp)) {
while (hb_set_next (input_codepoints, &cp)) {
hb_codepoint_t *wr = plan_codepoints.push();
*wr = cp;
}
plan_codepoints.qsort(hb_codepoint_t_cmp);
plan_codepoints.qsort (hb_codepoint_t_cmp);
}
void
populate_gids_to_retain (hb_face_t *face,
hb_auto_array_t<hb_codepoint_t>& codepoints,
hb_auto_array_t<hb_codepoint_t>& old_gids)
_populate_gids_to_retain (hb_face_t *face,
hb_auto_array_t<hb_codepoint_t>& codepoints,
hb_auto_array_t<hb_codepoint_t>& old_gids)
{
OT::cmap::accelerator_t cmap;
cmap.init (face);
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++) {
hb_codepoint_t gid;
if (!cmap.get_nominal_glyph(codepoints[i], &gid)) {
if (!cmap.get_nominal_glyph (codepoints[i], &gid)) {
gid = -1;
*(bad_indices.push()) = i;
*(bad_indices.push ()) = i;
}
*(old_gids.push()) = gid;
*(old_gids.push ()) = gid;
}
while (bad_indices.len > 0) {
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]);
codepoints.remove(i);
old_gids.remove(i);
codepoints.remove (i);
old_gids.remove (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_plan_t *plan = hb_object_create<hb_subset_plan_t> ();
populate_codepoints(input->codepoints, plan->codepoints);
populate_gids_to_retain(face, plan->codepoints, plan->gids_to_retain);
_populate_codepoints (input->codepoints, plan->codepoints);
_populate_gids_to_retain (face, plan->codepoints, plan->gids_to_retain);
return plan;
}
@ -138,7 +141,7 @@ hb_subset_plan_destroy (hb_subset_plan_t *plan)
{
if (!hb_object_destroy (plan)) return;
plan->codepoints.finish();
plan->gids_to_retain.finish();
plan->codepoints.finish ();
plan->gids_to_retain.finish ();
free (plan);
}

Loading…
Cancel
Save