Merge branch 'dev' into hidpi-icons

This commit is contained in:
Hombre
2018-11-29 00:15:57 +01:00
264 changed files with 6738 additions and 5146 deletions

View File

@@ -97,11 +97,11 @@ private:
public:
ExifPanel ();
virtual ~ExifPanel();
~ExifPanel() override;
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void setImageData (const rtengine::FramesMetaData* id);