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:
Desmis
2020-04-13 18:00:27 +02:00
parent 25513c85bc 22eee9787e
commit 6db96ed88e
21 changed files with 705 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtgui/paramsedited.cc
View File

@@ -625,6 +625,7 @@ void ParamsEdited::set(bool v)
filmNegative.redRatio = v;
filmNegative.greenExp = v;
filmNegative.blueRatio = v;
filmNegative.baseValues = v;
exif = v;
iptc = v;
@@ -1229,6 +1230,9 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
filmNegative.redRatio = filmNegative.redRatio && p.filmNegative.redRatio == other.filmNegative.redRatio;
filmNegative.greenExp = filmNegative.greenExp && p.filmNegative.greenExp == other.filmNegative.greenExp;
filmNegative.blueRatio = filmNegative.blueRatio && p.filmNegative.blueRatio == other.filmNegative.blueRatio;
filmNegative.baseValues = filmNegative.baseValues && p.filmNegative.redBase == other.filmNegative.redBase
&& p.filmNegative.greenBase == other.filmNegative.greenBase
&& p.filmNegative.blueBase == other.filmNegative.blueBase;
// How the hell can we handle that???
// exif = exif && p.exif==other.exif
@@ -3442,6 +3446,12 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.filmNegative.blueRatio = mods.filmNegative.blueRatio;
}
if (filmNegative.baseValues) {
toEdit.filmNegative.redBase = mods.filmNegative.redBase;
toEdit.filmNegative.greenBase = mods.filmNegative.greenBase;
toEdit.filmNegative.blueBase = mods.filmNegative.blueBase;
}
// Exif changes are added to the existing ones
if (exif) {
for (procparams::ExifPairs::const_iterator i = mods.exif.begin(); i != mods.exif.end(); ++i) {
@@ -3488,7 +3498,7 @@ bool RetinexParamsEdited::isUnchanged() const
bool FilmNegativeParamsEdited::isUnchanged() const
{
return enabled && redRatio && greenExp && blueRatio;
return enabled && redRatio && greenExp && blueRatio && baseValues;
}
bool CaptureSharpeningParamsEdited::isUnchanged() const