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

Better fix for #4934

Browse Source
This commit is contained in:
heckflosse
2018-11-05 09:43:45 +01:00
parent 56e45087cf
commit fa91103aec
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/EdgePreservingDecomposition.cc
View File

@@ -941,7 +941,7 @@ void EdgePreservingDecomposition::CompressDynamicRange(float *Source, float Scal
cev = xexpf(LVFU(Source[i]) + LVFU(u[i]) * (tempv)) - epsv; cev = xexpf(LVFU(Source[i]) + LVFU(u[i]) * (tempv)) - epsv;
uev = xexpf(LVFU(u[i])) - epsv; uev = xexpf(LVFU(u[i])) - epsv;
sourcev = xexpf(LVFU(Source[i])) - epsv; sourcev = xexpf(LVFU(Source[i])) - epsv;
_mm_storeu_ps( &Source[i], vmaxf(cev + DetailBoostv * (sourcev - uev), ZEROV)); _mm_storeu_ps( &Source[i], cev + DetailBoostv * (sourcev - uev) );
} }
} }
@@ -949,7 +949,7 @@ void EdgePreservingDecomposition::CompressDynamicRange(float *Source, float Scal
float ce = xexpf(Source[i] + u[i] * (temp)) - eps; float ce = xexpf(Source[i] + u[i] * (temp)) - eps;
float ue = xexpf(u[i]) - eps; float ue = xexpf(u[i]) - eps;
Source[i] = xexpf(Source[i]) - eps; Source[i] = xexpf(Source[i]) - eps;
Source[i] = rtengine::max(ce + DetailBoost * (Source[i] - ue), 0.f); Source[i] = ce + DetailBoost * (Source[i] - ue);
} }
#else #else
@@ -961,7 +961,7 @@ void EdgePreservingDecomposition::CompressDynamicRange(float *Source, float Scal
float ce = xexpf(Source[i] + u[i] * (temp)) - eps; float ce = xexpf(Source[i] + u[i] * (temp)) - eps;
float ue = xexpf(u[i]) - eps; float ue = xexpf(u[i]) - eps;
Source[i] = xexpf(Source[i]) - eps; Source[i] = xexpf(Source[i]) - eps;
Source[i] = rtengine::max(ce + DetailBoost * (Source[i] - ue), 0.f); Source[i] = ce + DetailBoost * (Source[i] - ue);
} }
#endif #endif

4
rtengine/improcfun.cc
View File

@@ -5264,6 +5264,10 @@ void ImProcFunctions::EPDToneMap (LabImage *lab, unsigned int Iterates, int skip
minL = 0.0f; //Disable the shift if there are no negative numbers. I wish there were just no negative numbers to begin with. minL = 0.0f; //Disable the shift if there are no negative numbers. I wish there were just no negative numbers to begin with.
} }
if (maxL == 0.f) { // avoid division by zero
maxL = 1.f;
}
#pragma omp parallel for #pragma omp parallel for
for (size_t i = 0; i < N; ++i) for (size_t i = 0; i < N; ++i)