Merge branch 'dev' into relax-procparam-dependency

2019-03-10 12:54:04 +01:00
parent 3074803688 d89364fcc0
commit 9fe6bcaab1
24 changed files with 281 additions and 148 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -1444,6 +1444,7 @@ struct RAWParams {
        Glib::ustring method;
        bool dualDemosaicAutoContrast;
        double dualDemosaicContrast;
+        int border;
        int ccSteps;
        double blackred;
        double blackgreen;