diff --git a/rtengine/guidedfilter.cc b/rtengine/guidedfilter.cc index 283da100c..bed4d8be7 100644 --- a/rtengine/guidedfilter.cc +++ b/rtengine/guidedfilter.cc @@ -90,7 +90,12 @@ void guidedFilter(const array2D &guide, const array2D &src, array2 enum Op { MUL, DIVEPSILON, ADD, SUB, ADDMUL, SUBMUL }; const auto apply = - [=](Op op, array2D &res, const array2D &a, const array2D &b, const array2D &c=array2D()) -> void +#ifdef _OPENMP + [multithread, epsilon](Op op, array2D &res, const array2D &a, const array2D &b, const array2D &c=array2D()) -> void +#else + // removed multithread to fix clang warning on msys2 clang builds, which don't support OpenMp + [epsilon](Op op, array2D &res, const array2D &a, const array2D &b, const array2D &c=array2D()) -> void +#endif { const int w = res.width(); const int h = res.height(); diff --git a/rtengine/iplocallab.cc b/rtengine/iplocallab.cc index b78409c0f..abe12884c 100644 --- a/rtengine/iplocallab.cc +++ b/rtengine/iplocallab.cc @@ -7345,7 +7345,8 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o levred = 7; noiscfactiv = false; } - +//lastsav for save restore image + lastsav = 0; if (lp.excmet == 1 && call <= 3) {//exclude const int bfh = int (lp.ly + lp.lyT) + del; //bfw bfh real size of square zone