merge with dev

This commit is contained in:
Desmis
2020-04-18 07:43:44 +02:00
22 changed files with 708 additions and 190 deletions

View File

@@ -175,6 +175,7 @@ protected:
AutoRadiusListener *pdSharpenAutoRadiusListener;
FrameCountListener *frameCountListener;
ImageTypeListener *imageTypeListener;
FilmNegListener *filmNegListener;
AutoColorTonListener* actListener;
AutoChromaListener* adnListener;
WaveletListener* awavListener;
@@ -432,6 +433,7 @@ public:
void getCamWB (double& temp, double& green) override;
void getSpotWB (int x, int y, int rectSize, double& temp, double& green) override;
bool getFilmNegativeExponents(int xA, int yA, int xB, int yB, std::array<float, 3>& newExps) override;
bool getRawSpotValues(int x, int y, int spotSize, std::array<float, 3>& rawValues) override;
void getAutoCrop (double ratio, int &x, int &y, int &w, int &h) override;
bool getHighQualComputed() override;
void setHighQualComputed() override;
@@ -562,6 +564,11 @@ public:
imageTypeListener = itl;
}
void setFilmNegListener (FilmNegListener* fnl) override
{
filmNegListener = fnl;
}
void saveInputICCReference (const Glib::ustring& fname, bool apply_wb) override;
InitialImage* getInitialImage () override