Merge with newlocallab...

2018-09-25 23:40:09 +02:00
parent 9930222c9d e9d4dede48
commit 854021cfee
2269 changed files with 56201 additions and 198310 deletions
--- a/rtengine/improccoordinator.h
+++ b/rtengine/improccoordinator.h
@@ -177,17 +177,17 @@ protected:
    int pW, pH;

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


    HistogramListener* hListener;