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

Merged master into gtk3, fixed three conflicts.

Browse Source
This commit is contained in:
Beep6581
2016-06-09 22:36:59 +02:00
parent 7040b6e5b1
commit c857bba95e
50 changed files with 6109 additions and 6009 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rtengine/colortemp.h
View File

@@ -47,12 +47,14 @@ private:
std::string method;
static void clip (double &temp, double &green);
static void clip (double &temp, double &green, double &equal);
int XYZtoCorColorTemp(double x0, double y0 , double z0, double &temp) const;
void temp2mul (double temp, double green, double equal, double& rmul, double& gmul, double& bmul) const;
public:
ColorTemp () : temp(-1.), green(-1.), equal (1.), method("Custom") {}
ColorTemp (double e) : temp(-1.), green(-1.), equal (e), method("Custom") {}
ColorTemp (double t, double g, double e, Glib::ustring m);
ColorTemp (double t, double g, double e, const Glib::ustring &m);
ColorTemp (double mulr, double mulg, double mulb, double e);
void update (const double rmul, const double gmul, const double bmul, const double equal)
@@ -67,42 +69,40 @@ public:
this->equal = equal;
}
inline std::string getMethod()
inline std::string getMethod() const
{
return method;
}
inline double getTemp ()
inline double getTemp () const
{
return temp;
}
inline double getGreen ()
inline double getGreen () const
{
return green;
}
inline double getEqual ()
inline double getEqual () const
{
return equal;
}
void getMultipliers (double &mulr, double &mulg, double &mulb)
void getMultipliers (double &mulr, double &mulg, double &mulb) const
{
temp2mul (temp, green, equal, mulr, mulg, mulb);
}
void mul2temp (const double rmul, const double gmul, const double bmul, const double equal, double& temp, double& green);
void temp2mul (double temp, double green, double equal, double& rmul, double& gmul, double& bmul);
void mul2temp (const double rmul, const double gmul, const double bmul, const double equal, double& temp, double& green) const;
static void temp2mulxyz (double tem, double gree, std::string method, double &Xxyz, double &Zxyz);
int XYZtoCorColorTemp(double x0, double y0 , double z0, double &temp);
static void cieCAT02(double Xw, double Yw, double Zw, double &CAM02BB00, double &CAM02BB01, double &CAM02BB02, double &CAM02BB10, double &CAM02BB11, double &CAM02BB12, double &CAM02BB20, double &CAM02BB21, double &CAM02BB22, double adap );
//static void CAT02 (Imagefloat* baseImg, const ProcParams* params);
//static void ciecam_02 (LabImage* lab, const ProcParams* params);
bool operator== (const ColorTemp& other)
bool operator== (const ColorTemp& other) const
{
return fabs(temp - other.temp) < 1e-10 && fabs(green - other.green) < 1e-10;
}
bool operator!= (const ColorTemp& other)
bool operator!= (const ColorTemp& other) const
{
return !(*this == other);
}