merge with dev

2018-10-19 19:26:14 +02:00
parent bda6ad9235 72699902a3
commit e7448bd084
198 changed files with 2052 additions and 1128 deletions
--- a/rtengine/dcrop.cc
+++ b/rtengine/dcrop.cc
@@ -148,10 +148,10 @@ void Crop::update(int todo)

    // give possibility to the listener to modify crop window (as the full image dimensions are already known at this point)
    int wx, wy, ww, wh, ws;
-    bool overrideWindow = false;
+    const bool overrideWindow = cropImageListener;

-    if (cropImageListener) {
-        overrideWindow = cropImageListener->getWindow(wx, wy, ww, wh, ws);
+    if (overrideWindow) {
+        cropImageListener->getWindow(wx, wy, ww, wh, ws);
    }

    // re-allocate sub-images and arrays if their dimensions changed