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/rtengine/improccoordinator.h
+++ b/rtengine/improccoordinator.h
@@ -177,18 +177,18 @@ protected:
    int pW, pH;

    ProgressListener* plistener;
-    AutoWBListener* awbListener;
    PreviewImageListener* imageListener;
    AutoExpListener* aeListener;
    AutoCamListener* acListener;
    AutoBWListener* abwListener;
+    AutoWBListener* awbListener;
    localListener* aloListener;
+    FrameCountListener *frameCountListener;
+    ImageTypeListener *imageTypeListener;
    AutoColorTonListener* actListener;
    AutoChromaListener* adnListener;
    WaveletListener* awavListener;
    RetinexListener* dehaListener;
-    FrameCountListener *frameCountListener;
-    ImageTypeListener *imageTypeListener;


    HistogramListener* hListener;