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

Fix -Wshadow warnings

Browse source
This commit is contained in:
Dane Springmeyer 2013-01-04 11:06:03 -08:00
parent 098f58a206
commit 866597c8c3
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boost/geometry/extensions/index/rtree/rtree.hpp
View file

@ -670,7 +670,7 @@ private:
} }
index = 0; index = 0;
for (typename std::vector<Box>::const_iterator it = boxes.begin(); for (it = boxes.begin();
it != boxes.end(); ++it, index++) it != boxes.end(); ++it, index++)
{ {
if (geometry::get<min_corner, D>(*it) >= highest_low && index != lowest_high_index) if (geometry::get<min_corner, D>(*it) >= highest_low && index != lowest_high_index)

4
src/agg/agg_renderer.cpp
View file

@ -368,7 +368,7 @@ void agg_renderer<T>::render_marker(pixel_position const& pos,
src.width(), src.width(),
src.height(), src.height(),
src.width()*4); src.width()*4);
agg::pixfmt_rgba32_pre pixf(marker_buf); agg::pixfmt_rgba32_pre marker_pixf(marker_buf);
typedef agg::image_accessor_clone<agg::pixfmt_rgba32_pre> img_accessor_type; typedef agg::image_accessor_clone<agg::pixfmt_rgba32_pre> img_accessor_type;
typedef agg::span_interpolator_linear<agg::trans_affine> interpolator_type; typedef agg::span_interpolator_linear<agg::trans_affine> interpolator_type;
typedef agg::span_image_filter_rgba_2x2<img_accessor_type, typedef agg::span_image_filter_rgba_2x2<img_accessor_type,
@ -376,7 +376,7 @@ void agg_renderer<T>::render_marker(pixel_position const& pos,
typedef agg::renderer_scanline_aa_alpha<renderer_base, typedef agg::renderer_scanline_aa_alpha<renderer_base,
agg::span_allocator<agg::rgba8>, agg::span_allocator<agg::rgba8>,
span_gen_type> renderer_type; span_gen_type> renderer_type;
img_accessor_type ia(pixf); img_accessor_type ia(marker_pixf);
interpolator_type interpolator(agg::trans_affine(p, 0, 0, width, height) ); interpolator_type interpolator(agg::trans_affine(p, 0, 0, width, height) );
span_gen_type sg(ia, interpolator, filter); span_gen_type sg(ia, interpolator, filter);
renderer_type rp(renb,sa, sg, unsigned(opacity*255)); renderer_type rp(renb,sa, sg, unsigned(opacity*255));

1
src/agg/process_line_symbolizer.cpp
View file

@ -153,7 +153,6 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
} }
typedef agg::renderer_scanline_aa_solid<renderer_base> renderer_type; typedef agg::renderer_scanline_aa_solid<renderer_base> renderer_type;
renderer_base renb(pixf);
renderer_type ren(renb); renderer_type ren(renb);
ren.color(agg::rgba8_pre(r, g, b, int(a * stroke_.get_opacity()))); ren.color(agg::rgba8_pre(r, g, b, int(a * stroke_.get_opacity())));
agg::scanline_u8 sl; agg::scanline_u8 sl;