Skip to content

O
opencv
Commit 1e1f20cf authored by Dan's avatar Dan
Browse files
Options

Improved consistency.

parent 3d1355ef
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/core/include/opencv2/core/mat.hpp
View file @ 1e1f20cf
...@@ -194,7 +194,7 @@ public: ...@@ -194,7 +194,7 @@ public:
UMat getUMat(int idx=-1) const; UMat getUMat(int idx=-1) const;
void getMatVector(std::vector<Mat>& mv) const; void getMatVector(std::vector<Mat>& mv) const;
void getUMatVector(std::vector<UMat>& umv) 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; cuda::GpuMat getGpuMat() const;
ogl::Buffer getOGlBuffer() const; ogl::Buffer getOGlBuffer() const;
......
modules/core/src/matrix.cpp
View file @ 1e1f20cf
...@@ -1429,12 +1429,12 @@ cuda::GpuMat _InputArray::getGpuMat() const ...@@ -1429,12 +1429,12 @@ cuda::GpuMat _InputArray::getGpuMat() const
CV_Error(cv::Error::StsNotImplemented, "getGpuMat is available only for cuda::GpuMat and cuda::HostMem"); CV_Error(cv::Error::StsNotImplemented, "getGpuMat is available only for cuda::GpuMat and cuda::HostMem");
return cuda::GpuMat(); return cuda::GpuMat();
} }
void _InputArray::getGpuMatVector(std::vector<cuda::GpuMat>** gpumv) const void _InputArray::getGpuMatVector(std::vector<cuda::GpuMat>& gpumv) const
{ {
int k = kind(); int k = kind();
if (k == STD_VECTOR_CUDA_GPU_MAT) if (k == STD_VECTOR_CUDA_GPU_MAT)
{ {
*gpumv = (std::vector<cuda::GpuMat>*)obj; gpumv = *(std::vector<cuda::GpuMat>*)obj;
} }
} }
ogl::Buffer _InputArray::getOGlBuffer() const ogl::Buffer _InputArray::getOGlBuffer() const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment