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

merge with dev

Browse Source
This commit is contained in:
Alberto Griggio
2017-06-19 13:52:26 +02:00
parent 3bfda08bcf a9f769c5d7
commit 44c4b8101e
95 changed files with 766 additions and 953 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rtgui/main.cc
View File

@@ -139,12 +139,12 @@ int main(int argc, char **argv)
// get the path where the rawtherapee executable is stored
#ifdef WIN32
WCHAR exnameU[512] = {0};
GetModuleFileNameW (NULL, exnameU, 512);
WideCharToMultiByte(CP_UTF8, 0, exnameU, -1, exname, 512, 0, 0 );
GetModuleFileNameW (NULL, exnameU, 511);
WideCharToMultiByte(CP_UTF8, 0, exnameU, -1, exname, 511, 0, 0 );
#else
if (readlink("/proc/self/exe", exname, 512) < 0) {
strncpy(exname, argv[0], 512);
if (readlink("/proc/self/exe", exname, 511) < 0) {
strncpy(exname, argv[0], 511);
}
#endif
@@ -437,7 +437,6 @@ void deleteProcParams(std::vector<rtengine::procparams::PartialProfile*> &pparam
int processLineParams( int argc, char **argv )
{
unsigned errors = 0;
for( int iArg = 1; iArg < argc; iArg++) {
Glib::ustring currParam(argv[iArg]);
@@ -512,5 +511,5 @@ int processLineParams( int argc, char **argv )
return 1;
}
return errors > 0 ? -2 : 0;
return 0;
}