INTEGRATION: CWS warnings01 (1.1.4); FILE MERGED

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

3 files changed, 25 insertions, 24 deletions

diff --git a/agg/source/agg_gsv_text.cpp b/agg/source/agg_gsv_text.cpp
index 0b958fcce04c..fd522cd8de08 100755
--- a/agg/source/agg_gsv_text.cpp
+++ b/agg/source/agg_gsv_text.cpp
@@ -518,9 +518,9 @@ namespace agg
 
 
     //-------------------------------------------------------------------------
-    void gsv_text::font(const void* font)
+    void gsv_text::font(const void* _font)
     {
-        m_font = font;
+        m_font = _font;
         if(m_font == 0) m_font = m_loaded_font;
     }
 
@@ -532,15 +532,15 @@ namespace agg
     }
 
     //-------------------------------------------------------------------------
-    void gsv_text::space(double space)
+    void gsv_text::space(double _space)
     {
-        m_space = space;
+        m_space = _space;
     }
 
     //-------------------------------------------------------------------------
-    void gsv_text::line_space(double line_space)
+    void gsv_text::line_space(double _line_space)
     {
-        m_line_space = line_space;
+        m_line_space = _line_space;
     }
 
     //-------------------------------------------------------------------------
@@ -578,21 +578,21 @@ namespace agg
 
 
     //-------------------------------------------------------------------------
-    void gsv_text::text(const char* text)
+    void gsv_text::text(const char* _text)
     {
-        if(text == 0)
+        if(_text == 0)
         {
             m_chr[0] = 0;
             m_text = m_chr;
             return;
         }
-        unsigned new_size = strlen(text) + 1;
+        unsigned new_size = strlen(_text) + 1;
         if(new_size > m_buf_size)
         {
             if(m_text_buf) delete [] m_text_buf;
             m_text_buf = new char [m_buf_size = new_size];
         }
-        memcpy(m_text_buf, text, new_size);
+        memcpy(m_text_buf, _text, new_size);
         m_text = m_text_buf;
     }
 
diff --git a/agg/source/agg_image_filters.cpp b/agg/source/agg_image_filters.cpp
index 23e4af74ca7f..28dd0654eeb4 100755
--- a/agg/source/agg_image_filters.cpp
+++ b/agg/source/agg_image_filters.cpp
@@ -38,10 +38,10 @@ namespace agg
     {}
 
     //--------------------------------------------------------------------
-    void image_filter_lut::realloc(double radius)
+    void image_filter_lut::realloc(double _radius)
     {
-        m_radius = radius;
-        m_diameter = unsigned(ceil(radius)) * 2;
+        m_radius = _radius;
+        m_diameter = unsigned(ceil(_radius)) * 2;
         m_start = -int(m_diameter / 2 - 1);
         unsigned size = m_diameter << image_subpixel_shift;
         if(size > m_max_size)
@@ -84,11 +84,11 @@ namespace agg
                 for(j = 0; j < m_diameter; j++)
                 {
                     sum += m_weight_array[j * image_subpixel_size + i] =
-                        int(m_weight_array[j * image_subpixel_size + i] * k);
+                        int16(m_weight_array[j * image_subpixel_size + i] * k);
                 }
 
                 sum -= image_filter_size;
-                int inc = (sum > 0) ? -1 : 1;
+                int16 inc = (sum > 0) ? -1 : 1;
 
                 for(j = 0; j < m_diameter && sum; j++)
                 {
@@ -97,7 +97,8 @@ namespace agg
                     int v = m_weight_array[idx * image_subpixel_size + i];
                     if(v < image_filter_size)
                     {
-                        m_weight_array[idx * image_subpixel_size + i] += inc;
+                        m_weight_array[idx * image_subpixel_size + i] =
+                            m_weight_array[idx * image_subpixel_size + i] + inc;
                         sum += inc;
                     }
                 }
diff --git a/agg/source/agg_line_profile_aa.cpp b/agg/source/agg_line_profile_aa.cpp
index 7eba34423ebe..1374475b663f 100755
--- a/agg/source/agg_line_profile_aa.cpp
+++ b/agg/source/agg_line_profile_aa.cpp
@@ -54,25 +54,25 @@ namespace agg
 
 
     //---------------------------------------------------------------------
-    void line_profile_aa::set(double center_width, double smoother_width)
+    void line_profile_aa::set(double center_width, double _smoother_width)
     {
         double base_val = 1.0;
         if(center_width == 0.0)   center_width = 1.0 / subpixel_size;
-        if(smoother_width == 0.0) smoother_width = 1.0 / subpixel_size;
+        if(_smoother_width == 0.0) _smoother_width = 1.0 / subpixel_size;
 
-        double width = center_width + smoother_width;
-        if(width < m_min_width)
+        double _width = center_width + _smoother_width;
+        if(_width < m_min_width)
         {
-            double k = width / m_min_width;
+            double k = _width / m_min_width;
             base_val *= k;
             center_width /= k;
-            smoother_width /= k;
+            _smoother_width /= k;
         }
 
-        value_type* ch = profile(center_width + smoother_width);
+        value_type* ch = profile(center_width + _smoother_width);
 
         unsigned subpixel_center_width = unsigned(center_width * subpixel_size);
-        unsigned subpixel_smoother_width = unsigned(smoother_width * subpixel_size);
+        unsigned subpixel_smoother_width = unsigned(_smoother_width * subpixel_size);
 
         value_type* ch_center   = ch + subpixel_size*2;
         value_type* ch_smoother = ch_center + subpixel_center_width;