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

[ot-font] Use the cmap cache more 

Use the cmap cache for get_nominal_glyph and
get_variation_glyph as well. The first of these
is used a lot in pango.
This commit is contained in:
Matthias Clasen 2023-01-29 09:17:17 -05:00
parent 5da829eaf5
commit 318aa10708
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/hb-ot-cmap-table.hh
View File

@ -1898,7 +1898,6 @@ struct cmap
bool get_nominal_glyph (hb_codepoint_t unicode, bool get_nominal_glyph (hb_codepoint_t unicode,
hb_codepoint_t *glyph) const hb_codepoint_t *glyph) const
{ {
if (unlikely (!this->get_glyph_funcZ)) return false;
return this->get_glyph_funcZ (this->get_glyph_data, unicode, glyph); return this->get_glyph_funcZ (this->get_glyph_data, unicode, glyph);
} }
@ -1913,12 +1912,20 @@ struct cmap
*glyph = v; *glyph = v;
return true; return true;
} }
bool ret = this->get_glyph_funcZ (this->get_glyph_data, unicode, glyph); bool ret = get_nominal_glyph (unicode, glyph);
if (cache && ret) if (cache && ret)
cache->set (unicode, *glyph); cache->set (unicode, *glyph);
return ret; return ret;
} }
template <typename cache_t = void>
bool get_nominal_glyph (hb_codepoint_t unicode,
hb_codepoint_t *glyph,
cache_t *cache = nullptr) const
{
return _cached_get (unicode, glyph, cache);
}
template <typename cache_t = void> template <typename cache_t = void>
unsigned int get_nominal_glyphs (unsigned int count, unsigned int get_nominal_glyphs (unsigned int count,
const hb_codepoint_t *first_unicode, const hb_codepoint_t *first_unicode,
@ -1940,9 +1947,11 @@ struct cmap
return done; return done;
} }
template <typename cache_t = void>
bool get_variation_glyph (hb_codepoint_t unicode, bool get_variation_glyph (hb_codepoint_t unicode,
hb_codepoint_t variation_selector, hb_codepoint_t variation_selector,
hb_codepoint_t *glyph) const hb_codepoint_t *glyph,
cache_t *cache = nullptr) const
{ {
switch (this->subtable_uvs->get_glyph_variant (unicode, switch (this->subtable_uvs->get_glyph_variant (unicode,
variation_selector, variation_selector,
@ -1953,7 +1962,7 @@ struct cmap
case GLYPH_VARIANT_USE_DEFAULT: break; case GLYPH_VARIANT_USE_DEFAULT: break;
} }
return get_nominal_glyph (unicode, glyph); return get_nominal_glyph (unicode, glyph, cache);
} }
void collect_unicodes (hb_set_t *out, unsigned int num_glyphs) const void collect_unicodes (hb_set_t *out, unsigned int num_glyphs) const

6
src/hb-ot-font.cc
View File

@ -136,7 +136,7 @@ hb_ot_get_nominal_glyph (hb_font_t *font HB_UNUSED,
{ {
const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data; const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data;
const hb_ot_face_t *ot_face = ot_font->ot_face; const hb_ot_face_t *ot_face = ot_font->ot_face;
return ot_face->cmap->get_nominal_glyph (unicode, glyph); return ot_face->cmap->get_nominal_glyph (unicode, glyph, ot_font->cmap_cache);
} }
static unsigned int static unsigned int
@ -167,7 +167,9 @@ hb_ot_get_variation_glyph (hb_font_t *font HB_UNUSED,
{ {
const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data; const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data;
const hb_ot_face_t *ot_face = ot_font->ot_face; const hb_ot_face_t *ot_face = ot_font->ot_face;
return ot_face->cmap->get_variation_glyph (unicode, variation_selector, glyph); return ot_face->cmap->get_variation_glyph (unicode,
variation_selector, glyph,
ot_font->cmap_cache);
} }
static void static void