Merge master into gtk3

This commit is contained in:
heckflosse
2016-10-28 17:59:47 +02:00
259 changed files with 5061 additions and 3654 deletions

View File

@@ -71,9 +71,9 @@ private:
public:
IPTCPanel ();
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = NULL);
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = NULL);
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = NULL);
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 setImageData (const rtengine::ImageMetaData* id);