merge with dev

2018-07-07 13:46:18 +02:00
parent c1463c7edd 523fe40662
commit e65c6786ff
92 changed files with 2399 additions and 1322 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -688,6 +688,7 @@ public:
    bool width;
    bool height;
    bool enabled;
+    bool allowUpscaling;
 };

 class ColorManagementParamsEdited
@@ -831,6 +832,13 @@ public:
    bool strength;
 };

+class SoftLightParamsEdited
+{
+public:
+    bool enabled;
+    bool strength;
+};
+
 class RAWParamsEdited
 {

@@ -840,6 +848,7 @@ public:

    public:
        bool method;
+        bool border;
        bool imageNum;
        bool ccSteps;
        bool exBlack0;
@@ -968,6 +977,7 @@ public:
    WaveletParamsEdited             wavelet;
    HSVEqualizerParamsEdited      hsvequalizer;
    FilmSimulationParamsEdited    filmSimulation;
+    SoftLightParamsEdited         softlight;
    MetaDataParamsEdited          metadata;
    bool                          exif;
    bool                          iptc;