diff --git a/rtengine/ipretinex.cc b/rtengine/ipretinex.cc index 440bc6989..e11b6514f 100644 --- a/rtengine/ipretinex.cc +++ b/rtengine/ipretinex.cc @@ -1145,14 +1145,6 @@ void ImProcFunctions::MSRLocal(int sp, bool fftw, int lum, float** reducDE, LabI const int H_L = height; const int W_L = width; - /* - float *src[H_L] ALIGNED16; - float *srcBuffer = new float[H_L * W_L]; - - for (int i = 0; i < H_L; i++) { - src[i] = &srcBuffer[i * W_L]; - } - */ std::unique_ptr> srcBuffer(new JaggedArray(W_L, H_L)); float** src = *(srcBuffer.get()); @@ -1245,7 +1237,6 @@ void ImProcFunctions::MSRLocal(int sp, bool fftw, int lum, float** reducDE, LabI } if (scale == 1) { //equalize last scale with darkness and lightness of course acts on TM! - if (dar != 1.f || lig != 1.f) { #ifdef _OPENMP @@ -1260,6 +1251,7 @@ void ImProcFunctions::MSRLocal(int sp, bool fftw, int lum, float** reducDE, LabI } } } + } #ifdef _OPENMP @@ -1299,10 +1291,11 @@ void ImProcFunctions::MSRLocal(int sp, bool fftw, int lum, float** reducDE, LabI } - srcBuffer.reset(); +// srcBuffer.reset(); if (scal == 1) {//only if user select scal = 1 + float kval = 1.f; #ifdef _OPENMP #pragma omp parallel for @@ -1368,8 +1361,10 @@ void ImProcFunctions::MSRLocal(int sp, bool fftw, int lum, float** reducDE, LabI buf *= 32768.f; luminance[i][j] = buf; } + } + srcBuffer.reset(); float str = strength * (chrome == 0 ? 1.f : 0.8f * (chrT - 0.4f)); const float maxclip = (chrome == 0 ? 32768.f : 50000.f); diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index c63bcdd7a..d5904eb6d 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -2643,7 +2643,7 @@ LocallabParams::LocallabSpot::LocallabSpot() : lightnessreti(1.0), limd(8.0), cliptm(1.0), - fftwreti(true), + fftwreti(false), Lmaskreticurve{(double)DCT_NURBS, 0.0, 0.0, 1.0, 1.0}, // Sharpening expsharp(false), diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc index 623ff3c21..76f5dda91 100644 --- a/rtgui/locallab.cc +++ b/rtgui/locallab.cc @@ -307,7 +307,7 @@ Locallab::Locallab(): 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.))), lapmaskreti(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LAPMASKCOL"), 0.0, 100.0, 0.1, 0.))), - scalereti(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SCALERETI"), 2.0, 10.0, 1., 2.))), + 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, 6.0, 0.01, 2.0))), lightnessreti(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LIGHTRETI"), 0.01, 4.0, 0.01, 1.))), limd(Gtk::manage(new Adjuster(M("TP_LOCALLAB_THRESRETI"), 1.2, 100.0, 0.1, 8.))),