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

Minor, fix -Wrange-loop-analysis warnings 

Fixing these complains raised by newer versions of clang,

./hb-ot-layout-common.hh:1720:53: error: loop variable 'gid_klass_pair' is always a copy because the range of type 'hb_map_iter_t<hb_sorted_array_t<OT::HBGlyphID>, (lambda at ./hb-ot-layout-common.hh:1672:29), hb_function_sortedness_t::RETAINS_SORTING, nullptr>' does not return a reference [-Werror,-Wrange-loop-analysis]
    for (const hb_pair_t<hb_codepoint_t, unsigned>& gid_klass_pair : + it)

And

./hb-ot-color-colr-table.hh:177:44: error: loop variable '_' is always a copy because the range of type 'hb_map_iter_t<hb_filter_iter_t<hb_map_iter_t<hb_range_iter_t<unsigned int, unsigned int>, (lambda at ./hb-ot-color-colr-table.hh:209:31), hb_function_sortedness_t::RETAINS_SORTING, nullptr>, (anonymous struct at ./hb-algs.hh:331:1) &, (anonymous struct at ./hb-algs.hh:51:1) &, nullptr>, (anonymous struct at ./hb-algs.hh:338:1) &, hb_function_sortedness_t::RETAINS_SORTING, nullptr>' does not return a reference [-Werror,-Wrange-loop-analysis]
    for (const hb_item_type<BaseIterator>& _ : + base_it.iter ())
This commit is contained in:
Ebrahim Byagowi 2020-07-04 23:43:21 +04:30
parent a470b0b205
commit a6fb8ce98a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hb-ot-color-colr-table.hh
View File

@ -174,7 +174,7 @@ struct COLR
baseGlyphsZ = COLR::min_size; baseGlyphsZ = COLR::min_size;
layersZ = COLR::min_size + numBaseGlyphs * BaseGlyphRecord::min_size; layersZ = COLR::min_size + numBaseGlyphs * BaseGlyphRecord::min_size;
for (const hb_item_type<BaseIterator>& _ : + base_it.iter ()) for (const hb_item_type<BaseIterator> _ : + base_it.iter ())
{ {
auto* record = c->embed (_); auto* record = c->embed (_);
if (unlikely (!record)) return_trace (false); if (unlikely (!record)) return_trace (false);

2
src/hb-ot-layout-common.hh
View File

@ -1717,7 +1717,7 @@ struct ClassDefFormat1
startGlyph = glyph_min; startGlyph = glyph_min;
if (unlikely (!classValue.serialize (c, glyph_count))) return_trace (false); if (unlikely (!classValue.serialize (c, glyph_count))) return_trace (false);
for (const hb_pair_t<hb_codepoint_t, unsigned>& gid_klass_pair : + it) for (const hb_pair_t<hb_codepoint_t, unsigned> gid_klass_pair : + it)
{ {
unsigned idx = gid_klass_pair.first - glyph_min; unsigned idx = gid_klass_pair.first - glyph_min;
classValue[idx] = gid_klass_pair.second; classValue[idx] = gid_klass_pair.second;