Small mods to mingw changes.

hobuinc · May 24, 2024 · e381bcc · e381bcc
1 parent 0cee044
commit e381bcc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/epf/Epf.cpp b/epf/Epf.cpp
@@ -466,14 +466,14 @@ std::vector<FileInfo> Epf::processLas(pdal::LasReader& r, FileInfo fi)
         fi.dimInfo.push_back(FileDimInfo(name, type));
     }
 
+    std::vector<FileInfo> fileInfos;
     // If we have LAS start capability, break apart file info into chunks of size 5 million.
 #ifdef PDAL_LAS_START
     PointCount ChunkSize = 5'000'000;
 
     PointCount remaining = fi.numPoints;
     PointId start = 0;
 
-    std::vector<FileInfo> fileInfos;
     while (remaining)
     {
         FileInfo lasFi(fi);
@@ -485,7 +485,7 @@ std::vector<FileInfo> Epf::processLas(pdal::LasReader& r, FileInfo fi)
         remaining -= lasFi.numPoints;
     }
 #else
-    fileInfos.push_back(fileInfo);
+    fileInfos.push_back(fi);
 #endif
     return fileInfos;
 }

diff --git a/untwine/Common.cpp b/untwine/Common.cpp
@@ -52,14 +52,12 @@ MapContext mapFile(const std::string& filename, bool readOnly, size_t pos, size_
         return ctx;
     }
 
-#ifndef _WIN32
-    ctx.m_fd = ::open(filename.data(), readOnly ? O_RDONLY : O_RDWR);
-#else
-#ifdef _MSC_VER
+#if defined(_MSC_VER)  // Windows
     ctx.m_fd = ::_wopen(toNative(filename).data(), readOnly ? _O_RDONLY : _O_RDWR);
-#else
+#elif defined(_WIN32)  // MinGW
     ctx.m_fd = ::_open(toNative(filename).data(), readOnly ? _O_RDONLY : _O_RDWR);
-#endif
+#else // Everyone else
+    ctx.m_fd = ::open(filename.data(), readOnly ? O_RDONLY : O_RDWR);
 #endif
 
     if (ctx.m_fd == -1)
@@ -133,11 +131,7 @@ std::vector<std::string> directoryList(const std::string& dir)
         fs::directory_iterator end;
         while (it != end)
         {
-#ifndef __MINGW32__
-            files.push_back(untwine::fromNative(it->path()));
-#else
-            files.push_back(untwine::fromNative(it->path().string()));
-#endif
+            files.push_back(it->path().string());
             it++;
         }
     }