merge with dev - I hope no error

This commit is contained in:
Desmis
2017-02-21 18:02:48 +01:00
74 changed files with 886 additions and 695 deletions

View File

@@ -254,10 +254,10 @@ public:
void writeOptions ();
// wbprovider interface
void getAutoWB (double& temp, double& green, double equal)
void getAutoWB (double& temp, double& green, double equal, double tempBias)
{
if (ipc) {
ipc->getAutoWB (temp, green, equal);
ipc->getAutoWB (temp, green, equal, tempBias);
}
}
void getCamWB (double& temp, double& green)