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

Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into issue1474

Browse Source
This commit is contained in:
rfranke
2020-01-03 20:25:48 +01:00
parent 3deff849ef cabbf8c229
commit c3c382e56e
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rtengine/guidedfilter.cc
View File

@@ -106,7 +106,18 @@ void guidedFilter(const array2D<float> &guide, const array2D<float> &src, array2
const auto f_subsample = const auto f_subsample =
[multithread](array2D<float> &d, const array2D<float> &s) -> void [multithread](array2D<float> &d, const array2D<float> &s) -> void
{ {
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); rescaleBilinear(s, d, multithread);
}
}; };
const auto f_mean = const auto f_mean =

5
rtgui/lensprofile.cc
View File

@@ -586,6 +586,9 @@ void LensProfilePanel::onCorrModeChanged(const Gtk::RadioButton* rbChanged)
LensProfilePanel::LFDbHelper::LFDbHelper() LensProfilePanel::LFDbHelper::LFDbHelper()
{ {
lensfunCameraModel = Gtk::TreeStore::create(lensfunModelCam);
lensfunLensModel = Gtk::TreeStore::create(lensfunModelLens);
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel sections if (!settings->verbose) #pragma omp parallel sections if (!settings->verbose)
#endif #endif
@@ -594,14 +597,12 @@ LensProfilePanel::LFDbHelper::LFDbHelper()
#pragma omp section #pragma omp section
#endif #endif
{ {
lensfunCameraModel = Gtk::TreeStore::create(lensfunModelCam);
fillLensfunCameras(); fillLensfunCameras();
} }
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp section #pragma omp section
#endif #endif
{ {
lensfunLensModel = Gtk::TreeStore::create(lensfunModelLens);
fillLensfunLenses(); fillLensfunLenses();
} }
} }