merge with dev

2018-01-14 12:26:00 +01:00
parent 90d4767ad0 b762804b80
commit 90bd7fa98d
28 changed files with 869 additions and 283 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -426,6 +426,7 @@ struct ColorToningParams {
     *  Lch        :
     *  RGBSliders :
     *  RGBCurves  :
+     *  LabGrid    :
     */
    Glib::ustring method;

@@ -449,6 +450,12 @@ struct ColorToningParams {
    double sathigh;
    bool lumamode;

+    double labgridALow;
+    double labgridBLow;
+    double labgridAHigh;
+    double labgridBHigh;
+    static const double LABGRID_CORR_MAX;
+
    ColorToningParams();

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