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
2020-01-04 06:16:15 +01:00
parent 9f8a2de752 cabbf8c229
commit db1c3ed08c
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rtengine/guidedfilter.cc
View File

@@ -132,7 +132,18 @@ void guidedFilter(const array2D<float> &guide, const array2D<float> &src, array2
const auto f_subsample = const auto f_subsample =
[=](array2D<float> &d, const array2D<float> &s) -> void [=](array2D<float> &d, const array2D<float> &s) -> void
{ {
rescaleBilinear(s, d, multithread); if (d.width() == s.width() && d.height() == s.height()) {
#ifdef _OPENMP
#pragma omp parallel for if (multithread)
#endif
for (int y = 0; y < s.height(); ++y) {
for (int x = 0; x < s.width(); ++x) {
d[y][x] = s[y][x];
}
}
} else {
rescaleBilinear(s, d, multithread);
}
}; };
// const auto f_upsample = f_subsample; // const auto f_upsample = f_subsample;