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

Merge pull request #2213 from ilya-lavrenov:tapi_buildPyramid

Browse Source
This commit is contained in:
Andrey Pavlenko
2014-01-28 16:31:29 +04:00
committed by OpenCV Buildbot
parent 84c29745f2 48a084c236
commit fff5a6c058
4 changed files with 57 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/core/include/opencv2/core/mat.hpp
View File

@@ -207,6 +207,7 @@ public:
virtual bool fixedType() const;
virtual bool needed() const;
virtual Mat& getMatRef(int i=-1) const;
virtual UMat& getUMatRef(int i=-1) const;
virtual cuda::GpuMat& getGpuMatRef() const;
virtual ogl::Buffer& getOGlBufferRef() const;
virtual cuda::CudaMem& getCudaMemRef() const;

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

@@ -2484,6 +2484,23 @@ Mat& _OutputArray::getMatRef(int i) const
}
}
UMat& _OutputArray::getUMatRef(int i) const
{
int k = kind();
if( i < 0 )
{
CV_Assert( k == UMAT );
return *(UMat*)obj;
}
else
{
CV_Assert( k == STD_VECTOR_UMAT );
std::vector<UMat>& v = *(std::vector<UMat>*)obj;
CV_Assert( i < (int)v.size() );
return v[i];
}
}
cuda::GpuMat& _OutputArray::getGpuMatRef() const
{
int k = kind();