archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2025-12-08 20:13:09 +00:00
Code Issues Projects Releases Wiki Activity

fix variable shadowing in simplify_converter - refs #3166

Browse Source
This commit is contained in:
Dane Springmeyer 2015-11-09 12:25:10 -08:00
parent 5eefd8b1ec
commit 9c7149aad5
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/mapnik/simplify_converter.hpp
View File

@ -486,7 +486,7 @@ private:
return status_ = process;
}
void RDP(std::vector<vertex2d>& vertices, const size_t start, const size_t end)
void RDP(std::vector<vertex2d>& vertices, const size_t start, const size_t itr_end)
{
// Squared length of a vector
auto sqlen = [] (vertex2d const& vec) { return vec.x*vec.x + vec.y*vec.y; };
@ -525,15 +525,15 @@ private:
};
// Compute the directional vector along the segment
vertex2d dir = vertex2d(vertices[end].x - vertices[start].x, vertices[end].y - vertices[start].y, SEG_END);
vertex2d dir = vertex2d(vertices[itr_end].x - vertices[start].x, vertices[itr_end].y - vertices[start].y, SEG_END);
double dir_sq_len = sqlen(dir);
// Find the point with the maximum distance from this line segment
double max = std::numeric_limits<double>::min();
size_t keeper = 0;
for (size_t i = start + 1; i < end; ++i)
for (size_t i = start + 1; i < itr_end; ++i)
{
double d = segment_distance(vertices[i], vertices[start], vertices[end], dir, dir_sq_len);
double d = segment_distance(vertices[i], vertices[start], vertices[itr_end], dir, dir_sq_len);
if (d > max)
{
keeper = i;
@ -550,15 +550,15 @@ private:
{
RDP(vertices, start, keeper);
}
if (end - keeper != 1)
if (itr_end - keeper != 1)
{
RDP(vertices, keeper, end);
RDP(vertices, keeper, itr_end);
}
}// Everyone between the start and the end was close enough to the line
else
{
// Mark each of them as discarded
for (size_t i = start + 1; i < end; ++i)
for (size_t i = start + 1; i < itr_end; ++i)
{
vertices[i].cmd = SEG_END;
}