boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-10 11:32:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'feature/relate' of github.com:boostorg/geometry into feature/relate

Browse Source
This commit is contained in:
Adam Wulkiewicz
2014-04-01 00:12:22 +02:00
parent 0a49cb1e3e 2fc1ca4e9c
commit 759258563e
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/boost/geometry/algorithms/detail/overlay/get_turn_info_for_endpoint.hpp
View File

@@ -134,7 +134,7 @@ struct get_turn_info_for_endpoint
bool is_q_first, bool is_q_last,
TurnInfo const& tp_model,
IntersectionResult const& result,
method_type method,
method_type /*method*/,
OutputIterator out)
{
std::size_t ip_count = result.template get<0>().count;
@@ -389,6 +389,9 @@ struct get_turn_info_for_endpoint
IntersectionResult const& result,
operation_type & op1, operation_type & op2)
{
boost::ignore_unused_variable_warning(ip);
boost::ignore_unused_variable_warning(tp_model);
if ( !first2 && !last2 )
{
if ( first1 )

4
include/boost/geometry/algorithms/detail/overlay/get_turn_info_la.hpp
View File

@@ -364,7 +364,7 @@ struct get_turn_info_linear_areal
method_type m_method;
};
static inline void replace_operations_i(operation_type & op0, operation_type & op1)
static inline void replace_operations_i(operation_type & /*op0*/, operation_type & op1)
{
// assuming Linear is always the first one
op1 = operation_union;
@@ -385,7 +385,7 @@ struct get_turn_info_linear_areal
bool is_q_first, bool is_q_last,
TurnInfo const& tp_model,
IntersectionResult const& result,
method_type method,
method_type /*method*/,
OutputIterator out)
{
namespace ov = overlay;

5
include/boost/geometry/algorithms/detail/relate/follow_helpers.hpp
View File

@@ -70,20 +70,17 @@ struct for_each_disjoint_geometry_if<OpId, Geometry, Tag, true>
{
typedef typename boost::range_iterator<Geometry const>::type iterator;
bool found = false;
// O(N)
// check predicate for each contained geometry without generated turn
for ( iterator it = boost::begin(geometry) ;
it != boost::end(geometry) ; ++it )
{
found = true;
bool cont = pred(*it);
if ( !cont )
break;
}
return true;
return !boost::empty(geometry);
}
template <typename TurnIt, typename Pred>

2
include/boost/geometry/algorithms/detail/relate/linear_linear.hpp
View File

@@ -335,7 +335,7 @@ struct linear_linear
void apply(Result & res,
TurnIt first, TurnIt it, TurnIt last,
Geometry const& geometry,
OtherGeometry const& other_geometry,
OtherGeometry const& /*other_geometry*/,
BoundaryChecker const& boundary_checker,
OtherBoundaryChecker const& other_boundary_checker)
{