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

geometry_envelope_test - fix linking/duplicate symbols (ref #3415)

Browse source
This commit is contained in:
artemp 2016-05-04 10:19:17 +02:00
parent e596ffc1c2
commit 52df451ee3
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
test/unit/geometry/geometry_envelope_test.cpp
View file

@ -1,8 +1,7 @@
#include "catch.hpp"
#include <mapnik/geometry.hpp>
#include <mapnik/geometry_envelope_impl.hpp>
//#include <mapnik/geometry_correct.hpp>
#include <mapnik/geometry_envelope.hpp>
namespace {

15
test/unit/geometry/geometry_test_helper.cpp Normal file
View file

@ -0,0 +1,15 @@
#include <mapnik/geometry.hpp>
#include <mapnik/geometry_envelope.hpp>
#include <mapnik/geometry_envelope_impl.hpp>
namespace mapnik { namespace geometry {
// instantiate types required by geometry_envelope_test
template mapnik::box2d<int> envelope(geometry<int> const& geom);
template mapnik::box2d<float> envelope(geometry<float> const& geom);
template mapnik::box2d<int> envelope(polygon<int> const& geom);
template mapnik::box2d<float> envelope(polygon<float> const& geom);
template mapnik::box2d<int> envelope(geometry_collection<int> const& geom);
template mapnik::box2d<float> envelope(geometry_collection<float> const& geom);
}}