From 9d63c101756cacacced1d6589e4fc5bc2bb7d668 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 3 Apr 2024 17:10:44 +0200 Subject: [PATCH] fix --- .../include/CGAL/Conforming_Delaunay_triangulation_3.h | 2 +- .../include/CGAL/Constrained_Delaunay_triangulation_3.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Triangulation_3/include/CGAL/Conforming_Delaunay_triangulation_3.h b/Triangulation_3/include/CGAL/Conforming_Delaunay_triangulation_3.h index adb7725b321..bdf82e9670a 100644 --- a/Triangulation_3/include/CGAL/Conforming_Delaunay_triangulation_3.h +++ b/Triangulation_3/include/CGAL/Conforming_Delaunay_triangulation_3.h @@ -198,7 +198,7 @@ protected: template void process_cells_in_conflict(InputIterator cell_it, InputIterator end) { - auto d = self.tr.dimension() + auto d = self.tr.dimension(); for( ; cell_it != end; ++cell_it ) for( int i = 0; i < d; ++i ) for( int j = i+1; j <= d; ++j ) { diff --git a/Triangulation_3/include/CGAL/Constrained_Delaunay_triangulation_3.h b/Triangulation_3/include/CGAL/Constrained_Delaunay_triangulation_3.h index 069ab892e76..11559ee9448 100644 --- a/Triangulation_3/include/CGAL/Constrained_Delaunay_triangulation_3.h +++ b/Triangulation_3/include/CGAL/Constrained_Delaunay_triangulation_3.h @@ -2332,7 +2332,6 @@ private: triangulate_cavity(original_intersecting_cells, original_facets_of_upper_cavity, original_vertices_of_upper_cavity); std::for_each(interior_constrained_faces_upper.begin(), interior_constrained_faces_upper.end(), register_internal_constrained_facet); - insert_in_conflict_visitor.process_cells_in_conflict(cells_of_upper_cavity.begin(), cells_of_upper_cavity.end()); if(this->debug_copy_triangulation_into_hole()) { std::cerr << "# lower cavity\n"; } @@ -2342,7 +2341,6 @@ private: triangulate_cavity(original_intersecting_cells, original_facets_of_lower_cavity, original_vertices_of_lower_cavity); std::for_each(interior_constrained_faces_lower.begin(), interior_constrained_faces_lower.end(), register_internal_constrained_facet); - insert_in_conflict_visitor.process_cells_in_conflict(cells_of_lower_cavity.begin(), cells_of_lower_cavity.end()); // the following transform_reduce is like `std::any_of` but without the fast-exit if(std::transform_reduce(fh_region.begin(), fh_region.end(), false, std::logical_or{}, [&](auto fh) { @@ -2410,6 +2408,9 @@ private: throw Next_region{"missing facet in polygon", fh_region[0]}; } + insert_in_conflict_visitor.process_cells_in_conflict(cells_of_upper_cavity.begin(), cells_of_upper_cavity.end()); + insert_in_conflict_visitor.process_cells_in_conflict(cells_of_lower_cavity.begin(), cells_of_lower_cavity.end()); + if(this->debug_copy_triangulation_into_hole()) { std::cerr << "# glu the upper triangulation of the cavity\n"; if(cells_of_lower_cavity.size() > original_intersecting_cells.size() ||