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/FTblockDN.cc
+++ b/rtengine/FTblockDN.cc
@@ -805,8 +805,15 @@ BENCHFUN
            }

 #endif
-            float *LbloxArray[denoiseNestedLevels * numthreads] = {};
-            float *fLbloxArray[denoiseNestedLevels * numthreads] = {};
+            const std::size_t blox_array_size = denoiseNestedLevels * numthreads;
+
+            float *LbloxArray[blox_array_size];
+            float *fLbloxArray[blox_array_size];
+
+            for (std::size_t i = 0; i < blox_array_size; ++i) {
+                LbloxArray[i] = nullptr;
+                fLbloxArray[i] = nullptr;
+            }

            if (numtiles > 1 && denoiseLuminance) {
                for (int i = 0; i < denoiseNestedLevels * numthreads; ++i) {