Make compilation unit rtengine/curves.cc -Wextra clean, #4155

This commit is contained in:
heckflosse
2017-10-22 22:25:05 +02:00
parent 8de8775264
commit 123c8b4443
6 changed files with 20 additions and 24 deletions

View File

@@ -476,14 +476,10 @@ void CurveFactory::complexsgnCurve (bool & autili, bool & butili, bool & ccutil
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
SSEFUNCTION void CurveFactory::complexCurve (double ecomp, double black, double hlcompr, double hlcomprthresh,
double shcompr, double br, double contr,
procparams::ToneCurveParams::eTCModeId curveMode, const std::vector<double>& curvePoints,
procparams::ToneCurveParams::eTCModeId curveMode2, const std::vector<double>& curvePoints2,
const std::vector<double>& curvePoints,
const std::vector<double>& curvePoints2,
LUTu & histogram,
LUTf & hlCurve, LUTf & shCurve, LUTf & outCurve,
LUTu & outBeforeCCurveHistogram,
@@ -1360,7 +1356,7 @@ void ColorGradientCurve::Reset()
lut3.reset();
}
void ColorGradientCurve::SetXYZ(const Curve *pCurve, const double xyz_rgb[3][3], const double rgb_xyz[3][3], float satur, float lumin)
void ColorGradientCurve::SetXYZ(const Curve *pCurve, const double xyz_rgb[3][3], float satur, float lumin)
{
if (pCurve->isIdentity()) {
lut1.reset();
@@ -1500,7 +1496,7 @@ void ColorGradientCurve::SetXYZ(const Curve *pCurve, const double xyz_rgb[3][3],
*/
}
void ColorGradientCurve::SetXYZ(const std::vector<double> &curvePoints, const double xyz_rgb[3][3], const double rgb_xyz[3][3], float satur, float lumin)
void ColorGradientCurve::SetXYZ(const std::vector<double> &curvePoints, const double xyz_rgb[3][3], float satur, float lumin)
{
std::unique_ptr<FlatCurve> tcurve;
@@ -1509,11 +1505,11 @@ void ColorGradientCurve::SetXYZ(const std::vector<double> &curvePoints, const do
}
if (tcurve) {
SetXYZ(tcurve.get(), xyz_rgb, rgb_xyz, satur, lumin);
SetXYZ(tcurve.get(), xyz_rgb, satur, lumin);
}
}
void ColorGradientCurve::SetRGB(const Curve *pCurve, const double xyz_rgb[3][3], const double rgb_xyz[3][3])
void ColorGradientCurve::SetRGB(const Curve *pCurve)
{
if (pCurve->isIdentity()) {
lut1.reset();
@@ -1599,7 +1595,7 @@ void ColorGradientCurve::SetRGB(const Curve *pCurve, const double xyz_rgb[3][3],
*/
}
void ColorGradientCurve::SetRGB(const std::vector<double> &curvePoints, const double xyz_rgb[3][3], const double rgb_xyz[3][3])
void ColorGradientCurve::SetRGB(const std::vector<double> &curvePoints)
{
std::unique_ptr<FlatCurve> tcurve;
@@ -1608,7 +1604,7 @@ void ColorGradientCurve::SetRGB(const std::vector<double> &curvePoints, const do
}
if (tcurve) {
SetRGB(tcurve.get(), xyz_rgb, rgb_xyz);
SetRGB(tcurve.get());
}
}