liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix EXV_UNICODE_PATH std::wstring conversion

Browse Source
This commit is contained in:
Flössie
2019-05-23 15:34:06 +02:00
parent 801e7b175e
commit fa63b2f7a6
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rtengine/imagedata.cc
View File

@@ -41,8 +41,13 @@ extern const Settings *settings;
Exiv2::Image::AutoPtr open_exiv2(const Glib::ustring& fname) Exiv2::Image::AutoPtr open_exiv2(const Glib::ustring& fname)
{ {
#ifdef EXV_UNICODE_PATH #ifdef EXV_UNICODE_PATH
const auto* const ws = g_utf8_to_utf16(fname.c_str(), -1, NULL, NULL, NULL); glong ws_size = 0;
const std::wstring wfname(ws); gunichar2* const ws = g_utf8_to_utf16(fname.c_str(), -1, nullptr, &ws_size, nullptr);
std::wstring wfname;
wfname.reserve(ws_size);
for (glong i = 0; i < ws_size; ++i) {
wfname.push_back(ws[i]);
}
g_free(ws); g_free(ws);
auto image = Exiv2::ImageFactory::open(wfname); auto image = Exiv2::ImageFactory::open(wfname);
#else #else