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

Merge pull request #4414 from hummeltech/v3.1.x_Patches

Browse source 
v3.1.x: Backporting more patches to fix builds with modern Boost & GCC
This commit is contained in:
Artem Pavlenko 2023-11-01 14:20:26 +00:00 • committed by GitHub
commit 08886e3b90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/mapnik/wkb.hpp
View file

@ -28,6 +28,9 @@
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>
// stl
#include <cstdint>
namespace mapnik namespace mapnik
{ {

17
test/unit/serialization/wkb_test.cpp
View file

@ -57,6 +57,23 @@ struct spatially_equal_visitor
return true; return true;
} }
result_type operator()(mapnik::geometry::multi_line_string<double> const& lhs,
mapnik::geometry::multi_line_string<double> const& rhs) const
{
std::size_t size0 = lhs.size();
std::size_t size1 = rhs.size();
if (size0 != size1)
return false;
for (std::size_t index = 0; index < size0; ++index)
{
if (!boost::geometry::equals(lhs[index], rhs[index]))
return false;
}
return true;
}
template <typename T> template <typename T>
result_type operator() (T const& lhs, T const& rhs) const result_type operator() (T const& lhs, T const& rhs) const
{ {