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

Misc warning fixes 

Fixes https://github.com/harfbuzz/harfbuzz/issues/712
This commit is contained in:
Behdad Esfahbod 2018-01-26 18:14:05 -08:00
parent 85be365ed9
commit 12757b6929
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/hb-ot-layout-gsubgpos-private.hh
View File

@ -333,8 +333,7 @@ struct hb_ot_apply_context_t :
inline void reject (void) { num_items++; match_glyph_data--; } inline void reject (void) { num_items++; match_glyph_data--; }
inline matcher_t::may_skip_t inline matcher_t::may_skip_t
may_skip (const hb_ot_apply_context_t *c, may_skip (const hb_glyph_info_t &info) const
const hb_glyph_info_t &info) const
{ {
return matcher.may_skip (c, info); return matcher.may_skip (c, info);
} }
@ -411,13 +410,13 @@ struct hb_ot_apply_context_t :
inline return_t dispatch (const T &obj) { return obj.apply (this); } inline return_t dispatch (const T &obj) { return obj.apply (this); }
static return_t default_return_value (void) { return false; } static return_t default_return_value (void) { return false; }
bool stop_sublookup_iteration (return_t r) const { return r; } bool stop_sublookup_iteration (return_t r) const { return r; }
return_t recurse (unsigned int lookup_index) return_t recurse (unsigned int sub_lookup_index)
{ {
if (unlikely (nesting_level_left == 0 || !recurse_func || buffer->max_ops-- <= 0)) if (unlikely (nesting_level_left == 0 || !recurse_func || buffer->max_ops-- <= 0))
return default_return_value (); return default_return_value ();
nesting_level_left--; nesting_level_left--;
bool ret = recurse_func (this, lookup_index); bool ret = recurse_func (this, sub_lookup_index);
nesting_level_left++; nesting_level_left++;
return ret; return ret;
} }
@ -763,7 +762,7 @@ static inline bool match_input (hb_ot_apply_context_t *c,
j--; j--;
} }
if (found && skippy_iter.may_skip (c, out[j]) == hb_ot_apply_context_t::matcher_t::SKIP_YES) if (found && skippy_iter.may_skip (out[j]) == hb_ot_apply_context_t::matcher_t::SKIP_YES)
ligbase = LIGBASE_MAY_SKIP; ligbase = LIGBASE_MAY_SKIP;
else else
ligbase = LIGBASE_MAY_NOT_SKIP; ligbase = LIGBASE_MAY_NOT_SKIP;

1
src/hb-ot-map-private.hh
View File

@ -198,7 +198,6 @@ struct hb_ot_map_builder_t
private: private:
HB_INTERNAL void add_lookups (hb_ot_map_t &m, HB_INTERNAL void add_lookups (hb_ot_map_t &m,
hb_face_t *face,
unsigned int table_index, unsigned int table_index,
unsigned int feature_index, unsigned int feature_index,
unsigned int variations_index, unsigned int variations_index,

5
src/hb-ot-map.cc
View File

@ -80,7 +80,6 @@ void hb_ot_map_builder_t::add_feature (hb_tag_t tag, unsigned int value,
void void
hb_ot_map_builder_t::add_lookups (hb_ot_map_t &m, hb_ot_map_builder_t::add_lookups (hb_ot_map_t &m,
hb_face_t *face,
unsigned int table_index, unsigned int table_index,
unsigned int feature_index, unsigned int feature_index,
unsigned int variations_index, unsigned int variations_index,
@ -289,14 +288,14 @@ hb_ot_map_builder_t::compile (hb_ot_map_t &m,
{ {
if (required_feature_index[table_index] != HB_OT_LAYOUT_NO_FEATURE_INDEX && if (required_feature_index[table_index] != HB_OT_LAYOUT_NO_FEATURE_INDEX &&
required_feature_stage[table_index] == stage) required_feature_stage[table_index] == stage)
add_lookups (m, face, table_index, add_lookups (m, table_index,
required_feature_index[table_index], required_feature_index[table_index],
variations_index, variations_index,
global_bit_mask); global_bit_mask);
for (unsigned i = 0; i < m.features.len; i++) for (unsigned i = 0; i < m.features.len; i++)
if (m.features[i].stage[table_index] == stage) if (m.features[i].stage[table_index] == stage)
add_lookups (m, face, table_index, add_lookups (m, table_index,
m.features[i].index[table_index], m.features[i].index[table_index],
variations_index, variations_index,
m.features[i].mask, m.features[i].mask,