mirror of
https://github.com/opencv/opencv.git
synced 2026-07-29 23:33:05 +04:00
Merge pull request #28935 from molhamfetnah:fix/21960-unicode-temp-path
core: fix Unicode temp path handling on Windows (fix #21960) #28935 ## Summary Fixes getCacheDirectoryForDownloads and related temp file functions failing when the user home directory contains Unicode characters like C:\\Users\\テスト\\AppData\\Local\\Temp. ## Root Cause On Windows, OpenCV was using ANSI versions of GetTempPath and GetTempFileName which fail with Unicode paths. ## Fix Replace with wide-character GetTempPathW plus UTF-8 conversion: - modules/core/src/utils/filesystem.cpp - getCacheDirectory for cache paths - modules/core/src/system.cpp - temporary file creation - modules/ts/src/ts_gtest.cpp - test stream capture ## Testing The fix has been verified compiles. Manual testing on Windows with Unicode username required. ## Risk Low: Uses same output format, just different encoding path. Existing ASCII functionality preserved. --- Fixes opencv/opencv#21960
This commit is contained in:
@@ -438,11 +438,18 @@ cv::String getCacheDirectory(const char* sub_directory_name, const char* configu
|
||||
{
|
||||
cv::String default_cache_path;
|
||||
#ifdef _WIN32
|
||||
char tmp_path_buf[MAX_PATH+1] = {0};
|
||||
DWORD res = GetTempPath(MAX_PATH, tmp_path_buf);
|
||||
wchar_t tmp_path_buf_w[MAX_PATH+1] = {0};
|
||||
DWORD res = GetTempPathW(MAX_PATH, tmp_path_buf_w);
|
||||
if (res > 0 && res <= MAX_PATH)
|
||||
{
|
||||
default_cache_path = tmp_path_buf;
|
||||
// Convert from UTF-16 to UTF-8 to support Unicode paths
|
||||
int len = WideCharToMultiByte(CP_UTF8, 0, tmp_path_buf_w, -1, NULL, 0, NULL, NULL);
|
||||
if (len > 0)
|
||||
{
|
||||
std::vector<char> utf8_buf(len);
|
||||
WideCharToMultiByte(CP_UTF8, 0, tmp_path_buf_w, -1, utf8_buf.data(), len, NULL, NULL);
|
||||
default_cache_path = std::string(utf8_buf.data());
|
||||
}
|
||||
}
|
||||
#elif defined __ANDROID__
|
||||
// no defaults
|
||||
|
||||
Reference in New Issue
Block a user