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

merge with dev - I hope no error

Browse Source
This commit is contained in:
Desmis
2018-11-24 14:18:37 +01:00
parent bdc888423b d1571658f8
commit 86c03e61d4
208 changed files with 2982 additions and 2150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rtengine/curves.h
View File

@@ -473,11 +473,11 @@ protected:
public:
DiagonalCurve(const std::vector<double>& points, int ppn = CURVES_MIN_POLY_POINTS);
virtual ~DiagonalCurve();
~DiagonalCurve () override;
double getVal(double t) const;
void getVal(const std::vector<double>& t, std::vector<double>& res) const;
bool isIdentity() const
double getVal (double t) const override;
void getVal (const std::vector<double>& t, std::vector<double>& res) const override;
bool isIdentity () const override
{
return kind == DCT_Empty;
};
@@ -498,12 +498,12 @@ private:
public:
FlatCurve(const std::vector<double>& points, bool isPeriodic = true, int ppn = CURVES_MIN_POLY_POINTS);
virtual ~FlatCurve();
~FlatCurve () override;
double getVal(double t) const;
void getVal(const std::vector<double>& t, std::vector<double>& res) const;
double getVal (double t) const override;
void getVal (const std::vector<double>& t, std::vector<double>& res) const override;
bool setIdentityValue(double iVal);
bool isIdentity() const
bool isIdentity () const override
{
return kind == FCT_Empty;
};
@@ -1051,7 +1051,7 @@ private:
static float cf_range[2];
static float cf[1000];
// for ciecam02
static float f, c, nc, yb, la, xw, yw, zw, gamut;
static float f, c, nc, yb, la, xw, yw, zw;
static float n, d, nbb, ncb, cz, aw, wh, pfl, fl, pow1;
static void cubic_spline(const float x[], const float y[], const int len, const float out_x[], float out_y[], const int out_len);