summaryrefslogtreecommitdiff
path: root/src/CGAL_Nef_polyhedron.cc
diff options
context:
space:
mode:
authordon bright <hugh.m.bright@gmail.com>2011-11-05 18:17:06 (GMT)
committerdon bright <hugh.m.bright@gmail.com>2011-11-05 18:17:06 (GMT)
commit273672c418e4ff2400a9cbc1dacb510a2452b734 (patch)
tree68d4cba8d98064482c1cdf68b514351468864b34 /src/CGAL_Nef_polyhedron.cc
parent88b8080f30d6ca1a9a74b8005a7408d4066f481b (diff)
parentd14a24a2b63d7d3815e02a79ef9dacd76cd01f4d (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/CGAL_Nef_polyhedron.cc')
-rw-r--r--src/CGAL_Nef_polyhedron.cc13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/CGAL_Nef_polyhedron.cc b/src/CGAL_Nef_polyhedron.cc
index 975c9a4..2538b64 100644
--- a/src/CGAL_Nef_polyhedron.cc
+++ b/src/CGAL_Nef_polyhedron.cc
@@ -6,8 +6,6 @@
#include "dxfdata.h"
#include "dxftess.h"
#include <CGAL/minkowski_sum_3.h>
-#include <CGAL/assertions_behaviour.h>
-#include <CGAL/exceptions.h>
CGAL_Nef_polyhedron& CGAL_Nef_polyhedron::operator+=(const CGAL_Nef_polyhedron &other)
{
@@ -34,15 +32,8 @@ extern CGAL_Nef_polyhedron2 minkowski2(const CGAL_Nef_polyhedron2 &a, const CGAL
CGAL_Nef_polyhedron &CGAL_Nef_polyhedron::minkowski(const CGAL_Nef_polyhedron &other)
{
- CGAL::Failure_behaviour old_behaviour = CGAL::set_error_behaviour(CGAL::THROW_EXCEPTION);
- try {
- if (this->dim == 2) (*this->p2) = minkowski2(*this->p2, *other.p2);
- else if (this->dim == 3) (*this->p3) = CGAL::minkowski_sum_3(*this->p3, *other.p3);
- }
- catch (CGAL::Assertion_exception e) {
- PRINTF("CGAL error in minkowski %s", e.what());
- CGAL::set_error_behaviour(old_behaviour);
- }
+ if (this->dim == 2) (*this->p2) = minkowski2(*this->p2, *other.p2);
+ else if (this->dim == 3) (*this->p3) = CGAL::minkowski_sum_3(*this->p3, *other.p3);
return *this;
}
contact: Jan Huwald // Impressum