Merge branch 'dev' into metadata-exiv2

This commit is contained in:
Lawrence Lee
2023-03-22 23:01:40 -07:00
43 changed files with 1185 additions and 333 deletions

View File

@@ -447,7 +447,7 @@ class AutoWBListener
{
public:
virtual ~AutoWBListener() = default;
virtual void WBChanged(double temp, double green, float studgood) = 0;
virtual void WBChanged(double temp, double green, double rw, double gw, double bw, float studgood) = 0;
};
class FrameCountListener
@@ -594,8 +594,8 @@ public:
* @return a pointer to the Crop object that handles the image data trough its own pipeline */
virtual DetailedCrop* createCrop (::EditDataProvider *editDataProvider, bool isDetailWindow) = 0;
virtual bool getAutoWB (double& temp, double& green, double equal, double tempBias) = 0;
virtual void getCamWB (double& temp, double& green) = 0;
virtual bool getAutoWB (double& temp, double& green, double equal, StandardObserver observer, double tempBias) = 0;
virtual void getCamWB (double& temp, double& green, StandardObserver observer) = 0;
virtual void getSpotWB (int x, int y, int rectSize, double& temp, double& green) = 0;
virtual bool getFilmNegativeSpot(int x, int y, int spotSize, procparams::FilmNegativeParams::RGB &refInput, procparams::FilmNegativeParams::RGB &refOutput) = 0;