organicmaps/harfbuzz
13
Fork 0
mirror of https://github.com/harfbuzz/harfbuzz.git synced 2025-04-06 14:05:05 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 7

[instancer] add iup_optimize() call into instantiation

Browse source
This commit is contained in:
Qunxin Liu 2024-01-26 11:26:10 -08:00
parent 52c3cda31b
commit 0cbc812340
2 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/hb-ot-var-common.hh
View file

@ -609,7 +609,9 @@ struct tuple_delta_t
const hb_map_t& axes_old_index_tag_map,
const hb_hashmap_t<const hb_vector_t<char>*, unsigned>* shared_tuples_idx_map)
{
if (!compiled_deltas) return false;
/* compiled_deltas could be empty after iup delta optimization, we can skip
* compiling this tuple and return true */
if (!compiled_deltas) return true;
unsigned cur_axis_count = axes_index_map.get_population ();
/* allocate enough memory: 1 peak + 2 intermediate coords + fixed header size */
@ -1755,6 +1757,9 @@ struct TupleVariationData
* min_size: 4 */
unsigned compiled_byte_size = 4;
/* for gvar iup delta optimization: whether this is a composite glyph */
bool is_composite = false;
public:
tuple_variations_t () = default;
tuple_variations_t (const tuple_variations_t&) = delete;
@ -1766,7 +1771,7 @@ struct TupleVariationData
explicit operator bool () const { return bool (tuple_vars); }
unsigned get_var_count () const
{
unsigned count = tuple_vars.length;
unsigned count = 0;
/* when iup delta opt is enabled, compiled_deltas could be empty and we
* should skip this tuple */
for (auto& tuple: tuple_vars)
@ -1786,7 +1791,8 @@ struct TupleVariationData
bool is_gvar,
const hb_map_t *axes_old_index_tag_map,
const hb_vector_t<unsigned> &shared_indices,
const hb_array_t<const F2DOT14> shared_tuples)
const hb_array_t<const F2DOT14> shared_tuples,
bool is_composite_glyph)
{
do
{
@ -1845,6 +1851,8 @@ struct TupleVariationData
}
tuple_vars.push (std::move (var));
} while (iterator.move_to_next ());
is_composite = is_composite_glyph;
return true;
}
@ -2041,6 +2049,16 @@ struct TupleVariationData
return true;
}
bool iup_optimize (const contour_point_vector_t& contour_points)
{
for (tuple_delta_t& var : tuple_vars)
{
if (!var.optimize (contour_points, is_composite))
return false;
}
return true;
}
public:
bool instantiate (const hb_hashmap_t<hb_tag_t, Triple>& normalized_axes_location,
const hb_hashmap_t<hb_tag_t, TripleDistances>& axes_triple_distances,
@ -2062,6 +2080,7 @@ struct TupleVariationData
if (!merge_tuple_variations (optimize ? contour_points : nullptr))
return false;
if (optimize && !iup_optimize (*contour_points)) return false;
return !tuple_vars.in_error ();
}
@ -2324,13 +2343,15 @@ struct TupleVariationData
const hb_map_t *axes_old_index_tag_map,
const hb_vector_t<unsigned> &shared_indices,
const hb_array_t<const F2DOT14> shared_tuples,
tuple_variations_t& tuple_variations /* OUT */) const
tuple_variations_t& tuple_variations, /* OUT */
bool is_composite_glyph = false) const
{
return tuple_variations.create_from_tuple_var_data (iterator, tupleVarCount,
point_count, is_gvar,
axes_old_index_tag_map,
shared_indices,
shared_tuples);
shared_tuples,
is_composite_glyph);
}
bool serialize (hb_serialize_context_t *c,

6
src/hb-ot-var-gvar-table.hh
View file

@ -114,13 +114,17 @@ struct glyph_variations_t
bool instantiate (const hb_subset_plan_t *plan)
{
unsigned count = plan->new_to_old_gid_list.length;
bool iup_optimize = false;
#ifdef HB_EXPERIMENTAL_API
iup_optimize = plan->flags & HB_SUBSET_FLAGS_IUP_DELTA_OPT;
#endif
for (unsigned i = 0; i < count; i++)
{
hb_codepoint_t new_gid = plan->new_to_old_gid_list[i].first;
contour_point_vector_t *all_points;
if (!plan->new_gid_contour_points_map.has (new_gid, &all_points))
return false;
if (!glyph_variations[i].instantiate (plan->axes_location, plan->axes_triple_distances, all_points))
if (!glyph_variations[i].instantiate (plan->axes_location, plan->axes_triple_distances, all_points, iup_optimize))
return false;
}
return true;