Merge branch 'dev' into dehaze_blend

2020-11-07 11:50:09 +01:00
parent f1b19fa664 ed01656a57
commit c49e47d81f
21 changed files with 1340 additions and 162 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -1422,6 +1422,7 @@ struct LocallabParams {
        // Log encoding
        bool visilog;
        bool explog;
+        int complexlog;
        bool autocompute;
        double sourceGray;
        double sourceabs;
@@ -1429,18 +1430,34 @@ struct LocallabParams {
        double targetGray;
        double catad;
        double saturl;
+        double lightl;
+        double lightq;
        double contl;
+        double contq;
+        double colorfl;
+        std::vector<double> LcurveL;
        bool Autogray;
        bool fullimage;
+        double repar;
        bool ciecam;
        double blackEv;
        double whiteEv;
        double detail;
        int sensilog;
+        Glib::ustring sursour;
        Glib::ustring surround;
        double baselog;
        double strlog;
        double anglog;
+        std::vector<double> CCmaskcurveL;
+        std::vector<double> LLmaskcurveL;
+        std::vector<double> HHmaskcurveL;
+        bool enaLMask;
+        double blendmaskL;
+        double radmaskL;
+        double chromaskL;
+        std::vector<double> LmaskcurveL;
+
        // mask
        bool visimask;
        int complexmask;