liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean code

Browse Source
This commit is contained in:
Desmis 2019-09-22 09:20:16 +02:00
parent 7fb2acd28c
commit 4a9feb02c6
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rtengine/ipretinex.cc
View File

@ -868,7 +868,7 @@ void ImProcFunctions::MSRLocal(int sp, bool fftw, int lum, LabImage * bufreti, L
const float lig = loc.spots.at(sp).lightnessreti;
float value = pow(strength, 0.4f);
float value_1 = pow(strength, 0.3f);
float logli = loc.spots.at(sp).loglin;
bool logli = loc.spots.at(sp).loglin;
float limD = loc.spots.at(sp).limd;//10.f
limD = pow(limD, 1.7f); //about 2500 enough
float ilimD = 1.f / limD;
@ -909,10 +909,8 @@ void ImProcFunctions::MSRLocal(int sp, bool fftw, int lum, LabImage * bufreti, L
moderetinex = 0;
} else if (loc.spots.at(sp).retinexMethod == "low") {
moderetinex = 1;
} else {
if (loc.spots.at(sp).retinexMethod == "high") {
} else if (loc.spots.at(sp).retinexMethod == "high") {
moderetinex = 2;
}
}
const float high = 0.f; // Dummy to pass to retinex_scales(...)
@ -1027,7 +1025,6 @@ void ImProcFunctions::MSRLocal(int sp, bool fftw, int lum, LabImage * bufreti, L
if (scale == 1) { //equalize last scale with darkness and lightness
if (dar != 1.f || lig != 1.f) {
// float value = pow(strength, 0.4f);
#ifdef _OPENMP
#pragma omp parallel for
@ -1110,7 +1107,6 @@ void ImProcFunctions::MSRLocal(int sp, bool fftw, int lum, LabImage * bufreti, L
kmaskLexp += 32768.f * valHH;
}
// printf("km=%f ",kmaskLexp);
bufmaskblurreti->L[ir][jr] = kmaskLexp;
bufmaskblurreti->a[ir][jr] = kmaskCH;
bufmaskblurreti->b[ir][jr] = kmaskCH;
@ -1327,7 +1323,7 @@ void ImProcFunctions::MSRLocal(int sp, bool fftw, int lum, LabImage * bufreti, L
}
if (scal == 1) { //use only local contrast
if (scal == 1) {
float kval = 1.f;
#ifdef _OPENMP
#pragma omp parallel for

8
rtgui/locallab.cc
View File

@ -1432,7 +1432,6 @@ Locallab::Locallab():
lightnessreti->setAdjusterListener(this);
limd->setAdjusterListener(this);
// ToolParamBlock* const maskretiBox = Gtk::manage(new ToolParamBlock());
maskretiBox->pack_start(*showmaskretiMethod, Gtk::PACK_SHRINK, 4);
maskretiBox->pack_start(*enaretiMask, Gtk::PACK_SHRINK, 0);
maskretiBox->pack_start(*enaretiMasktmap, Gtk::PACK_SHRINK, 0);
@ -1454,13 +1453,10 @@ Locallab::Locallab():
scopeBox->pack_start(*sensih);
expreti->add(*scopeBox, false);
// ToolParamBlock* const retiBox = Gtk::manage(new ToolParamBlock());
retiBox->pack_start(*retinexMethod);
retiBox->pack_start(*fftwreti);
retiBox->pack_start(*equilret);
retiBox->pack_start(*loglin);
// retiBox->pack_start(*str);
// retiBox->pack_start(*dehaz);
retiBox->pack_start(*chrrt);
retiBox->pack_start(*neigh);
retiBox->pack_start(*vart);
@ -1469,7 +1465,6 @@ Locallab::Locallab():
retiBox->pack_start(*darkness);
retiBox->pack_start(*lightnessreti);
// retiBox->pack_start(*softradiusret);
// retiBox->pack_start(*sensih);
retiBox->pack_start(*LocalcurveEditorgainT, Gtk::PACK_SHRINK, 4); // Padding is mandatory to correct behavior of curve editor
retiBox->pack_start(*expmaskreti);
retiBox->pack_start(*inversret);
@ -5029,7 +5024,6 @@ void Locallab::inversshaChanged()
void Locallab::equiltmChanged()
{
// printf("inversretChanged\n");
if (multiImage) {
if (equiltm->get_inconsistent()) {
@ -5056,7 +5050,6 @@ void Locallab::equiltmChanged()
void Locallab::equilretChanged()
{
// printf("inversretChanged\n");
if (multiImage) {
if (equilret->get_inconsistent()) {
@ -5081,7 +5074,6 @@ void Locallab::equilretChanged()
void Locallab::loglinChanged()
{
// printf("inversretChanged\n");
if (multiImage) {
if (loglin->get_inconsistent()) {