merge with dev

2020-03-19 13:40:11 +01:00
parent 54fdc848f0 d63fb77c8c
commit e573de78b4
169 changed files with 11568 additions and 5931 deletions
--- a/rtengine/ipdehaze.cc
+++ b/rtengine/ipdehaze.cc
@@ -266,9 +266,9 @@ float estimate_ambient_light(const array2D<float> &R, const array2D<float> &G, c
                float b = B[y][x];

                if (r + g + b >= bright_lim) {
-                    rr += r;
-                    gg += g;
-                    bb += b;
+                    rr += static_cast<double>(r);
+                    gg += static_cast<double>(g);
+                    bb += static_cast<double>(b);
                    ++n;
                }
            }