Merge pull request #6034 from sloriot/CGAL_data-moving_files

CGAL Data: doc + more data moves

Author: lrineau

CGAL_ImageIO/include/CGAL/Image_3.h

@@ -28,6 +28,7 @@
 #include <limits>
 #include <set>
 #include <cstdlib>
+#include <string>
 
 #if defined(BOOST_MSVC)
 #  pragma warning(push)
@@ -164,6 +165,11 @@ class CGAL_IMAGEIO_EXPORT Image_3
     return private_read(::_readImage(file));
   }
 
+  bool read(const std::string& file)
+  {
+    return read(file.c_str());
+  }
+
   bool read_raw(const char* file,
                 const unsigned int rx,
                 const unsigned int ry,

CGAL_ImageIO/test/CGAL_ImageIO/test_trilinear_interpolation.cpp

@@ -191,28 +191,12 @@ int main() {
   image.set_data(nullptr); // trick to avoid ~Image_3 segfault.
 
 
-  const char* filenames[] = {
-    "data/skull_2.9.inr",
-    "../../examples/Surface_mesher/data/skull_2.9.inr",
-    "../../../Surface_mesher/examples/Surface_mesher/data/skull_2.9.inr",
-    "../Surface_mesher_Examples/data/skull_2.9.inr"
-  };
-
-  std::size_t file_index = 0;
-  for(   ; file_index < sizeof(filenames); ++file_index)
-  {
-    std::ifstream image_file(filenames[file_index], std::ios_base::binary | std::ios_base::in );
-    if(image_file) {
-      break;
-    }
-  }
-
-  assert(file_index < sizeof(filenames) );
+  const std::string filename = CGAL::data_file_path("images/skull_2.9.inr");
 
-  std::cerr << "Opening file " << filenames[file_index] << "...\n";
+  std::cerr << "Opening file " << filename << "...\n";
 
   CGAL::Image_3 image2;
-  const bool result = image2.read(filenames[file_index]);
+  const bool result = image2.read(filename);
   assert(result);
 
   std::cerr << "Image info:"