Merge pull request #2381 from SCIInstitute/2379-image-crash

Fix 2379.  It appears that stat on windows is not thread-safe.

Author: akenmorris

Libs/Common/ShapeworksUtils.cpp

@@ -5,43 +5,31 @@
 #include <tbb/global_control.h>
 #include <tbb/info.h>
 
-namespace shapeworks {
-
-// Windows doesn't have S_ISDIR and S_ISREG macros
-#if !defined(S_ISREG) && defined(S_IFMT) && defined(S_IFREG)
-#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
-#endif
+#include <boost/filesystem.hpp>
 
-#if !defined(S_ISDIR) && defined(S_IFMT) && defined(S_IFDIR)
-#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-#endif
+namespace shapeworks {
 
 unsigned ShapeWorksUtils::rng_seed_ = std::chrono::system_clock::now().time_since_epoch().count();
 std::mt19937 ShapeWorksUtils::mt_;
 std::unique_ptr<tbb::global_control> ShapeWorksUtils::tbb_global_control_;
 
-//-----------------------------------------------------------------------------
-/// looks at the pathname to see if it's a file or a directory or neither
-static bool stat_path(const std::string& pathname, bool isdir = false) {
-  struct stat info;
-  if (stat(pathname.c_str(), &info) != 0) {
-    return false;
-  } else {
-    return isdir ? S_ISDIR(info.st_mode) : S_ISREG(info.st_mode);
-  }
-}
-
 //-----------------------------------------------------------------------------
 void ShapeWorksUtils::set_rng_seed(const unsigned seed) {
   rng_seed_ = seed;
   mt_.seed(rng_seed_);
 }
 
 //-----------------------------------------------------------------------------
-bool ShapeWorksUtils::is_directory(const std::string& pathname) { return stat_path(pathname, true); }
+bool ShapeWorksUtils::is_directory(const std::string& pathname) {
+  boost::system::error_code ec;
+  return boost::filesystem::is_directory(pathname, ec);
+}
 
 //-----------------------------------------------------------------------------
-bool ShapeWorksUtils::file_exists(const std::string& filename) { return stat_path(filename, false); }
+bool ShapeWorksUtils::file_exists(const std::string& filename) {
+  boost::system::error_code ec;
+  return boost::filesystem::is_regular_file(filename, ec);
+}
 
 //-----------------------------------------------------------------------------
 void ShapeWorksUtils::setup_console_logging(bool show_progress, bool xml_status) {

Libs/Image/Image.cpp

@@ -107,7 +107,9 @@ Image::ImageType::Pointer Image::read(const std::string& pathname) {
     throw std::invalid_argument("Empty pathname");
   }
 
-  if (ShapeWorksUtils::is_directory(pathname)) return readDICOMImage(pathname);
+  if (ShapeWorksUtils::is_directory(pathname)) {
+    return readDICOMImage(pathname);
+  }
 
   // check if it exists
   if (!boost::filesystem::exists(pathname)) {