merge with dev

2018-02-16 08:22:30 +01:00
parent 9916cdb4b0 38cab123fc
commit 9660858976
12 changed files with 100 additions and 26 deletions
--- a/rtengine/rawimagesource.cc
+++ b/rtengine/rawimagesource.cc
@@ -1348,7 +1348,7 @@ int RawImageSource::findHotDeadPixels( PixelsMap &bpMap, float thresh, bool find
    float varthresh = (20.0 * (thresh / 100.0) + 1.0) / 24.f;

    // allocate temporary buffer
-    float (*cfablur);
+    float* cfablur;
    cfablur = (float (*)) malloc(H * W * sizeof * cfablur);

    // counter for dead or hot pixels