Merge branch 'development'

tudelft3d · Sep 20, 2022 · 178a545 · 178a545
2 parents 37929f4 + 7a9643f
commit 178a545
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/src/main.cpp b/src/main.cpp
@@ -548,17 +548,19 @@ int main(int argc, const char * argv[]) {
           }
         }
         else {
-          if (!boost::filesystem::exists(thepath) || !boost::filesystem::is_directory(thepath)) {
-            std::cerr << "ERROR: " << thepath << " is not a valid path. Can not read LAS file.\n";
+          boost::filesystem::path p;
+          try {
+            p = canonical(thepath, ypcan).make_preferred();
+          } 
+          catch (boost::filesystem::filesystem_error &e) {
+            std::cerr << "WARNING: " << e.what() << ". Abort." << std::endl;
             return EXIT_FAILURE;
-          } else {
-            PointFile pointFile;
-            boost::filesystem::path p = canonical(thepath, ypcan).make_preferred();
-            pointFile.filename = p.string();
-            pointFile.lasomits = lasomits;
-            pointFile.thinning = thinning;
-            elevationFiles.push_back(pointFile);
           }
+          PointFile pointFile;
+          pointFile.filename = p.string();
+          pointFile.lasomits = lasomits;
+          pointFile.thinning = thinning;
+          elevationFiles.push_back(pointFile);
         }
       }
     }