Merge from branch 'dev'

This commit is contained in:
Lawrence Lee
2020-05-04 14:07:45 -07:00
282 changed files with 18917 additions and 9911 deletions

View File

@@ -297,6 +297,7 @@ public:
// FilmNegProvider interface
bool getFilmNegativeExponents(rtengine::Coord spotA, rtengine::Coord spotB, std::array<float, 3>& newExps) override;
bool getRawSpotValues(rtengine::Coord spot, int spotSize, std::array<float, 3>& rawValues) override;
// rotatelistener interface
void straightenRequested () override;
@@ -315,11 +316,11 @@ public:
// imageareatoollistener interface
void spotWBselected(int x, int y, Thumbnail* thm = nullptr) override;
void sharpMaskSelected(bool sharpMask) override;
void sharpMaskSelected(bool sharpMask) override final;
int getSpotWBRectSize() const override;
void cropSelectionReady() override;
void rotateSelectionReady(double rotate_deg, Thumbnail* thm = nullptr) override;
ToolBar* getToolBar() const override;
ToolBar* getToolBar() const final;
CropGUIListener* startCropEditing(Thumbnail* thm = nullptr) override;
void updateTPVScrollbar (bool hide);
@@ -327,7 +328,7 @@ public:
// ToolBarListener interface
void toolSelected (ToolMode tool) override;
void editModeSwitchedOff () override;
void editModeSwitchedOff () final;
void setEditProvider (EditDataProvider *provider);