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

Merge pull request #3345 from D-Alex:master

Browse Source
This commit is contained in:
Vadim Pisarevsky
2014-10-18 17:00:31 +00:00
parent c45d2642ca 11ebaf673f
commit e4418e186e
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/doc/basic_structures.rst
View File

@@ -534,7 +534,7 @@ Template class for a 4-element vector derived from Vec.
template<typename T2> operator Scalar_<T2>() const; template<typename T2> operator Scalar_<T2>() const;
//! per-element product //! per-element product
Scalar_<_Tp> mul(const Scalar_<_Tp>& t, double scale=1 ) const; Scalar_<_Tp> mul(const Scalar_<_Tp>& a, double scale=1 ) const;
// returns (v0, -v1, -v2, -v3) // returns (v0, -v1, -v2, -v3)
Scalar_<_Tp> conj() const; Scalar_<_Tp> conj() const;

12
modules/core/include/opencv2/core/types.hpp
View File

@@ -493,7 +493,7 @@ public:
template<typename T2> operator Scalar_<T2>() const; template<typename T2> operator Scalar_<T2>() const;
//! per-element product //! per-element product
Scalar_<_Tp> mul(const Scalar_<_Tp>& t, double scale=1 ) const; Scalar_<_Tp> mul(const Scalar_<_Tp>& a, double scale=1 ) const;
// returns (v0, -v1, -v2, -v3) // returns (v0, -v1, -v2, -v3)
Scalar_<_Tp> conj() const; Scalar_<_Tp> conj() const;
@@ -1802,12 +1802,12 @@ Scalar_<_Tp> Scalar_<_Tp>::all(_Tp v0)
template<typename _Tp> inline template<typename _Tp> inline
Scalar_<_Tp> Scalar_<_Tp>::mul(const Scalar_<_Tp>& t, double scale ) const Scalar_<_Tp> Scalar_<_Tp>::mul(const Scalar_<_Tp>& a, double scale ) const
{ {
return Scalar_<_Tp>(saturate_cast<_Tp>(this->val[0] * t.val[0] * scale), return Scalar_<_Tp>(saturate_cast<_Tp>(this->val[0] * a.val[0] * scale),
saturate_cast<_Tp>(this->val[1] * t.val[1] * scale), saturate_cast<_Tp>(this->val[1] * a.val[1] * scale),
saturate_cast<_Tp>(this->val[2] * t.val[2] * scale), saturate_cast<_Tp>(this->val[2] * a.val[2] * scale),
saturate_cast<_Tp>(this->val[3] * t.val[3] * scale)); saturate_cast<_Tp>(this->val[3] * a.val[3] * scale));
} }
template<typename _Tp> inline template<typename _Tp> inline