From 9a27a68f4a50f4833b97503eca667c9396bb34bd Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Sun, 3 Apr 2011 04:28:44 +0000 Subject: [PATCH] avoid unused parameter compiler warnings --- agg/include/agg_bezier_arc.h | 2 +- agg/include/agg_pixfmt_rgba.h | 18 +++++++++--------- agg/include/agg_rasterizer_sl_clip.h | 2 +- agg/include/agg_renderer_outline_aa.h | 16 ++++++++-------- agg/include/agg_renderer_outline_image.h | 4 ++-- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/agg/include/agg_bezier_arc.h b/agg/include/agg_bezier_arc.h index 6d98d1a9f..b3d65492f 100644 --- a/agg/include/agg_bezier_arc.h +++ b/agg/include/agg_bezier_arc.h @@ -68,7 +68,7 @@ namespace agg *x = m_vertices[m_vertex]; *y = m_vertices[m_vertex + 1]; m_vertex += 2; - return (m_vertex == 2) ? path_cmd_move_to : m_cmd; + return (m_vertex == 2) ? (unsigned)path_cmd_move_to : m_cmd; } // Supplemantary functions. num_vertices() actually returns doubled diff --git a/agg/include/agg_pixfmt_rgba.h b/agg/include/agg_pixfmt_rgba.h index ab75b213c..fe6d66dd7 100644 --- a/agg/include/agg_pixfmt_rgba.h +++ b/agg/include/agg_pixfmt_rgba.h @@ -218,7 +218,7 @@ namespace agg static AGG_INLINE void blend_pix(value_type* p, unsigned cr, unsigned cg, unsigned cb, unsigned alpha, - unsigned cover=0) + unsigned /*cover*/=0) { if(alpha == 0) return; calc_type a = p[Order::A]; @@ -1341,7 +1341,7 @@ namespace agg // Dca' = (Da - Dca) * Sa + Dca.(1 - Sa) // Da' = Sa + Da - Sa.Da static AGG_INLINE void blend_pix(value_type* p, - unsigned sr, unsigned sg, unsigned sb, + unsigned /*sr*/, unsigned /*sg*/, unsigned /*sb*/, unsigned sa, unsigned cover) { sa = (sa * cover + 255) >> 8; @@ -1612,7 +1612,7 @@ namespace agg base_mask = color_type::base_mask }; - static AGG_INLINE void blend_pix(unsigned op, value_type* p, + static AGG_INLINE void blend_pix(unsigned /*op*/, value_type* p, unsigned cr, unsigned cg, unsigned cb, unsigned ca, unsigned cover) @@ -1637,7 +1637,7 @@ namespace agg base_mask = color_type::base_mask }; - static AGG_INLINE void blend_pix(unsigned op, value_type* p, + static AGG_INLINE void blend_pix(unsigned /*op*/, value_type* p, unsigned cr, unsigned cg, unsigned cb, unsigned ca, unsigned cover) @@ -1667,7 +1667,7 @@ namespace agg base_mask = color_type::base_mask }; - static AGG_INLINE void blend_pix(unsigned op, value_type* p, + static AGG_INLINE void blend_pix(unsigned /*op*/, value_type* p, unsigned cr, unsigned cg, unsigned cb, unsigned ca, unsigned cover) @@ -2340,7 +2340,7 @@ namespace agg void blend_from_color(const SrcPixelFormatRenderer& from, const color_type& color, int xdst, int ydst, - int xsrc, int ysrc, + int /*xsrc*/, int ysrc, unsigned len, int8u cover) { @@ -2367,7 +2367,7 @@ namespace agg void blend_from_lut(const SrcPixelFormatRenderer& from, const color_type* color_lut, int xdst, int ydst, - int xsrc, int ysrc, + int /*xsrc*/, int ysrc, unsigned len, int8u cover) { @@ -2792,7 +2792,7 @@ namespace agg void blend_from_color(const SrcPixelFormatRenderer& from, const color_type& color, int xdst, int ydst, - int xsrc, int ysrc, + int /*xsrc*/, int ysrc, unsigned len, int8u cover) { @@ -2820,7 +2820,7 @@ namespace agg void blend_from_lut(const SrcPixelFormatRenderer& from, const color_type* color_lut, int xdst, int ydst, - int xsrc, int ysrc, + int /*xsrc*/, int ysrc, unsigned len, int8u cover) { diff --git a/agg/include/agg_rasterizer_sl_clip.h b/agg/include/agg_rasterizer_sl_clip.h index e7ba065ac..a3c5867fb 100644 --- a/agg/include/agg_rasterizer_sl_clip.h +++ b/agg/include/agg_rasterizer_sl_clip.h @@ -317,7 +317,7 @@ namespace agg rasterizer_sl_no_clip() : m_x1(0), m_y1(0) {} void reset_clipping() {} - void clip_box(coord_type x1, coord_type y1, coord_type x2, coord_type y2) {} + void clip_box(coord_type /*x1*/, coord_type /*y1*/, coord_type /*x2*/, coord_type /*y2*/) {} void move_to(coord_type x1, coord_type y1) { m_x1 = x1; m_y1 = y1; } template diff --git a/agg/include/agg_renderer_outline_aa.h b/agg/include/agg_renderer_outline_aa.h index bf5a493a9..57d5a70ec 100644 --- a/agg/include/agg_renderer_outline_aa.h +++ b/agg/include/agg_renderer_outline_aa.h @@ -1565,11 +1565,11 @@ namespace agg { if(li.vertical()) { - while(li.step_ver()); + while(li.step_ver()) ; } else { - while(li.step_hor()); + while(li.step_hor()) ; } } } @@ -1620,11 +1620,11 @@ namespace agg line_interpolator_aa1 li(*this, lp, sx, sy); if(li.vertical()) { - while(li.step_ver()); + while(li.step_ver()) ; } else { - while(li.step_hor()); + while(li.step_hor()) ; } } @@ -1688,11 +1688,11 @@ namespace agg line_interpolator_aa2 li(*this, lp, ex, ey); if(li.vertical()) { - while(li.step_ver()); + while(li.step_ver()) ; } else { - while(li.step_hor()); + while(li.step_hor()) ; } } @@ -1759,11 +1759,11 @@ namespace agg line_interpolator_aa3 li(*this, lp, sx, sy, ex, ey); if(li.vertical()) { - while(li.step_ver()); + while(li.step_ver()) ; } else { - while(li.step_hor()); + while(li.step_hor()) ; } } diff --git a/agg/include/agg_renderer_outline_image.h b/agg/include/agg_renderer_outline_image.h index fabea35a9..f25837658 100644 --- a/agg/include/agg_renderer_outline_image.h +++ b/agg/include/agg_renderer_outline_image.h @@ -924,11 +924,11 @@ namespace agg m_start, m_scale_x); if(li.vertical()) { - while(li.step_ver()); + while(li.step_ver()) ; } else { - while(li.step_hor()); + while(li.step_hor()) ; } m_start += uround(lp.len / m_scale_x); }