merge with dev

2020-03-19 13:40:11 +01:00
parent 54fdc848f0 d63fb77c8c
commit e573de78b4
169 changed files with 11568 additions and 5931 deletions
--- a/rtengine/improccoordinator.h
+++ b/rtengine/improccoordinator.h
@@ -73,9 +73,13 @@ protected:

    ColorTemp currWB;
    ColorTemp autoWB;
+    ColorTemp currWBloc;
+    ColorTemp autoWBloc;
+    ColorTemp currWBitc;

    double lastAwbEqual;
    double lastAwbTempBias;
+    Glib::ustring lastAwbauto;

    Glib::ustring monitorProfile;
    RenderingIntent monitorIntent;