This commit is contained in:
Maxime Gimeno 2019-06-17 15:24:43 +02:00
parent 3e5d3acb2f
commit e58b4475e7
3 changed files with 9 additions and 14 deletions

View File

@ -60,12 +60,10 @@ intersection(
typedef typename K::Plane_3 Plane_3; typedef typename K::Plane_3 Plane_3;
typedef std::vector<Point_3> Poly; typedef std::vector<Point_3> Poly;
typedef typename Intersection_traits<K, typedef typename Intersection_traits<K, CGAL::Iso_cuboid_3<K>,
CGAL::Iso_cuboid_3<K>,
CGAL::Plane_3<K> >::result_type Result_type; CGAL::Plane_3<K> >::result_type Result_type;
typedef typename Intersection_traits<K, typedef typename Intersection_traits<K, CGAL::Segment_3<K>,
CGAL::Segment_3<K>,
CGAL::Plane_3<K> >::result_type Inter_type; CGAL::Plane_3<K> >::result_type Inter_type;
std::vector<Segment_3> edges; std::vector<Segment_3> edges;

View File

@ -125,9 +125,7 @@ intersection(
} }
else //size = 4 else //size = 4
{ {
std::list<Segment_3> segs; std::list<Segment_3> segs(segments.begin(), segments.end());
for(auto s : segments)
segs.push_back(s);
std::list<typename K::Point_3> tmp; std::list<typename K::Point_3> tmp;
fill_points_list(segs, tmp); fill_points_list(segs, tmp);
std::vector<typename K::Point_3> res; std::vector<typename K::Point_3> res;

View File

@ -43,8 +43,7 @@ void filter_segments(const std::vector<Segment>& input,
{ {
Segment s = tmp.back(); Segment s = tmp.back();
tmp.pop_back(); tmp.pop_back();
auto s_it = tmp.begin(); for(auto s_it = tmp.begin(); s_it != tmp.end();)
for(; s_it != tmp.end();)
{ {
if(s == *s_it || s == s_it->opposite()) if(s == *s_it || s == s_it->opposite())
{ {