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

Some cppcheck cleanups

Browse Source
This commit is contained in:
Ingo Weyrich 2020-06-28 13:24:00 +02:00
parent a0eacde31a
commit bad0c0b1e7
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/curves.h
View File

@ -485,7 +485,7 @@ protected:
void NURBS_set(); void NURBS_set();
public: public:
DiagonalCurve(const std::vector<double>& points, int ppn = CURVES_MIN_POLY_POINTS); explicit DiagonalCurve(const std::vector<double>& points, int ppn = CURVES_MIN_POLY_POINTS);
~DiagonalCurve() override; ~DiagonalCurve() override;
double getVal(double t) const override; double getVal(double t) const override;
@ -510,7 +510,7 @@ private:
public: public:
FlatCurve(const std::vector<double>& points, bool isPeriodic = true, int ppn = CURVES_MIN_POLY_POINTS); explicit FlatCurve(const std::vector<double>& points, bool isPeriodic = true, int ppn = CURVES_MIN_POLY_POINTS);
~FlatCurve() override; ~FlatCurve() override;
double getVal(double t) const override; double getVal(double t) const override;

6
rtengine/improcfun.h
View File

@ -110,12 +110,6 @@ class ImProcFunctions
double scale; double scale;
bool multiThread; 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 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); void transformLuminanceOnly(Imagefloat* original, Imagefloat* transformed, int cx, int cy, int oW, int oH, int fW, int fH);

12
rtengine/simpleprocess.cc
View File

@ -1226,14 +1226,14 @@ private:
//provisory //provisory
double ecomp = params.locallab.spots.at(sp).expcomp; double ecomp = params.locallab.spots.at(sp).expcomp;
double black = params.locallab.spots.at(sp).black; double lblack = params.locallab.spots.at(sp).black;
double hlcompr = params.locallab.spots.at(sp).hlcompr; double lhlcompr = params.locallab.spots.at(sp).hlcompr;
double hlcomprthresh = params.locallab.spots.at(sp).hlcomprthresh; double lhlcomprthresh = params.locallab.spots.at(sp).hlcomprthresh;
double shcompr = params.locallab.spots.at(sp).shcompr; double shcompr = params.locallab.spots.at(sp).shcompr;
double br = params.locallab.spots.at(sp).lightness; double br = params.locallab.spots.at(sp).lightness;
double cont = params.locallab.spots.at(sp).contrast; double cont = params.locallab.spots.at(sp).contrast;
if(black < 0. && params.locallab.spots.at(sp).expMethod == "pde" ) { if (lblack < 0. && params.locallab.spots.at(sp).expMethod == "pde" ) {
black *= 1.5; lblack *= 1.5;
} }
// Reference parameters computation // Reference parameters computation
@ -1245,7 +1245,7 @@ private:
} else { } else {
ipf.calc_ref(sp, labView, labView, 0, 0, fw, fh, 1, huerefblu, chromarefblu, lumarefblu, huere, chromare, lumare, sobelre, avge, locwavCurveden, locwavdenutili); 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, hltonecurveloc, shtonecurveloc, tonecurveloc, lightCurveloc, avge,
1); 1);
float minCD; float minCD;