diff --git a/rtengine/improcfun.h b/rtengine/improcfun.h index 8510ef83e..d9e60eac3 100644 --- a/rtengine/improcfun.h +++ b/rtengine/improcfun.h @@ -210,7 +210,7 @@ public: void EPDToneMapResid(float * WavCoeffs_L0, unsigned int Iterates, int skip, struct cont_params& cp, int W_L, int H_L, float max0, float min0); void CompressDR(float *Source, int W_L, int H_L, float Compression, float DetailBoost); - void Compresslevels(float **Source, int W_L, int H_L, float compression, float detailBoost, float thres, float maxp, float maxn); + void Compresslevels(float **Source, int W_L, int H_L, float compression, float detailBoost, float thres);//, float maxp, float maxn); void ContrastResid(float * WavCoeffs_L0, struct cont_params &cp, int W_L, int H_L, float max0, float min0); void EPDToneMap(LabImage *lab, unsigned int Iterates = 0, int skip = 1); diff --git a/rtengine/iplocallab.cc b/rtengine/iplocallab.cc index 4468b1b37..cbc2dc07f 100644 --- a/rtengine/iplocallab.cc +++ b/rtengine/iplocallab.cc @@ -7044,12 +7044,12 @@ void ImProcFunctions::wavcbd(wavelet_decomposition &wdspot, int level_bl, int ma } -void ImProcFunctions::Compresslevels(float **Source, int W_L, int H_L, float compression, float detailBoost, float thres, float maxp, float maxn) +void ImProcFunctions::Compresslevels(float **Source, int W_L, int H_L, float compression, float detailBoost, float thres)//, float maxp, float maxn) { //J.Desmis 12-2019 float exponent; - printf("maxp=%f maxn=%f\n", maxp, maxn); + // printf("maxp=%f maxn=%f\n", maxp, maxn); if (detailBoost > 0.f && detailBoost < 0.05f) { float betemp = expf(-(2.f - detailBoost + 0.693147f)) - 1.f; //0.69315 = log(2) exponent = 1.2f * xlogf(-betemp); @@ -7178,10 +7178,10 @@ void ImProcFunctions::wavcont(wavelet_decomposition &wdspot, float ****templevel } float thresref = mean[level]; - float thresreal = 0.2f * thres * thresref;//to take into account noise and artifacts + float thresreal = 0.1f * thres * thresref;//to take into account noise and artifacts + // printf("mean=%f sig=%f\n", mean[level], sigma[level]); - - Compresslevels(templevel[dir - 1][level], W_L, H_L, compression, detailBoost, thresreal, MaxP[level], MaxN[level]); + Compresslevels(templevel[dir - 1][level], W_L, H_L, compression, detailBoost, thresreal);//, MaxP[level], MaxN[level]); } } } diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index 50fd52644..26c824f0b 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -2729,7 +2729,7 @@ LocallabParams::LocallabSpot::LocallabSpot() : residcomp(0.0), sigma(1.0), offset(1.0), - threswav(0.1), + threswav(0.05), chromalev(1.0), chromablu(1.0), fatdet(40.0), diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc index e084f319c..72f7bef9f 100644 --- a/rtgui/locallab.cc +++ b/rtgui/locallab.cc @@ -582,7 +582,7 @@ residchro(Gtk::manage(new Adjuster(M("TP_LOCALLAB_RESIDCHRO"), -100., 100., 1., residcomp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_RESIDCOMP"), -1., 1., 0.01, 0.))), sigma(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SIGMAWAV"), 0.2, 2.5, 0.01, 1.))), offset(Gtk::manage(new Adjuster(M("TP_LOCALLAB_OFFSETWAV"), 0.33, 1.66, 0.01, 1., Gtk::manage(new RTImage("circle-black-small.png")), Gtk::manage(new RTImage("circle-white-small.png"))))), -threswav(Gtk::manage(new Adjuster(M("TP_LOCALLAB_THRESWAV"), 0.001, 1., 0.001, 0.1))), +threswav(Gtk::manage(new Adjuster(M("TP_LOCALLAB_THRESWAV"), 0.001, 1., 0.001, 0.05))), chromalev(Gtk::manage(new Adjuster(M("TP_LOCALLAB_CHROMALEV"), 0.01, 2., 0.01, 1.))), chromablu(Gtk::manage(new Adjuster(M("TP_LOCALLAB_CHROMABLU"), 0.01, 2., 0.01, 1.))), fatdet(Gtk::manage(new Adjuster(M("TP_LOCALLAB_FATDETAIL"), -100., 300., 1., 0.))),