merge with dev

2018-10-07 09:58:43 +02:00
parent e9d4dede48 c34bd31765
commit 72ed6f81b0
156 changed files with 1988 additions and 2059 deletions
--- a/rtengine/improccoordinator.h
+++ b/rtengine/improccoordinator.h
@@ -204,7 +204,8 @@ protected:
    void reallocAll();
    void updateLRGBHistograms();
    void setScale(int prevscale);
-    void updatePreviewImage(int todo, Crop* cropCall = nullptr);
+    void updatePreviewImage (int todo, bool panningRelatedChange);
+//    void updatePreviewImage(int todo, Crop* cropCall = nullptr);

    MyMutex mProcessing;
    ProcParams params;