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/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -202,12 +202,14 @@ class LCurveParams {
        std::vector<double>   lcurve;
        std::vector<double>   acurve;
        std::vector<double>   bcurve;
+        std::vector<double>   cccurve;
+        std::vector<double>   chcurve;
+        //std::vector<double>   cbgcurve;
        int     brightness;
        int     contrast;
-        int     saturation;
-        bool    avoidclip;
-        bool    enable_saturationlimiter;
-        double  saturationlimit;
+        int     chromaticity;
+        bool    avoidcolorshift;
+        double  rstprotection;
        bool    bwtoning;
 };

@@ -273,8 +275,9 @@ class VibranceParams {
        bool           protectskins;
        bool           avoidcolorshift;
        bool           pastsattog;
+        std::vector<double> skintonescurve;

-        VibranceParams() : psthreshold(1, 75,  false) {};
+        VibranceParams() : psthreshold(0, 75,  false) {};
 };

 /**