Merge branch 'master' into gtk3

This commit is contained in:
Beep6581
2016-04-27 17:47:27 +02:00
4 changed files with 227 additions and 224 deletions

View File

@@ -258,14 +258,19 @@ public:
return *this;
}
// handy to sum up per thread histograms
// handy to sum up per thread histograms. #pragma omp simd speeds up the loop by about factor 3 for LUTu (unsigned int).
LUT<T> & operator+=(LUT<T> &rhs)
{
if (rhs.size == this->size) {
#ifdef _OPENMP
#pragma omp simd
#endif
for(unsigned int i = 0; i < this->size; i++) {
data[i] += rhs.data[i];
}
}
return *this;
}

View File

@@ -888,7 +888,7 @@ void RAWParams::setDefaults()
ff_clipControl = 0;
cared = 0;
cablue = 0;
caautostrength = 6;
caautostrength = 2;
ca_autocorrect = false;
hotPixelFilter = false;
deadPixelFilter = false;