GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-09-13 02:53:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix an error occurred while expanding utf8 path

Browse Source
This commit is contained in:
cwbhhjl 2020-06-04 10:40:38 +08:00
parent 28bafe4b11
commit 2f5aa9f13b
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tiny_gltf.h
View File

@ -2483,6 +2483,15 @@ static inline std::wstring UTF8ToWchar(const std::string &str) {
(int)wstr.size()); (int)wstr.size());
return wstr; return wstr;
} }
static inline std::string WcharToUTF8(const std::wstring &wstr) {
int str_size = WideCharToMultiByte(CP_UTF8, 0, wstr.data(), (int)wstr.size(),
nullptr, 0, NULL, NULL);
std::string str(str_size, 0);
WideCharToMultiByte(CP_UTF8, 0, wstr.data(), (int)wstr.size(), &str[0],
(int)str.size(), NULL, NULL);
return str;
}
#endif #endif
#ifndef TINYGLTF_NO_FS #ifndef TINYGLTF_NO_FS
@ -2534,15 +2543,15 @@ bool FileExists(const std::string &abs_filename, void *) {
std::string ExpandFilePath(const std::string &filepath, void *) { std::string ExpandFilePath(const std::string &filepath, void *) {
#ifdef _WIN32 #ifdef _WIN32
DWORD len = ExpandEnvironmentStringsA(filepath.c_str(), NULL, 0); std::wstring wfilepath = UTF8ToWchar(filepath);
char *str = new char[len]; DWORD wlen = ExpandEnvironmentStringsW(wfilepath.c_str(), NULL, 0);
ExpandEnvironmentStringsA(filepath.c_str(), str, len); wchar_t *wstr = new wchar_t[wlen];
ExpandEnvironmentStringsW(wfilepath.c_str(), wstr, wlen);
std::string s(str); std::wstring ws(wstr);
delete[] wstr;
delete[] str; return WcharToUTF8(ws);
return s;
#else #else
#if defined(TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR) || \ #if defined(TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR) || \
@ -7326,8 +7335,8 @@ static void SerializeGltfModel(Model *model, json &o) {
{ {
auto has_khr_lights_punctual = std::find_if( auto has_khr_lights_punctual = std::find_if(
extensionsUsed.begin(), extensionsUsed.end(), [](const std::string &s) { extensionsUsed.begin(), extensionsUsed.end(), [](const std::string &s) {
return (s.compare("KHR_lights_punctual") == 0); return (s.compare("KHR_lights_punctual") == 0);
}); });
if (has_khr_lights_punctual == extensionsUsed.end()) { if (has_khr_lights_punctual == extensionsUsed.end()) {
extensionsUsed.push_back("KHR_lights_punctual"); extensionsUsed.push_back("KHR_lights_punctual");