merge with Dev another time

2017-04-10 08:42:20 +02:00
parent 57e34c178e 3ff2519302
commit 8ca404f140
50 changed files with 1765 additions and 1658 deletions
--- a/rtengine/improccoordinator.cc
+++ b/rtengine/improccoordinator.cc
@@ -693,6 +693,9 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
 #endif
            lhist16 += lhist16thr;
        }
+#ifdef _OPENMP
+        static_cast<void> (numThreads); // to silence cppcheck warning
+#endif
        CurveFactory::complexLCurve (params.labCurve.brightness, params.labCurve.contrast, params.labCurve.lcurve, lhist16, lumacurve, histLCurve, scale == 1 ? 1 : 16, utili);
    }