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

more fix GCC shadows a member warning [-Wshadow]

Browse source
This commit is contained in:
artemp 2017-01-12 18:01:42 +01:00
parent 0a7e8bb429
commit 1c704447b7
6 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/agg/process_line_pattern_symbolizer.cpp
View file

@ -96,9 +96,9 @@ struct agg_renderer_process_visitor_l
private:
void render(mapnik::image_rgba8 const& marker, double width, double height) const
{
using color = agg::rgba8;
using col = agg::rgba8;
using order = agg::order_rgba;
using blender_type = agg::comp_op_adaptor_rgba_pre<color, order>;
using blender_type = agg::comp_op_adaptor_rgba_pre<col, order>;
using pattern_filter_type = agg::pattern_filter_bilinear_rgba8;
using pattern_type = agg::line_image_pattern<pattern_filter_type>;
using pixfmt_type = agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer>;

4
src/agg/process_markers_symbolizer.cpp
View file

@ -135,10 +135,10 @@ void agg_renderer<T0,T1>::process(markers_symbolizer const& sym,
buf_type render_buffer(current_buffer_->bytes(), current_buffer_->width(), current_buffer_->height(), current_buffer_->row_size());
box2d<double> clip_box = clipping_extent(common_);
using context_type = detail::agg_markers_renderer_context<svg_renderer_type,
using renderer_context_type = detail::agg_markers_renderer_context<svg_renderer_type,
buf_type,
rasterizer>;
context_type renderer_context(sym, feature, common_.vars_, render_buffer, *ras_ptr);
renderer_context_type renderer_context(sym, feature, common_.vars_, render_buffer, *ras_ptr);
render_markers_symbolizer(
sym, feature, prj_trans, common_, clip_box, renderer_context);

4
src/agg/process_polygon_pattern_symbolizer.cpp
View file

@ -118,9 +118,9 @@ private:
box2d<double> clip_box = clipping_extent(common_);
using color = agg::rgba8;
using col = agg::rgba8;
using order = agg::order_rgba;
using blender_type = agg::comp_op_adaptor_rgba_pre<color, order>;
using blender_type = agg::comp_op_adaptor_rgba_pre<col, order>;
using pixfmt_type = agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer>;
using wrap_x_type = agg::wrap_mode_repeat;

10
src/cairo/cairo_render_vector.cpp
View file

@ -35,7 +35,7 @@ namespace mapnik
void render_vector_marker(cairo_context & context, svg::svg_path_adapter & svg_path,
agg::pod_bvector<svg::path_attributes> const & attributes,
box2d<double> const& bbox, agg::trans_affine const& tr,
double opacity)
double opacity_)
{
using namespace mapnik::svg;
agg::trans_affine transform;
@ -75,14 +75,14 @@ void render_vector_marker(cairo_context & context, svg::svg_path_adapter & svg_p
}
if(attr.fill_gradient.get_gradient_type() != NO_GRADIENT)
{
cairo_gradient g(attr.fill_gradient,attr.fill_opacity * attr.opacity * opacity);
cairo_gradient g(attr.fill_gradient,attr.fill_opacity * attr.opacity * opacity_);
context.set_gradient(g,bbox);
context.fill();
}
else if(attr.fill_flag)
{
double fill_opacity = attr.fill_opacity * attr.opacity * opacity * attr.fill_color.opacity();
double fill_opacity = attr.fill_opacity * attr.opacity * opacity_ * attr.fill_color.opacity();
context.set_color(attr.fill_color.r/255.0,attr.fill_color.g/255.0,
attr.fill_color.b/255.0, fill_opacity);
context.fill();
@ -98,13 +98,13 @@ void render_vector_marker(cairo_context & context, svg::svg_path_adapter & svg_p
context.set_line_cap(line_cap_enum(attr.line_cap));
context.set_line_join(line_join_enum(attr.line_join));
context.set_miter_limit(attr.miter_limit);
cairo_gradient g(attr.stroke_gradient,attr.fill_opacity * attr.opacity * opacity);
cairo_gradient g(attr.stroke_gradient,attr.fill_opacity * attr.opacity * opacity_);
context.set_gradient(g,bbox);
context.stroke();
}
else if (attr.stroke_flag)
{
double stroke_opacity = attr.stroke_opacity * attr.opacity * opacity * attr.stroke_color.opacity();
double stroke_opacity = attr.stroke_opacity * attr.opacity * opacity_ * attr.stroke_color.opacity();
context.set_color(attr.stroke_color.r/255.0,attr.stroke_color.g/255.0,
attr.stroke_color.b/255.0, stroke_opacity);
context.set_line_width(attr.stroke_width);

4
src/cairo/cairo_renderer.cpp
View file

@ -254,11 +254,11 @@ struct cairo_render_marker_visitor
marker_tr *= tr_;
}
marker_tr *= agg::trans_affine_scaling(common_.scale_factor_);
agg::pod_bvector<svg::path_attributes> const & attributes = vmarker->attributes();
agg::pod_bvector<svg::path_attributes> const & attrs = vmarker->attributes();
svg::vertex_stl_adapter<svg::svg_path_storage> stl_storage(vmarker->source());
svg::svg_path_adapter svg_path(stl_storage);
marker_tr.translate(pos_.x, pos_.y);
render_vector_marker(context_, svg_path, attributes, bbox, marker_tr, opacity_);
render_vector_marker(context_, svg_path, attrs, bbox, marker_tr, opacity_);
}
}

4
src/grid/process_markers_symbolizer.cpp
View file

@ -152,12 +152,12 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
ras_ptr->reset();
box2d<double> clip_box = common_.query_extent_;
using context_type = detail::grid_markers_renderer_context<svg_renderer_type,
using renderer_context_type = detail::grid_markers_renderer_context<svg_renderer_type,
renderer_type,
buf_type,
grid_rasterizer,
buffer_type>;
context_type renderer_context(feature, render_buf, *ras_ptr, pixmap_);
renderer_context_type renderer_context(feature, render_buf, *ras_ptr, pixmap_);
render_markers_symbolizer(
sym, feature, prj_trans, common_, clip_box, renderer_context);