Fix plugin dir finding for windows.

PDAL · Jul 16, 2020 · 346a542 · 346a542
1 parent 4b643c8
commit 346a542
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/io/private/ept/TileContents.cpp b/io/private/ept/TileContents.cpp
@@ -131,9 +131,8 @@ void TileContents::readZstandard()
     transform();
 }
 #else
-void TileContents::readZstandard() const
-{
-}
+void TileContents::readZstandard()
+{}
 #endif // PDAL_HAVE_ZSTD
 
 void TileContents::readAddon(const Addon& addon)

diff --git a/pdal/PDALUtils.cpp b/pdal/PDALUtils.cpp
@@ -410,16 +410,16 @@ std::string dllDir()
 {
     std::string s;
 
-#ifdef WIN32
+#ifdef _WIN32
     HMODULE hm = NULL;
 
     if (GetModuleHandleEx(
         GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
         GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
         (LPCSTR)&dllDir, &hm))
     {
-        wchar_t path[MAX_PATH];
-        DWORD cnt = GetModuleFileName(hm, path, sizeof(path));
+        char path[MAX_PATH];
+        DWORD cnt = GetModuleFileNameA(hm, path, sizeof(path));
         if (cnt > 0 && cnt < MAX_PATH)
             s = path;
     }

diff --git a/pdal/PluginDirectory.cpp b/pdal/PluginDirectory.cpp
@@ -61,10 +61,7 @@ StringList pluginSearchPaths()
         {
             s = FileUtils::toCanonicalPath(s);
             if (s.size() && !Utils::contains(searchPaths, s))
-{
                 searchPaths.push_back(s);
-std::cerr << "Search path = " << s << "!\n";
-}
         }
     }
     return searchPaths;

diff --git a/pdal/util/FileUtils.cpp b/pdal/util/FileUtils.cpp
@@ -282,12 +282,13 @@ std::string getcwd()
 }
 
 
-std::string toCanonicalPath(const std::string& filename)
+std::string toCanonicalPath(std::string filename)
 {
     std::string result;
 
 #ifdef _WIN32
-    char buf[MAX_PATH]
+    filename = addTrailingSlash(filename);
+    char buf[MAX_PATH];
     if (GetFullPathName(filename.c_str(), MAX_PATH, buf, NULL))
         result = buf;
 #else

diff --git a/pdal/util/FileUtils.hpp b/pdal/util/FileUtils.hpp
@@ -215,7 +215,7 @@ namespace FileUtils
       \param filename  Name of file to convert to canonical path.
       \return  Canonical version of provided filename, or empty string.
     */
-    PDAL_DLL std::string toCanonicalPath(const std::string& filename);
+    PDAL_DLL std::string toCanonicalPath(std::string filename);
 
 
     /**