Added support for windows paths (tangrams#2276)

* Added support for windows paths * Minimal changes for Windows path support
ericnelsonaz · Aug 3, 2021 · dd8b8cd · dd8b8cd
1 parent 836acba
commit dd8b8cd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/core/include/tangram/util/url.h b/core/include/tangram/util/url.h
@@ -131,7 +131,7 @@ class Url {
     // parts describes URL components by their location within the buffer.
     struct Parts {
         struct Range {
-            uint16_t start = 0, count = 0;
+            size_t start = 0, count = 0;
         } scheme, location, path, parameters, query, fragment, media, data;
     } parts;
 

diff --git a/core/src/util/url.cpp b/core/src/util/url.cpp
@@ -2,6 +2,7 @@
 
 #include <cstdlib>
 #include <cassert>
+#include <algorithm>
 
 namespace Tangram {
 
@@ -320,6 +321,10 @@ std::string Url::removeDotSegmentsFromString(std::string path) {
 }
 
 void Url::parse() {
+#ifdef TANGRAM_WINDOWS
+    // Normalize Windows paths. Chromium also does this.
+    std::replace(buffer.begin(), buffer.end(), '\\', '/');
+#endif
 
     // The parsing process roughly follows https://tools.ietf.org/html/rfc1808#section-2.4