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

Improvment to Smooth Blur

Browse Source
This commit is contained in:
Desmis 2020-02-03 11:08:37 +01:00
parent 3ad362c526
commit 75d95735fa
1 changed files with 122 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
rtengine/iplocallab.cc
View File

@ -768,15 +768,15 @@ static void calcLocalParams(int sp, int oW, int oH, const LocallabParams& locall
}
if(locallab.spots.at(sp).wavMethod == "D2") {
if (locallab.spots.at(sp).wavMethod == "D2") {
lp.daubLen = 4;
} else if(locallab.spots.at(sp).wavMethod == "D4") {
} else if (locallab.spots.at(sp).wavMethod == "D4") {
lp.daubLen = 6;
} else if(locallab.spots.at(sp).wavMethod == "D6") {
} else if (locallab.spots.at(sp).wavMethod == "D6") {
lp.daubLen = 8;
} else if(locallab.spots.at(sp).wavMethod == "D10") {
} else if (locallab.spots.at(sp).wavMethod == "D10") {
lp.daubLen = 12;
} else if(locallab.spots.at(sp).wavMethod == "D14"){
} else if (locallab.spots.at(sp).wavMethod == "D14") {
lp.daubLen = 16;
// } else if(locallab.spots.at(sp).wavMethod == "D20"){
// lp.daubLen = 22;
@ -2672,6 +2672,7 @@ void ImProcFunctions::DeNoise_Local(int call, struct local_params& lp, LabImage
float dark = transformed->L[y][x];
transformed->L[y][x] = dark * aadark + bbdark;
}
if (lp.colorde <= 0) {
transformed->a[y][x] = 0.f;
transformed->b[y][x] = difbdisp;
@ -6316,6 +6317,7 @@ void ImProcFunctions::BlurNoise_Local(LabImage *tmp1, LabImage * originalmask, f
transformed->a[y][x] = CLIPC(original->a[y][x] + difa);
transformed->b[y][x] = CLIPC(original->b[y][x] + difb);
}
float maxdifab = max(fabs(difa), fabs(difb));
if ((blshow) && lp.colorde < 0) { //show modifications whith use "b"
@ -10678,11 +10680,10 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o
if (fft || lp.rad > 30.f) {
if (lp.chromet == 0) {
ImProcFunctions::fftw_convol_blur2(tmp1->L, tmp1->L, bfwr, bfhr, radius, 0, 0);
}
else if (lp.chromet == 1){
} else if (lp.chromet == 1) {
ImProcFunctions::fftw_convol_blur2(tmp1->a, tmp1->a, bfwr, bfhr, radius, 0, 0);
ImProcFunctions::fftw_convol_blur2(tmp1->b, tmp1->b, bfwr, bfhr, radius, 0, 0);
} else if (lp.chromet == 2){
} else if (lp.chromet == 2) {
ImProcFunctions::fftw_convol_blur2(tmp1->L, tmp1->L, bfwr, bfhr, radius, 0, 0);
ImProcFunctions::fftw_convol_blur2(tmp1->a, tmp1->a, bfwr, bfhr, radius, 0, 0);
ImProcFunctions::fftw_convol_blur2(tmp1->b, tmp1->b, bfwr, bfhr, radius, 0, 0);
@ -10693,7 +10694,8 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o
#pragma omp parallel
#endif
{
if (lp.chromet == 0) {
if (lp.chromet == 0)
{
gaussianBlur(tmp1->L, tmp1->L, bfw, bfh, radius);
}
@ -10702,8 +10704,7 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o
{
gaussianBlur(tmp1->a, tmp1->a, bfw, bfh, radius);
gaussianBlur(tmp1->b, tmp1->b, bfw, bfh, radius);
}
else if (lp.chromet == 2)
} else if (lp.chromet == 2)
{
gaussianBlur(tmp1->L, tmp1->L, bfw, bfh, radius);
gaussianBlur(tmp1->a, tmp1->a, bfw, bfh, radius);
@ -10719,11 +10720,10 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o
ImProcFunctions::fftw_convol_blur2(original->L, tmp1->L, GW, GH, radius, 0, 0);
}
else if (lp.chromet == 1){
else if (lp.chromet == 1) {
ImProcFunctions::fftw_convol_blur2(original->a, tmp1->a, GW, GH, radius, 0, 0);
ImProcFunctions::fftw_convol_blur2(original->b, tmp1->b, GW, GH, radius, 0, 0);
}
else if (lp.chromet == 2){
} else if (lp.chromet == 2) {
ImProcFunctions::fftw_convol_blur2(original->L, tmp1->L, GW, GH, radius, 0, 0);
ImProcFunctions::fftw_convol_blur2(original->a, tmp1->a, GW, GH, radius, 0, 0);
ImProcFunctions::fftw_convol_blur2(original->b, tmp1->b, GW, GH, radius, 0, 0);
@ -10735,16 +10735,15 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o
#pragma omp parallel
#endif
{
if (lp.chromet == 0) {
if (lp.chromet == 0)
{
gaussianBlur(original->L, tmp1->L, GW, GH, radius);
}
else if (lp.chromet == 1)
} else if (lp.chromet == 1)
{
gaussianBlur(original->a, tmp1->a, GW, GH, radius);
gaussianBlur(original->b, tmp1->b, GW, GH, radius);
}
else if (lp.chromet == 2)
} else if (lp.chromet == 2)
{
gaussianBlur(original->L, tmp1->L, GW, GH, radius);
@ -10823,17 +10822,15 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o
for (int i = 0; i < hei; ++i) {
tmL[i] = new float[wid];
}
if (lp.chromet == 0) {
Median_Denoise(tmp1->L, tmp1->L, bfw, bfh, medianTypeL, lp.it, multiThread, tmL);
}
else if (lp.chromet == 1)
{
else if (lp.chromet == 1) {
Median_Denoise(tmp1->a, tmp1->a, bfw, bfh, medianTypeAB, lp.it, multiThread, tmL);
Median_Denoise(tmp1->b, tmp1->b, bfw, bfh, medianTypeAB, lp.it, multiThread, tmL);
}
else if (lp.chromet == 2)
{
} else if (lp.chromet == 2) {
Median_Denoise(tmp1->L, tmp1->L, bfw, bfh, medianTypeL, lp.it, multiThread, tmL);
Median_Denoise(tmp1->a, tmp1->a, bfw, bfh, medianTypeAB, lp.it, multiThread, tmL);
Median_Denoise(tmp1->b, tmp1->b, bfw, bfh, medianTypeAB, lp.it, multiThread, tmL);
@ -10854,14 +10851,13 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o
for (int i = 0; i < hei; ++i) {
tmL[i] = new float[wid];
}
if (lp.chromet == 0) {
Median_Denoise(tmp2->L, tmp1->L, GW, GH, medianTypeL, lp.it, multiThread, tmL);
}
else if (lp.chromet == 1) {
} else if (lp.chromet == 1) {
Median_Denoise(tmp2->a, tmp1->a, GW, GH, medianTypeAB, lp.it, multiThread, tmL);
Median_Denoise(tmp2->b, tmp1->b, GW, GH, medianTypeAB, lp.it, multiThread, tmL);
}
else if (lp.chromet == 2) {
} else if (lp.chromet == 2) {
Median_Denoise(tmp2->L, tmp1->L, GW, GH, medianTypeL, lp.it, multiThread, tmL);
Median_Denoise(tmp2->a, tmp1->a, GW, GH, medianTypeAB, lp.it, multiThread, tmL);
Median_Denoise(tmp2->b, tmp1->b, GW, GH, medianTypeAB, lp.it, multiThread, tmL);
@ -10889,9 +10885,11 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o
bufgb->L[y - ystart][x - xstart] = original->L[y][x];
}
}
Imagefloat *tmpImage = nullptr;
tmpImage = new Imagefloat(bfw, bfh);
lab2rgb(*tmp1, *tmpImage, params->icm.workingProfile);
array2D<float> LL(bfw, bfh);
array2D<float> rr(bfw, bfh);
array2D<float> gg(bfw, bfh);
array2D<float> bb(bfw, bfh);
@ -10901,23 +10899,24 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o
for (int y = 0; y < bfh ; y++) {
for (int x = 0; x < bfw; x++) {
LL[y][x] = tmp1->L[y][x];
rr[y][x] = tmpImage->r(y, x);
gg[y][x] = tmpImage->g(y, x);
bb[y][x] = tmpImage->b(y, x);
}
}
int r = max(int(lp.guidb / sk), 1);
const float epsil = 0.001f * std::pow(2, - lp.epsb);
if (lp.chromet == 0) {
rtengine::guidedFilterLog(10.f, gg, r, epsil, multiThread);
}
else if (lp.chromet == 1) {
rtengine::guidedFilterLog(10.f, LL, r, epsil, multiThread);
} else if (lp.chromet == 1) {
rtengine::guidedFilterLog(10.f, rr, r, epsil, multiThread);
rtengine::guidedFilterLog(10.f, bb, r, epsil, multiThread);
}
else if (lp.chromet == 2) {
} else if (lp.chromet == 2) {
rtengine::guidedFilterLog(10.f, gg, r, epsil, multiThread);
rtengine::guidedFilterLog(10.f, rr, r, epsil, multiThread);
rtengine::guidedFilterLog(10.f, bb, r, epsil, multiThread);
@ -10929,15 +10928,27 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o
for (int y = 0; y < bfh ; y++) {
for (int x = 0; x < bfw; x++) {
tmpImage->r(y, x)= rr[y][x];
tmpImage->g(y, x)= gg[y][x];
tmpImage->b(y, x)= bb[y][x];
tmpImage->r(y, x) = rr[y][x];
tmpImage->g(y, x) = gg[y][x];
tmpImage->b(y, x) = bb[y][x];
}
}
rgb2lab(*tmpImage, *tmp1, params->icm.workingProfile);
if (lp.chromet == 0) {
#ifdef _OPENMP
#pragma omp parallel for schedule(dynamic,16)
#endif
for (int y = 0; y < bfh ; y++) {
for (int x = 0; x < bfw; x++) {
tmp1->L[y][x] = LL[y][x];
}
}
}
delete tmpImage;
}
@ -10960,6 +10971,7 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o
Imagefloat *tmpImage = nullptr;
tmpImage = new Imagefloat(GW, GH);
lab2rgb(*tmp1, *tmpImage, params->icm.workingProfile);
array2D<float> LL(GW, GH);
array2D<float> rr(GW, GH);
array2D<float> gg(GW, GH);
array2D<float> bb(GW, GH);
@ -10969,23 +10981,24 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o
for (int y = 0; y < GH ; y++) {
for (int x = 0; x < GW; x++) {
LL[y][x] = tmp1->L[y][x];
rr[y][x] = tmpImage->r(y, x);
gg[y][x] = tmpImage->g(y, x);
bb[y][x] = tmpImage->b(y, x);
}
}
int r = max(int(lp.guidb / sk), 1);
const float epsil = 0.001f * std::pow(2, - lp.epsb);
if (lp.chromet == 0) {
rtengine::guidedFilterLog(10.f, gg, r, epsil, multiThread);
}
else if (lp.chromet == 1) {
rtengine::guidedFilterLog(10.f, LL, r, epsil, multiThread);
} else if (lp.chromet == 1) {
rtengine::guidedFilterLog(10.f, rr, r, epsil, multiThread);
rtengine::guidedFilterLog(10.f, bb, r, epsil, multiThread);
}
else if (lp.chromet == 2) {
} else if (lp.chromet == 2) {
rtengine::guidedFilterLog(10.f, gg, r, epsil, multiThread);
rtengine::guidedFilterLog(10.f, rr, r, epsil, multiThread);
rtengine::guidedFilterLog(10.f, bb, r, epsil, multiThread);
@ -10997,15 +11010,27 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o
for (int y = 0; y < GH ; y++) {
for (int x = 0; x < GW; x++) {
tmpImage->r(y, x)= rr[y][x];
tmpImage->g(y, x)= gg[y][x];
tmpImage->b(y, x)= bb[y][x];
tmpImage->r(y, x) = rr[y][x];
tmpImage->g(y, x) = gg[y][x];
tmpImage->b(y, x) = bb[y][x];
}
}
rgb2lab(*tmpImage, *tmp1, params->icm.workingProfile);
if (lp.chromet == 0) {
#ifdef _OPENMP
#pragma omp parallel for schedule(dynamic,16)
#endif
for (int y = 0; y < GH ; y++) {
for (int x = 0; x < GW; x++) {
tmp1->L[y][x] = LL[y][x];
}
}
}
delete tmpImage;
}