From 6a6ccc0fb0d537f9bbafd841428afe908773767d Mon Sep 17 00:00:00 2001
From: RichardTea <31507749+RichardTea@users.noreply.github.com>
Date: Mon, 14 Oct 2019 11:27:34 +0100
Subject: [PATCH] Rename ConvertPath() to UriDecodePath()

---
 code/Collada/ColladaLoader.cpp | 2 +-
 code/Collada/ColladaParser.cpp | 8 ++++----
 code/Collada/ColladaParser.h   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/Collada/ColladaLoader.cpp b/code/Collada/ColladaLoader.cpp
index 8327142bf..37529bc98 100644
--- a/code/Collada/ColladaLoader.cpp
+++ b/code/Collada/ColladaLoader.cpp
@@ -1763,7 +1763,7 @@ aiString ColladaLoader::FindFilenameForEffectTexture(const ColladaParser& pParse
 
         //set default texture file name
         result.Set(name + ".jpg");
-        ColladaParser::ConvertPath(result);
+        ColladaParser::UriDecodePath(result);
         return result;
     }
 
diff --git a/code/Collada/ColladaParser.cpp b/code/Collada/ColladaParser.cpp
index f80ed1417..4eece8327 100644
--- a/code/Collada/ColladaParser.cpp
+++ b/code/Collada/ColladaParser.cpp
@@ -184,7 +184,7 @@ std::string ColladaParser::ReadZaeManifest(ZipArchiveIOSystem &zip_archive) {
                     return std::string();
 
                 aiString ai_str(filepath);
-                ConvertPath(ai_str);
+                UriDecodePath(ai_str);
 
                 return std::string(ai_str.C_Str());
             }
@@ -195,7 +195,7 @@ std::string ColladaParser::ReadZaeManifest(ZipArchiveIOSystem &zip_archive) {
 
 // ------------------------------------------------------------------------------------------------
 // Convert a path read from a collada file to the usual representation
-void ColladaParser::ConvertPath(aiString& ss)
+void ColladaParser::UriDecodePath(aiString& ss)
 {
     // TODO: collada spec, p 22. Handle URI correctly.
     // For the moment we're just stripping the file:// away to make it work.
@@ -1176,7 +1176,7 @@ void ColladaParser::ReadImage(Collada::Image& pImage)
                         if (sz)
                         {
                             aiString filepath(sz);
-                            ConvertPath(filepath);
+                            UriDecodePath(filepath);
                             pImage.mFileName = filepath.C_Str();
                         }
                         TestClosing("init_from");
@@ -1214,7 +1214,7 @@ void ColladaParser::ReadImage(Collada::Image& pImage)
                     if (sz)
                     {
                         aiString filepath(sz);
-                        ConvertPath(filepath);
+                        UriDecodePath(filepath);
                         pImage.mFileName = filepath.C_Str();
                     }
                     TestClosing("ref");
diff --git a/code/Collada/ColladaParser.h b/code/Collada/ColladaParser.h
index 2c4adaead..4e8c8fccf 100644
--- a/code/Collada/ColladaParser.h
+++ b/code/Collada/ColladaParser.h
@@ -67,7 +67,7 @@ namespace Assimp
         friend class ColladaLoader;
 
         /** Converts a path read from a collada file to the usual representation */
-        static void ConvertPath(aiString& ss);
+        static void UriDecodePath(aiString& ss);
 
     protected:
         /** Map for generic metadata as aiString */