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

[VARC] Separate varc scratch from glyf scratch

Browse source
This commit is contained in:
Behdad Esfahbod 2025-03-03 01:19:52 -07:00
parent 3199d1c1f5
commit a62058eee8
3 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/OT/Var/VARC/VARC.cc
View file

@ -355,7 +355,7 @@ VARC::get_path_at (const hb_varc_context_t &c,
hb_draw_session_t transformer_session {transformer_funcs, &context};
hb_draw_session_t &shape_draw_session = transform.is_identity () ? *c.draw_session : transformer_session;
if (!c.font->face->table.glyf->get_path_at (c.font, glyph, shape_draw_session, coords, c.scratch))
if (!c.font->face->table.glyf->get_path_at (c.font, glyph, shape_draw_session, coords, c.scratch.glyf_scratch))
#ifndef HB_NO_CFF
if (!c.font->face->table.cff2->get_path_at (c.font, glyph, shape_draw_session, coords))
if (!c.font->face->table.cff1->get_path (c.font, glyph, shape_draw_session)) // Doesn't have variations

27
src/OT/Var/VARC/VARC.hh
View file

@ -21,6 +21,13 @@ namespace OT {
#ifndef HB_NO_VAR_COMPOSITES
struct hb_varc_scratch_t
{
hb_vector_t<unsigned> axisIndices;
hb_vector_t<float> axisValues;
hb_glyf_scratch_t glyf_scratch;
};
struct hb_varc_context_t
{
hb_font_t *font;
@ -29,7 +36,7 @@ struct hb_varc_context_t
mutable hb_decycler_t decycler;
mutable signed edges_left;
mutable signed depth_left;
hb_glyf_scratch_t &scratch;
hb_varc_scratch_t &scratch;
};
struct VarComponent
@ -105,7 +112,7 @@ struct VARC
get_path (hb_font_t *font,
hb_codepoint_t gid,
hb_draw_session_t &draw_session,
hb_glyf_scratch_t &scratch) const
hb_varc_scratch_t &scratch) const
{
hb_varc_context_t c {font,
&draw_session,
@ -123,7 +130,7 @@ struct VARC
get_extents (hb_font_t *font,
hb_codepoint_t gid,
hb_extents_t *extents,
hb_glyf_scratch_t &scratch) const
hb_varc_scratch_t &scratch) const
{
hb_varc_context_t c {font,
nullptr,
@ -163,7 +170,7 @@ struct VARC
auto *scratch = cached_scratch.get_relaxed ();
if (scratch)
{
scratch->~hb_glyf_scratch_t ();
scratch->~hb_varc_scratch_t ();
hb_free (scratch);
}
@ -204,31 +211,31 @@ struct VARC
private:
hb_glyf_scratch_t *acquire_scratch () const
hb_varc_scratch_t *acquire_scratch () const
{
hb_glyf_scratch_t *scratch = cached_scratch.get_acquire ();
hb_varc_scratch_t *scratch = cached_scratch.get_acquire ();
if (!scratch || unlikely (!cached_scratch.cmpexch (scratch, nullptr)))
{
scratch = (hb_glyf_scratch_t *) hb_calloc (1, sizeof (hb_glyf_scratch_t));
scratch = (hb_varc_scratch_t *) hb_calloc (1, sizeof (hb_varc_scratch_t));
if (unlikely (!scratch))
return nullptr;
}
return scratch;
}
void release_scratch (hb_glyf_scratch_t *scratch) const
void release_scratch (hb_varc_scratch_t *scratch) const
{
if (!cached_scratch.cmpexch (scratch, nullptr))
{
scratch->~hb_glyf_scratch_t ();
scratch->~hb_varc_scratch_t ();
hb_free (scratch);
}
}
private:
hb_blob_ptr_t<VARC> table;
hb_atomic_ptr_t<hb_glyf_scratch_t> cached_scratch;
hb_atomic_ptr_t<hb_varc_scratch_t> cached_scratch;
};
bool has_data () const { return version.major != 0; }

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

@ -53,10 +53,6 @@ struct hb_glyf_scratch_t
contour_point_vector_t deltas;
hb_vector_t<unsigned int> shared_indices;
hb_vector_t<unsigned int> private_indices;
// VARC
hb_vector_t<unsigned> axisIndices;
hb_vector_t<float> axisValues;
};
namespace OT {