diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:00:48 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:00:48 +0000 |
commit | f14bcb553dbf47fd884fa0f74738da49c6f5ece8 (patch) | |
tree | 753443c98cd8e2aa15fd1feb8023cfc23e5dbb27 /agg | |
parent | a33d30556e4abe59352ccbe8b4165f241c48fe24 (diff) |
INTEGRATION: CWS warnings01 (1.1.4); FILE MERGED
2005/12/02 10:37:52 mbu 1.1.4.1: necessary changes to prevent warnings
Diffstat (limited to 'agg')
-rwxr-xr-x | agg/source/agg_vcgen_contour.cpp | 2 | ||||
-rwxr-xr-x | agg/source/agg_vcgen_dash.cpp | 8 | ||||
-rwxr-xr-x | agg/source/agg_vcgen_smooth_poly1.cpp | 3 | ||||
-rwxr-xr-x | agg/source/agg_vcgen_stroke.cpp | 4 |
4 files changed, 10 insertions, 7 deletions
diff --git a/agg/source/agg_vcgen_contour.cpp b/agg/source/agg_vcgen_contour.cpp index 41c1cb84497f..979407417e75 100755 --- a/agg/source/agg_vcgen_contour.cpp +++ b/agg/source/agg_vcgen_contour.cpp @@ -179,7 +179,7 @@ namespace agg case end_poly: if(!m_closed) return path_cmd_stop; m_status = stop; - return path_cmd_end_poly | path_flags_close | path_flags_ccw; + return (unsigned)path_cmd_end_poly | (unsigned)path_flags_close | (unsigned)path_flags_ccw; case stop: return path_cmd_stop; diff --git a/agg/source/agg_vcgen_dash.cpp b/agg/source/agg_vcgen_dash.cpp index 838f99cedced..96783abe9952 100755 --- a/agg/source/agg_vcgen_dash.cpp +++ b/agg/source/agg_vcgen_dash.cpp @@ -169,7 +169,7 @@ namespace agg { double dash_rest = m_dashes[m_curr_dash] - m_curr_dash_start; - unsigned cmd = (m_curr_dash & 1) ? + unsigned _cmd = (m_curr_dash & 1) ? path_cmd_move_to : path_cmd_line_to; @@ -217,9 +217,11 @@ namespace agg } } } - return cmd; + return _cmd; } - break; + + // statement unreachable + //break; case stop: cmd = path_cmd_stop; diff --git a/agg/source/agg_vcgen_smooth_poly1.cpp b/agg/source/agg_vcgen_smooth_poly1.cpp index 30779abb8aa2..1df1edb5c72c 100755 --- a/agg/source/agg_vcgen_smooth_poly1.cpp +++ b/agg/source/agg_vcgen_smooth_poly1.cpp @@ -184,7 +184,8 @@ namespace agg m_status = ctrl1; return path_cmd_curve4; } - break; + // statement unreachable + //break; case ctrl_b: *x = m_ctrl2_x; diff --git a/agg/source/agg_vcgen_stroke.cpp b/agg/source/agg_vcgen_stroke.cpp index 6241b730002f..a8a4481ec25b 100755 --- a/agg/source/agg_vcgen_stroke.cpp +++ b/agg/source/agg_vcgen_stroke.cpp @@ -229,11 +229,11 @@ namespace agg case end_poly1: m_status = m_prev_status; - return path_cmd_end_poly | path_flags_close | path_flags_ccw; + return (unsigned)path_cmd_end_poly | (unsigned)path_flags_close | (unsigned)path_flags_ccw; case end_poly2: m_status = m_prev_status; - return path_cmd_end_poly | path_flags_close | path_flags_cw; + return (unsigned)path_cmd_end_poly | (unsigned)path_flags_close | (unsigned)path_flags_cw; case stop: cmd = path_cmd_stop; |