merge with dev

2019-08-17 06:47:28 +02:00
parent 7a2f5f985e f7ec852e05
commit 7ed4c4422a
27 changed files with 209 additions and 267 deletions
--- a/rtengine/ipdehaze.cc
+++ b/rtengine/ipdehaze.cc
@@ -228,12 +228,12 @@ void ImProcFunctions::dehaze(Imagefloat *img, const DehazeParams &dehazeParams)
    array2D<float> dark(W, H);

    int patchsize = max(int(5 / scale), 2);
-    int npatches = 0;
    float ambient[3];
    array2D<float> &t_tilde = dark;
    float max_t = 0.f;

    {
+        int npatches = 0;
        array2D<float> R(W, H);
        array2D<float> G(W, H);
        array2D<float> B(W, H);