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

fix -Wshadow warnings in agg

Browse source
This commit is contained in:
Dane Springmeyer 2015-06-15 20:05:06 -07:00
parent eb8c412a3b
commit 9a80a253bf
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
deps/agg/src/agg_trans_single_path.cpp vendored
View file

@ -91,9 +91,9 @@ void trans_single_path::finalize_path()
for(i = 0; i < m_src_vertices.size(); i++) for(i = 0; i < m_src_vertices.size(); i++)
{ {
vertex_dist& v = m_src_vertices[i]; vertex_dist& v = m_src_vertices[i];
double d = v.dist; double dd = v.dist;
v.dist = dist; v.dist = dist;
dist += d; dist += dd;
} }
m_kindex = (m_src_vertices.size() - 1) / dist; m_kindex = (m_src_vertices.size() - 1) / dist;
m_status = ready; m_status = ready;

4
deps/agg/src/agg_vcgen_dash.cpp vendored
View file

@ -169,7 +169,7 @@ unsigned vcgen_dash::vertex(double* x, double* y)
{ {
double dash_rest = m_dashes[m_curr_dash] - m_curr_dash_start; double dash_rest = m_dashes[m_curr_dash] - m_curr_dash_start;
unsigned cmd = (m_curr_dash & 1) ? unsigned cmd2 = (m_curr_dash & 1) ?
path_cmd_move_to : path_cmd_move_to :
path_cmd_line_to; path_cmd_line_to;
@ -217,7 +217,7 @@ unsigned vcgen_dash::vertex(double* x, double* y)
} }
} }
} }
return cmd; return cmd2;
} }
break; break;