merge with dev

2018-10-26 09:00:29 +02:00
parent e7448bd084 fef2f73aa7
commit 21292f6db5
34 changed files with 503 additions and 164 deletions
--- a/rtengine/improccoordinator.h
+++ b/rtengine/improccoordinator.h
@@ -182,6 +182,9 @@ protected:
    AutoCamListener* acListener;
    AutoBWListener* abwListener;
    AutoWBListener* awbListener;
+    FlatFieldAutoClipListener *flatFieldAutoClipListener;
+    AutoContrastListener *bayerAutoContrastListener;
+    AutoContrastListener *xtransAutoContrastListener;
    FrameCountListener *frameCountListener;
    ImageTypeListener *imageTypeListener;
    AutoColorTonListener* actListener;
@@ -407,6 +410,20 @@ public:
        frameCountListener = fcl;
    }

+    void setFlatFieldAutoClipListener  (FlatFieldAutoClipListener* ffacl)
+    {
+        flatFieldAutoClipListener = ffacl;
+    }
+    void setBayerAutoContrastListener  (AutoContrastListener* acl)
+    {
+        bayerAutoContrastListener = acl;
+    }
+
+    void setXtransAutoContrastListener  (AutoContrastListener* acl)
+    {
+        xtransAutoContrastListener = acl;
+    }
+
    void setImageTypeListener(ImageTypeListener* itl)
    {
        imageTypeListener = itl;