Merge branch 'dev' into favorites-gui

This commit is contained in:
Lawrence Lee
2023-01-02 15:37:07 -08:00
193 changed files with 64046 additions and 10050 deletions

View File

@@ -365,7 +365,7 @@ public:
void unsetTweakOperator (rtengine::TweakOperator *tOperator) override;
// FilmNegProvider interface
void imageTypeChanged (bool isRaw, bool isBayer, bool isXtrans, bool isMono = false) override;
void imageTypeChanged (bool isRaw, bool isBayer, bool isXtrans, bool isMono = false, bool isGainMapSupported = false) override;
// profilechangelistener interface
void profileChange(
@@ -412,7 +412,7 @@ public:
}
//DFProvider interface
rtengine::RawImage* getDF() override;
const rtengine::RawImage* getDF() override;
//FFProvider interface
rtengine::RawImage* getFF() override;