From 0c1ccdb4239dbfb37076c8a7a3c80ff97136d88a Mon Sep 17 00:00:00 2001 From: Peter Hachenberger Date: Mon, 27 Jul 2009 11:27:57 +0000 Subject: [PATCH] the check for the correct file format was not properly. Now the demo program only accepts OFF files, but in exchange all OFF files --- .../demo/Minkowski_sum_3/minkowski_sum_3.cpp | 28 ++++++------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/Minkowski_sum_3/demo/Minkowski_sum_3/minkowski_sum_3.cpp b/Minkowski_sum_3/demo/Minkowski_sum_3/minkowski_sum_3.cpp index faa429da9b8..95969e17e8a 100644 --- a/Minkowski_sum_3/demo/Minkowski_sum_3/minkowski_sum_3.cpp +++ b/Minkowski_sum_3/demo/Minkowski_sum_3/minkowski_sum_3.cpp @@ -1,7 +1,4 @@ -#include -#include -#include -#include +#include #include #include #include @@ -13,23 +10,16 @@ #include #include -typedef CGAL::Lazy_kernel > Kernel; +typedef CGAL::Exact_predicates_exact_constructions_kernel Kernel; typedef CGAL::Nef_polyhedron_3 Nef_polyhedron; typedef CGAL::Polyhedron_3 Polyhedron; -bool loadFile(char* filename, Nef_polyhedron& N) { +bool loadFile(char* filename, Nef_polyhedron& N) +{ std::ifstream in(filename); - std::ifstream test(filename); - char c; - test >> c; - if(c!='S' && c!='O') return false; - if(c == 'S') - in >> N; - else { - Polyhedron P; - in >> P; - N = Nef_polyhedron(P); - } + Polyhedron P; + in >> P; + N = Nef_polyhedron(P); return true; } @@ -39,11 +29,11 @@ int main(int argc, char* argv[]) { Nef_polyhedron N0, N1; if(!loadFile(argv[1], N0)) { - std::cerr << "parameter 1 is not a valid input file" << std::endl; + std::cerr << "parameter 1 is not a valid OFF file" << std::endl; return 0; } if(!loadFile(argv[2], N1)) { - std::cerr << "parameter 2 is not a valid input file" << std::endl; + std::cerr << "parameter 2 is not a valid OFF file" << std::endl; return 0; }