generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed getUMatIndex

Browse Source
This commit is contained in:
Ilya Lavrenov 2013-12-27 13:18:31 +04:00
parent a7d2830d3f
commit 52b8bb6761
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/imgproc/src/histogram.cpp
View File

@ -1940,10 +1940,16 @@ static void getUMatIndex(const std::vector<UMat> & um, int cn, int & idx, int &
int ccn = um[i].channels(); int ccn = um[i].channels();
totalChannels += ccn; totalChannels += ccn;
if (totalChannels >= cn) if (totalChannels == cn)
{
idx = (int)(i + 1);
cnidx = 0;
return;
}
else if (totalChannels > cn)
{ {
idx = (int)i; idx = (int)i;
cnidx = i == 0 ? cn : cn % (totalChannels - ccn); cnidx = i == 0 ? cn : (cn - totalChannels + ccn);
return; return;
} }
} }