sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

silence more gcc shadow/unused warnings

Browse source
This commit is contained in:
Dane Springmeyer 2016-01-19 18:06:11 -08:00
parent 493e49257f
commit e874f9237b
4 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
deps/agg/include/agg_vpgen_clip_polygon.h vendored
View file

@ -43,12 +43,12 @@ namespace agg
{ {
} }
void clip_box(double x1, double y1, double x2, double y2) void clip_box(double _x1, double _y1, double _x2, double _y2)
{ {
m_clip_box.x1 = x1; m_clip_box.x1 = _x1;
m_clip_box.y1 = y1; m_clip_box.y1 = _y1;
m_clip_box.x2 = x2; m_clip_box.x2 = _x2;
m_clip_box.y2 = y2; m_clip_box.y2 = _y2;
m_clip_box.normalize(); m_clip_box.normalize();
} }

10
deps/agg/include/agg_vpgen_clip_polyline.h vendored
View file

@ -41,12 +41,12 @@ namespace agg
{ {
} }
void clip_box(double x1, double y1, double x2, double y2) void clip_box(double _x1, double _y1, double _x2, double _y2)
{ {
m_clip_box.x1 = x1; m_clip_box.x1 = _x1;
m_clip_box.y1 = y1; m_clip_box.y1 = _y1;
m_clip_box.x2 = x2; m_clip_box.x2 = _x2;
m_clip_box.y2 = y2; m_clip_box.y2 = _y2;
m_clip_box.normalize(); m_clip_box.normalize();
} }

3
include/mapnik/offset_converter.hpp
View file

@ -482,7 +482,8 @@ private:
} }
start_v2.x = v2.x; start_v2.x = v2.x;
start_v2.y = v2.y; start_v2.y = v2.y;
bool continue_loop = true; bool continue_loop;
continue_loop = true;
vertex2d tmp_prev(vertex2d::no_init); vertex2d tmp_prev(vertex2d::no_init);
while (i < points.size()) while (i < points.size())

24
include/mapnik/quad_tree.hpp
View file

@ -84,12 +84,12 @@ class quad_tree : util::noncopyable
int num_subnodes() const int num_subnodes() const
{ {
int count = 0; int _count = 0;
for (int i = 0; i < 4; ++i) for (int i = 0; i < 4; ++i)
{ {
if (children_[i]) ++count; if (children_[i]) ++_count;
} }
return count; return _count;
} }
~node () {} ~node () {}
}; };
@ -165,9 +165,9 @@ public:
int count_items() const int count_items() const
{ {
int count = 0; int _count = 0;
count_items(root_, count); count_items(root_, _count);
return count; return _count;
} }
void trim() void trim()
{ {
@ -278,23 +278,23 @@ private:
if (!n) return 0; if (!n) return 0;
else else
{ {
int count = 1; int _count = 1;
for (int i = 0; i < 4; ++i) for (int i = 0; i < 4; ++i)
{ {
count += count_nodes(n->children_[i]); _count += count_nodes(n->children_[i]);
} }
return count; return _count;
} }
} }
void count_items(node const* n,int& count) const void count_items(node const* n, int& _count) const
{ {
if (n) if (n)
{ {
count += n->cont_.size(); _count += n->cont_.size();
for (int i = 0; i < 4; ++i) for (int i = 0; i < 4; ++i)
{ {
count_items(n->children_[i],count); count_items(n->children_[i],_count);
} }
} }
} }