Merge with b989fba4c24c34873648df6871da4d0d8cb0a6d1

2014-02-06 20:51:21 +01:00
parent d8e5bc8bd9
commit 6398f6bf66
86 changed files with 3159 additions and 2519 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -649,6 +649,7 @@ class BlackWhiteParams {
        eTCModeId beforeCurveMode;
        std::vector<double> afterCurve;
        eTCModeId afterCurveMode;
+        Glib::ustring algo;

        std::vector<double> luminanceCurve;
        bool autoc;