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

(Partially) solved issue 663 : UTF-8 support at Windows for stable branch_3.0

Browse Source
This commit is contained in:
Hombre
2011-05-22 18:20:35 +02:00
parent 49a2b9237e
commit fe003b2752
4 changed files with 396 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
rtengine/safegtk.cc
View File

@@ -50,19 +50,22 @@ Glib::RefPtr<Gdk::Pixbuf> safe_create_from_file(const std::string& filename)
return res;
}
Cairo::RefPtr<Cairo::ImageSurface> safe_create_from_png(const std::string& filename)
Cairo::RefPtr<Cairo::ImageSurface> safe_create_from_png(const Glib::ustring& filename)
{
Cairo::RefPtr<Cairo::ImageSurface> res;
Cairo::RefPtr<Cairo::ImageSurface> res;
if (!safe_file_test (filename, Glib::FILE_TEST_EXISTS)) {
printf ("ERROR: File \"%s\" not found.\n", filename.c_str());
} else {
// files_test need a std::string which (as stated in its proto) but will only work if
// we use the Glib::ustring filename !?
if (!Glib::file_test (filename, Glib::FILE_TEST_EXISTS)) {
printf ("ERROR: (ustring) File \"%s\" not found.\n", filename.c_str());
} else {
try {
res = Cairo::ImageSurface::create_from_png (filename);
// create_from_png need a std::string converted from UTF8 with safe_locale_from_utf8
res = Cairo::ImageSurface::create_from_png (safe_locale_from_utf8(filename));
} catch (...) {}
}
return res;
}
return res;
}
Glib::RefPtr<Gio::FileInfo> safe_query_file_info (Glib::RefPtr<Gio::File> &file)
@@ -286,4 +289,4 @@ int safe_g_rename(const Glib::ustring& oldFilename, const Glib::ustring& newFile
int safe_g_mkdir_with_parents(const Glib::ustring& dirName, int mode)
{
return ::g_mkdir_with_parents(dirName.c_str(), mode);
}
}