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

Clean and format code and fixed bug in exposure with chrominance

Browse Source
This commit is contained in:
Desmis
2018-03-11 10:01:18 +01:00
parent 1a91bb60fe
commit 424b9dbea7
8 changed files with 64 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
rtengine/improccoordinator.h
View File

@@ -122,7 +122,7 @@ protected:
LUTf shtonecurveloc;
LUTf tonecurveloc;
LUTf lightCurveloc;
// ToneCurve customToneCurve1loc;
LUTf cl2Toningcurve;
@@ -244,7 +244,7 @@ protected:
bool curveutili;
int **dataspot;
int maxdata;
int maxdata;
std::string *retistr;
std::string *llstr;
std::string *lhstr;
@@ -445,29 +445,29 @@ public:
}
DetailedCrop* createCrop(::EditDataProvider *editDataProvider, bool isDetailWindow);
/*
<<<<<<< HEAD
/*
<<<<<<< HEAD
bool getAutoWB(double& temp, double& green, double equal, double tempBias);
void getCamWB(double& temp, double& green);
void getSpotWB(int x, int y, int rectSize, double& temp, double& green);
void getAutoCrop(double ratio, int &x, int &y, int &w, int &h);
void setMonitorProfile(const Glib::ustring& profile, RenderingIntent intent);
void getMonitorProfile(Glib::ustring& profile, RenderingIntent& intent) const;
void setSoftProofing(bool softProof, bool gamutCheck);
void getSoftProofing(bool &softProof, bool &gamutCheck);
=======
*/
bool getAutoWB(double& temp, double& green, double equal, double tempBias);
void getCamWB(double& temp, double& green);
void getSpotWB(int x, int y, int rectSize, double& temp, double& green);
void getAutoCrop(double ratio, int &x, int &y, int &w, int &h);
bool getHighQualComputed();
void setHighQualComputed();
void setMonitorProfile(const Glib::ustring& profile, RenderingIntent intent);
void getMonitorProfile(Glib::ustring& profile, RenderingIntent& intent) const;
void setSoftProofing(bool softProof, bool gamutCheck);
void getSoftProofing(bool &softProof, bool &gamutCheck);
=======
*/
bool getAutoWB (double& temp, double& green, double equal, double tempBias);
void getCamWB (double& temp, double& green);
void getSpotWB (int x, int y, int rectSize, double& temp, double& green);
void getAutoCrop (double ratio, int &x, int &y, int &w, int &h);
bool getHighQualComputed();
void setHighQualComputed();
void setMonitorProfile (const Glib::ustring& profile, RenderingIntent intent);
void getMonitorProfile (Glib::ustring& profile, RenderingIntent& intent) const;
void setSoftProofing (bool softProof, bool gamutCheck);
void getSoftProofing (bool &softProof, bool &gamutCheck);
//>>>>>>> dev
bool updateTryLock()