Skip to content

Commit d0e6a99

Browse files
Merge pull request #7 from boostorg/develop
update
2 parents 6ae8e07 + 602790a commit d0e6a99

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1942
-789
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# ![Boost.Geometry](doc/other/logo/logo_bkg.png)
22

3-
Boost.Geometry, part of collection of the [Boost C++ Libraries](http://github.com/boostorg), defines concepts, primitives and algorithms for solving geometry problems.
3+
Boost.Geometry, part of collection of the [Boost C++ Libraries](http://github.com/boostorg), defines concepts, primitives and algorithms for solving geometry problems. Boost.Geometry is a C++14 header-only library.
44

55
[![Licence](https://img.shields.io/badge/license-boost-4480cc.png)](http://www.boost.org/LICENSE_1_0.txt)
66
[![Documentation](https://img.shields.io/badge/-documentation-4480cc.png)](http://boost.org/libs/geometry)

example/05_b_overlay_linestring_polygon_example.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,13 @@ int main(void)
6767
#endif
6868

6969
// Calculate intersection points (turn points)
70-
typedef bg::segment_ratio_type<point_2d, bg::detail::no_rescale_policy>::type segment_ratio;
70+
typedef bg::detail::segment_ratio_type<point_2d, bg::detail::no_rescale_policy>::type segment_ratio;
7171
typedef bg::detail::overlay::turn_info<point_2d, segment_ratio> turn_info;
7272
std::vector<turn_info> turns;
7373
bg::detail::get_turns::no_interrupt_policy policy;
7474
bg::detail::no_rescale_policy rescale_policy;
75-
bg::get_turns<false, false, bg::detail::overlay::assign_null_policy>(ls, p, rescale_policy, turns, policy);
75+
bg::strategy::intersection::services::default_strategy<typename bg::cs_tag<point_2d>::type>::type intersection_strategy;
76+
bg::get_turns<false, false, bg::detail::overlay::assign_null_policy>(ls, p, intersection_strategy, rescale_policy, turns, policy);
7677

7778
std::cout << "Intersection of linestring/polygon" << std::endl;
7879
BOOST_FOREACH(turn_info const& turn, turns)

example/c05_custom_point_pointer_example.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,11 @@ int main()
102102

103103
// This works because outputs to a normal struct point, no point*
104104
typedef boost::geometry::model::linestring<point_2d> linestring_2d;
105+
boost::geometry::detail::no_rescale_policy rescale_policy;
105106
std::vector<linestring_2d> clipped;
106107
boost::geometry::strategy::intersection::liang_barsky<box_2d, point_2d> strategy;
107108
boost::geometry::detail::intersection::clip_range_with_box<linestring_2d>(cb,
108-
myline, std::back_inserter(clipped), strategy);
109+
myline, rescale_policy, std::back_inserter(clipped), strategy);
109110

110111

111112
std::cout << boost::geometry::length(clipped.front()) << std::endl;

example/c08_custom_non_std_example.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ int main()
281281

282282
// Create (as an example) a regular polygon
283283
const int n = 5;
284-
const double d = (360 / n) * boost::geometry::math::d2r;
284+
const double d = (360 / n) * boost::geometry::math::d2r<double>();
285285
double a = 0;
286286
for (int i = 0; i < n + 1; i++, a += d)
287287
{

extensions/test/triangulation/side_robust.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <geometry_test_common.hpp>
1414

1515
#include <boost/geometry/geometries/point_xy.hpp>
16-
#include <boost/geometry/extensions/triangulation/strategies/cartesian/side_robust.hpp>
16+
#include <boost/geometry/strategy/cartesian/side_robust.hpp>
1717

1818
template <typename P>
1919
void test_all()

0 commit comments

Comments
 (0)