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

updated OpenCV version to 2.2.9; added missing cv::convertPointsHomogeneous for backward compatibility; fixed bug #952

Browse Source
This commit is contained in:
Vadim Pisarevsky
2011-05-02 22:20:22 +00:00
parent b435ff0bb7
commit d02a0cab48
6 changed files with 62 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1131,27 +1131,30 @@ operator - (const Vec<_Tp, cn>& a, const Vec<_Tp, cn>& b)
return c -= b;
}
template<typename _Tp> static inline
Vec<_Tp, 2>& operator *= (Vec<_Tp, 2>& a, _Tp alpha)
template<typename _Tp, int cn> static inline
Vec<_Tp, cn>& operator *= (Vec<_Tp, cn>& a, _Tp alpha)
{
a[0] *= alpha; a[1] *= alpha;
for( int i = 0; i < cn; i++ )
a[i] *= alpha;
return a;
}
template<typename _Tp> static inline
Vec<_Tp, 3>& operator *= (Vec<_Tp, 3>& a, _Tp alpha)
template<int cn> static inline
Vec<float, cn>& operator *= (Vec<float, cn>& a, double alpha)
{
a[0] *= alpha; a[1] *= alpha; a[2] *= alpha;
for( int i = 0; i < cn; i++ )
a[i] *= (float)alpha;
return a;
}
template<typename _Tp> static inline
Vec<_Tp, 4>& operator *= (Vec<_Tp, 4>& a, _Tp alpha)
template<int cn> static inline
Vec<float, cn>& operator *= (Vec<float, cn>& a, int alpha)
{
a[0] *= alpha; a[1] *= alpha; a[2] *= alpha; a[3] *= alpha;
for( int i = 0; i < cn; i++ )
a[i] *= (float)alpha;
return a;
}
template<typename _Tp, int cn> static inline Vec<_Tp, cn>
operator * (const Vec<_Tp, cn>& a, _Tp alpha)
{
@@ -1162,10 +1165,38 @@ operator * (const Vec<_Tp, cn>& a, _Tp alpha)
template<typename _Tp, int cn> static inline Vec<_Tp, cn>
operator * (_Tp alpha, const Vec<_Tp, cn>& a)
{
return a * alpha;
Vec<_Tp, cn> c = a;
return c *= alpha;
}
template<int cn> static inline Vec<float, cn>
operator * (double alpha, const Vec<float, cn>& a)
{
Vec<float, cn> c = a;
return c *= (float)alpha;
}
template<int cn> static inline Vec<float, cn>
operator * (const Vec<float, cn>& a, double alpha)
{
Vec<float, cn> c = a;
return c *= (float)alpha;
}
template<int cn> static inline Vec<float, cn>
operator * (int alpha, const Vec<float, cn>& a)
{
Vec<float, cn> c = a;
return c *= (float)alpha;
}
template<int cn> static inline Vec<float, cn>
operator * (const Vec<float, cn>& a, int alpha)
{
Vec<float, cn> c = a;
return c *= (float)alpha;
}
template<typename _Tp> static inline Vec<_Tp, 4>
operator * (const Vec<_Tp, 4>& a, const Vec<_Tp, 4>& b)
{

2
modules/core/include/opencv2/core/version.hpp
View File

@@ -49,7 +49,7 @@
#define CV_MAJOR_VERSION 2
#define CV_MINOR_VERSION 2
#define CV_SUBMINOR_VERSION 0
#define CV_SUBMINOR_VERSION 9
#define CVAUX_STR_EXP(__A) #__A
#define CVAUX_STR(__A) CVAUX_STR_EXP(__A)