diff options
| author | Marius Kintel <marius@kintel.net> | 2013-12-09 04:12:13 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-12-09 04:12:13 (GMT) |
| commit | 462d4d447885594629fefb8a658f9f1d079bcc44 (patch) | |
| tree | 6690951e4f814b87a1a372a913b75ceda1f6cc1a /src/CGAL_Nef_polyhedron.cc | |
| parent | 435e0c021c5018ee5de69d3218c3e31c8ab75be5 (diff) | |
| parent | 33c34b6f7c43d19bbfa3bf91e7b577bcc062e5bd (diff) | |
Merge branch 'master' into travis
Diffstat (limited to 'src/CGAL_Nef_polyhedron.cc')
| -rw-r--r-- | src/CGAL_Nef_polyhedron.cc | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/CGAL_Nef_polyhedron.cc b/src/CGAL_Nef_polyhedron.cc index 440f4ed..49b9a53 100644 --- a/src/CGAL_Nef_polyhedron.cc +++ b/src/CGAL_Nef_polyhedron.cc @@ -96,13 +96,22 @@ PolySet *CGAL_Nef_polyhedron::convertToPolyset() } else if (this->dim == 3) { CGAL::Failure_behaviour old_behaviour = CGAL::set_error_behaviour(CGAL::THROW_EXCEPTION); + bool err = true; + std::string errmsg(""); + CGAL_Polyhedron P; try { - CGAL_Polyhedron P; - this->p3->convert_to_Polyhedron(P); - ps = createPolySetFromPolyhedron(P); + err = nefworkaround::convert_to_Polyhedron<CGAL_Kernel3>( *(this->p3), P ); + //this->p3->convert_to_Polyhedron(P); + } + catch (const CGAL::Failure_exception &e) { + err = true; + errmsg = std::string(e.what()); } - catch (const CGAL::Precondition_exception &e) { - PRINTB("CGAL error in CGAL_Nef_polyhedron::convertToPolyset(): %s", e.what()); + if (err) { + PRINT("ERROR: CGAL NefPolyhedron->Polyhedron conversion failed."); + if (errmsg!="") PRINTB("ERROR: %s",errmsg); + } else { + ps = createPolySetFromPolyhedron(P); } CGAL::set_error_behaviour(old_behaviour); } |