merge with dev

2019-11-22 07:28:09 +01:00
parent aa84bb3b0c 7b54c7f2a4
commit e366cf39a4
13 changed files with 16 additions and 115 deletions
--- a/rtengine/dcrop.cc
+++ b/rtengine/dcrop.cc
@@ -196,18 +196,8 @@ void Crop::update(int todo)

        params.dirpyrDenoise.getCurves(noiseLCurve, noiseCCurve);

-        int tilesize;
-        int overlap;
-
-        if (settings->leveldnti == 0) {
-            tilesize = 1024;
-            overlap = 128;
-        }
-
-        if (settings->leveldnti == 1) {
-            tilesize = 768;
-            overlap = 96;
-        }
+        const int tilesize = settings->leveldnti == 0 ? 1024 : 768;
+        const int overlap = settings->leveldnti == 0 ? 128 : 96;

        int numtiles_W, numtiles_H, tilewidth, tileheight, tileWskip, tileHskip;