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

Merge branch 'master' into gtk3

Browse Source
This commit is contained in:
Morgan Hardwood
2016-07-15 01:29:06 +02:00
parent 2bfb0acdd7 57e95a35c2
commit bedee9e32b
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/curves.h
View File

@@ -249,7 +249,11 @@ public:
#ifdef __SSE2__
static inline vfloat igamma (vfloat x, vfloat gamma, vfloat start, vfloat slope, vfloat mul, vfloat add)
{
#if !defined(__clang__)
return (x <= start * slope ? x / slope : xexpf(xlogf((x + add) / mul) * gamma) );
#else
return vself(vmaskf_le(x, start * slope), x / slope, xexpf(xlogf((x + add) / mul) * gamma));
#endif
}
#endif
static inline float hlcurve (const float exp_scale, const float comp, const float hlrange, float level)

9
rtgui/extprog.cc
View File

@@ -250,7 +250,10 @@ bool ExtProgStore::openInGimp (const Glib::ustring& fileName)
#elif defined __APPLE__
auto cmdLine = Glib::ustring("open -a /Applications/GIMP.app \'") + fileName + Glib::ustring("\'");
// Apps should be opened using the simplest, case-insensitive form, "open -a NameOfProgram"
// Calling the executable directly is said to often cause trouble,
// https://discuss.pixls.us/t/affinity-photo-as-external-editor-how-to/1756/18
auto cmdLine = Glib::ustring("open -a GIMP \'") + fileName + Glib::ustring("\'");
auto success = spawnCommandAsync (cmdLine);
#else
@@ -279,7 +282,7 @@ bool ExtProgStore::openInGimp (const Glib::ustring& fileName)
#elif defined __APPLE__
cmdLine = Glib::ustring("open -a /Applications/Gimp.app/Contents/Resources/start \'") + fileName + Glib::ustring("\'");
cmdLine = Glib::ustring("open -a GIMP-dev \'") + fileName + Glib::ustring("\'");
success = ExtProgStore::spawnCommandAsync (cmdLine);
#else
@@ -301,7 +304,7 @@ bool ExtProgStore::openInPhotoshop (const Glib::ustring& fileName)
#elif defined __APPLE__
const auto cmdLine = Glib::ustring("open -a \'") + Glib::build_filename(options.psDir, "Photoshop.app\' ") + Glib::ustring("\'") + fileName + Glib::ustring("\'");
const auto cmdLine = Glib::ustring("open -a Photoshop \'") + fileName + Glib::ustring("\'");
#else