merge with Dev

2017-12-15 15:53:04 +01:00
parent 1faa7d7d08 c202a61292
commit ba61124ee5
6 changed files with 448 additions and 450 deletions
--- a/rtengine/lcp.cc
+++ b/rtengine/lcp.cc
@@ -361,7 +361,7 @@ void rtengine::LCPProfile::calcParams(
            const float focDist = aPersModel[pm]->focDist;
            const float focDistLog = std::log(focDist) + euler;

-            double meanErr;
+            double meanErr = 0.0;

            if (aPersModel[pm]->hasModeData(mode)) {
                double lowMeanErr = 0.0;