generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed bug #1306 (Vec assignment); added tests for Vec & Matx multiplication

Browse Source
This commit is contained in:
Vadim Pisarevsky
2011-08-15 13:24:13 +00:00
parent 58c0bea68a
commit fba70ca131
3 changed files with 59 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/core/include/opencv2/core/core.hpp
View File

@@ -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);

10
modules/core/include/opencv2/core/operations.hpp
View File

@@ -1038,15 +1038,7 @@ template<typename _Tp, int cn> template<typename _T2> inline
Vec<_Tp, cn>::Vec(const Matx<_Tp, cn, 1>& a, _T2 alpha, Matx_ScaleOp op)
: Matx<_Tp, cn, 1>(a, alpha, op)
{}
template<typename _Tp, int cn> 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<typename _Tp, int cn> inline Vec<_Tp, cn> Vec<_Tp, cn>::all(_Tp alpha)
{
Vec v;