fixed getUMatIndex

52b8bb67 · Ilya Lavrenov · a7d2830d · 52b8bb67
Commit 52b8bb67 authored Dec 27, 2013 by Ilya Lavrenov
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

histogram.cpp modules/imgproc/src/histogram.cpp +8 -2

No files found.
--- a/modules/imgproc/src/histogram.cpp
+++ b/modules/imgproc/src/histogram.cpp
@@ -1940,10 +1940,16 @@ static void getUMatIndex(const std::vector<UMat> & um, int cn, int & idx, int &
        int ccn = um[i].channels();
        totalChannels += ccn;

-        if (totalChannels >= cn)
+        if (totalChannels == cn)
+        {
+            idx = (int)(i + 1);
+            cnidx = 0;
+            return;
+        }
+        else if (totalChannels > cn)
        {
            idx = (int)i;
-            cnidx = i == 0 ? cn : cn % (totalChannels - ccn);
+            cnidx = i == 0 ? cn : (cn - totalChannels + ccn);
            return;
        }
    }