diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-05-01 17:34:56 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-05-01 17:34:56 +0400 |
commit | 04cbb3ad149563035e6606db48040e4ef00f1762 (patch) | |
tree | e2de26a82133a1d4e22185c81a7777fbba98a83b /source/blender/freestyle/intern/system | |
parent | 8843eb906388f9b014458f24bffb690a34ab4e5f (diff) |
Fix for [#35116] Freestyle StringUtils::toAscii breakes non-ascii path values.
Just removed all calls of StringUtils::toAscii() as well as the function definitions.
Diffstat (limited to 'source/blender/freestyle/intern/system')
-rw-r--r-- | source/blender/freestyle/intern/system/StringUtils.cpp | 20 | ||||
-rw-r--r-- | source/blender/freestyle/intern/system/StringUtils.h | 2 |
2 files changed, 1 insertions, 21 deletions
diff --git a/source/blender/freestyle/intern/system/StringUtils.cpp b/source/blender/freestyle/intern/system/StringUtils.cpp index 20cec90fc9f..28876c4031f 100644 --- a/source/blender/freestyle/intern/system/StringUtils.cpp +++ b/source/blender/freestyle/intern/system/StringUtils.cpp @@ -54,7 +54,7 @@ void getPathName(const string& path, const string& base, vector<string>& pathnam BLI_strncpy(cleaned, dir.c_str(), FILE_MAX); BLI_cleanup_file(NULL, cleaned); - res = toAscii(string(cleaned)); + res = string(cleaned); if (!base.empty()) res += Config::DIR_SEP + base; @@ -63,24 +63,6 @@ void getPathName(const string& path, const string& base, vector<string>& pathnam } } -string toAscii(const string &str) -{ - stringstream out(""); - char s; - - for (unsigned int i = 0; i < str.size() ; i++) { - s = ((char)(str.at(i) & 0x7F)); - out << s; - } - - return out.str(); -} - -const char *toAscii(const char *str) -{ - return toAscii(string(str)).c_str(); -} - } // end of namespace StringUtils } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/system/StringUtils.h b/source/blender/freestyle/intern/system/StringUtils.h index 983e102d439..92600eddc42 100644 --- a/source/blender/freestyle/intern/system/StringUtils.h +++ b/source/blender/freestyle/intern/system/StringUtils.h @@ -53,8 +53,6 @@ namespace StringUtils { LIB_SYSTEM_EXPORT void getPathName(const string& path, const string& base, vector<string>& pathnames); -string toAscii(const string &str); -const char *toAscii(const char *str); // STL related struct ltstr |