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

resize: added "allow upscaling" checkbox (issue #4643)

Browse Source
This commit is contained in:
Alberto Griggio
2018-07-04 13:32:12 +02:00
parent 370e5d0222
commit 8c3e14b7f0
10 changed files with 64 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/paramsedited.cc
View File

@@ -377,6 +377,7 @@ void ParamsEdited::set (bool v)
resize.width = v;
resize.height = v;
resize.enabled = v;
resize.allowUpscaling = v;
icm.input = v;
icm.toneCurve = v;
icm.applyLookTable = v;
@@ -931,6 +932,7 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
resize.width = resize.width && p.resize.width == other.resize.width;
resize.height = resize.height && p.resize.height == other.resize.height;
resize.enabled = resize.enabled && p.resize.enabled == other.resize.enabled;
resize.allowUpscaling = resize.allowUpscaling && p.resize.allowUpscaling == other.resize.allowUpscaling;
icm.input = icm.input && p.icm.input == other.icm.input;
icm.toneCurve = icm.toneCurve && p.icm.toneCurve == other.icm.toneCurve;
icm.applyLookTable = icm.applyLookTable && p.icm.applyLookTable == other.icm.applyLookTable;
@@ -2406,6 +2408,10 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
toEdit.resize.enabled = mods.resize.enabled;
}
if (resize.allowUpscaling) {
toEdit.resize.allowUpscaling = mods.resize.allowUpscaling;
}
if (icm.input) {
toEdit.icm.input = mods.icm.input;
}