Merge branch 'dev' into metadata-exiv2

This commit is contained in:
Lawrence Lee
2023-08-06 10:25:49 -07:00
95 changed files with 8220 additions and 2998 deletions

View File

@@ -79,6 +79,7 @@
#include "softlight.h"
#include "spot.h"
#include "tonecurve.h"
#include "toneequalizer.h"
#include "toolbar.h"
#include "toolpanel.h"
#include "vibrance.h"
@@ -134,6 +135,7 @@ protected:
Crop* crop;
ToneCurve* toneCurve;
ShadowsHighlights* shadowshighlights;
ToneEqualizer* toneEqualizer;
LocalContrast *localContrast;
Spot* spot;
Defringe* defringe;
@@ -245,6 +247,7 @@ public:
enum class Tool {
TONE_CURVE,
SHADOWS_HIGHLIGHTS,
TONE_EQUALIZER,
IMPULSE_DENOISE,
DEFRINGE_TOOL,
SPOT,