diff --git a/rtengine/iplocallab.cc b/rtengine/iplocallab.cc index a5e8fb000..95e52c379 100644 --- a/rtengine/iplocallab.cc +++ b/rtengine/iplocallab.cc @@ -463,7 +463,7 @@ static void calcLocalParams(int sp, int oW, int oH, const LocallabParams& locall float blurexpo = (float) locallab.spots.at(sp).blurexpde; float blurcolor = (float) locallab.spots.at(sp).blurcolde; int local_transit = locallab.spots.at(sp).transit; - double radius = (double) locallab.spots.at(sp).radius; + double radius = locallab.spots.at(sp).radius; double sharradius = ((double) locallab.spots.at(sp).sharradius); double lcamount = ((double) locallab.spots.at(sp).lcamount); double sharblurr = ((double) locallab.spots.at(sp).sharblur); @@ -4601,7 +4601,7 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o noiscfactiv = false; } - if (lp.inv || lp.invret || lp.invex) { //exterior || lp.curvact + if (lp.inv || lp.invret || lp.invex) { //exterior ave = 0.f; n = 0; #pragma omp parallel for reduction(+:ave,n) diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index ae21bcd86..90a81c20b 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -2420,7 +2420,7 @@ LocallabParams::LocallabSpot::LocallabSpot() : explabregion(false), // Blur & Noise expblur(false), - radius(1), + radius(1.0), strength(0), sensibn(40), blurMethod("norm"), diff --git a/rtengine/procparams.h b/rtengine/procparams.h index bd6aa97f5..d98e5ca55 100644 --- a/rtengine/procparams.h +++ b/rtengine/procparams.h @@ -1022,7 +1022,7 @@ struct LocallabParams { // ColorToningParams::LabCorrectionRegion Labcorr; // Blur & Noise bool expblur; - int radius; + double radius; int strength; int sensibn; Glib::ustring blurMethod; diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc index 9aea2030c..30d06ad2f 100644 --- a/rtgui/locallab.cc +++ b/rtgui/locallab.cc @@ -101,7 +101,7 @@ Locallab::Locallab(): streng(Gtk::manage(new Adjuster(M("TP_LOCALLAB_STRENG"), 1, 100, 1, 1))), sensisf(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SENSI"), 1, 100, 1, 15))), // Blur & Noise - radius(Gtk::manage(new Adjuster(M("TP_LOCALLAB_RADIUS"), 1, 100, 1, 1))), + radius(Gtk::manage(new Adjuster(M("TP_LOCALLAB_RADIUS"), 1.0, 100.0, 0.1, 1.0))), strength(Gtk::manage(new Adjuster(M("TP_LOCALLAB_STRENGTH"), 0, 100, 1, 0))), sensibn(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SENSIBN"), 0, 100, 1, 40))), // Tone Mapping @@ -1579,7 +1579,7 @@ void Locallab::write(ProcParams* pp, ParamsEdited* pedited) pp->locallab.spots.at(pp->locallab.selspot).sensisf = sensisf->getIntValue(); // Blur & Noise pp->locallab.spots.at(pp->locallab.selspot).expblur = expblur->getEnabled(); - pp->locallab.spots.at(pp->locallab.selspot).radius = radius->getIntValue(); + pp->locallab.spots.at(pp->locallab.selspot).radius = radius->getValue(); pp->locallab.spots.at(pp->locallab.selspot).strength = strength->getIntValue(); pp->locallab.spots.at(pp->locallab.selspot).sensibn = sensibn->getIntValue(); @@ -2642,7 +2642,7 @@ void Locallab::setDefaults(const ProcParams * defParams, const ParamsEdited * pe streng->setDefault((double)defSpot->streng); sensisf->setDefault((double)defSpot->sensisf); // Blur & Noise - radius->setDefault((double)defSpot->radius); + radius->setDefault(defSpot->radius); strength->setDefault((double)defSpot->strength); sensibn->setDefault((double)defSpot->sensibn); // Tone Mapping