merge with dev - I hope no error

This commit is contained in:
Desmis
2018-11-24 14:18:37 +01:00
208 changed files with 2982 additions and 2150 deletions

View File

@@ -807,8 +807,8 @@ BENCHFUN
#endif
const std::size_t blox_array_size = denoiseNestedLevels * numthreads;
float *LbloxArray[blox_array_size] = {};
float *fLbloxArray[blox_array_size] = {};
float *LbloxArray[blox_array_size];
float *fLbloxArray[blox_array_size];
for (std::size_t i = 0; i < blox_array_size; ++i) {
LbloxArray[i] = nullptr;
@@ -1749,7 +1749,7 @@ BENCHFUN
}
for (int i = 0; i < denoiseNestedLevels * numthreads; ++i) {
for (size_t i = 0; i < blox_array_size; ++i) {
if (LbloxArray[i]) {
fftwf_free(LbloxArray[i]);
}