Merge pull request #158 from Geode-solutions/fix/windows_problem_with_tellg_seekg

fix(Input): Fixed problem on windows when using tellg and seekg on fi…

Author: BotellaA

src/geode/geosciences_io/mesh/grdecl_input.cpp

@@ -65,7 +65,7 @@ namespace
     public:
         GRDECLInputImpl(
             std::string_view filename, geode::HybridSolid3D& solid )
-            : file_{ geode::to_string( filename ) },
+            : file_{ geode::to_string( filename ), std::ios::binary },
               filepath_{
                   geode::filepath_without_filename( filename ).string()
               },

src/geode/geosciences_io/mesh/pl_input.cpp

@@ -40,7 +40,7 @@ namespace
     {
     public:
         PLInputImpl( std::string_view filename, geode::EdgedCurve3D& curve )
-            : file_{ geode::to_string( filename ) },
+            : file_{ geode::to_string( filename ), std::ios::binary },
               curve_( curve ),
               builder_( geode::EdgedCurveBuilder< 3 >::create( curve ) )
         {

src/geode/geosciences_io/mesh/ts_input.cpp

@@ -41,7 +41,7 @@ namespace
     public:
         TSInputImpl(
             std::string_view filename, geode::TriangulatedSurface3D& surface )
-            : file_{ geode::to_string( filename ) },
+            : file_{ geode::to_string( filename ), std::ios::binary },
               surface_( surface ),
               builder_(
                   geode::TriangulatedSurfaceBuilder< 3 >::create( surface ) )

src/geode/geosciences_io/mesh/vo_input.cpp

@@ -28,6 +28,7 @@
 #include <string>
 
 #include <absl/strings/str_replace.h>
+#include <absl/strings/strip.h>
 
 #include <geode/basic/attribute_manager.hpp>
 #include <geode/basic/file.hpp>
@@ -63,7 +64,7 @@ namespace
     {
     public:
         VOInputImpl( std::string_view filename, geode::RegularGrid3D& grid )
-            : file_{ geode::to_string( filename ) },
+            : file_{ geode::to_string( filename ), std::ios::binary },
               file_folder_{
                   geode::filepath_without_filename( filename ).string()
               },
@@ -157,10 +158,11 @@ namespace
             const auto data_file_name = get_data_file( file_ );
             OPENGEODE_EXCEPTION(
                 data_file_name.has_value(), "[VOInput] No data file record" );
-            std::ifstream data_file{ absl::StrCat(
-                file_folder_, data_file_name.value() ) };
+            const auto data_file_path = absl::StrCat( file_folder_,
+                absl::StripSuffix( data_file_name.value(), "\r" ) );
+            std::ifstream data_file{ data_file_path, std::ios::binary };
             OPENGEODE_EXCEPTION( data_file.good(),
-                "[VOInput] Cannot open data file: ", data_file_name.value() );
+                "[VOInput] Cannot open data file: ", data_file_path );
             std::string line;
             std::getline( data_file, line );
             std::getline( data_file, line );
@@ -219,7 +221,8 @@ namespace geode
 
         auto VOInput::additional_files() const -> AdditionalFiles
         {
-            std::ifstream file{ geode::to_string( filename() ) };
+            std::ifstream file{ geode::to_string( filename() ),
+                std::ios::binary };
             const auto data_file = get_data_file( file );
             file.close();
             if( !data_file.has_value() )
@@ -234,7 +237,8 @@ namespace geode
 
         Percentage VOInput::is_loadable() const
         {
-            std::ifstream file{ to_string( this->filename() ) };
+            std::ifstream file{ to_string( this->filename() ),
+                std::ios::binary };
             if( goto_keyword_if_it_exists( file, "GOCAD Voxet" ) )
             {
                 return Percentage{ 1 };

src/geode/geosciences_io/mesh/vs_input.cpp

@@ -40,7 +40,7 @@ namespace
     {
     public:
         VSInputImpl( std::string_view filename, geode::PointSet3D& point_set )
-            : file_{ geode::to_string( filename ) },
+            : file_{ geode::to_string( filename ), std::ios::binary },
               point_set_( point_set ),
               builder_( geode::PointSetBuilder< 3 >::create( point_set ) )
         {

src/geode/geosciences_io/mesh/well_dev_input.cpp

@@ -49,7 +49,7 @@ namespace
     public:
         WellDevInputImpl(
             std::string_view filename, geode::EdgedCurve3D& curve )
-            : file_{ geode::to_string( filename ) },
+            : file_{ geode::to_string( filename ), std::ios::binary },
               curve_( curve ),
               builder_( geode::EdgedCurveBuilder3D::create( curve ) )
         {

src/geode/geosciences_io/mesh/wl_input.cpp

@@ -41,7 +41,7 @@ namespace
     {
     public:
         WLInputImpl( std::string_view filename, geode::EdgedCurve3D& curve )
-            : file_{ geode::to_string( filename ) },
+            : file_{ geode::to_string( filename ), std::ios::binary },
               builder_( geode::EdgedCurveBuilder3D::create( curve ) )
         {
             OPENGEODE_EXCEPTION(

src/geode/geosciences_io/model/internal/lso_input.cpp

@@ -68,7 +68,7 @@ namespace
             "geode_block_name_attribute_name";
 
         LSOInputImpl( std::string_view filename, geode::StructuralModel& model )
-            : file_{ geode::to_string( filename ) },
+            : file_{ geode::to_string( filename ), std::ios::binary },
               model_( model ),
               builder_{ model },
               solid_{ geode::TetrahedralSolid3D::create() },

src/geode/geosciences_io/model/internal/ml_input.cpp

@@ -82,7 +82,7 @@ namespace
         static constexpr char EOL{ '\n' };
 
         MLInputImpl( std::string_view filename, geode::StructuralModel& model )
-            : file_{ geode::to_string( filename ) },
+            : file_{ geode::to_string( filename ), std::ios::binary },
               model_( model ),
               builder_( model )
         {

tests/mesh/test-vo.cpp

@@ -70,6 +70,7 @@ int main()
     try
     {
         geode::GeosciencesIOMeshLibrary::initialize();
+        geode::Logger::set_level( geode::Logger::LEVEL::debug );
         test_grid_input();
 
         geode::Logger::info( "TEST SUCCESS" );