merge with dev

2018-08-05 09:05:47 +02:00
parent a4c92ac986 263d96eeca
commit 5472673b9e
146 changed files with 6196 additions and 2570 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -696,20 +696,21 @@ class ColorManagementParamsEdited
 {

 public:
-    bool input;
+    bool inputProfile;
    bool toneCurve;
    bool applyLookTable;
    bool applyBaselineExposureOffset;
    bool applyHueSatMap;
    bool dcpIlluminant;
-    bool working;
-    bool output;
+
+    bool workingProfile;
+    bool workingTRC;
+    bool workingTRCGamma;
+    bool workingTRCSlope;
+
+    bool outputProfile;
    bool outputIntent;
    bool outputBPC;
-    bool gamma;
-    bool gampos;
-    bool slpos;
-    bool freegamma;
 };
 class WaveletParamsEdited
 {
@@ -923,7 +924,8 @@ public:
 };


-class MetaDataParamsEdited {
+class MetaDataParamsEdited
+{
 public:
    bool mode;
 };