diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2017-10-23 05:48:12 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2017-10-23 05:48:12 +0000 |
commit | 6a26d1aa8ad4cdce657ae0ae7c12b464b34b6bd1 (patch) | |
tree | 61e17b15c55073763d4e45388b20322d5311c783 /Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-map-private.hh | |
parent | 1ee93ecee3dcb1e5ed488c3d8616a5ebfdf9fa7a (diff) |
harfbuzz 1.6.1
git-svn-id: svn://tug.org/texlive/trunk@45584 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-map-private.hh')
-rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-map-private.hh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-map-private.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-map-private.hh index 6f774dde02f..105909a1fdb 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-map-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-map-private.hh @@ -53,8 +53,8 @@ struct hb_ot_map_t unsigned int auto_zwnj : 1; unsigned int auto_zwj : 1; - static int cmp (const feature_map_t *a, const feature_map_t *b) - { return a->tag < b->tag ? -1 : a->tag > b->tag ? 1 : 0; } + inline int cmp (const hb_tag_t *tag_) const + { return *tag_ < tag ? -1 : *tag_ > tag ? 1 : 0; } }; struct lookup_map_t { @@ -79,7 +79,7 @@ struct hb_ot_map_t inline hb_mask_t get_global_mask (void) const { return global_mask; } - inline hb_mask_t get_mask (hb_tag_t feature_tag, unsigned int *shift = NULL) const { + inline hb_mask_t get_mask (hb_tag_t feature_tag, unsigned int *shift = nullptr) const { const feature_map_t *map = features.bsearch (&feature_tag); if (shift) *shift = map ? map->shift : 0; return map ? map->mask : 0; @@ -108,14 +108,14 @@ struct hb_ot_map_t inline void get_stage_lookups (unsigned int table_index, unsigned int stage, const struct lookup_map_t **plookups, unsigned int *lookup_count) const { if (unlikely (stage == (unsigned int) -1)) { - *plookups = NULL; + *plookups = nullptr; *lookup_count = 0; return; } assert (stage <= stages[table_index].len); unsigned int start = stage ? stages[table_index][stage - 1].last_lookup : 0; unsigned int end = stage < stages[table_index].len ? stages[table_index][stage].last_lookup : lookups[table_index].len; - *plookups = end == start ? NULL : &lookups[table_index][start]; + *plookups = end == start ? nullptr : &lookups[table_index][start]; *lookup_count = end - start; } |