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

fix more clang++ -Wshadow warnings

Browse source
This commit is contained in:
Dane Springmeyer 2013-01-03 12:37:45 -08:00
parent 271e8468fd
commit 000b714eae
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/mapnik/geom_util.hpp
View file

@ -505,9 +505,9 @@ bool interior_position(PathType & path, double & x, double & y)
double max_width = 0;
for (unsigned ii = 1; ii < intersections.size(); ++ii)
{
double x1=intersections[ii];
double xc=(x0+x1)/2.0;
double width = std::fabs(x1-x0);
double xi=intersections[ii];
double xc=(x0+xi)/2.0;
double width = std::fabs(xi-x0);
if (width > max_width && hit_test(path,xc,y,0))
{
x=xc;

10
plugins/input/osm/osm.h
View file

@ -34,12 +34,12 @@ struct bounds
{
double w, s, e, n;
bounds() { w = -180; s = -90; e = 180; n = 90; }
bounds(double w, double s, double e, double n)
bounds(double w_, double s_, double e_, double n_)
{
this->w = w;
this->s = s;
this->e = e;
this->n = n;
this->w = w_;
this->s = s_;
this->e = e_;
this->n = n_;
}
};

6
plugins/input/shape/shapefile.hpp
View file

@ -72,9 +72,9 @@ struct shape_record
size_t size;
mutable size_t pos;
explicit shape_record(size_t size)
: data(Tag::alloc(size)),
size(size),
explicit shape_record(size_t size_)
: data(Tag::alloc(size_)),
size(size_),
pos(0)
{}

4
src/box2d.cpp
View file

@ -41,9 +41,9 @@ box2d<T>::box2d()
:minx_(0),miny_(0),maxx_(-1),maxy_(-1) {}
template <typename T>
box2d<T>::box2d(T minx_,T miny_,T maxx_,T maxy_)
box2d<T>::box2d(T minx,T miny,T maxx,T maxy)
{
init(minx_,miny_,maxx_,maxy_);
init(minx,miny,maxx,maxy);
}
template <typename T>