Merge from DEFAULT f1e80d00c3099a65283f143268318e504ce6ea85

see comments in issue 1052, comment 439
2012-07-25 21:24:57 -04:00
parent 015d1d8af0 ccae234f7e
commit 00097e8dd2
89 changed files with 6454 additions and 4740 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -53,14 +53,16 @@ class LCurveParamsEdited {
    public:
        bool brightness;
        bool contrast;
-        bool saturation;
-        bool avoidclip;
-        bool enable_saturationlimiter;
-        bool saturationlimit;
+        bool chromaticity;
+        bool avoidcolorshift;
+        bool rstprotection;
        bool lcurve;
        bool acurve;
        bool bcurve;
        bool bwtoning;
+        bool cccurve;
+        bool chcurve;
+        //bool cbgcurve;
 };

 class RGBCurvesParamsEdited {
@@ -118,6 +120,7 @@ class VibranceParamsEdited {
        bool protectskins;
        bool avoidcolorshift;
        bool pastsattog;
+        bool skintonescurve;
 };

 /*class ColorBoostParamsEdited {
@@ -126,7 +129,7 @@ class VibranceParamsEdited {
        bool amount;
        bool avoidclip;
        bool enable_saturationlimiter;
-        bool saturationlimit;
+        bool rstprotection;
 };*/

 class WBParamsEdited {