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

Merge pull request #2075 from ilya-lavrenov:tapi_mixchannels

Browse Source
This commit is contained in:
Andrey Pavlenko
2013-12-28 22:05:49 +04:00
committed by OpenCV Buildbot
parent 0913dd7ffa 73c96cbd50
commit dbaf125fcd
4 changed files with 337 additions and 20 deletions
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();
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;
}
}