Use C-style casts instead of compare to 0, to convert hb_bool_t to bool

This commit is contained in:
Behdad Esfahbod 2015-11-26 19:22:22 -05:00
parent 67a36a725e
commit ea512f7108
10 changed files with 13 additions and 13 deletions

View File

@ -521,7 +521,7 @@ hb_user_data_array_t::set (hb_user_data_key_t *key,
} }
} }
hb_user_data_item_t item = {key, data, destroy}; hb_user_data_item_t item = {key, data, destroy};
bool ret = !!items.replace_or_insert (item, lock, replace != 0); bool ret = !!items.replace_or_insert (item, lock, (bool) replace);
return ret; return ret;
} }

View File

@ -106,7 +106,7 @@ _hb_fallback_shape (hb_shape_plan_t *shape_plan HB_UNUSED,
*/ */
hb_codepoint_t space; hb_codepoint_t space;
bool has_space = font->get_glyph (' ', 0, &space) != 0; bool has_space = (bool) font->get_glyph (' ', 0, &space);
buffer->clear_positions (); buffer->clear_positions ();

View File

@ -160,7 +160,7 @@ struct hb_font_t {
HB_FONT_FUNCS_IMPLEMENT_CALLBACKS HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
#undef HB_FONT_FUNC_IMPLEMENT #undef HB_FONT_FUNC_IMPLEMENT
inline hb_bool_t has_glyph (hb_codepoint_t unicode) inline bool has_glyph (hb_codepoint_t unicode)
{ {
hb_codepoint_t glyph; hb_codepoint_t glyph;
return get_glyph (unicode, 0, &glyph); return get_glyph (unicode, 0, &glyph);

View File

@ -742,7 +742,7 @@ hb_ot_layout_lookup_would_substitute_fast (hb_face_t *face,
hb_bool_t zero_context) hb_bool_t zero_context)
{ {
if (unlikely (lookup_index >= hb_ot_layout_from_face (face)->gsub_lookup_count)) return false; if (unlikely (lookup_index >= hb_ot_layout_from_face (face)->gsub_lookup_count)) return false;
OT::hb_would_apply_context_t c (face, glyphs, glyphs_length, zero_context != 0); OT::hb_would_apply_context_t c (face, glyphs, glyphs_length, (bool) zero_context);
const OT::SubstLookup& l = hb_ot_layout_from_face (face)->gsub->get_lookup (lookup_index); const OT::SubstLookup& l = hb_ot_layout_from_face (face)->gsub->get_lookup (lookup_index);

View File

@ -89,7 +89,7 @@ hb_ot_map_builder_t::hb_ot_map_builder_t (hb_face_t *face_,
for (unsigned int table_index = 0; table_index < 2; table_index++) { for (unsigned int table_index = 0; table_index < 2; table_index++) {
hb_tag_t table_tag = table_tags[table_index]; hb_tag_t table_tag = table_tags[table_index];
found_script[table_index] = hb_ot_layout_table_choose_script (face, table_tag, script_tags, &script_index[table_index], &chosen_script[table_index]) != 0; found_script[table_index] = (bool) hb_ot_layout_table_choose_script (face, table_tag, script_tags, &script_index[table_index], &chosen_script[table_index]);
hb_ot_layout_script_find_language (face, table_tag, script_index[table_index], language_tag, &language_index[table_index]); hb_ot_layout_script_find_language (face, table_tag, script_index[table_index], language_tag, &language_index[table_index]);
} }
} }

View File

@ -301,7 +301,7 @@ preprocess_text_hangul (const hb_ot_shape_plan_t *plan,
{ {
/* Have <LV>, <LVT>, or <LV,T> */ /* Have <LV>, <LVT>, or <LV,T> */
hb_codepoint_t s = u; hb_codepoint_t s = u;
bool has_glyph = font->has_glyph (s) != 0; bool has_glyph = font->has_glyph (s);
unsigned int lindex = (s - SBase) / NCount; unsigned int lindex = (s - SBase) / NCount;
unsigned int nindex = (s - SBase) % NCount; unsigned int nindex = (s - SBase) % NCount;
unsigned int vindex = nindex / TCount; unsigned int vindex = nindex / TCount;

View File

@ -68,7 +68,7 @@ compose_hebrew (const hb_ot_shape_normalize_context_t *c,
0xFB4Au /* TAV */ 0xFB4Au /* TAV */
}; };
bool found = c->unicode->compose (a, b, ab) != 0; bool found = (bool) c->unicode->compose (a, b, ab);
if (!found && !c->plan->has_mark) if (!found && !c->plan->has_mark)
{ {

View File

@ -1806,7 +1806,7 @@ decompose_indic (const hb_ot_shape_normalize_context_t *c,
} }
} }
return c->unicode->decompose (ab, a, b) != 0; return (bool) c->unicode->decompose (ab, a, b);
} }
static bool static bool
@ -1822,7 +1822,7 @@ compose_indic (const hb_ot_shape_normalize_context_t *c,
/* Composition-exclusion exceptions that we want to recompose. */ /* Composition-exclusion exceptions that we want to recompose. */
if (a == 0x09AFu && b == 0x09BCu) { *ab = 0x09DFu; return true; } if (a == 0x09AFu && b == 0x09BCu) { *ab = 0x09DFu; return true; }
return c->unicode->compose (a, b, ab) != 0; return (bool) c->unicode->compose (a, b, ab);
} }

View File

@ -76,7 +76,7 @@ decompose_unicode (const hb_ot_shape_normalize_context_t *c,
hb_codepoint_t *a, hb_codepoint_t *a,
hb_codepoint_t *b) hb_codepoint_t *b)
{ {
return c->unicode->decompose (ab, a, b) != 0; return (bool) c->unicode->decompose (ab, a, b);
} }
static bool static bool
@ -85,7 +85,7 @@ compose_unicode (const hb_ot_shape_normalize_context_t *c,
hb_codepoint_t b, hb_codepoint_t b,
hb_codepoint_t *ab) hb_codepoint_t *ab)
{ {
return c->unicode->compose (a, b, ab) != 0; return (bool) c->unicode->compose (a, b, ab);
} }
static inline void static inline void
@ -127,7 +127,7 @@ decompose (const hb_ot_shape_normalize_context_t *c, bool shortest, hb_codepoint
(b && !font->get_glyph (b, 0, &b_glyph))) (b && !font->get_glyph (b, 0, &b_glyph)))
return 0; return 0;
bool has_a = font->get_glyph (a, 0, &a_glyph) != 0; bool has_a = (bool) font->get_glyph (a, 0, &a_glyph);
if (shortest && has_a) { if (shortest && has_a) {
/* Output a and b */ /* Output a and b */
output_char (buffer, a, a_glyph); output_char (buffer, a, a_glyph);

View File

@ -688,7 +688,7 @@ hb_ot_position_complex (hb_ot_shape_context_t *c)
{ {
bool ret = false; bool ret = false;
unsigned int count = c->buffer->len; unsigned int count = c->buffer->len;
bool has_positioning = hb_ot_layout_has_positioning (c->face) != 0; bool has_positioning = (bool) hb_ot_layout_has_positioning (c->face);
/* If the font has no GPOS, AND, no fallback positioning will /* If the font has no GPOS, AND, no fallback positioning will
* happen, AND, direction is forward, then when zeroing mark * happen, AND, direction is forward, then when zeroing mark
* widths, we shift the mark with it, such that the mark * widths, we shift the mark with it, such that the mark