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

Fixed bad behavior in mask denoise and smooth

Browse Source
This commit is contained in:
Desmis 2019-09-10 19:43:06 +02:00
parent bdf426304e
commit 3fcd11489e
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rtengine/iplocallab.cc
View File

@ -6478,13 +6478,13 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o
//Prepare mask for Blur and noise and Denoise //Prepare mask for Blur and noise and Denoise
bool denoiz = false; bool denoiz = false;
if (((lp.noiself > 0.f || lp.noiself0 > 0.f || lp.noiself2 > 0.f || lp.noiselc > 0.f || lp.noisecf > 0.f || lp.noisecc > 0.f || lp.bilat > 0.f))) { if (((lp.noiself > 0.f || lp.noiself0 > 0.f || lp.noiself2 > 0.f || lp.noiselc > 0.f || lp.noisecf > 0.f || lp.noisecc > 0.f || lp.bilat > 0.f) && lp.denoiena)) {
denoiz = true; denoiz = true;
} }
bool blurz = false; bool blurz = false;
if (((radius >= 1.5 * GAUSS_SKIP && lp.rad > 1.) || lp.stren > 0.1 || lp.blmet == 1 || lp.guidb > 1 || lp.showmaskblmet == 2 || lp.enablMask || lp.showmaskblmet == 3 || lp.showmaskblmet == 4)) { if (((radius >= 1.5 * GAUSS_SKIP && lp.rad > 1.) || lp.stren > 0.1 || lp.blmet == 1 || lp.guidb > 1 || lp.showmaskblmet == 2 || lp.enablMask || lp.showmaskblmet == 3 || lp.showmaskblmet == 4) && lp.blurena) {
blurz = true; blurz = true;
} }
@ -6494,8 +6494,7 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o
LabImage * originalmaskbl = nullptr; LabImage * originalmaskbl = nullptr;
std::unique_ptr<LabImage> bufmaskorigbl; std::unique_ptr<LabImage> bufmaskorigbl;
std::unique_ptr<LabImage> bufmaskblurbl; std::unique_ptr<LabImage> bufmaskblurbl;
// std::unique_ptr<LabImage> originalmaskbl; std::unique_ptr<LabImage> bufgb;
std::unique_ptr<LabImage> bufgb; //(new LabImage(GW, GH));
if (denoiz || blurz || lp.denoiena || lp.blurena) { if (denoiz || blurz || lp.denoiena || lp.blurena) {
bufgb.reset(new LabImage(GW, GH)); bufgb.reset(new LabImage(GW, GH));
@ -6503,7 +6502,6 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o
if (lp.showmaskblmet == 2 || lp.enablMask || lp.showmaskblmet == 3 || lp.showmaskblmet == 4) { if (lp.showmaskblmet == 2 || lp.enablMask || lp.showmaskblmet == 3 || lp.showmaskblmet == 4) {
bufmaskorigbl.reset(new LabImage(GW, GH)); bufmaskorigbl.reset(new LabImage(GW, GH));
bufmaskblurbl.reset(new LabImage(GW, GH)); bufmaskblurbl.reset(new LabImage(GW, GH));
// originalmaskbl.reset(new LabImage(GW, GH));
originalmaskbl = new LabImage(GW, GH); originalmaskbl = new LabImage(GW, GH);
} }
@ -6631,11 +6629,6 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o
} }
// if (lp.showmaskblmet == 2 || lp.enablMask || lp.showmaskblmet == 3 || lp.showmaskblmet == 4) {
// delete originalmaskbl;
// }
//end mask //end mask