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

[subset] More HB_NO_SUBSET_LAYOUT 

Part of https://github.com/harfbuzz/harfbuzz/issues/1652
This commit is contained in:
Behdad Esfahbod 2019-05-10 23:46:22 -07:00
parent 31c591d69f
commit d43af339e7
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@
#include "hb-ot-glyf-table.hh" #include "hb-ot-glyf-table.hh"
#include "hb-ot-cff1-table.hh" #include "hb-ot-cff1-table.hh"
static void static inline void
_add_gid_and_children (const OT::glyf::accelerator_t &glyf, _add_gid_and_children (const OT::glyf::accelerator_t &glyf,
hb_codepoint_t gid, hb_codepoint_t gid,
hb_set_t *gids_to_retain) hb_set_t *gids_to_retain)
@ -53,7 +53,7 @@ _add_gid_and_children (const OT::glyf::accelerator_t &glyf,
} }
} }
static void static inline void
_add_cff_seac_components (const OT::cff1::accelerator_t &cff, _add_cff_seac_components (const OT::cff1::accelerator_t &cff,
hb_codepoint_t gid, hb_codepoint_t gid,
hb_set_t *gids_to_retain) hb_set_t *gids_to_retain)
@ -66,7 +66,7 @@ _add_cff_seac_components (const OT::cff1::accelerator_t &cff,
} }
} }
static void static inline void
_gsub_closure (hb_face_t *face, hb_set_t *gids_to_retain) _gsub_closure (hb_face_t *face, hb_set_t *gids_to_retain)
{ {
hb_set_t lookup_indices; hb_set_t lookup_indices;
@ -81,7 +81,7 @@ _gsub_closure (hb_face_t *face, hb_set_t *gids_to_retain)
gids_to_retain); gids_to_retain);
} }
static void static inline void
_remove_invalid_gids (hb_set_t *glyphs, _remove_invalid_gids (hb_set_t *glyphs,
unsigned int num_glyphs) unsigned int num_glyphs)
{ {
@ -126,9 +126,11 @@ _populate_gids_to_retain (hb_face_t *face,
initial_gids_to_retain->add (gid); initial_gids_to_retain->add (gid);
} }
#ifndef HB_NO_SUBSET_LAYOUT
if (close_over_gsub) if (close_over_gsub)
// Add all glyphs needed for GSUB substitutions. // Add all glyphs needed for GSUB substitutions.
_gsub_closure (face, initial_gids_to_retain); _gsub_closure (face, initial_gids_to_retain);
#endif
// Populate a full set of glyphs to retain by adding all referenced // Populate a full set of glyphs to retain by adding all referenced
// composite glyphs. // composite glyphs.
@ -137,14 +139,15 @@ _populate_gids_to_retain (hb_face_t *face,
while (initial_gids_to_retain->next (&gid)) while (initial_gids_to_retain->next (&gid))
{ {
_add_gid_and_children (glyf, gid, all_gids_to_retain); _add_gid_and_children (glyf, gid, all_gids_to_retain);
#ifndef HB_NO_SUBSET_CFF
if (cff.is_valid ()) if (cff.is_valid ())
_add_cff_seac_components (cff, gid, all_gids_to_retain); _add_cff_seac_components (cff, gid, all_gids_to_retain);
#endif
} }
hb_set_destroy (initial_gids_to_retain); hb_set_destroy (initial_gids_to_retain);
_remove_invalid_gids (all_gids_to_retain, face->get_num_glyphs ()); _remove_invalid_gids (all_gids_to_retain, face->get_num_glyphs ());
cff.fini (); cff.fini ();
glyf.fini (); glyf.fini ();
cmap.fini (); cmap.fini ();