Merge master for the C++11 ABI fixes.

2015-12-20 20:53:59 +01:00
parent 151556ae23 13e7260a23
commit 4ecf463f9f
60 changed files with 2855 additions and 651 deletions
--- a/rtengine/improcfun.cc
+++ b/rtengine/improcfun.cc
@@ -5821,7 +5821,7 @@ SSEFUNCTION void ImProcFunctions::chromiLuminanceCurve (EditBuffer *editBuffer,
    };

 #ifdef _DEBUG
-    #pragma omp parallel default(shared) firstprivate(highlight, ccut, clut, chromaticity, bwToning, rstprotection, avoidColorShift, LCredsk, protectRed, protectRedH, gamutLch, lold, lnew, MunsDebugInfo, pW) if (multiThread)
+    #pragma omp parallel default(shared) firstprivate(lold, lnew, MunsDebugInfo, pW) if (multiThread)
 #else
    #pragma omp parallel if (multiThread)
 #endif