diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:57:58 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:57:58 +0000 |
commit | 371c75264fa3e22947bd70b04561acdf0f3e90b1 (patch) | |
tree | 626b593057f8384e1781f3b0f5f4eee997a19937 /agg | |
parent | 0faa7cd61d3ed5339f9ee482a48c583335a73d49 (diff) |
INTEGRATION: CWS warnings01 (1.1.4); FILE MERGED
2005/12/02 10:37:18 mbu 1.1.4.1: necessary changes to prevent warnings
Diffstat (limited to 'agg')
-rwxr-xr-x | agg/inc/agg_renderer_outline_aa.h | 96 | ||||
-rwxr-xr-x | agg/inc/agg_rendering_buffer.h | 30 | ||||
-rwxr-xr-x | agg/inc/agg_vpgen_clip_polygon.h | 10 |
3 files changed, 68 insertions, 68 deletions
diff --git a/agg/inc/agg_renderer_outline_aa.h b/agg/inc/agg_renderer_outline_aa.h index e4cac0a214ca..e1f2a428d33b 100755 --- a/agg/inc/agg_renderer_outline_aa.h +++ b/agg/inc/agg_renderer_outline_aa.h @@ -49,35 +49,35 @@ namespace agg void dec_y() { m_dist += m_dx; } //--------------------------------------------------------------------- - void inc_x(int dy) + void inc_x(int _dy) { m_dist += m_dy; - if(dy > 0) m_dist -= m_dx; - if(dy < 0) m_dist += m_dx; + if(_dy > 0) m_dist -= m_dx; + if(_dy < 0) m_dist += m_dx; } //--------------------------------------------------------------------- - void dec_x(int dy) + void dec_x(int _dy) { m_dist -= m_dy; - if(dy > 0) m_dist -= m_dx; - if(dy < 0) m_dist += m_dx; + if(_dy > 0) m_dist -= m_dx; + if(_dy < 0) m_dist += m_dx; } //--------------------------------------------------------------------- - void inc_y(int dx) + void inc_y(int _dx) { m_dist -= m_dx; - if(dx > 0) m_dist += m_dy; - if(dx < 0) m_dist -= m_dy; + if(_dx > 0) m_dist += m_dy; + if(_dx < 0) m_dist -= m_dy; } - void dec_y(int dx) + void dec_y(int _dx) //--------------------------------------------------------------------- { m_dist += m_dx; - if(dx > 0) m_dist += m_dy; - if(dx < 0) m_dist -= m_dy; + if(_dx > 0) m_dist += m_dy; + if(_dx < 0) m_dist -= m_dy; } //--------------------------------------------------------------------- @@ -117,35 +117,35 @@ namespace agg void dec_y() { m_dist += m_dx; } //--------------------------------------------------------------------- - void inc_x(int dy) + void inc_x(int _dy) { m_dist += m_dy; - if(dy > 0) m_dist -= m_dx; - if(dy < 0) m_dist += m_dx; + if(_dy > 0) m_dist -= m_dx; + if(_dy < 0) m_dist += m_dx; } //--------------------------------------------------------------------- - void dec_x(int dy) + void dec_x(int _dy) { m_dist -= m_dy; - if(dy > 0) m_dist -= m_dx; - if(dy < 0) m_dist += m_dx; + if(_dy > 0) m_dist -= m_dx; + if(_dy < 0) m_dist += m_dx; } //--------------------------------------------------------------------- - void inc_y(int dx) + void inc_y(int _dx) { m_dist -= m_dx; - if(dx > 0) m_dist += m_dy; - if(dx < 0) m_dist -= m_dy; + if(_dx > 0) m_dist += m_dy; + if(_dx < 0) m_dist -= m_dy; } - void dec_y(int dx) + void dec_y(int _dx) //--------------------------------------------------------------------- { m_dist += m_dx; - if(dx > 0) m_dist += m_dy; - if(dx < 0) m_dist -= m_dy; + if(_dx > 0) m_dist += m_dy; + if(_dx < 0) m_dist -= m_dy; } //--------------------------------------------------------------------- @@ -216,16 +216,16 @@ namespace agg void dec_y() { m_dist += m_dx; m_dist_start += m_dx_start; } //--------------------------------------------------------------------- - void inc_x(int dy) + void inc_x(int _dy) { m_dist += m_dy; m_dist_start += m_dy_start; - if(dy > 0) + if(_dy > 0) { m_dist -= m_dx; m_dist_start -= m_dx_start; } - if(dy < 0) + if(_dy < 0) { m_dist += m_dx; m_dist_start += m_dx_start; @@ -233,16 +233,16 @@ namespace agg } //--------------------------------------------------------------------- - void dec_x(int dy) + void dec_x(int _dy) { m_dist -= m_dy; m_dist_start -= m_dy_start; - if(dy > 0) + if(_dy > 0) { m_dist -= m_dx; m_dist_start -= m_dx_start; } - if(dy < 0) + if(_dy < 0) { m_dist += m_dx; m_dist_start += m_dx_start; @@ -250,16 +250,16 @@ namespace agg } //--------------------------------------------------------------------- - void inc_y(int dx) + void inc_y(int _dx) { m_dist -= m_dx; m_dist_start -= m_dx_start; - if(dx > 0) + if(_dx > 0) { m_dist += m_dy; m_dist_start += m_dy_start; } - if(dx < 0) + if(_dx < 0) { m_dist -= m_dy; m_dist_start -= m_dy_start; @@ -267,16 +267,16 @@ namespace agg } //--------------------------------------------------------------------- - void dec_y(int dx) + void dec_y(int _dx) { m_dist += m_dx; m_dist_start += m_dx_start; - if(dx > 0) + if(_dx > 0) { m_dist += m_dy; m_dist_start += m_dy_start; } - if(dx < 0) + if(_dx < 0) { m_dist -= m_dy; m_dist_start -= m_dy_start; @@ -351,18 +351,18 @@ namespace agg void dec_y() { m_dist += m_dx; m_dist_start += m_dx_start; m_dist_end += m_dx_end; } //--------------------------------------------------------------------- - void inc_x(int dy) + void inc_x(int _dy) { m_dist += m_dy; m_dist_start += m_dy_start; m_dist_end += m_dy_end; - if(dy > 0) + if(_dy > 0) { m_dist -= m_dx; m_dist_start -= m_dx_start; m_dist_end -= m_dx_end; } - if(dy < 0) + if(_dy < 0) { m_dist += m_dx; m_dist_start += m_dx_start; @@ -371,18 +371,18 @@ namespace agg } //--------------------------------------------------------------------- - void dec_x(int dy) + void dec_x(int _dy) { m_dist -= m_dy; m_dist_start -= m_dy_start; m_dist_end -= m_dy_end; - if(dy > 0) + if(_dy > 0) { m_dist -= m_dx; m_dist_start -= m_dx_start; m_dist_end -= m_dx_end; } - if(dy < 0) + if(_dy < 0) { m_dist += m_dx; m_dist_start += m_dx_start; @@ -391,18 +391,18 @@ namespace agg } //--------------------------------------------------------------------- - void inc_y(int dx) + void inc_y(int _dx) { m_dist -= m_dx; m_dist_start -= m_dx_start; m_dist_end -= m_dx_end; - if(dx > 0) + if(_dx > 0) { m_dist += m_dy; m_dist_start += m_dy_start; m_dist_end += m_dy_end; } - if(dx < 0) + if(_dx < 0) { m_dist -= m_dy; m_dist_start -= m_dy_start; @@ -411,18 +411,18 @@ namespace agg } //--------------------------------------------------------------------- - void dec_y(int dx) + void dec_y(int _dx) { m_dist += m_dx; m_dist_start += m_dx_start; m_dist_end += m_dx_end; - if(dx > 0) + if(_dx > 0) { m_dist += m_dy; m_dist_start += m_dy_start; m_dist_end += m_dy_end; } - if(dx < 0) + if(_dx < 0) { m_dist -= m_dy; m_dist_start -= m_dy_start; diff --git a/agg/inc/agg_rendering_buffer.h b/agg/inc/agg_rendering_buffer.h index 227f33c6667d..50b6a46fdfa8 100755 --- a/agg/inc/agg_rendering_buffer.h +++ b/agg/inc/agg_rendering_buffer.h @@ -57,7 +57,7 @@ namespace agg } //-------------------------------------------------------------------- - row_ptr_cache(T* buf, unsigned width, unsigned height, int stride) : + row_ptr_cache(T* _buf, unsigned _width, unsigned _height, int _stride) : m_buf(0), m_rows(0), m_width(0), @@ -65,35 +65,35 @@ namespace agg m_stride(0), m_max_height(0) { - attach(buf, width, height, stride); + attach(_buf, _width, _height, _stride); } //-------------------------------------------------------------------- - void attach(T* buf, unsigned width, unsigned height, int stride) + void attach(T* _buf, unsigned _width, unsigned _height, int _stride) { - m_buf = buf; - m_width = width; - m_height = height; - m_stride = stride; - if(height > m_max_height) + m_buf = _buf; + m_width = _width; + m_height = _height; + m_stride = _stride; + if(_height > m_max_height) { delete [] m_rows; - m_rows = new T* [m_max_height = height]; + m_rows = new T* [m_max_height = _height]; } T* row_ptr = m_buf; - if(stride < 0) + if(_stride < 0) { - row_ptr = m_buf - int(height - 1) * stride; + row_ptr = m_buf - int(_height - 1) * _stride; } - T** rows = m_rows; + T** _rows = m_rows; - while(height--) + while(_height--) { - *rows++ = row_ptr; - row_ptr += stride; + *_rows++ = row_ptr; + row_ptr += _stride; } } diff --git a/agg/inc/agg_vpgen_clip_polygon.h b/agg/inc/agg_vpgen_clip_polygon.h index f68e791b8d76..d5da460843e6 100755 --- a/agg/inc/agg_vpgen_clip_polygon.h +++ b/agg/inc/agg_vpgen_clip_polygon.h @@ -39,12 +39,12 @@ namespace agg { } - void clip_box(double x1, double y1, double x2, double y2) + void clip_box(double _x1, double _y1, double _x2, double _y2) { - m_clip_box.x1 = x1; - m_clip_box.y1 = y1; - m_clip_box.x2 = x2; - m_clip_box.y2 = y2; + m_clip_box.x1 = _x1; + m_clip_box.y1 = _y1; + m_clip_box.x2 = _x2; + m_clip_box.y2 = _y2; m_clip_box.normalize(); } |