INTEGRATION: CWS warnings01 (1.1.4); FILE MERGED

2005/12/02 10:37:17 mbu 1.1.4.1: necessary changes to prevent warnings

4 files changed, 18 insertions, 18 deletions

diff --git a/agg/inc/agg_dda_line.h b/agg/inc/agg_dda_line.h
index 7a5df473f6ea..6e7335c6dfec 100755
--- a/agg/inc/agg_dda_line.h
+++ b/agg/inc/agg_dda_line.h
@@ -125,10 +125,10 @@ namespace agg
         }
 
         //-------------------------------------------- Backward-adjusted line
-        dda2_line_interpolator(int y, int count) :
+        dda2_line_interpolator(int _y, int count) :
             m_cnt(count <= 0 ? 1 : count),
-            m_lft(y / m_cnt),
-            m_rem(y % m_cnt),
+            m_lft(_y / m_cnt),
+            m_rem(_y % m_cnt),
             m_mod(m_rem),
             m_y(0)
         {
@@ -228,17 +228,17 @@ namespace agg
         static int line_lr(int v) { return v >> subpixel_shift; }
 
         //--------------------------------------------------------------------
-        line_bresenham_interpolator(int x1, int y1, int x2, int y2) :
-            m_x1_lr(line_lr(x1)),
-            m_y1_lr(line_lr(y1)),
-            m_x2_lr(line_lr(x2)),
-            m_y2_lr(line_lr(y2)),
+        line_bresenham_interpolator(int _x1, int _y1, int _x2, int _y2) :
+            m_x1_lr(line_lr(_x1)),
+            m_y1_lr(line_lr(_y1)),
+            m_x2_lr(line_lr(_x2)),
+            m_y2_lr(line_lr(_y2)),
             m_ver(abs(m_x2_lr - m_x1_lr) < abs(m_y2_lr - m_y1_lr)),
             m_len(m_ver ? abs(m_y2_lr - m_y1_lr) :
                           abs(m_x2_lr - m_x1_lr)),
-            m_inc(m_ver ? ((y2 > y1) ? 1 : -1) : ((x2 > x1) ? 1 : -1)),
-            m_interpolator(m_ver ? x1 : y1,
-                           m_ver ? x2 : y2,
+            m_inc(m_ver ? ((_y2 > _y1) ? 1 : -1) : ((_x2 > _x1) ? 1 : -1)),
+            m_interpolator(m_ver ? _x1 : _y1,
+                           m_ver ? _x2 : _y2,
                            m_len)
         {
         }
diff --git a/agg/inc/agg_line_aa_basics.h b/agg/inc/agg_line_aa_basics.h
index 79f8ebd50678..ab8e94715019 100755
--- a/agg/inc/agg_line_aa_basics.h
+++ b/agg/inc/agg_line_aa_basics.h
@@ -42,13 +42,13 @@ namespace agg
     //------------------------------------------------------------------line_mr
     inline int line_mr(int x)
     {
-        return x >> (line_subpixel_shift - line_mr_subpixel_shift);
+        return x >> ((int)line_subpixel_shift - (int)line_mr_subpixel_shift);
     }
 
     //-------------------------------------------------------------------line_hr
     inline int line_hr(int x)
     {
-        return x << (line_subpixel_shift - line_mr_subpixel_shift);
+        return x << ((int)line_subpixel_shift - (int)line_mr_subpixel_shift);
     }
 
     //---------------------------------------------------------------line_dbl_hr
diff --git a/agg/inc/agg_rasterizer_scanline_aa.h b/agg/inc/agg_rasterizer_scanline_aa.h
index acebe5ee8aee..03be55dcc62a 100755
--- a/agg/inc/agg_rasterizer_scanline_aa.h
+++ b/agg/inc/agg_rasterizer_scanline_aa.h
@@ -473,9 +473,9 @@ namespace agg
 
     //------------------------------------------------------------------------
     template<unsigned XScale, unsigned AA_Shift>
-    void rasterizer_scanline_aa<XScale, AA_Shift>::filling_rule(filling_rule_e filling_rule)
+    void rasterizer_scanline_aa<XScale, AA_Shift>::filling_rule(filling_rule_e _filling_rule)
     {
-        m_filling_rule = filling_rule;
+        m_filling_rule = _filling_rule;
     }
 
     //------------------------------------------------------------------------
diff --git a/agg/inc/agg_renderer_base.h b/agg/inc/agg_renderer_base.h
index b58d9ee00aab..1ef44fecc6d2 100755
--- a/agg/inc/agg_renderer_base.h
+++ b/agg/inc/agg_renderer_base.h
@@ -34,9 +34,9 @@ namespace agg
         typedef typename pixfmt_type::color_type color_type;
 
         //--------------------------------------------------------------------
-        renderer_base(pixfmt_type& ren) :
-            m_ren(&ren),
-            m_clip_box(0, 0, ren.width() - 1, ren.height() - 1)
+        renderer_base(pixfmt_type& _ren) :
+            m_ren(&_ren),
+            m_clip_box(0, 0, _ren.width() - 1, _ren.height() - 1)
         {
         }