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

[perf] Only call combining_class() for marks 

Saves some time.  Also preparing for reusing the ccc byte for other stuff.
This commit is contained in:
Behdad Esfahbod 2015-11-02 17:27:48 -08:00
parent 5ba450407b
commit 7127718545
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/hb-ot-layout-private.hh
View File

@ -224,12 +224,14 @@ enum {
static inline void
_hb_glyph_info_set_unicode_props (hb_glyph_info_t *info, hb_unicode_funcs_t *unicode)
{
/* XXX This shouldn't be inlined, or at least not while is_default_ignorable() is inline. */
info->unicode_props0() = ((unsigned int) unicode->general_category (info->codepoint)) |
(unicode->is_default_ignorable (info->codepoint) ? MASK0_IGNORABLE : 0) |
(info->codepoint == 0x200Cu ? MASK0_ZWNJ : 0) |
(info->codepoint == 0x200Du ? MASK0_ZWJ : 0);
info->unicode_props1() = unicode->modified_combining_class (info->codepoint);
unsigned int gen_cat = (unsigned int) unicode->general_category (info->codepoint);
/* XXX This wouldn't be inlined, or at least not while is_default_ignorable() is inline. */
info->unicode_props0() = gen_cat |
(unicode->is_default_ignorable (info->codepoint) ? MASK0_IGNORABLE : 0) |
(info->codepoint == 0x200Cu ? MASK0_ZWNJ : 0) |
(info->codepoint == 0x200Du ? MASK0_ZWJ : 0);
info->unicode_props1() = unlikely (HB_UNICODE_GENERAL_CATEGORY_IS_MARK (gen_cat)) ?
unicode->modified_combining_class (info->codepoint) : 0;
}
static inline void