merge with dev

2018-11-01 17:34:21 +01:00
parent b9c7fa80da 5e30b5ac58
commit 19d71e46d4
19 changed files with 955 additions and 92 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -459,6 +459,22 @@ struct ColorToningParams {
    static const double LABGRID_CORR_MAX;
    static const double LABGRID_CORR_SCALE;

+    struct LabCorrectionRegion {
+        double a;
+        double b;
+        double saturation;
+        double lightness;
+        std::vector<double> hueMask;
+        std::vector<double> chromaticityMask;
+        std::vector<double> lightnessMask;
+
+        LabCorrectionRegion();
+        bool operator==(const LabCorrectionRegion &other) const;
+        bool operator!=(const LabCorrectionRegion &other) const;
+    };
+    std::vector<LabCorrectionRegion> labregions;
+    int labregionsShowMask;
+    
    ColorToningParams();

    bool operator ==(const ColorToningParams& other) const;