merge with dev

2017-12-21 08:42:43 +01:00
parent a017505cec 62585bc434
commit 46181f1008
43 changed files with 878 additions and 75 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -118,6 +118,17 @@ public:
    bool clcurve;
 };

+
+class LocalContrastParamsEdited {
+public:
+    bool enabled;
+    bool radius;
+    bool amount;
+    bool darkness;
+    bool lightness;
+};
+
+
 class RGBCurvesParamsEdited
 {

@@ -852,6 +863,7 @@ public:
        bool pixelShiftSmooth;
        bool pixelShiftExp0;
        bool pixelShiftLmmse;
+        bool pixelShiftOneGreen;
        bool pixelShiftEqualBright;
        bool pixelShiftEqualBrightChannel;
        bool pixelShiftNonGreenCross;
@@ -908,6 +920,7 @@ public:
    GeneralParamsEdited           general;
    ToneCurveParamsEdited         toneCurve;
    LCurveParamsEdited            labCurve;
+    LocalContrastParamsEdited     localContrast;
    RGBCurvesParamsEdited         rgbCurves;
    ColorToningEdited             colorToning;
    RetinexParamsEdited             retinex;