Skip to content

Commit a138b87

Browse files
committed
Removed angus clipper library from code and updated all visual tests to master
1 parent 8e1e5f1 commit a138b87

File tree

8 files changed

+6
-5018
lines changed

8 files changed

+6
-5018
lines changed

SConstruct

-1
Original file line numberDiff line numberDiff line change
@@ -1593,7 +1593,6 @@ if not preconfigured:
15931593
# prepend to make sure we link locally
15941594
env.Prepend(CPPPATH = '#deps/agg/include')
15951595
env.Prepend(LIBPATH = '#deps/agg')
1596-
env.Prepend(CPPPATH = '#deps/clipper/include')
15971596
# prepend deps dir for auxillary headers
15981597
env.Prepend(CPPPATH = '#deps')
15991598

benchmark/test_polygon_clipping.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
// agg
2020
#include "agg_conv_clip_polygon.h"
2121
// clipper
22-
#include "clipper.hpp"
2322
#include "agg_path_storage.h"
2423
// rendering
2524
#include "agg_basics.h"
@@ -307,6 +306,8 @@ class test3 : public benchmark::test_case
307306
}
308307
};
309308

309+
/*
310+
Commented out section because clipper moved out of mapnik core.
310311
inline void process_polynode_branch(ClipperLib::PolyNode* polynode,
311312
mapnik::geometry::multi_polygon<double> & mp)
312313
{
@@ -491,6 +492,7 @@ class test4 : public benchmark::test_case
491492
return valid;
492493
}
493494
};
495+
*/
494496

495497
int main(int argc, char** argv)
496498
{
@@ -518,9 +520,11 @@ int main(int argc, char** argv)
518520
test3 test_runner(params,wkt_in,clipping_box);
519521
run(test_runner,"clipping polygon with boost");
520522
}
523+
/*
521524
{
522525
test4 test_runner(params,wkt_in,clipping_box);
523526
run(test_runner,"clipping polygon with clipper_tree");
524527
}
528+
*/
525529
return 0;
526530
}

deps/clipper/build.py

-26
This file was deleted.

0 commit comments

Comments
 (0)