merge with dev

2018-10-27 16:11:17 +02:00
parent 59339644de eee6837385
commit b50b8dea9f
211 changed files with 2968 additions and 1991 deletions
--- a/rtengine/dcrop.cc
+++ b/rtengine/dcrop.cc
@@ -139,10 +139,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