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/LUT.h
+++ b/rtengine/LUT.h
@@ -234,7 +234,7 @@ public:
    LUT<T> & operator+=(LUT<T> &rhs)
    {
        if (rhs.size == this->size) {
-#ifdef _OPENMP
+#ifdef _RT_NESTED_OPENMP // temporary solution to fix Issue #3324
            #pragma omp simd
 #endif