merge with Dev

2018-01-08 13:31:26 +01:00
parent 3008d5d90d 1006dd1ebf
commit 48721c4da1
10 changed files with 128 additions and 55 deletions
--- a/rtengine/curves.h
+++ b/rtengine/curves.h
@@ -1277,6 +1277,10 @@ inline void SatAndValueBlendingToneCurve::Apply(float& r, float& g, float& b) co
    const float lum = (r + g + b) / 3.f;
    const float newLum = lutToneCurve[lum];

+    if (newLum == lum) {
+        return;
+    }
+
    float h, s, v;
    Color::rgb2hsvtc(r, g, b, h, s, v);