diff options
author | Gard Spreemann <gspreemann@gmail.com> | 2017-04-20 11:15:58 +0200 |
---|---|---|
committer | Gard Spreemann <gspreemann@gmail.com> | 2017-04-20 11:15:58 +0200 |
commit | eadd3e18b55fc3b7a7d0420015902df2d58dcea5 (patch) | |
tree | ce025060ea9045415b1f738886c8c70ed32218e8 /data/points/generator/hypergenerator.cpp | |
parent | 5638527781e1d8cd916cd28f9d375eef7b5d820b (diff) | |
parent | 8d7329f3e5ad843e553c3c5503cecc28ef2eead6 (diff) |
Merge tag 'upstream/2.0.0' into dfsg/latest
Upstream's 2.0.0 release.
Diffstat (limited to 'data/points/generator/hypergenerator.cpp')
-rw-r--r-- | data/points/generator/hypergenerator.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/data/points/generator/hypergenerator.cpp b/data/points/generator/hypergenerator.cpp index 60890b44..5831de18 100644 --- a/data/points/generator/hypergenerator.cpp +++ b/data/points/generator/hypergenerator.cpp @@ -29,7 +29,7 @@ #include <iterator> #include <vector> #include <fstream> // for std::ofstream - +#include <cstdlib> typedef CGAL::Epick_d< CGAL::Dynamic_dimension_tag > K; typedef K::Point_d Point; @@ -47,24 +47,22 @@ int main(int argc, char **argv) { usage(argv[0]); } - int points_number = 0; - int returnedScanValue = sscanf(argv[4], "%d", &points_number); - if ((returnedScanValue == EOF) || (points_number <= 0)) { + int points_number = atoi(argv[4]); + if (points_number <= 0) { std::cerr << "Error: " << argv[4] << " is not correct" << std::endl; usage(argv[0]); } - int dimension = 0; - returnedScanValue = sscanf(argv[5], "%d", &dimension); - if ((returnedScanValue == EOF) || (dimension <= 0)) { + int dimension = atoi(argv[5]); + if (dimension <= 0) { std::cerr << "Error: " << argv[5] << " is not correct" << std::endl; usage(argv[0]); } double radius = 1.0; if (argc == 7) { - returnedScanValue = sscanf(argv[6], "%lf", &radius); - if ((returnedScanValue == EOF) || (radius <= 0.0)) { + radius = atof(argv[6]); + if (radius <= 0.0) { std::cerr << "Error: " << argv[6] << " is not correct" << std::endl; usage(argv[0]); } |