diff --git a/rtengine/curves.h b/rtengine/curves.h index 71875fa94..5769cada1 100644 --- a/rtengine/curves.h +++ b/rtengine/curves.h @@ -485,7 +485,7 @@ protected: void NURBS_set(); public: - DiagonalCurve(const std::vector& points, int ppn = CURVES_MIN_POLY_POINTS); + explicit DiagonalCurve(const std::vector& points, int ppn = CURVES_MIN_POLY_POINTS); ~DiagonalCurve() override; double getVal(double t) const override; @@ -510,7 +510,7 @@ private: public: - FlatCurve(const std::vector& points, bool isPeriodic = true, int ppn = CURVES_MIN_POLY_POINTS); + explicit FlatCurve(const std::vector& points, bool isPeriodic = true, int ppn = CURVES_MIN_POLY_POINTS); ~FlatCurve() override; double getVal(double t) const override; diff --git a/rtengine/improcfun.h b/rtengine/improcfun.h index 3af1e0ec6..57c8c4c64 100644 --- a/rtengine/improcfun.h +++ b/rtengine/improcfun.h @@ -110,12 +110,6 @@ class ImProcFunctions double scale; bool multiThread; - bool lastcutpast; - int lastcxbuf; - int lastcybuf; - int lastcount; - LabImage *spotbuffer; - void calcVignettingParams(int oW, int oH, const procparams::VignettingParams& vignetting, double &w2, double &h2, double& maxRadius, double &v, double &b, double &mul); void transformLuminanceOnly(Imagefloat* original, Imagefloat* transformed, int cx, int cy, int oW, int oH, int fW, int fH); diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc index bf382f3d9..8eae9daba 100644 --- a/rtengine/simpleprocess.cc +++ b/rtengine/simpleprocess.cc @@ -1226,14 +1226,14 @@ private: //provisory double ecomp = params.locallab.spots.at(sp).expcomp; - double black = params.locallab.spots.at(sp).black; - double hlcompr = params.locallab.spots.at(sp).hlcompr; - double hlcomprthresh = params.locallab.spots.at(sp).hlcomprthresh; + double lblack = params.locallab.spots.at(sp).black; + double lhlcompr = params.locallab.spots.at(sp).hlcompr; + double lhlcomprthresh = params.locallab.spots.at(sp).hlcomprthresh; double shcompr = params.locallab.spots.at(sp).shcompr; double br = params.locallab.spots.at(sp).lightness; double cont = params.locallab.spots.at(sp).contrast; - if(black < 0. && params.locallab.spots.at(sp).expMethod == "pde" ) { - black *= 1.5; + if (lblack < 0. && params.locallab.spots.at(sp).expMethod == "pde" ) { + lblack *= 1.5; } // Reference parameters computation @@ -1245,7 +1245,7 @@ private: } else { ipf.calc_ref(sp, labView, labView, 0, 0, fw, fh, 1, huerefblu, chromarefblu, lumarefblu, huere, chromare, lumare, sobelre, avge, locwavCurveden, locwavdenutili); } - CurveFactory::complexCurvelocal(ecomp, black / 65535., hlcompr, hlcomprthresh, shcompr, br, cont, lumare, + CurveFactory::complexCurvelocal(ecomp, lblack / 65535., lhlcompr, lhlcomprthresh, shcompr, br, cont, lumare, hltonecurveloc, shtonecurveloc, tonecurveloc, lightCurveloc, avge, 1); float minCD;