From 866597c8c3c10b23e76afbca70a634706fae163f Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Fri, 4 Jan 2013 11:06:03 -0800
Subject: [PATCH] Fix -Wshadow warnings

---
 boost/geometry/extensions/index/rtree/rtree.hpp | 2 +-
 src/agg/agg_renderer.cpp                        | 4 ++--
 src/agg/process_line_symbolizer.cpp             | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/boost/geometry/extensions/index/rtree/rtree.hpp b/boost/geometry/extensions/index/rtree/rtree.hpp
index 4a06bd6a0..372a27d03 100644
--- a/boost/geometry/extensions/index/rtree/rtree.hpp
+++ b/boost/geometry/extensions/index/rtree/rtree.hpp
@@ -670,7 +670,7 @@ private:
         }
 
         index = 0;
-        for (typename std::vector<Box>::const_iterator it = boxes.begin();
+        for (it = boxes.begin();
              it != boxes.end(); ++it, index++)
         {
             if (geometry::get<min_corner, D>(*it) >= highest_low && index != lowest_high_index)
diff --git a/src/agg/agg_renderer.cpp b/src/agg/agg_renderer.cpp
index 12ba39753..00da20bb2 100644
--- a/src/agg/agg_renderer.cpp
+++ b/src/agg/agg_renderer.cpp
@@ -368,7 +368,7 @@ void agg_renderer<T>::render_marker(pixel_position const& pos,
                                              src.width(),
                                              src.height(),
                                              src.width()*4);
-            agg::pixfmt_rgba32_pre pixf(marker_buf);
+            agg::pixfmt_rgba32_pre marker_pixf(marker_buf);
             typedef agg::image_accessor_clone<agg::pixfmt_rgba32_pre> img_accessor_type;
             typedef agg::span_interpolator_linear<agg::trans_affine> interpolator_type;
             typedef agg::span_image_filter_rgba_2x2<img_accessor_type,
@@ -376,7 +376,7 @@ void agg_renderer<T>::render_marker(pixel_position const& pos,
             typedef agg::renderer_scanline_aa_alpha<renderer_base,
                         agg::span_allocator<agg::rgba8>,
                         span_gen_type> renderer_type;
-            img_accessor_type ia(pixf);
+            img_accessor_type ia(marker_pixf);
             interpolator_type interpolator(agg::trans_affine(p, 0, 0, width, height) );
             span_gen_type sg(ia, interpolator, filter);
             renderer_type rp(renb,sa, sg, unsigned(opacity*255));
diff --git a/src/agg/process_line_symbolizer.cpp b/src/agg/process_line_symbolizer.cpp
index bb0322817..eecb37224 100644
--- a/src/agg/process_line_symbolizer.cpp
+++ b/src/agg/process_line_symbolizer.cpp
@@ -153,7 +153,6 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
         }
 
         typedef agg::renderer_scanline_aa_solid<renderer_base> renderer_type;
-        renderer_base renb(pixf);
         renderer_type ren(renb);
         ren.color(agg::rgba8_pre(r, g, b, int(a * stroke_.get_opacity())));
         agg::scanline_u8 sl;