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

merge with dev

Browse Source
This commit is contained in:
Desmis
2018-02-06 16:54:30 +01:00
parent 94eeb923ea e6265cdfef
commit 40cc22f1e1
42 changed files with 576 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rtengine/improccoordinator.h
View File

@@ -385,6 +385,8 @@ protected:
float colourToningSatLimit;
float colourToningSatLimitOpacity;
bool lastspotdup;
bool highQualityComputed;
public:
ImProcCoordinator();
@@ -441,7 +443,8 @@ public:
}
DetailedCrop* createCrop(::EditDataProvider *editDataProvider, bool isDetailWindow);
/*
<<<<<<< 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);
@@ -451,6 +454,19 @@ public:
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()
{