Merged master into rgbcurvesspeedup.

This commit is contained in:
Beep6581
2016-06-02 22:33:34 +02:00
81 changed files with 3557 additions and 2018 deletions

View File

@@ -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