potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

added cv::merge to T-API

Browse Source
This commit is contained in:
Ilya Lavrenov
2013-12-08 01:32:17 +04:00
parent d368bf5210
commit cd3f7fbf05
6 changed files with 367 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/matrix.cpp
+14
View File
@@ -1822,6 +1822,13 @@ size_t _InputArray::offset(int i) const
return (size_t)(vv[i].data - vv[i].datastart);
}
if( k == STD_VECTOR_UMAT )
{
const std::vector<UMat>& vv = *(const std::vector<UMat>*)obj;
CV_Assert((size_t)i < vv.size());
return vv[i].offset;
}
if( k == GPU_MAT )
{
CV_Assert( i < 0 );
@@ -1861,6 +1868,13 @@ size_t _InputArray::step(int i) const
return vv[i].step;
}
if( k == STD_VECTOR_UMAT )
{
const std::vector<UMat>& vv = *(const std::vector<UMat>*)obj;
CV_Assert((size_t)i < vv.size());
return vv[i].step;
}
if( k == GPU_MAT )
{
CV_Assert( i < 0 );