diff --git a/src/cairo_renderer.cpp b/src/cairo_renderer.cpp index 41ad3fb0f..1eaaf500e 100644 --- a/src/cairo_renderer.cpp +++ b/src/cairo_renderer.cpp @@ -151,15 +151,15 @@ class cairo_gradient : private mapnik::noncopyable public: cairo_gradient(const mapnik::gradient &grad, double opacity=1.0) { - double x1,x2,y1,y2,r; - grad.get_control_points(x1,y1,x2,y2,r); + double x1,x2,y1,y2,rad; + grad.get_control_points(x1,y1,x2,y2,rad); if (grad.get_gradient_type() == LINEAR) { pattern_ = Cairo::LinearGradient::create(x1, y1, x2, y2); } else if (grad.get_gradient_type() == RADIAL) { - pattern_ = Cairo::RadialGradient::create(x1, y1, 0, x2, y2, r); + pattern_ = Cairo::RadialGradient::create(x1, y1, 0, x2, y2, rad); } units_ = grad.get_units(); @@ -1762,10 +1762,10 @@ void cairo_renderer_base::process(markers_symbolizer const& sym, bool result = push_explicit_style( (*stock_vector_marker)->attributes(), attributes, sym); agg::trans_affine marker_tr = agg::trans_affine_scaling(scale_factor_); evaluate_transform(marker_tr, feature, sym.get_image_transform()); - box2d bbox = marker_ellipse.bounding_box(); + box2d new_bbox = marker_ellipse.bounding_box(); dispatch_type dispatch(context, marker_ellipse, result?attributes:(*stock_vector_marker)->attributes(), - *detector_, sym, bbox, marker_tr, scale_factor_); + *detector_, sym, new_bbox, marker_tr, scale_factor_); vertex_converter, dispatch_type, markers_symbolizer, CoordTransform, proj_transform, agg::trans_affine, conv_types> converter(query_extent_, dispatch, sym, t_, prj_trans, marker_tr, scale_factor_);