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-03-19 13:40:11 +01:00
parent 54fdc848f0 d63fb77c8c
commit e573de78b4
169 changed files with 11568 additions and 5931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtengine/dirpyr_equalizer.cc
View File

@@ -231,11 +231,11 @@ void fillLut(LUTf &irangefn, int level, double dirpyrThreshold, float mult, floa
}
const float offs = skinprot == 0.f ? 0.f : -1.f;
constexpr float noise = 2000.f;
const float noisehi = 1.33f * noise * dirpyrThreshold / expf(level * log(3.0)), noiselo = 0.66f * noise * dirpyrThreshold / expf(level * log(3.0));
constexpr double noise = 2000.0;
const float noisehi = 1.33 * noise * dirpyrThreshold / exp(level * log(3.0)), noiselo = 0.66 * noise * dirpyrThreshold / exp(level * log(3.0));
for (int i = 0; i < 0x20000; i++) {
if (abs(i - 0x10000) > noisehi || multbis < 1.0) {
if (abs(i - 0x10000) > noisehi || multbis < 1.f) {
irangefn[i] = multbis + offs;
} else {
if (abs(i - 0x10000) < noiselo) {
@@ -307,7 +307,7 @@ void idirpyr_eq_channel(const float * const * data_coarse, const float * const *
buffer[i][j] += irangefn[hipass + 0x10000] * hipass;
}
}
} else if (skinprot > 0.f) {
} else if (skinprot > 0.0) {
#ifdef _OPENMP
#pragma omp parallel for schedule(dynamic,16)
#endif
@@ -359,7 +359,7 @@ void idirpyr_eq_channelcam(const float * const * data_coarse, const float * cons
buffer[i][j] += irangefn[hipass + 0x10000] * hipass;
}
}
} else if (skinprot > 0.f) {
} else if (skinprot > 0.0) {
#ifdef _OPENMP
#pragma omp parallel for schedule(dynamic,16)
#endif