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

Merge pull request #339 from vpisarev:core_fixes

Browse Source
This commit is contained in:
Andrey Kamaev
2013-01-29 15:51:22 +04:00
committed by OpenCV Buildbot
parent 63873a8393 146ca61a27
commit 98fdd70466
4 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/core/src/matrix.cpp
View File

@@ -830,7 +830,8 @@ int Mat::checkVector(int _elemChannels, int _depth, bool _requireContinuous) con
{
return (depth() == _depth || _depth <= 0) &&
(isContinuous() || !_requireContinuous) &&
((dims == 2 && (((rows == 1 || cols == 1) && channels() == _elemChannels) || (cols == _elemChannels))) ||
((dims == 2 && (((rows == 1 || cols == 1) && channels() == _elemChannels) ||
(cols == _elemChannels && channels() == 1))) ||
(dims == 3 && channels() == 1 && size.p[2] == _elemChannels && (size.p[0] == 1 || size.p[1] == 1) &&
(isContinuous() || step.p[1] == step.p[2]*size.p[2])))
? (int)(total()*channels()/_elemChannels) : -1;