Merge last trunk modifications

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/python_2.1.0_fix_vincent@3495 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 4033114216c767ad4028e3f6d4ccb5f5dfb88f78

1 files changed, 3 insertions, 3 deletions

diff --git a/src/Bitmap_cubical_complex/include/gudhi/Bitmap_cubical_complex_base.h b/src/Bitmap_cubical_complex/include/gudhi/Bitmap_cubical_complex_base.h
index bf257be1..9b74e267 100644
--- a/src/Bitmap_cubical_complex/include/gudhi/Bitmap_cubical_complex_base.h
+++ b/src/Bitmap_cubical_complex/include/gudhi/Bitmap_cubical_complex_base.h
@@ -4,7 +4,7 @@
  *
  *    Author(s):       Pawel Dlotko
  *
- *    Copyright (C) 2015  INRIA Sophia-Saclay (France)
+ *    Copyright (C) 2015 Inria
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
@@ -492,7 +492,7 @@ class Bitmap_cubical_complex_base {
       this->multipliers.push_back(multiplier);
       multiplier *= 2 * sizes[i] + 1;
     }
-    this->data = std::vector<T>(multiplier, std::numeric_limits<T>::max());
+    this->data = std::vector<T>(multiplier, std::numeric_limits<T>::infinity());
     this->total_number_of_cells = multiplier;
   }
 
@@ -562,7 +562,7 @@ void Bitmap_cubical_complex_base<T>::put_data_to_bins(T diameter_of_bin) {
 
 template <typename T>
 std::pair<T, T> Bitmap_cubical_complex_base<T>::min_max_filtration() {
-  std::pair<T, T> min_max(std::numeric_limits<T>::max(), std::numeric_limits<T>::min());
+  std::pair<T, T> min_max(std::numeric_limits<T>::infinity(), -std::numeric_limits<T>::infinity());
   for (std::size_t i = 0; i != this->data.size(); ++i) {
     if (this->data[i] < min_max.first) min_max.first = this->data[i];
     if (this->data[i] > min_max.second) min_max.second = this->data[i];