templated std::vector<T> constructor was being called instead of const…

templated std::vector<T> constructor was being called instead of const std::vector<cv::cuda::GpuMat>.

templated std::vector<T> constructor was being called instead of const…
templated std::vector<T> constructor was being called instead of const std::vector<cv::cuda::GpuMat>.
e9461d3f · Dan · 0df901b3 · e9461d3f
Commit e9461d3f authored Apr 14, 2016 by Dan
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

mat.inl.hpp modules/core/include/opencv2/core/mat.inl.hpp +5 -1

No files found.
--- a/modules/core/include/opencv2/core/mat.inl.hpp
+++ b/modules/core/include/opencv2/core/mat.inl.hpp
@@ -314,8 +314,12 @@ inline _InputOutputArray::_InputOutputArray(const std::vector<UMat>& vec)

 inline _InputOutputArray::_InputOutputArray(const cuda::GpuMat& d_mat)
 { init(FIXED_TYPE + FIXED_SIZE + CUDA_GPU_MAT + ACCESS_RW, &d_mat); }
+
 inline _InputOutputArray::_InputOutputArray(const std::vector<cuda::GpuMat>& d_mat)
-{	init(FIXED_TYPE + FIXED_SIZE + STD_VECTOR_CUDA_GPU_MAT + ACCESS_RW, &d_mat);}
+{ init(FIXED_TYPE + FIXED_SIZE + STD_VECTOR_CUDA_GPU_MAT + ACCESS_RW, &d_mat);}
+
+template<> inline _InputOutputArray::_InputOutputArray(std::vector<cuda::GpuMat>& d_mat)
+{ init(FIXED_TYPE + FIXED_SIZE + STD_VECTOR_CUDA_GPU_MAT + ACCESS_RW, &d_mat);}

 inline _InputOutputArray::_InputOutputArray(const ogl::Buffer& buf)
 { init(FIXED_TYPE + FIXED_SIZE + OPENGL_BUFFER + ACCESS_RW, &buf); }