mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 04:00:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved consistency.

Browse Source
This commit is contained in:
Dan 2015-10-12 09:21:53 -04:00
parent 3d1355efc1
commit 1e1f20cfee
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,7 +194,7 @@ public:
UMat getUMat(int idx=-1) const;
void getMatVector(std::vector<Mat>& mv) const;
void getUMatVector(std::vector<UMat>& umv) const;
void getGpuMatVector(std::vector<cuda::GpuMat>** gpumv) const;
void getGpuMatVector(std::vector<cuda::GpuMat>& gpumv) const;
cuda::GpuMat getGpuMat() const;
ogl::Buffer getOGlBuffer() const;

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

@ -1429,12 +1429,12 @@ cuda::GpuMat _InputArray::getGpuMat() const
CV_Error(cv::Error::StsNotImplemented, "getGpuMat is available only for cuda::GpuMat and cuda::HostMem");
return cuda::GpuMat();
}
void _InputArray::getGpuMatVector(std::vector<cuda::GpuMat>** gpumv) const
void _InputArray::getGpuMatVector(std::vector<cuda::GpuMat>& gpumv) const
{
int k = kind();
if (k == STD_VECTOR_CUDA_GPU_MAT)
{
*gpumv = (std::vector<cuda::GpuMat>*)obj;
gpumv = *(std::vector<cuda::GpuMat>*)obj;
}
}
ogl::Buffer _InputArray::getOGlBuffer() const