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

Fix for bench

Browse source
This commit is contained in:
Blake Thompson 2015-04-21 10:29:22 -05:00
parent d7f7bc18c1
commit 1bb8136390
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
benchmark/test_polygon_clipping.cpp
View file

@ -468,7 +468,7 @@ public:
mapnik::geometry::correct(poly);
ClipperLib::Clipper clipper;
std::vector<ClipperLib::IntPoint> path;
mapnik::geometry::line_string<std::int64_t> path;
for (auto const& pt : poly.exterior_ring)
{
double x = pt.x;
@ -494,7 +494,7 @@ public:
}
}
std::cerr << "path size=" << path.size() << std::endl;
std::vector<ClipperLib::IntPoint> clip_box;
mapnik::geometry::line_string<std::int64_t> clip_box;
clip_box.emplace_back(static_cast<ClipperLib::cInt>(extent_.minx()),static_cast<ClipperLib::cInt>(extent_.miny()));
clip_box.emplace_back(static_cast<ClipperLib::cInt>(extent_.maxx()),static_cast<ClipperLib::cInt>(extent_.miny()));
clip_box.emplace_back(static_cast<ClipperLib::cInt>(extent_.maxx()),static_cast<ClipperLib::cInt>(extent_.maxy()));
@ -521,7 +521,7 @@ public:
else mp.emplace_back(); // start new polygon
for (auto const& pt : polynode->Contour)
{
mp.back().exterior_ring.add_coord(pt.X, pt.Y);
mp.back().exterior_ring.add_coord(pt.x, pt.y);
}
// childrens are interior rings
for (auto const* ring : polynode->Childs)
@ -529,7 +529,7 @@ public:
mapnik::geometry::linear_ring<double> hole;
for (auto const& pt : ring->Contour)
{
hole.add_coord(pt.X, pt.Y);
hole.add_coord(pt.x, pt.y);
}
mp.back().add_hole(std::move(hole));
}

8
deps/agg/include/agg_conv_clipper.h vendored
View file

@ -227,8 +227,8 @@ namespace agg
{
ClipperLib::IntPoint v;
v.X = Round(x * m_scaling_factor);
v.Y = Round(y * m_scaling_factor);
v.x = Round(x * m_scaling_factor);
v.y = Round(y * m_scaling_factor);
m_vertex_accumulator.add( v );
}
//------------------------------------------------------------------------------
@ -248,8 +248,8 @@ namespace agg
{
m_vertex++;
if(m_vertex >= (int)m_result[m_contour].size()) return false;
*x = (double)m_result[ m_contour ][ m_vertex ].X / m_scaling_factor;
*y = (double)m_result[ m_contour ][ m_vertex ].Y / m_scaling_factor;
*x = (double)m_result[ m_contour ][ m_vertex ].x / m_scaling_factor;
*y = (double)m_result[ m_contour ][ m_vertex ].y / m_scaling_factor;
return true;
}
//------------------------------------------------------------------------------