From 41a35c3c951b39bee910db4da6f348e3e4523d43 Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Mon, 15 Aug 2011 12:29:39 +0000 Subject: [PATCH] fixed bug #1306 (Vec assignment) --- modules/core/include/opencv2/core/core.hpp | 1 - modules/core/include/opencv2/core/operations.hpp | 10 +--------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/modules/core/include/opencv2/core/core.hpp b/modules/core/include/opencv2/core/core.hpp index 9e1d8556dd..cfe096b930 100644 --- a/modules/core/include/opencv2/core/core.hpp +++ b/modules/core/include/opencv2/core/core.hpp @@ -592,7 +592,6 @@ public: explicit Vec(const _Tp* values); Vec(const Vec<_Tp, cn>& v); - Vec<_Tp, cn>& operator =(const Matx<_Tp, cn, 1>& m); static Vec all(_Tp alpha); diff --git a/modules/core/include/opencv2/core/operations.hpp b/modules/core/include/opencv2/core/operations.hpp index c6b5e9c630..8859de1dfe 100644 --- a/modules/core/include/opencv2/core/operations.hpp +++ b/modules/core/include/opencv2/core/operations.hpp @@ -1038,15 +1038,7 @@ template template inline Vec<_Tp, cn>::Vec(const Matx<_Tp, cn, 1>& a, _T2 alpha, Matx_ScaleOp op) : Matx<_Tp, cn, 1>(a, alpha, op) {} - -template inline -Vec<_Tp, cn>& Vec<_Tp, cn>::operator = (const Matx<_Tp, cn, 1>& m) -{ - for( int i = 0; i < cn; i++ ) - this->val[i] = m.val[i]; - return *this; -} - + template inline Vec<_Tp, cn> Vec<_Tp, cn>::all(_Tp alpha) { Vec v;