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

Merge pull request #4092 from harfbuzz/more-cmap-cache 

[ot-font] Use the cmap cache more
This commit is contained in:
Behdad Esfahbod 2023-01-29 09:36:46 -07:00 committed by GitHub
parent 6622e04aa1 784fe9ac67
commit 02f79f60f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,7 @@
#include "hb-ot-shaper-arabic-pua.hh" #include "hb-ot-shaper-arabic-pua.hh"
#include "hb-open-type.hh" #include "hb-open-type.hh"
#include "hb-set.hh" #include "hb-set.hh"
#include "hb-cache.hh"
/* /*
* cmap -- Character to Glyph Index Mapping * cmap -- Character to Glyph Index Mapping
@ -1841,6 +1842,8 @@ struct cmap
struct accelerator_t struct accelerator_t
{ {
using cache_t = hb_cache_t<21, 16, 8, true>;
accelerator_t (hb_face_t *face) accelerator_t (hb_face_t *face)
{ {
this->table = hb_sanitize_context_t ().reference_table<cmap> (face); this->table = hb_sanitize_context_t ().reference_table<cmap> (face);
@ -1895,14 +1898,6 @@ struct cmap
} }
~accelerator_t () { this->table.destroy (); } ~accelerator_t () { this->table.destroy (); }
bool get_nominal_glyph (hb_codepoint_t unicode,
hb_codepoint_t *glyph) const
{
if (unlikely (!this->get_glyph_funcZ)) return false;
return this->get_glyph_funcZ (this->get_glyph_data, unicode, glyph);
}
template <typename cache_t = void>
inline bool _cached_get (hb_codepoint_t unicode, inline bool _cached_get (hb_codepoint_t unicode,
hb_codepoint_t *glyph, hb_codepoint_t *glyph,
cache_t *cache) const cache_t *cache) const
@ -1913,13 +1908,21 @@ struct cmap
*glyph = v; *glyph = v;
return true; return true;
} }
bool ret = this->get_glyph_funcZ (this->get_glyph_data, unicode, glyph); bool ret = this->get_glyph_funcZ (this->get_glyph_data, 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
{
if (unlikely (!this->get_glyph_funcZ)) return 0;
return _cached_get (unicode, glyph, cache);
}
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,
unsigned int unicode_stride, unsigned int unicode_stride,
@ -1942,7 +1945,8 @@ struct cmap
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 +1957,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