Merge branch 'master' into gtk3

This commit is contained in:
Beep6581
2016-03-17 21:44:00 +01:00
7 changed files with 186 additions and 121 deletions

View File

@@ -2772,13 +2772,13 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
bool RAWParamsEdited::BayerSensor::isUnchanged() const
{
return method && ccSteps && dcbIterations && dcbEnhance && lmmseIterations/*&& allEnhance*/ && greenEq
return method && dcbIterations && dcbEnhance && lmmseIterations/*&& allEnhance*/ && greenEq
&& linenoise && exBlack0 && exBlack1 && exBlack2 && exBlack3 && exTwoGreen;
}
bool RAWParamsEdited::XTransSensor::isUnchanged() const
{
return method && ccSteps && exBlackRed && exBlackGreen && exBlackBlue;
return method && exBlackRed && exBlackGreen && exBlackBlue;
}
bool RAWParamsEdited::isUnchanged() const