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

Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into dev

Browse Source
This commit is contained in:
Ingo Weyrich
2019-09-24 18:59:42 +02:00
parent 79b3ff8e6e 26bfb526bf
commit 85cdf5fbe7
3 changed files with 14 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtgui/extprog.cc
View File

@@ -58,7 +58,7 @@ bool ExtProgAction::execute (const std::vector<Glib::ustring>& fileNames) const
}
for (const auto& fileName : fileNames) {
cmdLine += " \"" + fileName + "\"";
cmdLine += " " + Glib::shell_quote(fileName);
}
return ExtProgStore::spawnCommandAsync (cmdLine);
@@ -256,7 +256,7 @@ bool ExtProgStore::openInGimp (const Glib::ustring& fileName)
#else
auto cmdLine = Glib::ustring("gimp \"") + fileName + Glib::ustring("\"");
auto cmdLine = Glib::ustring("gimp ") + Glib::shell_quote(fileName);
auto success = spawnCommandAsync (cmdLine);
#endif
@@ -291,7 +291,7 @@ bool ExtProgStore::openInGimp (const Glib::ustring& fileName)
#else
cmdLine = Glib::ustring("gimp-remote \"") + fileName + Glib::ustring("\"");
cmdLine = Glib::ustring("gimp-remote ") + Glib::shell_quote(fileName);
success = ExtProgStore::spawnCommandAsync (cmdLine);
#endif
@@ -312,7 +312,7 @@ bool ExtProgStore::openInPhotoshop (const Glib::ustring& fileName)
#else
const auto cmdLine = Glib::ustring("\"") + Glib::build_filename(options.psDir, "Photoshop.exe") + Glib::ustring("\" \"") + fileName + Glib::ustring("\"");
const auto cmdLine = Glib::ustring("\"") + Glib::build_filename(options.psDir, "Photoshop.exe") + "\" " + Glib::shell_quote(fileName);
#endif
@@ -334,7 +334,7 @@ bool ExtProgStore::openInCustomEditor (const Glib::ustring& fileName)
#else
const auto cmdLine = Glib::ustring("\"") + options.customEditorProg + Glib::ustring("\" \"") + fileName + Glib::ustring("\"");
const auto cmdLine = Glib::ustring("\"") + options.customEditorProg + "\" " + Glib::shell_quote(fileName);
return spawnCommandAsync (cmdLine);
#endif

12
rtgui/pdsharpening.cc
View File

@@ -18,17 +18,23 @@
*/
#include <cmath>
#include "eventmapper.h"
#include <iomanip>
#include "pdsharpening.h"
#include "eventmapper.h"
#include "options.h"
#include "../rtengine/procparams.h"
using namespace rtengine;
using namespace rtengine::procparams;
PdSharpening::PdSharpening() : FoldableToolPanel(this, "capturesharpening", M("TP_PDSHARPENING_LABEL"), false, true)
PdSharpening::PdSharpening() :
FoldableToolPanel(this, "capturesharpening", M("TP_PDSHARPENING_LABEL"), false, true),
lastAutoContrast(true),
lastAutoRadius(true)
{
auto m = ProcEventMapper::getInstance();
EvPdShrContrast = m->newEvent(CAPTURESHARPEN, "HISTORY_MSG_PDSHARPEN_CONTRAST");
EvPdSharpenGamma = m->newEvent(CAPTURESHARPEN, "HISTORY_MSG_PDSHARPEN_GAMMA");