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

[buffer] Fix compiler warnings 

line 323: Warning: info hides hb_buffer_t::info
...
This commit is contained in:
Behdad Esfahbod 2018-01-11 17:57:46 +01:00
parent d887f93148
commit 3f291ffd5a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/hb-buffer-private.hh
View File

@ -307,37 +307,37 @@ struct hb_buffer_t {
HB_INTERNAL bool message_impl (hb_font_t *font, const char *fmt, va_list ap) HB_PRINTF_FUNC(3, 0); HB_INTERNAL bool message_impl (hb_font_t *font, const char *fmt, va_list ap) HB_PRINTF_FUNC(3, 0);
static inline void static inline void
set_cluster (hb_glyph_info_t &info, unsigned int cluster, unsigned int mask = 0) set_cluster (hb_glyph_info_t &inf, unsigned int cluster, unsigned int mask = 0)
{ {
if (info.cluster != cluster) if (inf.cluster != cluster)
{ {
if (mask & HB_GLYPH_FLAG_UNSAFE_TO_BREAK) if (mask & HB_GLYPH_FLAG_UNSAFE_TO_BREAK)
info.mask |= HB_GLYPH_FLAG_UNSAFE_TO_BREAK; inf.mask |= HB_GLYPH_FLAG_UNSAFE_TO_BREAK;
else else
info.mask &= ~HB_GLYPH_FLAG_UNSAFE_TO_BREAK; inf.mask &= ~HB_GLYPH_FLAG_UNSAFE_TO_BREAK;
} }
info.cluster = cluster; inf.cluster = cluster;
} }
inline int inline int
_unsafe_to_break_find_min_cluster (const hb_glyph_info_t *info, _unsafe_to_break_find_min_cluster (const hb_glyph_info_t *infos,
unsigned int start, unsigned int end, unsigned int start, unsigned int end,
unsigned int cluster) const unsigned int cluster) const
{ {
for (unsigned int i = start; i < end; i++) for (unsigned int i = start; i < end; i++)
cluster = MIN<unsigned int> (cluster, info[i].cluster); cluster = MIN<unsigned int> (cluster, infos[i].cluster);
return cluster; return cluster;
} }
inline void inline void
_unsafe_to_break_set_mask (hb_glyph_info_t *info, _unsafe_to_break_set_mask (hb_glyph_info_t *infos,
unsigned int start, unsigned int end, unsigned int start, unsigned int end,
unsigned int cluster) unsigned int cluster)
{ {
for (unsigned int i = start; i < end; i++) for (unsigned int i = start; i < end; i++)
if (cluster != info[i].cluster) if (cluster != infos[i].cluster)
{ {
scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_UNSAFE_TO_BREAK; scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_UNSAFE_TO_BREAK;
info[i].mask |= HB_GLYPH_FLAG_UNSAFE_TO_BREAK; infos[i].mask |= HB_GLYPH_FLAG_UNSAFE_TO_BREAK;
} }
} }