From 9a80a253bfcb098a6f45fa346a407141a8318854 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Mon, 15 Jun 2015 20:05:06 -0700 Subject: [PATCH] fix -Wshadow warnings in agg --- deps/agg/src/agg_trans_single_path.cpp | 4 ++-- deps/agg/src/agg_vcgen_dash.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deps/agg/src/agg_trans_single_path.cpp b/deps/agg/src/agg_trans_single_path.cpp index 57a6cb094..9b1d7cb69 100644 --- a/deps/agg/src/agg_trans_single_path.cpp +++ b/deps/agg/src/agg_trans_single_path.cpp @@ -91,9 +91,9 @@ void trans_single_path::finalize_path() for(i = 0; i < m_src_vertices.size(); i++) { vertex_dist& v = m_src_vertices[i]; - double d = v.dist; + double dd = v.dist; v.dist = dist; - dist += d; + dist += dd; } m_kindex = (m_src_vertices.size() - 1) / dist; m_status = ready; diff --git a/deps/agg/src/agg_vcgen_dash.cpp b/deps/agg/src/agg_vcgen_dash.cpp index 311239040..6bfa5db71 100644 --- a/deps/agg/src/agg_vcgen_dash.cpp +++ b/deps/agg/src/agg_vcgen_dash.cpp @@ -169,7 +169,7 @@ unsigned vcgen_dash::vertex(double* x, double* y) { 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_line_to; @@ -217,7 +217,7 @@ unsigned vcgen_dash::vertex(double* x, double* y) } } } - return cmd; + return cmd2; } break;