INTEGRATION: CWS warnings01 (1.1.4); FILE MERGED

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

3 files changed, 21 insertions, 21 deletions

diff --git a/agg/inc/agg_array.h b/agg/inc/agg_array.h
index fcafb5497b1b..2970181c4510 100755
--- a/agg/inc/agg_array.h
+++ b/agg/inc/agg_array.h
@@ -29,8 +29,8 @@ namespace agg
     {
     public:
         typedef T value_type;
-        pod_array_adaptor(T* array, unsigned size) :
-            m_array(array), m_size(size) {}
+        pod_array_adaptor(T* array, unsigned _size) :
+            m_array(array), m_size(_size) {}
 
         unsigned size() const { return m_size; }
         const T& operator [] (unsigned idx) const { return m_array[idx]; }
@@ -95,7 +95,7 @@ namespace agg
         void resize(unsigned new_size);
 
         void add(const T& v)  { m_array[m_size++] = v; }
-        void inc_size(unsigned size) { m_size += size; }
+        void inc_size(unsigned _size) { m_size += _size; }
         unsigned size()      const { return m_size; }
         unsigned byte_size() const { return m_size * sizeof(T); }
         void serialize(int8u* ptr) const;
@@ -175,11 +175,11 @@ namespace agg
 
     //------------------------------------------------------------------------
     template<class T>
-    void pod_array<T>::deserialize(const int8u* data, unsigned byte_size)
+    void pod_array<T>::deserialize(const int8u* data, unsigned _byte_size)
     {
-        byte_size /= sizeof(T);
-        capacity(byte_size);
-        if(byte_size) memcpy(m_array, data, byte_size * sizeof(T));
+        _byte_size /= sizeof(T);
+        capacity(_byte_size);
+        if(_byte_size) memcpy(m_array, data, _byte_size * sizeof(T));
     }
 
 
@@ -243,9 +243,9 @@ namespace agg
             }
         }
 
-        void cut_at(unsigned size)
+        void cut_at(unsigned _size)
         {
-            if(size < m_size) m_size = size;
+            if(_size < m_size) m_size = _size;
         }
 
         unsigned size() const { return m_size; }
@@ -385,16 +385,16 @@ namespace agg
 
     //------------------------------------------------------------------------
     template<class T, unsigned S>
-    void pod_deque<T, S>::free_tail(unsigned size)
+    void pod_deque<T, S>::free_tail(unsigned _size)
     {
-        if(size < m_size)
+        if(_size < m_size)
         {
-            unsigned nb = (size + block_mask) >> block_shift;
+            unsigned nb = (_size + block_mask) >> block_shift;
             while(m_num_blocks > nb)
             {
                 delete [] m_blocks[--m_num_blocks];
             }
-            m_size = size;
+            m_size = _size;
         }
     }
 
@@ -575,11 +575,11 @@ namespace agg
 
     //------------------------------------------------------------------------
     template<class T, unsigned S>
-    void pod_deque<T, S>::deserialize(const int8u* data, unsigned byte_size)
+    void pod_deque<T, S>::deserialize(const int8u* data, unsigned _byte_size)
     {
         remove_all();
-        byte_size /= sizeof(T);
-        for(unsigned i = 0; i < byte_size; ++i)
+        _byte_size /= sizeof(T);
+        for(unsigned i = 0; i < _byte_size; ++i)
         {
             T* ptr = data_ptr();
             memcpy(ptr, data, sizeof(T));
@@ -593,15 +593,15 @@ namespace agg
     //------------------------------------------------------------------------
     template<class T, unsigned S>
     void pod_deque<T, S>::deserialize(unsigned start, const T& empty_val,
-                                      const int8u* data, unsigned byte_size)
+                                      const int8u* data, unsigned _byte_size)
     {
         while(m_size < start)
         {
             add(empty_val);
         }
 
-        byte_size /= sizeof(T);
-        for(unsigned i = 0; i < byte_size; ++i)
+        _byte_size /= sizeof(T);
+        for(unsigned i = 0; i < _byte_size; ++i)
         {
             if(start + i < m_size)
             {
diff --git a/agg/inc/agg_basics.h b/agg/inc/agg_basics.h
index 4b91c51ab046..d9ca881ab328 100755
--- a/agg/inc/agg_basics.h
+++ b/agg/inc/agg_basics.h
@@ -258,7 +258,7 @@ namespace agg
     inline bool is_close(unsigned c)
     {
         return (c & ~(path_flags_cw | path_flags_ccw)) ==
-               (path_cmd_end_poly | path_flags_close);
+               (((bool)path_cmd_end_poly) | ((bool)path_flags_close));
     }
 
     //------------------------------------------------------------is_next_poly
diff --git a/agg/inc/agg_clip_liang_barsky.h b/agg/inc/agg_clip_liang_barsky.h
index 105d0e49fd65..e229d52bc6e9 100755
--- a/agg/inc/agg_clip_liang_barsky.h
+++ b/agg/inc/agg_clip_liang_barsky.h
@@ -55,7 +55,7 @@ namespace agg
 
     //-------------------------------------------------------clip_liang_barsky
     template<class T>
-    inline unsigned clip_liang_barsky(T x1, T y1, T x2, T y2,
+    /*inline*/ unsigned clip_liang_barsky(T x1, T y1, T x2, T y2,
                                       const rect_base<T>& clip_box,
                                       T* x, T* y)
     {