songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/lrineau/Triangulation_3-CDT_3-lrineau' into Triangulation_3-CDT_3-lrineau

This commit is contained in:
Laurent Rineau 2023-07-25 18:46:07 +02:00
parent 9188bfbd63 facd881c19
commit 41b46baf5b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Triangulation_3/include/CGAL/Constrained_Delaunay_triangulation_3.h
View File

@ -822,7 +822,9 @@ private:
for(const auto& [va, vb]: border_edges_set) { for(const auto& [va, vb]: border_edges_set) {
Cell_handle c; Cell_handle c;
int i, j; int i, j;
CGAL_assume(this->tds().is_edge(va, vb, c, i, j)); CGAL_assume_code(bool b =)
this->tds().is_edge(va, vb, c, i, j);
CGAL_assume(b);
border_edges.emplace_back(c, i, j); border_edges.emplace_back(c, i, j);
} }
#if CGAL_DEBUG_CDT_3 #if CGAL_DEBUG_CDT_3

5
Triangulation_3/test/Triangulation_3/cdt_3_from_off.cpp
View File

@ -92,7 +92,8 @@ int main(int argc, char* argv[])
try { try {
go(mesh, output_filename); go(mesh, output_filename);
} catch(CGAL::Error_exception& e) { } catch(CGAL::Error_exception& e) {
if(e.message().contains(std::string("### error with cavity ###"))) { if(e.message().find(std::string("### error with cavity ###")) != std::string::npos)
{
std::cerr << "BAD MESH! " << mesh.number_of_faces() << " faces\n"; std::cerr << "BAD MESH! " << mesh.number_of_faces() << " faces\n";
std::ofstream bad("bad.off"); std::ofstream bad("bad.off");
bad.precision(17); bad.precision(17);
@ -206,7 +207,7 @@ int go(Mesh mesh, std::string output_filename) {
std::cerr << "Polygon is not coplanar\n"; std::cerr << "Polygon is not coplanar\n";
} }
try { try {
auto id = cdt.insert_constrained_polygon(polygon, true); [[maybe_unused]] auto id = cdt.insert_constrained_polygon(polygon, true);
assert(id == poly_id); assert(id == poly_id);
++poly_id; ++poly_id;
} catch(int error) { } catch(int error) {