sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix -Wshadow warning

Browse source
This commit is contained in:
Dane Springmeyer 2013-01-03 18:04:01 -08:00
parent fb5b6e5a7c
commit ccf10961c7
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/cairo_renderer.cpp
View file

@ -151,15 +151,15 @@ class cairo_gradient : private mapnik::noncopyable
public: public:
cairo_gradient(const mapnik::gradient &grad, double opacity=1.0) cairo_gradient(const mapnik::gradient &grad, double opacity=1.0)
{ {
double x1,x2,y1,y2,r; double x1,x2,y1,y2,rad;
grad.get_control_points(x1,y1,x2,y2,r); grad.get_control_points(x1,y1,x2,y2,rad);
if (grad.get_gradient_type() == LINEAR) if (grad.get_gradient_type() == LINEAR)
{ {
pattern_ = Cairo::LinearGradient::create(x1, y1, x2, y2); pattern_ = Cairo::LinearGradient::create(x1, y1, x2, y2);
} }
else if (grad.get_gradient_type() == RADIAL) 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(); 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); bool result = push_explicit_style( (*stock_vector_marker)->attributes(), attributes, sym);
agg::trans_affine marker_tr = agg::trans_affine_scaling(scale_factor_); agg::trans_affine marker_tr = agg::trans_affine_scaling(scale_factor_);
evaluate_transform(marker_tr, feature, sym.get_image_transform()); evaluate_transform(marker_tr, feature, sym.get_image_transform());
box2d<double> bbox = marker_ellipse.bounding_box(); box2d<double> new_bbox = marker_ellipse.bounding_box();
dispatch_type dispatch(context, marker_ellipse, result?attributes:(*stock_vector_marker)->attributes(), 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<box2d<double>, dispatch_type, markers_symbolizer, vertex_converter<box2d<double>, dispatch_type, markers_symbolizer,
CoordTransform, proj_transform, agg::trans_affine, conv_types> CoordTransform, proj_transform, agg::trans_affine, conv_types>
converter(query_extent_, dispatch, sym, t_, prj_trans, marker_tr, scale_factor_); converter(query_extent_, dispatch, sym, t_, prj_trans, marker_tr, scale_factor_);