From 1e1f20cfee89c9ac6c8b884e52bcd79a51278976 Mon Sep 17 00:00:00 2001 From: Dan Date: Mon, 12 Oct 2015 09:21:53 -0400 Subject: [PATCH] Improved consistency. --- modules/core/include/opencv2/core/mat.hpp | 2 +- modules/core/src/matrix.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/core/include/opencv2/core/mat.hpp b/modules/core/include/opencv2/core/mat.hpp index cd76027c2..f85b38ea5 100644 --- a/modules/core/include/opencv2/core/mat.hpp +++ b/modules/core/include/opencv2/core/mat.hpp @@ -194,7 +194,7 @@ public: UMat getUMat(int idx=-1) const; void getMatVector(std::vector& mv) const; void getUMatVector(std::vector& umv) const; - void getGpuMatVector(std::vector** gpumv) const; + void getGpuMatVector(std::vector& gpumv) const; cuda::GpuMat getGpuMat() const; ogl::Buffer getOGlBuffer() const; diff --git a/modules/core/src/matrix.cpp b/modules/core/src/matrix.cpp index 958ee616b..717b7ea4f 100644 --- a/modules/core/src/matrix.cpp +++ b/modules/core/src/matrix.cpp @@ -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** gpumv) const +void _InputArray::getGpuMatVector(std::vector& gpumv) const { int k = kind(); if (k == STD_VECTOR_CUDA_GPU_MAT) { - *gpumv = (std::vector*)obj; + gpumv = *(std::vector*)obj; } } ogl::Buffer _InputArray::getOGlBuffer() const