Merge bottleneck_misc_fixes branch to fix bottleneck cpplint issue and doxygen warning

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@1974 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: a8704c1ff42c8e0f78ba2e70d83b71c91b3274a0

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]);
     }