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
2017-02-21 18:02:48 +01:00
parent f9b592dfd5 ac882d2ff2
commit 1f7ad78e25
74 changed files with 886 additions and 695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtengine/improccoordinator.h
View File

@@ -72,6 +72,7 @@ protected:
ColorTemp autoWB;
double lastAwbEqual;
double lastAwbTempBias;
ImProcFunctions ipf;
@@ -167,6 +168,7 @@ protected:
AutoCamListener* acListener;
AutoBWListener* abwListener;
localListener* aloListener;
AutoWBListener* awbListener;
AutoColorTonListener* actListener;
AutoChromaListener* adnListener;
@@ -354,7 +356,7 @@ public:
DetailedCrop* createCrop (::EditDataProvider *editDataProvider, bool isDetailWindow);
bool getAutoWB (double& temp, double& green, double equal);
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);
@@ -414,6 +416,10 @@ public:
aloListener = alo;
}
void setAutoWBListener (AutoWBListener* awb)
{
awbListener = awb;
}
void setAutoColorTonListener (AutoColorTonListener* bwct)
{
actListener = bwct;