merge with dev - all warnings are not delete - come soon

2017-04-08 19:28:04 +02:00
parent 6608d5147c 73e14702dd
commit 398e862b2b
144 changed files with 5970 additions and 5235 deletions
--- a/rtengine/ipsharpen.cc
+++ b/rtengine/ipsharpen.cc
@@ -1008,7 +1008,7 @@ void ImProcFunctions::sharpeningcam (CieImage* ncie, float** b2)
    // Rest is UNSHARP MASK

    int W = ncie->W, H = ncie->H;
-    float** b3;
+    float** b3 = nullptr;

    if (params->sharpening.edgesonly) {
        b3 = new float*[H];