liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with dev

Browse Source
This commit is contained in:
Desmis
2019-10-28 17:43:06 +01:00
parent b608ce7efb 0ee3873ce4
commit d80357c284
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rtengine/guidedfilter.cc
View File

@@ -90,7 +90,12 @@ void guidedFilter(const array2D<float> &guide, const array2D<float> &src, array2
enum Op { MUL, DIVEPSILON, ADD, SUB, ADDMUL, SUBMUL };
const auto apply =
[=](Op op, array2D<float> &res, const array2D<float> &a, const array2D<float> &b, const array2D<float> &c=array2D<float>()) -> void
#ifdef _OPENMP
[multithread, epsilon](Op op, array2D<float> &res, const array2D<float> &a, const array2D<float> &b, const array2D<float> &c=array2D<float>()) -> void
#else
// removed multithread to fix clang warning on msys2 clang builds, which don't support OpenMp
[epsilon](Op op, array2D<float> &res, const array2D<float> &a, const array2D<float> &b, const array2D<float> &c=array2D<float>()) -> void
#endif
{
const int w = res.width();
const int h = res.height();