Merge branch 'dev' into tone-equalizer

This commit is contained in:
Lawrence Lee
2023-04-15 16:58:52 -07:00
86 changed files with 2734 additions and 735 deletions

View File

@@ -401,16 +401,16 @@ public:
void updateShowtooltipVisibility (bool showtooltip);
// wbprovider interface
void getAutoWB (double& temp, double& green, double equal, double tempBias) override
void getAutoWB (double& temp, double& green, double equal, rtengine::StandardObserver observer, double tempBias) override
{
if (ipc) {
ipc->getAutoWB(temp, green, equal, tempBias);
ipc->getAutoWB(temp, green, equal, observer, tempBias);
}
}
void getCamWB (double& temp, double& green) override
void getCamWB (double& temp, double& green, rtengine::StandardObserver observer) override
{
if (ipc) {
ipc->getCamWB(temp, green);
ipc->getCamWB(temp, green, observer);
}
}