diff --git a/rtdata/languages/default b/rtdata/languages/default index 1d0bc0e6b..e5c850183 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -932,7 +932,7 @@ HISTORY_MSG_685;Local - Retinex mask chroma HISTORY_MSG_686;Local - Retinex mask gamma HISTORY_MSG_687;Local - Retinex mask slope HISTORY_MSG_689;Local - Retinex mask transmission map -HISTORY_MSG_690;Local - Retinex blend with original +HISTORY_MSG_690;Local - Retinex scale HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction HISTORY_MSG_COLORTONING_LABREGION_AB;CT - Color correction @@ -1987,7 +1987,7 @@ TP_LOCALLAB_AVOID;Avoid color shift TP_LOCALLAB_BALAN;Balance deltaE ab-L TP_LOCALLAB_BILATERAL;Bilateral filter TP_LOCALLAB_BLENDMASKCOL;Blend -TP_LOCALLAB_BLENDRETI;Blend Luminance with original +TP_LOCALLAB_SCALERETI;Scale TP_LOCALLAB_BLMETHOD_TOOLTIP;Normal - direct blur and noise with all settings.\nInverse - Inverse blur and noise without scope and whithout enhanced algorithm.\nSymmetric - inverse blur and noise with all settings. Be careful some results may be curious TP_LOCALLAB_BLUFR;Blur & Noise TP_LOCALLAB_BLURDE;Blur Shape detection diff --git a/rtengine/iplocallab.cc b/rtengine/iplocallab.cc index 9c1e85780..34f18a58b 100644 --- a/rtengine/iplocallab.cc +++ b/rtengine/iplocallab.cc @@ -2310,7 +2310,6 @@ void ImProcFunctions::transit_shapedetect_retinex(int senstype, LabImage * bufex const float refb = chromaref * sin(hueref); const bool retishow = ((lp.showmaskretimet == 1 || lp.showmaskretimet == 2)); const bool previewreti = ((lp.showmaskretimet == 4)); - //balance deltaE float kL = lp.balance; float kab = 1.f; @@ -2321,7 +2320,8 @@ void ImProcFunctions::transit_shapedetect_retinex(int senstype, LabImage * bufex } std::unique_ptr origblur(new LabImage(GW, GH)); const float radius = 3.f / sk; - const bool usemaskreti = (lp.showmaskretimet == 2 || lp.enaretiMask || lp.showmaskretimet == 4) && senstype == 4 && !lp.enaretiMasktmap; + const bool usemaskreti = lp.enaretiMask && senstype == 4 && !lp.enaretiMasktmap; + float strcli = 0.03f * lp.str; #ifdef _OPENMP #pragma omp parallel #endif @@ -2341,7 +2341,6 @@ void ImProcFunctions::transit_shapedetect_retinex(int senstype, LabImage * bufex const float maxdE = 5.f + MAXSCOPE * varsens * (1 + 0.1f * lp.thr); const float mindElim = 2.f + MINSCOPE * limscope * lp.thr; const float maxdElim = 5.f + MAXSCOPE * limscope * (1 + 0.1f * lp.thr); -printf("OK use3\n"); #ifdef _OPENMP #pragma omp for schedule(dynamic,16) @@ -2377,11 +2376,11 @@ printf("OK use3\n"); float rL = origblur->L[y][x] / 327.68f; float dE; - // if(!usemaskreti) { + if(!usemaskreti) { dE = sqrt(kab * SQR(refa - origblur->a[y][x] / 327.68f) + kab * SQR(refb - origblur->b[y][x] / 327.68f) + kL * SQR(lumaref - rL)); - // } else { - // dE = sqrt(kab * SQR(refa - buforigmas->a[loy - begy][lox - begx] / 327.68f) + kab * SQR(refb - buforigmas->b[loy - begy][lox - begx] / 327.68f) + kL * SQR(lumaref - buforigmas->L[loy - begy][lox - begx] / 327.68f)); - // } + } else { + dE = sqrt(kab * SQR(refa - buforigmas->a[loy - begy][lox - begx] / 327.68f) + kab * SQR(refb - buforigmas->b[loy - begy][lox - begx] / 327.68f) + kL * SQR(lumaref - buforigmas->L[loy - begy][lox - begx] / 327.68f)); + } float cli = buflight[loy - begy][lox - begx]; //float clc = bufchro[loy - begy][lox - begx]; float clc = previewreti ? settings->previewselection * 100.f : bufchro[loy - begy][lox - begx]; @@ -2394,7 +2393,7 @@ printf("OK use3\n"); reducdE /= 100.f; cli *= reducdE; clc *= reducdE; - + cli *= (1.f + strcli); if (rL > 0.1f) { //to avoid crash with very low gamut in rare cases ex : L=0.01 a=0.5 b=-0.9 if (senstype == 4) {//all except color and light (TODO) and exposure float lightc = bufexporig->L[loy - begy][lox - begx]; @@ -2407,7 +2406,7 @@ printf("OK use3\n"); if(!showmas) transformed->L[y][x] = CLIP(original->L[y][x] + diflc); else transformed->L[y][x] = bufmask->L[loy - begy][lox - begx]; ; //bufexporig->L[loy - begy][lox - begx]; if(retishow) { - transformed->L[y][x] = CLIP(12000.f + diflc2); + transformed->L[y][x] = CLIP(12000.f + diflc); } } diff --git a/rtengine/ipretinex.cc b/rtengine/ipretinex.cc index 69b0964ea..f81bf01e2 100644 --- a/rtengine/ipretinex.cc +++ b/rtengine/ipretinex.cc @@ -852,16 +852,17 @@ void ImProcFunctions::MSRLocal(int sp, int lum, LabImage * bufreti, LabImage * b float mean, stddv, maxtr, mintr; float delta; constexpr float eps = 2.f; - constexpr bool useHslLin = false;//never used + bool useHslLin = false; const float offse = 0.f; //loc.offs; const float chrT = (float)(loc.spots.at(sp).chrrt) / 100.f; - const int scal = scall;//3;//loc.scale;; + const int scal = (loc.spots.at(sp).scalereti); const float vart = loc.spots.at(sp).vart / 100.f;//variance const float strength = loc.spots.at(sp).str / 100.f; // Blend with original L channel data float limD = 10.f;//(float) loc.limd; limD = pow(limD, 1.7f); //about 2500 enough float ilimD = 1.f / limD; const float elogt = 2.71828f; + if(scal <= 3) useHslLin = true; //empirical skip evaluation : very difficult because quasi all parameters interfere //to test on several images @@ -880,7 +881,7 @@ void ImProcFunctions::MSRLocal(int sp, int lum, LabImage * bufreti, LabImage * b } else if (loc.spots.at(sp).retinexMethod == "low") { moderetinex = 1; } else { - if (loc.spots.at(sp).retinexMethod == "high") { // default to 2 ( deh.retinexMethod == "high" ) + if (loc.spots.at(sp).retinexMethod == "high") { moderetinex = 2; } } @@ -1267,7 +1268,6 @@ void ImProcFunctions::MSRLocal(int sp, int lum, LabImage * bufreti, LabImage * b // float absciss; float cdmax = -999999.f, cdmin = 999999.f; float gan = 0.5f; - float blreti = 0.01f * loc.spots.at(sp).blendreti; #ifdef _OPENMP #pragma omp for schedule(dynamic,16) @@ -1294,7 +1294,6 @@ void ImProcFunctions::MSRLocal(int sp, int lum, LabImage * bufreti, LabImage * b cdmax = cd > cdmax ? cd : cdmax; cdmin = cd < cdmin ? cd : cdmin; luminance[i][j] = LIM(cd, 0.f, maxclip) * str + (1.f - str) * originalLuminance[i][j]; -// luminance[i][j] = blreti * luminance[i][j] + (1.f - blreti) * originalLuminance[i][j]; } #ifdef _OPENMP diff --git a/rtengine/procevents.h b/rtengine/procevents.h index d9d4f3275..ce0a901b6 100644 --- a/rtengine/procevents.h +++ b/rtengine/procevents.h @@ -716,7 +716,7 @@ enum ProcEventCode { Evlocallabslomaskreti = 686, EvlocallabshowmaskretiMethod = 687, EvLocallabEnaretiMasktmap = 688, - Evlocallabblendreti = 689, + Evlocallabscalereti = 689, NUMOFEVENTS }; diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index 308ab44d9..b53e34504 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -2471,7 +2471,7 @@ LocallabParams::LocallabSpot::LocallabSpot() : retinexMethod("high"), str(0.0), chrrt(0), - neigh(170), + neigh(150), vart(70), dehaz(0), sensih(30), @@ -2488,7 +2488,7 @@ LocallabParams::LocallabSpot::LocallabSpot() : chromaskreti(0.0), gammaskreti(1.0), slomaskreti(0.0), - blendreti(80.0), + scalereti(4.0), // Sharpening expsharp(false), sharcontrast(20), @@ -2698,7 +2698,7 @@ bool LocallabParams::LocallabSpot::operator ==(const LocallabSpot& other) const && chromaskreti == other.chromaskreti && gammaskreti == other.gammaskreti && slomaskreti == other.slomaskreti - && blendreti == other.blendreti + && scalereti == other.scalereti // Sharpening && expsharp == other.expsharp && sharcontrast == other.sharcontrast @@ -3864,7 +3864,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo saveToKeyfile(!pedited || pedited->locallab.spots.at(i).chromaskreti, "Locallab", "Chromaskreti_" + std::to_string(i), spot.chromaskreti, keyFile); saveToKeyfile(!pedited || pedited->locallab.spots.at(i).gammaskreti, "Locallab", "Gammaskreti_" + std::to_string(i), spot.gammaskreti, keyFile); saveToKeyfile(!pedited || pedited->locallab.spots.at(i).slomaskreti, "Locallab", "Slomaskreti_" + std::to_string(i), spot.slomaskreti, keyFile); - saveToKeyfile(!pedited || pedited->locallab.spots.at(i).blendreti, "Locallab", "Blendreti_" + std::to_string(i), spot.blendreti, keyFile); + saveToKeyfile(!pedited || pedited->locallab.spots.at(i).scalereti, "Locallab", "Scalereti_" + std::to_string(i), spot.scalereti, keyFile); // Sharpening saveToKeyfile(!pedited || pedited->locallab.spots.at(i).expsharp, "Locallab", "Expsharp_" + std::to_string(i), spot.expsharp, keyFile); saveToKeyfile(!pedited || pedited->locallab.spots.at(i).sharcontrast, "Locallab", "Sharcontrast_" + std::to_string(i), spot.sharcontrast, keyFile); @@ -5171,7 +5171,7 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited) assignFromKeyfile(keyFile, "Locallab", "Chromaskreti_" + std::to_string(i), pedited, spot.chromaskreti, spotEdited.chromaskreti); assignFromKeyfile(keyFile, "Locallab", "Gammaskreti_" + std::to_string(i), pedited, spot.gammaskreti, spotEdited.gammaskreti); assignFromKeyfile(keyFile, "Locallab", "Slomaskreti_" + std::to_string(i), pedited, spot.slomaskreti, spotEdited.slomaskreti); - assignFromKeyfile(keyFile, "Locallab", "Blendreti_" + std::to_string(i), pedited, spot.blendreti, spotEdited.blendreti); + assignFromKeyfile(keyFile, "Locallab", "Scalereti_" + std::to_string(i), pedited, spot.scalereti, spotEdited.scalereti); // Sharpening assignFromKeyfile(keyFile, "Locallab", "Expsharp_" + std::to_string(i), pedited, spot.expsharp, spotEdited.expsharp); assignFromKeyfile(keyFile, "Locallab", "Sharcontrast_" + std::to_string(i), pedited, spot.sharcontrast, spotEdited.sharcontrast); diff --git a/rtengine/procparams.h b/rtengine/procparams.h index e3c3cac96..7733b4ea5 100644 --- a/rtengine/procparams.h +++ b/rtengine/procparams.h @@ -1089,7 +1089,7 @@ struct LocallabParams { double chromaskreti; double gammaskreti; double slomaskreti; - double blendreti; + double scalereti; // Sharpening bool expsharp; int sharcontrast; diff --git a/rtengine/refreshmap.cc b/rtengine/refreshmap.cc index 5242fb9e8..930ad2a15 100644 --- a/rtengine/refreshmap.cc +++ b/rtengine/refreshmap.cc @@ -716,7 +716,7 @@ int refreshmap[rtengine::NUMOFEVENTS] = { LUMINANCECURVE, //Evlocallabslomaskreti LUMINANCECURVE, //EvlocallabshowmaskretiMethod LUMINANCECURVE, //EvLocallabEnaretiMasktmap - LUMINANCECURVE //Evlocallabblendreti + LUMINANCECURVE //Evlocallabscalereti }; diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc index 73db081c2..93bf04990 100644 --- a/rtgui/locallab.cc +++ b/rtgui/locallab.cc @@ -151,17 +151,17 @@ 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, 100, 1, 0))), - neigh(Gtk::manage(new Adjuster(M("TP_LOCALLAB_NEIGH"), 4, 200, 1, 150))), - vart(Gtk::manage(new Adjuster(M("TP_LOCALLAB_VART"), 50, 500, 1, 70))), + neigh(Gtk::manage(new Adjuster(M("TP_LOCALLAB_NEIGH"), 4, 300, 1, 150))), + vart(Gtk::manage(new Adjuster(M("TP_LOCALLAB_VART"), 10, 500, 1, 70))), dehaz(Gtk::manage(new Adjuster(M("TP_LOCALLAB_DEHAZ"), 0, 100, 1, 0))), sensih(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SENSIH"), 0, 100, 1, 30))), softradiusret(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GUIDFILTER"), 0.0, 100.0, 0.1, 0.))), blendmaskreti(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BLENDMASKCOL"), -100, 100, 1, 0))), radmaskreti(Gtk::manage(new Adjuster(M("TP_LOCALLAB_RADMASKCOL"), 0.0, 100.0, 0.1, 10.))), 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.1, 5.0, 0.01, 1.))), + 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.))), - blendreti(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BLENDRETI"), 0.0, 100.0, 0.1, 80.))),//not used + scalereti(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SCALERETI"), 1.0, 10.0, 1., 4.))), // Sharpening sharcontrast(Gtk::manage(new Adjuster(M("TP_SHARPENING_CONTRAST"), 0, 200, 1, 20))), sharradius(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SHARRADIUS"), 0.4, 2.5, 0.01, 0.75))), @@ -909,7 +909,7 @@ Locallab::Locallab(): chromaskreti->setAdjusterListener(this); gammaskreti->setAdjusterListener(this); slomaskreti->setAdjusterListener(this); - blendreti->setAdjusterListener(this); + scalereti->setAdjusterListener(this); ToolParamBlock* const maskretiBox = Gtk::manage(new ToolParamBlock()); maskretiBox->pack_start(*showmaskretiMethod, Gtk::PACK_SHRINK, 4); @@ -925,11 +925,11 @@ Locallab::Locallab(): ToolParamBlock* const retiBox = Gtk::manage(new ToolParamBlock()); retiBox->pack_start(*retinexMethod); - //retiBox->pack_start(*blendreti); retiBox->pack_start(*str); retiBox->pack_start(*chrrt); retiBox->pack_start(*neigh); retiBox->pack_start(*vart); + retiBox->pack_start(*scalereti); retiBox->pack_start(*dehaz); retiBox->pack_start(*softradiusret); retiBox->pack_start(*sensih); @@ -2141,7 +2141,7 @@ void Locallab::write(ProcParams* pp, ParamsEdited* pedited) pp->locallab.spots.at(pp->locallab.selspot).chromaskreti = chromaskreti->getValue(); pp->locallab.spots.at(pp->locallab.selspot).gammaskreti = gammaskreti->getValue(); pp->locallab.spots.at(pp->locallab.selspot).slomaskreti = slomaskreti->getValue(); - pp->locallab.spots.at(pp->locallab.selspot).blendreti = blendreti->getValue(); + pp->locallab.spots.at(pp->locallab.selspot).scalereti = scalereti->getValue(); // Sharpening pp->locallab.spots.at(pp->locallab.selspot).expsharp = expsharp->getEnabled(); pp->locallab.spots.at(pp->locallab.selspot).sharcontrast = sharcontrast->getIntValue(); @@ -2353,7 +2353,7 @@ void Locallab::write(ProcParams* pp, ParamsEdited* pedited) pe->locallab.spots.at(pp->locallab.selspot).chromaskreti = pe->locallab.spots.at(pp->locallab.selspot).chromaskreti || chromaskreti->getEditedState(); pe->locallab.spots.at(pp->locallab.selspot).gammaskreti = pe->locallab.spots.at(pp->locallab.selspot).gammaskreti || gammaskreti->getEditedState(); pe->locallab.spots.at(pp->locallab.selspot).slomaskreti = pe->locallab.spots.at(pp->locallab.selspot).slomaskreti || slomaskreti->getEditedState(); - pe->locallab.spots.at(pp->locallab.selspot).blendreti = pe->locallab.spots.at(pp->locallab.selspot).blendreti || blendreti->getEditedState(); + pe->locallab.spots.at(pp->locallab.selspot).scalereti = pe->locallab.spots.at(pp->locallab.selspot).scalereti || scalereti->getEditedState(); // Sharpening pe->locallab.spots.at(pp->locallab.selspot).expsharp = pe->locallab.spots.at(pp->locallab.selspot).expsharp || !expsharp->get_inconsistent(); pe->locallab.spots.at(pp->locallab.selspot).sharcontrast = pe->locallab.spots.at(pp->locallab.selspot).sharcontrast || sharcontrast->getEditedState(); @@ -2569,7 +2569,7 @@ void Locallab::write(ProcParams* pp, ParamsEdited* pedited) pedited->locallab.spots.at(pp->locallab.selspot).chromaskreti = pedited->locallab.spots.at(pp->locallab.selspot).chromaskreti || chromaskreti->getEditedState(); pedited->locallab.spots.at(pp->locallab.selspot).gammaskreti = pedited->locallab.spots.at(pp->locallab.selspot).gammaskreti || gammaskreti->getEditedState(); pedited->locallab.spots.at(pp->locallab.selspot).slomaskreti = pedited->locallab.spots.at(pp->locallab.selspot).slomaskreti || slomaskreti->getEditedState(); - pedited->locallab.spots.at(pp->locallab.selspot).blendreti = pedited->locallab.spots.at(pp->locallab.selspot).blendreti || blendreti->getEditedState(); + pedited->locallab.spots.at(pp->locallab.selspot).scalereti = pedited->locallab.spots.at(pp->locallab.selspot).scalereti || scalereti->getEditedState(); // Sharpening pedited->locallab.spots.at(pp->locallab.selspot).expsharp = pedited->locallab.spots.at(pp->locallab.selspot).expsharp || !expsharp->get_inconsistent(); pedited->locallab.spots.at(pp->locallab.selspot).sharcontrast = pedited->locallab.spots.at(pp->locallab.selspot).sharcontrast || sharcontrast->getEditedState(); @@ -3622,7 +3622,7 @@ void Locallab::setDefaults(const ProcParams * defParams, const ParamsEdited * pe chromaskreti->setDefault(defSpot->chromaskreti); gammaskreti->setDefault(defSpot->gammaskreti); slomaskreti->setDefault(defSpot->slomaskreti); - blendreti->setDefault(defSpot->blendreti); + scalereti->setDefault(defSpot->scalereti); // Sharpening sharcontrast->setDefault((double)defSpot->sharcontrast); sharradius->setDefault(defSpot->sharradius); @@ -3751,7 +3751,7 @@ void Locallab::setDefaults(const ProcParams * defParams, const ParamsEdited * pe chromaskreti->setDefaultEditedState(Irrelevant); gammaskreti->setDefaultEditedState(Irrelevant); slomaskreti->setDefaultEditedState(Irrelevant); - blendreti->setDefaultEditedState(Irrelevant); + scalereti->setDefaultEditedState(Irrelevant); // Sharpening sharcontrast->setDefaultEditedState(Irrelevant); sharradius->setDefaultEditedState(Irrelevant); @@ -3884,7 +3884,7 @@ void Locallab::setDefaults(const ProcParams * defParams, const ParamsEdited * pe chromaskreti->setDefaultEditedState(defSpotState->chromaskreti ? Edited : UnEdited); gammaskreti->setDefaultEditedState(defSpotState->gammaskreti ? Edited : UnEdited); slomaskreti->setDefaultEditedState(defSpotState->slomaskreti ? Edited : UnEdited); - blendreti->setDefaultEditedState(defSpotState->blendreti ? Edited : UnEdited); + scalereti->setDefaultEditedState(defSpotState->scalereti ? Edited : UnEdited); // Sharpening sharcontrast->setDefaultEditedState(defSpotState->sharcontrast ? Edited : UnEdited); sharradius->setDefaultEditedState(defSpotState->sharradius ? Edited : UnEdited); @@ -4434,9 +4434,9 @@ void Locallab::adjusterChanged(Adjuster * a, double newval) } } - if (a == blendreti) { + if (a == scalereti) { if (listener) { - listener->panelChanged(Evlocallabblendreti, blendreti->getTextValue()); + listener->panelChanged(Evlocallabscalereti, scalereti->getTextValue()); } } @@ -4797,7 +4797,7 @@ void Locallab::setBatchMode(bool batchMode) chromaskreti->showEditedCB(); gammaskreti->showEditedCB(); slomaskreti->showEditedCB(); - blendreti->showEditedCB(); + scalereti->showEditedCB(); // Sharpening sharradius->showEditedCB(); sharamount->showEditedCB(); @@ -5261,7 +5261,7 @@ void Locallab::updateLocallabGUI(const rtengine::procparams::ProcParams* pp, con chromaskreti->setValue(pp->locallab.spots.at(index).chromaskreti); gammaskreti->setValue(pp->locallab.spots.at(index).gammaskreti); slomaskreti->setValue(pp->locallab.spots.at(index).slomaskreti); - blendreti->setValue(pp->locallab.spots.at(index).blendreti); + scalereti->setValue(pp->locallab.spots.at(index).scalereti); // Sharpening expsharp->setEnabled(pp->locallab.spots.at(index).expsharp); @@ -5507,7 +5507,7 @@ void Locallab::updateLocallabGUI(const rtengine::procparams::ProcParams* pp, con chromaskreti->setEditedState(spotState->chromaskreti ? Edited : UnEdited); gammaskreti->setEditedState(spotState->gammaskreti ? Edited : UnEdited); slomaskreti->setEditedState(spotState->slomaskreti ? Edited : UnEdited); - blendreti->setEditedState(spotState->blendreti ? Edited : UnEdited); + scalereti->setEditedState(spotState->scalereti ? Edited : UnEdited); // Sharpening expsharp->set_inconsistent(!spotState->expsharp); diff --git a/rtgui/locallab.h b/rtgui/locallab.h index 94307c139..8c218affe 100644 --- a/rtgui/locallab.h +++ b/rtgui/locallab.h @@ -187,7 +187,7 @@ private: Adjuster* const chromaskreti; Adjuster* const gammaskreti; Adjuster* const slomaskreti; - Adjuster* const blendreti; + Adjuster* const scalereti; // Sharpening Adjuster* const sharcontrast; diff --git a/rtgui/paramsedited.cc b/rtgui/paramsedited.cc index 5bd37399c..ec5df37af 100644 --- a/rtgui/paramsedited.cc +++ b/rtgui/paramsedited.cc @@ -1078,7 +1078,7 @@ void ParamsEdited::initFrom(const std::vector& locallab.spots.at(j).chromaskreti = locallab.spots.at(j).chromaskreti && pSpot.chromaskreti == otherSpot.chromaskreti; locallab.spots.at(j).gammaskreti = locallab.spots.at(j).gammaskreti && pSpot.gammaskreti == otherSpot.gammaskreti; locallab.spots.at(j).slomaskreti = locallab.spots.at(j).slomaskreti && pSpot.slomaskreti == otherSpot.slomaskreti; - locallab.spots.at(j).blendreti = locallab.spots.at(j).blendreti && pSpot.blendreti == otherSpot.blendreti; + locallab.spots.at(j).scalereti = locallab.spots.at(j).scalereti && pSpot.scalereti == otherSpot.scalereti; // Sharpening locallab.spots.at(j).expsharp = locallab.spots.at(j).expsharp && pSpot.expsharp == otherSpot.expsharp; locallab.spots.at(j).sharcontrast = locallab.spots.at(j).sharcontrast && pSpot.sharcontrast == otherSpot.sharcontrast; @@ -3135,8 +3135,8 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng toEdit.locallab.spots.at(i).slomaskreti = mods.locallab.spots.at(i).slomaskreti; } - if (locallab.spots.at(i).blendreti) { - toEdit.locallab.spots.at(i).blendreti = mods.locallab.spots.at(i).blendreti; + if (locallab.spots.at(i).scalereti) { + toEdit.locallab.spots.at(i).scalereti = mods.locallab.spots.at(i).scalereti; } // Sharpening @@ -4421,7 +4421,7 @@ LocallabParamsEdited::LocallabSpotEdited::LocallabSpotEdited(bool v) : chromaskreti(v), gammaskreti(v), slomaskreti(v), - blendreti(v), + scalereti(v), // Sharpening expsharp(v), sharcontrast(v), @@ -4628,7 +4628,7 @@ void LocallabParamsEdited::LocallabSpotEdited::set(bool v) chromaskreti = v; gammaskreti = v; slomaskreti = v; - blendreti = v; + scalereti = v; // Sharpening expsharp = v; sharcontrast = v; diff --git a/rtgui/paramsedited.h b/rtgui/paramsedited.h index 3259a67ff..4f110a321 100644 --- a/rtgui/paramsedited.h +++ b/rtgui/paramsedited.h @@ -505,7 +505,7 @@ public: bool chromaskreti; bool gammaskreti; bool slomaskreti; - bool blendreti; + bool scalereti; // Sharpening bool expsharp; bool sharcontrast;