Merge branch 'dev' into sharpmask

This commit is contained in:
heckflosse
2018-06-13 13:02:38 +02:00
39 changed files with 440 additions and 105 deletions

View File

@@ -190,22 +190,12 @@ BENCHFUN
if (!needdamp) {
// apply gaussian blur and divide luminance by result of gaussian blur
gaussianBlur(tmpI, tmp, W, H, sigma, nullptr, GAUSS_DIV, luminance);
#ifdef _OPENMP
#pragma omp for
#endif
for (int i = 0; i < H; ++i) {
for(int j = 0; j < W; ++j) {
tmp[i][j] = max(tmp[i][j], 0.f);
}
}
} else {
// apply gaussian blur + damping
gaussianBlur(tmpI, tmp, W, H, sigma);
dcdamping(tmp, luminance, damping, W, H);
}
gaussianBlur(tmp, tmpI, W, H, sigma, nullptr, GAUSS_MULT);
} // end for
#ifdef _OPENMP