From 39ab716e1190294fcfd451c98673f03e8041af68 Mon Sep 17 00:00:00 2001
From: Stepan Hrbek <stepan.git@lightsprint.com>
Date: Thu, 31 Dec 2015 03:22:25 +0100
Subject: [PATCH] Collada exporter: Fix unicode filenames.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Although existing code uses "C" locale partially, both calls to isalnum() clearly did not use it.
So for example character "ä" was written to .dae as is, rather than converted to %e4, generated .dae was unreadable to many parsers.
---
 code/ColladaExporter.cpp | 7 ++++---
 code/ColladaExporter.h   | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/code/ColladaExporter.cpp b/code/ColladaExporter.cpp
index c0279e4c1..2f1236aab 100644
--- a/code/ColladaExporter.cpp
+++ b/code/ColladaExporter.cpp
@@ -93,7 +93,8 @@ void ExportSceneCollada(const char* pFile, IOSystem* pIOSystem, const aiScene* p
 ColladaExporter::ColladaExporter( const aiScene* pScene, IOSystem* pIOSystem, const std::string& path, const std::string& file) : mIOSystem(pIOSystem), mPath(path), mFile(file)
 {
     // make sure that all formatting happens using the standard, C locale and not the user's current locale
-    mOutput.imbue( std::locale("C") );
+    clocale = std::locale("C");
+    mOutput.imbue( clocale );
 
     mScene = pScene;
     mSceneOwned = false;
@@ -540,7 +541,7 @@ void ColladaExporter::WriteImageEntry( const Surface& pSurface, const std::strin
     std::stringstream imageUrlEncoded;
     for( std::string::const_iterator it = pSurface.texture.begin(); it != pSurface.texture.end(); ++it )
     {
-      if( isalnum( (unsigned char) *it) || *it == '_' || *it == '.' || *it == '/' || *it == '\\' )
+      if( isalnum( (unsigned char) *it, clocale) || *it == '_' || *it == '.' || *it == '/' || *it == '\\' )
         imageUrlEncoded << *it;
       else
         imageUrlEncoded << '%' << std::hex << size_t( (unsigned char) *it) << std::dec;
@@ -633,7 +634,7 @@ void ColladaExporter::WriteMaterials()
     for( std::string::iterator it = materials[a].name.begin(); it != materials[a].name.end(); ++it ) {
         // isalnum on MSVC asserts for code points outside [0,255]. Thus prevent unwanted promotion
         // of char to signed int and take the unsigned char value.
-      if( !isalnum( static_cast<uint8_t>(*it) ) ) {
+      if( !isalnum( static_cast<uint8_t>(*it), clocale ) ) {
         *it = '_';
       }
     }
diff --git a/code/ColladaExporter.h b/code/ColladaExporter.h
index 858cef2b6..f8bdbe7fc 100644
--- a/code/ColladaExporter.h
+++ b/code/ColladaExporter.h
@@ -130,6 +130,9 @@ public:
     std::stringstream mOutput;
 
 protected:
+    /// C locale
+    std::locale clocale;
+
     /// The IOSystem for output
     IOSystem* mIOSystem;