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

Merge branch 'dev' into perspective

Browse Source 
Resolve minor conflict in ImProcFunctions::transformGeneral and add new
arguments for use of ImProcFunctions::needsTransform in
PerspectiveCorrection::autocompute.
This commit is contained in:
Lawrence
2020-01-18 18:41:26 -08:00
parent 7395b26db4 906347ab2d
commit f16773eb3f
60 changed files with 785 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/paramsedited.cc
View File

@@ -321,6 +321,7 @@ void ParamsEdited::set(bool v)
coarse.rotate = v;
coarse.hflip = v;
coarse.vflip = v;
commonTrans.method = v;
commonTrans.autofill = v;
rotate.degree = v;
distortion.amount = v;
@@ -918,6 +919,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
coarse.rotate = coarse.rotate && p.coarse.rotate == other.coarse.rotate;
coarse.hflip = coarse.hflip && p.coarse.hflip == other.coarse.hflip;
coarse.vflip = coarse.vflip && p.coarse.vflip == other.coarse.vflip;
commonTrans.method = commonTrans.method && p.commonTrans.method == other.commonTrans.method;
commonTrans.autofill = commonTrans.autofill && p.commonTrans.autofill == other.commonTrans.autofill;
rotate.degree = rotate.degree && p.rotate.degree == other.rotate.degree;
distortion.amount = distortion.amount && p.distortion.amount == other.distortion.amount;
@@ -2293,6 +2295,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.coarse.vflip = mods.coarse.vflip;
}
if (commonTrans.method) {
toEdit.commonTrans.method = mods.commonTrans.method;
}
if (commonTrans.autofill) {
toEdit.commonTrans.autofill = mods.commonTrans.autofill;
}