merge with dev

2018-02-01 15:28:56 +01:00
parent 1398c3822f 6567380f7d
commit a3569f11e5
8 changed files with 56 additions and 34 deletions
--- a/rtengine/histmatching.cc
+++ b/rtengine/histmatching.cc
@@ -180,9 +180,9 @@ void RawImageSource::getAutoMatchedToneCurve(std::vector<double> &outCurve)
    if (!histMatchingCache.empty()) {
        if (settings->verbose) {
            std::cout << "tone curve found in cache" << std::endl;
-            outCurve = histMatchingCache;
-            return;
        }
+        outCurve = histMatchingCache;
+        return;
    }

    outCurve = { DCT_Linear };