merge with dev - I hope no error

This commit is contained in:
Desmis
2018-01-02 19:58:42 +01:00
66 changed files with 2796 additions and 2393 deletions

View File

@@ -916,6 +916,13 @@ public:
bool isUnchanged() const;
};
class MetaDataParamsEdited {
public:
bool mode;
};
class ParamsEdited
{
@@ -965,6 +972,7 @@ public:
WaveletParamsEdited wavelet;
HSVEqualizerParamsEdited hsvequalizer;
FilmSimulationParamsEdited filmSimulation;
MetaDataParamsEdited metadata;
bool exif;
bool iptc;