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

adjustements between radius FFTW Gaussianblur

Browse Source
This commit is contained in:
Desmis 2019-07-01 07:31:17 +02:00
parent f656d6f7b0
commit b371629b23
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rtengine/iplocalcontrast.cc
View File

@ -55,8 +55,17 @@ void ImProcFunctions::localContrast(LabImage *lab, float **destination, const Lo
#endif #endif
gaussianBlur(lab->L, buf, width, height, sigma); gaussianBlur(lab->L, buf, width, height, sigma);
} else { } else {
sigma *= 1.f; float kr = 1.f;
ImProcFunctions::fftw_convol_blur2(lab->L, buf, width, height, sigma, 0, 0); //emprical adjustement between FFTW radius and Gaussainblur
//under 50 ==> 10.f
//above 400 ==> 1.f
float ak = -9.f / 350.f;
float bk = 10.f - 50.f * ak;
kr = ak * sigma + bk;
if(sigma < 50.f) kr = 10.f;
if(sigma > 400.f) kr = 1.f;
// printf("kr=%f \n", kr);
ImProcFunctions::fftw_convol_blur2(lab->L, buf, width, height, kr * sigma, 0, 0);
} }
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel for if(multiThread) #pragma omp parallel for if(multiThread)

17
rtengine/ipretinex.cc
View File

@ -962,9 +962,20 @@ void ImProcFunctions::MSRLocal(int sp, bool fftw, int lum, LabImage * bufreti, L
} }
float *buffer = new float[W_L * H_L]; float *buffer = new float[W_L * H_L];
float mulradiusfftw = 1.f; float kr = 1.f;
for (int scale = scal - 1; scale >= 0; scale--) { for (int scale = scal - 1; scale >= 0; scale--) {
// printf("retscale=%f scale=%i \n", mulradiusfftw * RetinexScales[scale], scale); // printf("retscale=%f scale=%i \n", mulradiusfftw * RetinexScales[scale], scale);
//emprical adjustement between FFTW radius and Gaussainblur
//under 50 ==> 10.f
//above 400 ==> 1.f
float sigm = RetinexScales[scale];
float mulradiusfftw = 1.f;
float ak = -9.f / 350.f;
float bk = 10.f - 50.f * ak;
kr = ak * sigm + bk;
if(sigm < 50.f) kr = 10.f;
if(sigm > 400.f) kr = 1.f;
if(!fftw) { if(!fftw) {
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel //disabled with FFTW #pragma omp parallel //disabled with FFTW
@ -983,11 +994,11 @@ void ImProcFunctions::MSRLocal(int sp, bool fftw, int lum, LabImage * bufreti, L
} else { } else {
if (scale == scal - 1) if (scale == scal - 1)
{ {
ImProcFunctions::fftw_convol_blur2(src, out, W_L, H_L, mulradiusfftw * RetinexScales[scale], 0, 0); ImProcFunctions::fftw_convol_blur2(src, out, W_L, H_L, (kr * RetinexScales[scale]), 0, 0);
} else // reuse result of last iteration } else // reuse result of last iteration
{ {
// out was modified in last iteration => restore it // out was modified in last iteration => restore it
ImProcFunctions::fftw_convol_blur2(out, out, W_L, H_L,sqrtf(SQR(mulradiusfftw * RetinexScales[scale]) - SQR(mulradiusfftw * RetinexScales[scale + 1])), 0, 0); ImProcFunctions::fftw_convol_blur2(out, out, W_L, H_L,sqrtf(SQR(kr * RetinexScales[scale]) - SQR(kr * RetinexScales[scale + 1])), 0, 0);
} }
} }