diff --git a/rtengine/ipretinex.cc b/rtengine/ipretinex.cc index bf0bb8f3d..b58bf94ac 100644 --- a/rtengine/ipretinex.cc +++ b/rtengine/ipretinex.cc @@ -925,10 +925,7 @@ void ImProcFunctions::MSRLocal(int sp, bool fftw, int lum, LabImage * bufreti, L const int H_L = height; const int W_L = width; - - // array2D src(W_L, H_L); - // array2D out(W_L, H_L); - + float *src[H_L] ALIGNED16; float *srcBuffer = new float[H_L * W_L]; @@ -1376,7 +1373,7 @@ void ImProcFunctions::MSRLocal(int sp, bool fftw, int lum, LabImage * bufreti, L avg /= ng; avg /= 32768.f; avg = LIM01(avg); - float contreal = 2.f * vart; + float contreal = 0.5f * vart; DiagonalCurve reti_contrast({ DCT_NURBS, 0, 0, diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index eb11372c5..7bf6bd230 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -2578,15 +2578,15 @@ LocallabParams::LocallabSpot::LocallabSpot() : retinexMethod("high"), str(0.0), chrrt(0.0), - neigh(0.1), - vart(0.1), + neigh(40.0), + vart(100.0), dehaz(0), depth(25), sensih(30), localTgaincurve{(double)FCT_MinMaxCPoints, 0.0, 0.12, 0.35, 0.35, 0.70, 0.50, 0.35, 0.35, 1.00, 0.12, 0.35, 0.35}, inversret(false), equilret(true), - loglin(true), + loglin(false), softradiusret(0.0), CCmaskreticurve{(double)FCT_MinMaxCPoints, 0.0, 1.0, 0.35, 0.35, 0.50, 1.0, 0.35, 0.35, 1.0, 1.0, 0.35, 0.35 }, LLmaskreticurve{(double)FCT_MinMaxCPoints, 0.0, 1.0, 0.35, 0.35, 0.50, 1.0, 0.35, 0.35, 1.0, 1.0, 0.35, 0.35}, @@ -2598,8 +2598,8 @@ LocallabParams::LocallabSpot::LocallabSpot() : chromaskreti(0.0), gammaskreti(1.0), slomaskreti(0.0), - scalereti(1.0), - darkness(1.0), + scalereti(2.0), + darkness(2.0), lightnessreti(1.0), limd(8.0), fftwreti(false), diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc index 0ea00b036..2a0120180 100644 --- a/rtgui/locallab.cc +++ b/rtgui/locallab.cc @@ -267,8 +267,8 @@ Locallab::Locallab(): // Retinex str(Gtk::manage(new Adjuster(M("TP_LOCALLAB_STR"), 0., 100., 0.1, 0.0))), chrrt(Gtk::manage(new Adjuster(M("TP_LOCALLAB_CHRRT"), 0.0, 100.0, 0.1, 0.0))), - neigh(Gtk::manage(new Adjuster(M("TP_LOCALLAB_NEIGH"), MINNEIGH, MAXNEIGH, 0.5, 0.1, nullptr, nullptr, &retiSlider2neigh, &retiNeigh2Slider))), - vart(Gtk::manage(new Adjuster(M("TP_LOCALLAB_VART"), 0.1, 500., 0.1, 0.1))), + neigh(Gtk::manage(new Adjuster(M("TP_LOCALLAB_NEIGH"), MINNEIGH, MAXNEIGH, 0.5, 40., nullptr, nullptr, &retiSlider2neigh, &retiNeigh2Slider))), + vart(Gtk::manage(new Adjuster(M("TP_LOCALLAB_VART"), 0.1, 500., 0.1, 100.))), dehaz(Gtk::manage(new Adjuster(M("TP_LOCALLAB_DEHAZ"), 0, 100, 1, 0))), depth(Gtk::manage(new Adjuster(M("TP_LOCALLAB_DEPTH"), 0, 100, 1, 25))), sensih(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SENSIH"), 0, 100, 1, 30))), @@ -278,8 +278,8 @@ Locallab::Locallab(): chromaskreti(Gtk::manage(new Adjuster(M("TP_LOCALLAB_CHROMASKCOL"), -100.0, 100.0, 0.1, 0.))), gammaskreti(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GAMMASKCOL"), 0.05, 5.0, 0.01, 1.))), slomaskreti(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SLOMASKCOL"), 0.0, 15.0, 0.1, 0.))), - scalereti(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SCALERETI"), 1.0, 10.0, 1., 1.))), - darkness(Gtk::manage(new Adjuster(M("TP_LOCALLAB_DARKRETI"), 0.01, 3.0, 0.01, 1.))), + scalereti(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SCALERETI"), 1.0, 10.0, 1., 2.))), + darkness(Gtk::manage(new Adjuster(M("TP_LOCALLAB_DARKRETI"), 0.01, 4.0, 0.01, 2.0))), lightnessreti(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LIGHTRETI"), 0.01, 3.0, 0.01, 1.))), limd(Gtk::manage(new Adjuster(M("TP_LOCALLAB_THRESRETI"), 1.2, 100.0, 0.1, 8.))), // Sharpening @@ -352,8 +352,8 @@ Locallab::Locallab(): enatmMask(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_ENABLE_MASK")))), // Retinex equilret(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_EQUIL")))), - loglin(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_LOGLIN")))), inversret(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_INVERS")))), + loglin(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_LOGLIN")))), enaretiMask(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_ENABLE_MASK")))), enaretiMasktmap(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_TM_MASK")))), fftwreti(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_FFTW")))), @@ -6377,11 +6377,9 @@ void Locallab::adjusterChanged(Adjuster * a, double newval) if (a == scalereti) { if (scalereti->getValue() == 1) { - // limd->hide(); LocalcurveEditorgainT->hide(); retinexMethod->hide(); } else { - // limd->show(); LocalcurveEditorgainT->show(); retinexMethod->show(); }