INTEGRATION: CWS warnings01 (1.1.4); FILE MERGED

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

5 files changed, 32 insertions, 32 deletions

diff --git a/agg/source/agg_path_storage.cpp b/agg/source/agg_path_storage.cpp
index 147d7ae73852..c5d381ed55be 100755
--- a/agg/source/agg_path_storage.cpp
+++ b/agg/source/agg_path_storage.cpp
@@ -385,27 +385,27 @@ namespace agg
 
 
     //------------------------------------------------------------------------
-    void path_storage::reverse_polygon(unsigned start, unsigned end)
+    void path_storage::reverse_polygon(unsigned _start, unsigned _end)
     {
         unsigned i;
-        unsigned tmp_cmd = command(start);
+        unsigned tmp_cmd = command(_start);
 
         // Shift all commands to one position
-        for(i = start; i < end; i++)
+        for(i = _start; i < _end; i++)
         {
             modify_command(i, command(i + 1));
         }
 
         // Assign starting command to the ending command
-        modify_command(end, tmp_cmd);
+        modify_command(_end, tmp_cmd);
 
         // Reverse the polygon
-        while(end > start)
+        while(_end > _start)
         {
-            unsigned start_nb = start >> block_shift;
-            unsigned end_nb   = end   >> block_shift;
-            double* start_ptr = m_coord_blocks[start_nb] + ((start & block_mask) << 1);
-            double* end_ptr   = m_coord_blocks[end_nb]   + ((end   & block_mask) << 1);
+            unsigned start_nb = _start >> block_shift;
+            unsigned end_nb   = _end   >> block_shift;
+            double* start_ptr = m_coord_blocks[start_nb] + ((_start & block_mask) << 1);
+            double* end_ptr   = m_coord_blocks[end_nb]   + ((_end   & block_mask) << 1);
             double tmp_xy;
 
             tmp_xy       = *start_ptr;
@@ -416,12 +416,12 @@ namespace agg
             *start_ptr   = *end_ptr;
             *end_ptr     = tmp_xy;
 
-            tmp_cmd = m_cmd_blocks[start_nb][start & block_mask];
-            m_cmd_blocks[start_nb][start & block_mask] = m_cmd_blocks[end_nb][end & block_mask];
-            m_cmd_blocks[end_nb][end & block_mask] = (unsigned char)tmp_cmd;
+            tmp_cmd = m_cmd_blocks[start_nb][_start & block_mask];
+            m_cmd_blocks[start_nb][_start & block_mask] = m_cmd_blocks[end_nb][_end & block_mask];
+            m_cmd_blocks[end_nb][_end & block_mask] = (unsigned char)tmp_cmd;
 
-            ++start;
-            --end;
+            ++_start;
+            --_end;
         }
     }
 
@@ -430,7 +430,7 @@ namespace agg
     unsigned path_storage::arrange_orientations(unsigned path_id,
                                                 path_flags_e new_orientation)
     {
-        unsigned end = m_total_vertices;
+        unsigned _end = m_total_vertices;
         if(m_total_vertices && new_orientation != path_flags_none)
         {
             unsigned start = path_id;
@@ -441,35 +441,35 @@ namespace agg
             for(;;)
             {
                 unsigned orientation;
-                end = perceive_polygon_orientation(start + 1, xs, ys,
+                _end = perceive_polygon_orientation(start + 1, xs, ys,
                                                    &orientation);
-                if(end > start + 2 &&
+                if(_end > start + 2 &&
                    orientation &&
                    orientation != unsigned(new_orientation))
                 {
-                    reverse_polygon(start + inc, end - 1);
+                    reverse_polygon(start + inc, _end - 1);
                 }
-                if(end >= m_total_vertices) break;
-                cmd = command(end);
+                if(_end >= m_total_vertices) break;
+                cmd = command(_end);
                 if(is_stop(cmd))
                 {
-                    ++end;
+                    ++_end;
                     break;
                 }
                 if(is_end_poly(cmd))
                 {
                     inc = 1;
-                    modify_command(end, set_orientation(cmd, new_orientation));
+                    modify_command(_end, set_orientation(cmd, new_orientation));
                 }
                 else
                 {
-                    cmd = vertex(++end, &xs, &ys);
+                    cmd = vertex(++_end, &xs, &ys);
                     inc = 0;
                 }
-                start = end;
+                start = _end;
             }
         }
-        return end;
+        return _end;
     }
 
 
diff --git a/agg/source/agg_rasterizer_scanline_aa.cpp b/agg/source/agg_rasterizer_scanline_aa.cpp
index 05f7ad71731e..421c0187d0aa 100755
--- a/agg/source/agg_rasterizer_scanline_aa.cpp
+++ b/agg/source/agg_rasterizer_scanline_aa.cpp
@@ -428,7 +428,7 @@ namespace agg
 
 
     //------------------------------------------------------------------------
-    template <class T> static AGG_INLINE void swap_cells(T* a, T* b)
+    template <class T> AGG_INLINE void swap_cells(T* a, T* b)
     {
         T temp = *a;
         *a = *b;
@@ -436,7 +436,7 @@ namespace agg
     }
 
     //------------------------------------------------------------------------
-    template <class T> static AGG_INLINE bool less_than(T* a, T* b)
+    template <class T> AGG_INLINE bool less_than(T* a, T* b)
     {
         return (*a)->packed_coord < (*b)->packed_coord;
     }
diff --git a/agg/source/agg_rounded_rect.cpp b/agg/source/agg_rounded_rect.cpp
index ed07ebfc8d21..8f6e532e7096 100755
--- a/agg/source/agg_rounded_rect.cpp
+++ b/agg/source/agg_rounded_rect.cpp
@@ -152,7 +152,7 @@ namespace agg
             else return path_cmd_line_to;
 
         case 8:
-            cmd = path_cmd_end_poly | path_flags_close | path_flags_ccw;
+            cmd = (unsigned)path_cmd_end_poly | (unsigned)path_flags_close | (unsigned)path_flags_ccw;
             m_status++;
             break;
         }
diff --git a/agg/source/agg_trans_double_path.cpp b/agg/source/agg_trans_double_path.cpp
index 20e3467b416b..5fc83ea50391 100755
--- a/agg/source/agg_trans_double_path.cpp
+++ b/agg/source/agg_trans_double_path.cpp
@@ -21,10 +21,10 @@ namespace agg
 
     //------------------------------------------------------------------------
     trans_double_path::trans_double_path() :
-        m_kindex1(0.0),
-        m_kindex2(0.0),
         m_base_length(0.0),
         m_base_height(1.0),
+        m_kindex1(0.0),
+        m_kindex2(0.0),
         m_status1(initial),
         m_status2(initial),
         m_preserve_x_scale(true)
diff --git a/agg/source/agg_trans_single_path.cpp b/agg/source/agg_trans_single_path.cpp
index 8ce64e2f0719..cc4fb5356267 100755
--- a/agg/source/agg_trans_single_path.cpp
+++ b/agg/source/agg_trans_single_path.cpp
@@ -91,9 +91,9 @@ namespace agg
             for(i = 0; i < m_src_vertices.size(); i++)
             {
                 vertex_dist& v = m_src_vertices[i];
-                double d = v.dist;
+                double _d = v.dist;
                 v.dist = dist;
-                dist += d;
+                dist += _d;
             }
             m_kindex = (m_src_vertices.size() - 1) / dist;
             m_status = ready;