merge with dev

2019-03-03 18:20:16 +01:00
parent 2748cde1c1 9c9728ac95
commit 65a418ae27
10 changed files with 57 additions and 12 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -1569,6 +1569,7 @@ struct RAWParams {
        Glib::ustring method;
        bool dualDemosaicAutoContrast;
        double dualDemosaicContrast;
+        int border;
        int ccSteps;
        double blackred;
        double blackgreen;