boost_mirror/geometry
1
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2025-05-10 07:34:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move intersection_box_box from overlay to intersection.

Browse Source
This commit is contained in:
Tinko Bartels 2023-10-02 03:57:52 +08:00
parent 7b7b3ebd9e
commit bc45baff0c
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/geometry/algorithms/detail/intersection/box_box.hpp
View File

@ -16,7 +16,7 @@
#include <boost/geometry/algorithms/detail/intersection/interface.hpp> #include <boost/geometry/algorithms/detail/intersection/interface.hpp>
#include <boost/geometry/algorithms/detail/overlay/intersection_box_box.hpp> #include <boost/geometry/algorithms/detail/intersection/box_box_implementation.hpp>
namespace boost { namespace geometry namespace boost { namespace geometry

17
include/boost/geometry/algorithms/detail/overlay/intersection_box_box.hpp → include/boost/geometry/algorithms/detail/intersection/box_box_implementation.hpp
View File

@ -11,12 +11,11 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_INTERSECTION_BOX_BOX_HPP #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_INTERSECTION_BOX_BOX_IMPLEMENTATION_HPP
#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_INTERSECTION_BOX_BOX_HPP #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_INTERSECTION_BOX_BOX_IMPLEMENTATION_HPP
#include <boost/geometry/core/access.hpp> #include <boost/geometry/core/access.hpp>
#include <boost/geometry/core/coordinate_type.hpp>
namespace boost { namespace geometry namespace boost { namespace geometry
@ -42,18 +41,16 @@ struct intersection_box_box
BoxOut& box_out, BoxOut& box_out,
Strategy const& strategy) Strategy const& strategy)
{ {
typedef typename coordinate_type<BoxOut>::type ct; auto max1 = get<max_corner, Dimension>(box1);
auto min2 = get<min_corner, Dimension>(box2);
ct max1 = get<max_corner, Dimension>(box1);
ct min2 = get<min_corner, Dimension>(box2);
if (max1 < min2) if (max1 < min2)
{ {
return false; return false;
} }
ct max2 = get<max_corner, Dimension>(box2); auto max2 = get<max_corner, Dimension>(box2);
ct min1 = get<min_corner, Dimension>(box1); auto min1 = get<min_corner, Dimension>(box1);
if (max2 < min1) if (max2 < min1)
{ {
@ -93,4 +90,4 @@ struct intersection_box_box<DimensionCount, DimensionCount>
}} // namespace boost::geometry }} // namespace boost::geometry
#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_INTERSECTION_BOX_BOX_HPP #endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_INTERSECTION_BOX_BOX_IMPLEMENTATION_HPP

2
include/boost/geometry/index/detail/algorithms/intersection_content.hpp
View File

@ -16,7 +16,7 @@
#define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_INTERSECTION_CONTENT_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_INTERSECTION_CONTENT_HPP
#include <boost/geometry/algorithms/detail/disjoint/box_box.hpp> #include <boost/geometry/algorithms/detail/disjoint/box_box.hpp>
#include <boost/geometry/algorithms/detail/overlay/intersection_box_box.hpp> #include <boost/geometry/algorithms/detail/intersection/box_box_implementation.hpp>
#include <boost/geometry/index/detail/algorithms/content.hpp> #include <boost/geometry/index/detail/algorithms/content.hpp>