diff options
| author | Michiharu Ariza <ariza@adobe.com> | 2019-02-14 10:09:19 -0800 |
|---|---|---|
| committer | Michiharu Ariza <ariza@adobe.com> | 2019-02-14 10:09:19 -0800 |
| commit | 1cb1d5d7fb74e9f42dc8361dcdf669ed479d595d (patch) | |
| tree | 3d1a2ee11e7b0255b842ad4c5d743ac0edf53470 /src | |
| parent | 8a568a8858b44a81ca43a82761a70bf8d53e7c26 (diff) | |
| parent | d5287e1ba40638be5d48178ce3d64557b622b01f (diff) | |
Merge branch 'master' into cff-more-arrayof-fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/hb-ot-layout.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/hb-ot-layout.hh b/src/hb-ot-layout.hh index b2b5ec29..5125e9fa 100644 --- a/src/hb-ot-layout.hh +++ b/src/hb-ot-layout.hh @@ -215,7 +215,7 @@ _hb_glyph_info_set_unicode_props (hb_glyph_info_t *info, hb_buffer_t *buffer) unsigned int gen_cat = (unsigned int) unicode->general_category (u); unsigned int props = gen_cat; - if (u >= 0x80) + if (u >= 0x80u) { buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_NON_ASCII; @@ -232,10 +232,10 @@ _hb_glyph_info_set_unicode_props (hb_glyph_info_t *info, hb_buffer_t *buffer) * FVSes are GC=Mn, we have use a separate bit to remember them. * Fixes: * https://github.com/harfbuzz/harfbuzz/issues/234 */ - else if (unlikely (hb_in_range<uint32_t> (u, 0x180Bu, 0x180Du))) props |= UPROPS_MASK_HIDDEN; + else if (unlikely (hb_in_range<hb_codepoint_t> (u, 0x180Bu, 0x180Du))) props |= UPROPS_MASK_HIDDEN; /* TAG characters need similar treatment. Fixes: * https://github.com/harfbuzz/harfbuzz/issues/463 */ - else if (unlikely (hb_in_range<uint32_t> (u, 0xE0020u, 0xE007Fu))) props |= UPROPS_MASK_HIDDEN; + else if (unlikely (hb_in_range<hb_codepoint_t> (u, 0xE0020u, 0xE007Fu))) props |= UPROPS_MASK_HIDDEN; /* COMBINING GRAPHEME JOINER should not be skipped; at least some times. * https://github.com/harfbuzz/harfbuzz/issues/554 */ else if (unlikely (u == 0x034Fu)) |