merge with dev

2019-09-19 06:46:55 +02:00
parent c9971d3764 e10c3b2f66
commit 0d04d63c70
1 changed files with 2 additions and 2 deletions
--- a/rtengine/filmnegativeproc.cc
+++ b/rtengine/filmnegativeproc.cc
@@ -77,8 +77,8 @@ bool channelsAvg(
    }

    std::array<int, 3> pxCount = {}; // Per-channel sample counts
-    for (int c = spotPos.x - spotSize; c < spotPos.x + spotSize; ++c) {
-        for (int r = spotPos.y - spotSize; r < spotPos.y + spotSize; ++r) {
+    for (int c = x1; c < x2; ++c) {
+        for (int r = y1; r < y2; ++r) {
            const int ch = ri->getSensorType() == rtengine::ST_BAYER ? ri->FC(r,c) : ri->XTRANSFC(r,c);

            ++pxCount[ch];