From f69fd2ddec950ad38dfcc1a7564084b4d10466d0 Mon Sep 17 00:00:00 2001 From: Desmis Date: Wed, 18 Sep 2019 13:00:17 +0200 Subject: [PATCH] Re-enabled chroma detail DCT - denoise --- rtengine/iplocallab.cc | 8 ++++---- rtengine/procparams.cc | 2 +- rtgui/locallab.cc | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rtengine/iplocallab.cc b/rtengine/iplocallab.cc index a13c9b2a1..4fef8fee6 100644 --- a/rtengine/iplocallab.cc +++ b/rtengine/iplocallab.cc @@ -5947,9 +5947,9 @@ void ImProcFunctions::DeNoise(int call, int del, float * slidL, float * slida, f if (!adecomp.memoryAllocationFailed) { if ((lp.noisecf >= 0.1f || lp.noisecc >= 0.1f)) { - if (lp.noisechrodetail > 1000) { //to avoid all utilisation + // if (lp.noisechrodetail > 1000) { //to avoid all utilisation fftw_denoise(GW, GH, max_numblox_W, min_numblox_W, tmp1.a, Ain, numThreads, lp, 1); - } + // } } @@ -5977,12 +5977,12 @@ void ImProcFunctions::DeNoise(int call, int del, float * slidL, float * slida, f if (!bdecomp.memoryAllocationFailed) { - if ((lp.noisecf >= 0.1f || lp.noisecc >= 0.1f)) { + // if ((lp.noisecf >= 0.1f || lp.noisecc >= 0.1f)) { if (lp.noisechrodetail > 1000) {//to avoid all utilisation fftw_denoise(GW, GH, max_numblox_W, min_numblox_W, tmp1.b, Bin, numThreads, lp, 1); } - } + // } } diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index 591e9cc90..76f04d00d 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -2656,7 +2656,7 @@ LocallabParams::LocallabSpot::LocallabSpot() : noiselequal(7), noisechrof(0), noisechroc(0), - noisechrodetail(0), + noisechrodetail(90), adjblur(0), bilateral(0), sensiden(20) diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc index 9e5772b01..5b44a43ef 100644 --- a/rtgui/locallab.cc +++ b/rtgui/locallab.cc @@ -325,7 +325,7 @@ Locallab::Locallab(): noiselequal(Gtk::manage(new Adjuster(M("TP_LOCALLAB_NOISELEQUAL"), -2, 10, 1, 7, Gtk::manage(new RTImage("circle-white-small.png")), Gtk::manage(new RTImage("circle-black-small.png"))))), noisechrof(Gtk::manage(new Adjuster(M("TP_LOCALLAB_NOISECHROFINE"), MINCHRO, MAXCHRO, 1, 0))), noisechroc(Gtk::manage(new Adjuster(M("TP_LOCALLAB_NOISECHROCOARSE"), MINCHRO, MAXCHROCC, 1, 0))), - noisechrodetail(Gtk::manage(new Adjuster(M("TP_LOCALLAB_NOISECHRODETAIL"), 0, 100, 1, 0))), + noisechrodetail(Gtk::manage(new Adjuster(M("TP_LOCALLAB_NOISECHRODETAIL"), 0, 100, 1, 90))), adjblur(Gtk::manage(new Adjuster(M("TP_LOCALLAB_ADJ"), -100., 100., 1., 0., Gtk::manage(new RTImage("circle-blue-small.png")), Gtk::manage(new RTImage("circle-red-small.png"))))), bilateral(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BILATERAL"), 0, 100, 1, 0))), sensiden(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SENSIDEN"), 0, 100, 1, 20))), @@ -1966,7 +1966,7 @@ Locallab::Locallab(): wavBox->pack_start(*noiselequal); wavBox->pack_start(*noisechrof); wavBox->pack_start(*noisechroc); - // wavBox->pack_start(*noisechrodetail); // Uncomment this line to use the noisechrodetail adjuster + wavBox->pack_start(*noisechrodetail); // Uncomment this line to use the noisechrodetail adjuster wavBox->pack_start(*adjblur); wavFrame->add(*wavBox); denoisBox->pack_start(*wavFrame);