Merged master into rgbcurvesspeedup.

2016-06-02 22:33:34 +02:00
parent f885b17439 ba53481750
commit 10f4bf3109
81 changed files with 3557 additions and 2018 deletions
--- a/rtengine/improccoordinator.h
+++ b/rtengine/improccoordinator.h
@@ -134,6 +134,7 @@ protected:
    WavOpacityCurveW waOpacityCurveW;
    WavOpacityCurveWL waOpacityCurveWL;
    RetinextransmissionCurve dehatransmissionCurve;
+    RetinexgaintransmissionCurve dehagaintransmissionCurve;

    ColorAppearance customColCurve1;
    ColorAppearance customColCurve2;