INTEGRATION: CWS warnings01 (1.1.4); FILE MERGED

2006/03/08 21:56:30 thb 1.1.4.1: #i55991# Renamed a few more vars, to no longer conflict with similar-named methods/types

5 files changed, 16 insertions, 16 deletions

diff --git a/agg/inc/agg_scanline_p.h b/agg/inc/agg_scanline_p.h
index 8f5fdbd3e7ae..f217998578a1 100755
--- a/agg/inc/agg_scanline_p.h
+++ b/agg/inc/agg_scanline_p.h
@@ -66,7 +66,7 @@ namespace agg
         void add_cell(int x, unsigned cover);
         void add_cells(int x, unsigned len, const T* covers);
         void add_span(int x, unsigned len, unsigned cover);
-        void finalize(int y) { m_y = y; }
+        void finalize(int y_) { m_y = y_; }
         void reset_spans();
 
         int            y()         const { return m_y; }
diff --git a/agg/inc/agg_span_gradient.h b/agg/inc/agg_span_gradient.h
index 0fb4666c58b5..6bac1c652a84 100755
--- a/agg/inc/agg_span_gradient.h
+++ b/agg/inc/agg_span_gradient.h
@@ -63,15 +63,15 @@ namespace agg
         //--------------------------------------------------------------------
         span_gradient(alloc_type& alloc,
                       interpolator_type& inter,
-                      const GradientF& gradient_function,
-                      const ColorF& color_function,
-                      double d1, double d2) :
+                      const GradientF& gradient_function_,
+                      const ColorF& color_function_,
+                      double d1_, double d2_) :
             base_type(alloc),
             m_interpolator(&inter),
-            m_gradient_function(&gradient_function),
-            m_color_function(&color_function),
-            m_d1(int(d1 * gradient_subpixel_size)),
-            m_d2(int(d2 * gradient_subpixel_size))
+            m_gradient_function(&gradient_function_),
+            m_color_function(&color_function_),
+            m_d1(int(d1_ * gradient_subpixel_size)),
+            m_d2(int(d2_ * gradient_subpixel_size))
         {}
 
         //--------------------------------------------------------------------
diff --git a/agg/inc/agg_span_image_filter.h b/agg/inc/agg_span_image_filter.h
index 34f910e4af30..34163bb29f24 100755
--- a/agg/inc/agg_span_image_filter.h
+++ b/agg/inc/agg_span_image_filter.h
@@ -47,13 +47,13 @@ namespace agg
         span_image_filter(alloc_type& alloc,
                           const rendering_buffer& src,
                           const color_type& back_color,
-                          interpolator_type& interpolator,
-                          const image_filter_lut* filter) :
+                          interpolator_type& interpolator_,
+                          const image_filter_lut* filter_) :
             span_generator<color_type, alloc_type>(alloc),
             m_src(&src),
             m_back_color(back_color),
-            m_interpolator(&interpolator),
-            m_filter(filter),
+            m_interpolator(&interpolator_),
+            m_filter(filter_),
             m_dx_dbl(0.5),
             m_dy_dbl(0.5),
             m_dx_int(image_subpixel_size / 2),
diff --git a/agg/inc/agg_span_image_resample.h b/agg/inc/agg_span_image_resample.h
index 6bf7e0e7e4dd..f4dfd57455d7 100755
--- a/agg/inc/agg_span_image_resample.h
+++ b/agg/inc/agg_span_image_resample.h
@@ -104,8 +104,8 @@ namespace agg
                                    const rendering_buffer& src,
                                    const color_type& back_color,
                                    interpolator_type& inter,
-                                   const image_filter_lut& filter) :
-            base_type(alloc, src, back_color, inter, &filter),
+                                   const image_filter_lut& filter_) :
+            base_type(alloc, src, back_color, inter, &filter_),
             m_scale_limit(200.0),
             m_blur_x(1.0),
             m_blur_y(1.0)
diff --git a/agg/inc/agg_span_pattern_resample_rgb.h b/agg/inc/agg_span_pattern_resample_rgb.h
index c91ca3027606..baef860eb472 100755
--- a/agg/inc/agg_span_pattern_resample_rgb.h
+++ b/agg/inc/agg_span_pattern_resample_rgb.h
@@ -57,8 +57,8 @@ namespace agg
         span_pattern_resample_rgb_affine(alloc_type& alloc,
                                          const rendering_buffer& src,
                                          interpolator_type& inter,
-                                         const image_filter_lut& filter) :
-            base_type(alloc, src, color_type(0,0,0,0), inter, filter),
+                                         const image_filter_lut& filter_) :
+            base_type(alloc, src, color_type(0,0,0,0), inter, filter_),
             m_wrap_mode_x(src.width()),
             m_wrap_mode_y(src.height())
         {}