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

Merge branch 'master' into cff-subset

This commit is contained in:
Michiharu Ariza 2018-09-07 10:50:55 -07:00
parent 22b88632d5 ebe67137ab
commit 1e88b1755c
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/hb-ot-layout-common.hh
View File

@ -702,6 +702,23 @@ struct Lookup
return_trace (true); return_trace (true);
} }
/* Older compileres need this to NOT be locally defined in a function. */
template <typename TSubTable>
struct SubTableSubsetWrapper
{
inline SubTableSubsetWrapper (const TSubTable &subtable_,
unsigned int lookup_type_) :
subtable (subtable_),
lookup_type (lookup_type_) {}
inline bool subset (hb_subset_context_t *c) const
{ return subtable.dispatch (c, lookup_type); }
private:
const TSubTable &subtable;
unsigned int lookup_type;
};
template <typename TSubTable> template <typename TSubTable>
inline bool subset (hb_subset_context_t *c) const inline bool subset (hb_subset_context_t *c) const
{ {
@ -717,20 +734,7 @@ struct Lookup
unsigned int count = subTable.len; unsigned int count = subTable.len;
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
{ {
struct Wrapper SubTableSubsetWrapper<TSubTable> wrapper (this+subtables[i], get_type ());
{
inline Wrapper (const TSubTable &subtable_,
unsigned int lookup_type_) :
subtable (subtable_),
lookup_type (lookup_type_) {}
inline bool subset (hb_subset_context_t *c) const
{ return subtable.dispatch (c, lookup_type); }
private:
const TSubTable &subtable;
unsigned int lookup_type;
} wrapper (this+subtables[i], get_type ());
out_subtables[i].serialize_subset (c, wrapper, out); out_subtables[i].serialize_subset (c, wrapper, out);
} }

3
src/hb-subset.cc
View File

@ -53,6 +53,9 @@ _plan_estimate_subset_table_size (hb_subset_plan_t *plan,
unsigned int src_glyphs = plan->source->get_num_glyphs (); unsigned int src_glyphs = plan->source->get_num_glyphs ();
unsigned int dst_glyphs = plan->glyphset->get_population (); unsigned int dst_glyphs = plan->glyphset->get_population ();
if (unlikely (!src_glyphs))
return 512 + table_len;
return 512 + (unsigned int) (table_len * sqrt ((double) dst_glyphs / src_glyphs)); return 512 + (unsigned int) (table_len * sqrt ((double) dst_glyphs / src_glyphs));
} }