Merge branch 'dev' into dual_demosaic_auto_threshold

2018-10-21 21:54:24 +02:00
parent 3cd065ea21 18f812d96a
commit e5f373d0e1
177 changed files with 1886 additions and 1041 deletions
--- a/rtgui/xtransprocess.cc
+++ b/rtgui/xtransprocess.cc
@@ -189,7 +189,7 @@ void XTransProcess::setDefaults(const rtengine::procparams::ProcParams* defParam
    }
 }

-void XTransProcess::adjusterChanged (Adjuster* a, double newval)
+void XTransProcess::adjusterChanged(Adjuster* a, double newval)
 {
    if (listener) {
        if (a == ccSteps) {
@@ -209,6 +209,10 @@ void XTransProcess::checkBoxToggled (CheckBox* c, CheckValue newval)
    }
 }

+void XTransProcess::adjusterAutoToggled(Adjuster* a, bool newval)
+{
+}
+
 void XTransProcess::methodChanged ()
 {
    const int curSelection = method->get_active_row_number();