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

19
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)

2
rtengine/safegtk.h
View File

@@ -6,7 +6,7 @@
#include <giomm.h>
Glib::RefPtr<Gdk::Pixbuf> safe_create_from_file(const std::string& filename);
Cairo::RefPtr<Cairo::ImageSurface> safe_create_from_png(const std::string& filename);
Cairo::RefPtr<Cairo::ImageSurface> safe_create_from_png(const Glib::ustring& filename);
class FileMTimeInfo {

92
rtgui/main.cc
View File

@@ -61,41 +61,33 @@ int processLineParams( int argc, char **argv );
int main(int argc, char **argv)
{
std::string argv0_;
Glib::ustring argv0_;
#ifdef WIN32
char exname[512];
GetModuleFileName (NULL, exname, 512);
WCHAR exnameU[512] = {0};
char exname[512] = {0};
GetModuleFileNameW (NULL, exnameU, 512);
WideCharToMultiByte(CP_UTF8,0,exnameU,-1,exname,512,0,0 );
argv0_ = exname;
// get the path where the rawtherapee is stored
int i;
for (i=argv0_.size()-1; (argv0_[i]!='/' && argv0_[i]!='\\') && i>0; i--);
if (argv0_[i]=='/' || argv0_[i]=='\\')
argv0_ = argv0_.substr(0,i);
// get the path where the rawtherapee executable is stored
argv0 = Glib::path_get_dirname(argv0_);
#else
// get the path to data (defined in config.h which is generated by cmake)
argv0_ = DATA_SEARCH_PATH;
argv0 = DATA_SEARCH_PATH;
// check if path exists, otherwise revert back to behavior similar to windows
try {
Glib::Dir dir(DATA_SEARCH_PATH);
} catch (Glib::FileError) {
argv0_ = argv[0];
int i;
for (i=argv0_.size()-1; (argv0_[i]!='/' && argv0_[i]!='\\') && i>0; i--);
if (argv0_[i]=='/' || argv0_[i]=='\\')
argv0_ = argv0_.substr(0,i);
argv0 = Glib::path_get_dirname(argv0_);
}
#endif
#ifdef GLIBMM_EXCEPTIONS_ENABLED
argv0 = Glib::filename_to_utf8 (argv0_);
#else
std::auto_ptr<Glib::Error> error;
argv0 = Glib::filename_to_utf8 (argv0_, error);
#endif //GLIBMM_EXCEPTIONS_ENABLED
Glib::thread_init();
gdk_threads_init();
Gio::init ();
@@ -116,12 +108,12 @@ int main(int argc, char **argv)
simpleEditor=false;
if( !argv1.empty() )
if( Glib::file_test(argv1, Glib::FILE_TEST_EXISTS) && !Glib::file_test(argv1, Glib::FILE_TEST_IS_DIR))
if( safe_file_test(argv1, Glib::FILE_TEST_EXISTS) && !safe_file_test(argv1, Glib::FILE_TEST_IS_DIR))
simpleEditor = true;
if (!options.useSystemTheme)
{
std::vector<std::string> rcfiles;
std::vector<Glib::ustring> rcfiles;
rcfiles.push_back (argv0+"/themes/"+options.theme);
// Set the font face and size
Gtk::RC::parse_string (Glib::ustring::compose(
@@ -143,8 +135,8 @@ int main(int argc, char **argv)
int processLineParams( int argc, char **argv )
{
std::vector<Glib::ustring> inputFiles;
Glib::ustring outputPath;
Glib::ustring processingParams;
Glib::ustring outputPath = "";
Glib::ustring processingParams = "";
bool isDirectory=false;
bool outputDirectory=false;
bool overwriteFiles=false;
@@ -153,7 +145,7 @@ int processLineParams( int argc, char **argv )
bool useDefaultIfAbsent=true;
int compression=100;
int bits=-1;
std::string outputType;
std::string outputType = "";
unsigned errors=0;
for( int iArg=1; iArg<argc; iArg++){
if( argv[iArg][0]=='-' ){
@@ -163,7 +155,7 @@ int processLineParams( int argc, char **argv )
case 'o': // outputfile or dir
if( iArg+1 <argc ){
iArg++;
outputPath = Glib::filename_to_utf8 (argv[iArg]);
outputPath = safe_locale_to_utf8 (argv[iArg]);
if( safe_file_test (outputPath, Glib::FILE_TEST_IS_DIR))
outputDirectory=true;
}
@@ -171,7 +163,7 @@ int processLineParams( int argc, char **argv )
case 'p': // processing parameters for all inputs
if( iArg+1 <argc ){
iArg++;
processingParams = Glib::filename_to_utf8 ( argv[iArg] );
processingParams = safe_locale_to_utf8 ( argv[iArg] );
}
break;
case 'S':
@@ -197,11 +189,11 @@ int processLineParams( int argc, char **argv )
case 'c': // MUST be last option
while( iArg+1 <argc ){
iArg++;
if( !safe_file_test( argv[iArg], Glib::FILE_TEST_EXISTS )){
if( !safe_file_test( safe_locale_to_utf8(argv[iArg]), Glib::FILE_TEST_EXISTS )){
std::cerr << argv[iArg] << " doesn't exist."<< std::endl;
continue;
}
if( safe_file_test( argv[iArg], Glib::FILE_TEST_IS_DIR )){
if( safe_file_test( safe_locale_to_utf8(argv[iArg]), Glib::FILE_TEST_IS_DIR )){
isDirectory = true;
std::vector<Glib::ustring> names;
Glib::RefPtr<Gio::File> dir = Gio::File::create_for_path ( argv[iArg] );
@@ -219,7 +211,7 @@ int processLineParams( int argc, char **argv )
}
}
}else{
inputFiles.push_back( Glib::filename_to_utf8 (argv[iArg]) );
inputFiles.push_back( safe_locale_to_utf8 (argv[iArg]) );
}
}
break;
@@ -248,20 +240,26 @@ int processLineParams( int argc, char **argv )
return -1;
}
}else{
argv1 = Glib::filename_to_utf8 ( argv[iArg] );
if( outputDirectory ){
options.savePathFolder = outputPath;
options.saveUsePathTemplate = false;
}
if (outputType == "jpg") {
argv1 = safe_locale_to_utf8 ( argv[iArg] );
if( outputDirectory ){
options.savePathFolder = outputPath;
options.saveUsePathTemplate = false;
}
else {
options.saveUsePathTemplate = true;
if (!options.savePathTemplate.length())
// If the save path template is empty, we use its default value
options.savePathTemplate = "%p1/converted/%f";
}
if (outputType == "jpg") {
options.saveFormat.format = outputType;
options.saveFormat.jpegQuality = compression;
} else if (outputType == "tif") {
} else if (outputType == "tif") {
options.saveFormat.format = outputType;
} else if (outputType == "png") {
} else if (outputType == "png") {
options.saveFormat.format = outputType;
}
break;
}
break;
}
}
if( !argv1.empty() )
@@ -305,11 +303,11 @@ int processLineParams( int argc, char **argv )
outputFile = s.substr(0,ext) + "." + outputType;
}
if( inputFile == outputFile){
std::cerr << "Cannot overwrite:" << inputFile << std::endl;
std::cerr << "Cannot overwrite: " << inputFile << std::endl;
continue;
}
if( !overwriteFiles && safe_file_test( outputFile , Glib::FILE_TEST_EXISTS ) ){
std::cerr << outputFile <<" already exists: use -Y option to overwrite:" << std::endl;
std::cerr << outputFile <<" already exists: use -Y option to overwrite. This image has been skipped." << std::endl;
continue;
}
@@ -321,7 +319,7 @@ int processLineParams( int argc, char **argv )
ii = rtengine::InitialImage::load ( inputFile , false, &errorCode, NULL );
if (!ii) {
errors++;
std::cerr << "Error loading file:"<< inputFile << std::endl;
std::cerr << "Error loading file: "<< inputFile << std::endl;
continue;
}
if( sideProcParams ){
@@ -332,7 +330,7 @@ int processLineParams( int argc, char **argv )
}else{
delete ii;
errors++;
std::cerr << "Error loading processing params:"<< sideProcessingParams << std::endl;
std::cerr << "Error loading processing params: "<< sideProcessingParams << std::endl;
continue;
}
}else
@@ -347,7 +345,7 @@ int processLineParams( int argc, char **argv )
job = rtengine::ProcessingJob::create (ii, *currentParams);
if( !job ){
errors++;
std::cerr << "Error creating processing for:"<< inputFile << std::endl;
std::cerr << "Error creating processing for: "<< inputFile << std::endl;
ii->decreaseRef();
continue;
}
@@ -356,7 +354,7 @@ int processLineParams( int argc, char **argv )
rtengine::IImage16* resultImage = rtengine::processImage (job, errorCode, NULL, options.tunnelMetaData);
if( !resultImage ){
errors++;
std::cerr << "Error processing:"<< inputFile << std::endl;
std::cerr << "Error processing: "<< inputFile << std::endl;
rtengine::ProcessingJob::destroy( job );
continue;
}
@@ -372,7 +370,7 @@ int processLineParams( int argc, char **argv )
if(errorCode){
errors++;
std::cerr << "Error saving to:"<< outputFile << std::endl;
std::cerr << "Error saving to: "<< outputFile << std::endl;
}else{
if( copyParamsFile ){
Glib::ustring outputProcessingParams = outputFile + paramFileExtension;

213
rtgui/safegtk.cc
View File

@@ -1,213 +0,0 @@
/*
* This file is part of RawTherapee.
*
* Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
* Copyright (c) 2010 Sasha Vasko <sasha@aftercode.net>
*
* RawTherapee is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* RawTherapee is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
#include <safegtk.h>
#include <guiutils.h>
Glib::RefPtr<Gdk::Pixbuf> safe_create_from_file(const std::string& filename)
{
Glib::RefPtr<Gdk::Pixbuf> res;
#ifdef GLIBMM_EXCEPTIONS_ENABLED
try {
res = Gdk::Pixbuf::create_from_file (filename);
}
catch (Glib::Exception& ex) {
printf ("%s\n", ex.what().c_str());
}
#else
std::auto_ptr<Glib::Error> error;
res = Gdk::Pixbuf::create_from_file (filename, error);
if (error.get())
printf ("%s\n", error->what().c_str());
#endif
return res;
}
Cairo::RefPtr<Cairo::ImageSurface> safe_create_from_png(const std::string& filename)
{
Cairo::RefPtr<Cairo::ImageSurface> res;
if (!Glib::file_test (filename, Glib::FILE_TEST_EXISTS)) {
printf ("ERROR: File \"%s\" not found.\n", filename.c_str());
} else {
try {
res = Cairo::ImageSurface::create_from_png (filename);
} catch (...) {}
}
return res;
}
Glib::RefPtr<Gio::FileInfo> safe_query_file_info (Glib::RefPtr<Gio::File> &file)
{
Glib::RefPtr<Gio::FileInfo> info;
#ifdef GLIBMM_EXCEPTIONS_ENABLED
try { info = file->query_info(); }catch (...) { }
#else
std::auto_ptr<Glib::Error> error;
info = file->query_info("*", Gio::FILE_QUERY_INFO_NONE, error);
#endif
return info;
}
#ifdef GLIBMM_EXCEPTIONS_ENABLED
# define SAFE_ENUMERATOR_CODE_START \
do{try { if ((dirList = dir->enumerate_children ())) \
for (Glib::RefPtr<Gio::FileInfo> info = dirList->next_file(); info; info = dirList->next_file()) {
# define SAFE_ENUMERATOR_CODE_END \
}} catch (Glib::Exception& ex) { printf ("%s\n", ex.what().c_str()); }}while(0)
#else
# define SAFE_ENUMERATOR_CODE_START \
do{std::auto_ptr<Glib::Error> error; Glib::RefPtr<Gio::Cancellable> cancellable; \
if ((dirList = dir->enumerate_children (cancellable, "*", Gio::FILE_QUERY_INFO_NONE, error))) \
for (Glib::RefPtr<Gio::FileInfo> info = dirList->next_file(cancellable, error); !error.get() && info; info = dirList->next_file(cancellable, error)) {
# define SAFE_ENUMERATOR_CODE_END } if (error.get()) printf ("%s\n", error->what().c_str());}while (0)
#endif
void safe_build_file_list (Glib::RefPtr<Gio::File> &dir, std::vector<FileMTimeInfo> &flist)
{
Glib::RefPtr<Gio::FileEnumerator> dirList;
if (dir) {
SAFE_ENUMERATOR_CODE_START
flist.push_back (FileMTimeInfo (removeExtension(info->get_name()), info->modification_time()));
SAFE_ENUMERATOR_CODE_END;
}
}
void safe_build_file_list (Glib::RefPtr<Gio::File> &dir, std::vector<Glib::ustring> &names, const Glib::ustring &directory)
{
Glib::RefPtr<Gio::FileEnumerator> dirList;
if (dir) {
SAFE_ENUMERATOR_CODE_START
names.push_back (Glib::build_filename (directory, info->get_name()));
SAFE_ENUMERATOR_CODE_END;
}
}
void safe_build_subdir_list (Glib::RefPtr<Gio::File> &dir, std::vector<Glib::ustring> &subDirs, bool add_hidden)
{
Glib::RefPtr<Gio::FileEnumerator> dirList;
if (dir)
{
// CD-ROMs with no drive inserted are reported, but do not exist, causing RT to crash
if (!Glib::file_test(dir->get_path(),Glib::FILE_TEST_EXISTS)) return;
SAFE_ENUMERATOR_CODE_START
if (info->get_file_type() == Gio::FILE_TYPE_DIRECTORY && (!info->is_hidden() || add_hidden))
subDirs.push_back (info->get_name());
SAFE_ENUMERATOR_CODE_END;
}
}
Glib::ustring safe_locale_to_utf8 (const std::string& src)
{
Glib::ustring utf8_str;
#ifdef GLIBMM_EXCEPTIONS_ENABLED
try {
utf8_str = Glib::locale_to_utf8(src);
}
catch (const Glib::ConvertError& e) {
utf8_str = Glib::convert_with_fallback(src, "UTF8", "LATIN1","?");
}
#else
{
std::auto_ptr<Glib::Error> error;
utf8_str = locale_to_utf8(src, error);
if (error.get())
utf8_str = Glib::convert_with_fallback(src, "UTF8", "LATIN1","?", error);
}
#endif //GLIBMM_EXCEPTIONS_ENABLED
return utf8_str;
}
std::string safe_locale_from_utf8 (const Glib::ustring& utf8_str)
{
std::string str;
#ifdef GLIBMM_EXCEPTIONS_ENABLED
try {
str = Glib::locale_from_utf8(utf8_str);
}
catch (const Glib::ConvertError& e) {
//str = Glib::convert_with_fallback(utf8_str, "LATIN1", "UTF8", "?");
}
#else
{
std::auto_ptr<Glib::Error> error;
str = Glib::locale_from_utf8(utf8_str, error);
/*if (error.get())
{str = Glib::convert_with_fallback(utf8_str, "LATIN1", "UTF8", "?", error);}*/
}
#endif //GLIBMM_EXCEPTIONS_ENABLED
return str;
}
bool safe_spawn_command_line_async (const Glib::ustring& cmd_utf8)
{
std::string cmd;
bool success = false;
#ifdef GLIBMM_EXCEPTIONS_ENABLED
try {
cmd = Glib::filename_from_utf8(cmd_utf8);
printf ("command line: |%s|\n", cmd.c_str());
Glib::spawn_command_line_async (cmd);
success = true;
} catch (Glib::Exception& ex) {
printf ("%s\n", ex.what().c_str());
}
#else
std::auto_ptr<Glib::Error> error;
cmd = Glib::filename_from_utf8(cmd_utf8, error);
if (!error.get()) {
printf ("command line: |%s|\n", cmd.c_str());
Glib::spawn_command_line_async (cmd, error);
}
if (error.get())
printf ("%s\n", error->what().c_str());
else
success = true;
#endif
return success;
}
bool safe_spawn_command_line_sync (const Glib::ustring& cmd_utf8)
{
std::string cmd;
std::string stdOut;
std::string stdErr;
bool success = false;
int exitStatus=-1;
try {
cmd = Glib::filename_from_utf8(cmd_utf8);
printf ("command line: |%s|\n", cmd.c_str());
// if it crashes here on windows, make sure you have the GTK runtime files gspawn-win32-helper*.exe files in RT directory
Glib::spawn_command_line_sync (cmd,NULL,NULL, &exitStatus);
} catch (Glib::Exception& ex) {
printf ("%s\n", ex.what().c_str());
}
return (exitStatus==0);
}