Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed Vec*scalar operations, fixed minEnclosingCircle Python interface.

Browse Source
pull/13383/head
Vadim Pisarevsky 14 years ago
parent 5868875ab9
commit f85b9754e0
3 changed files with 62 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      modules/core/include/opencv2/core/core.hpp
  2. 112
      modules/core/include/opencv2/core/operations.hpp
  3. 2
      modules/imgproc/include/opencv2/imgproc/imgproc.hpp

6
modules/core/include/opencv2/core/core.hpp
Unescape View File

@ -589,6 +589,8 @@ 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);
//! per-element multiplication
@ -610,6 +612,10 @@ public:
_Tp& operator[](int i);
const _Tp& operator ()(int i) const;
_Tp& operator ()(int i);
Vec(const Matx<_Tp, cn, 1>& a, const Matx<_Tp, cn, 1>& b, Matx_AddOp);
Vec(const Matx<_Tp, cn, 1>& a, const Matx<_Tp, cn, 1>& b, Matx_SubOp);
template<typename _T2> Vec(const Matx<_Tp, cn, 1>& a, _T2 alpha, Matx_ScaleOp);
};

112
modules/core/include/opencv2/core/operations.hpp
Unescape View File

@ -1017,10 +1017,33 @@ template<typename _Tp, int cn> inline Vec<_Tp, cn>::Vec(const _Tp* values)
{}
template<typename _Tp, int cn> inline Vec<_Tp, cn>::Vec(const Vec<_Tp, cn>& v)
: Matx<_Tp, cn, 1>(v.val)
template<typename _Tp, int cn> inline Vec<_Tp, cn>::Vec(const Vec<_Tp, cn>& m)
: Matx<_Tp, cn, 1>(m.val)
{}
template<typename _Tp, int cn> inline
Vec<_Tp, cn>::Vec(const Matx<_Tp, cn, 1>& a, const Matx<_Tp, cn, 1>& b, Matx_AddOp op)
: Matx<_Tp, cn, 1>(a, b, op)
{}
template<typename _Tp, int cn> inline
Vec<_Tp, cn>::Vec(const Matx<_Tp, cn, 1>& a, const Matx<_Tp, cn, 1>& b, Matx_SubOp op)
: Matx<_Tp, cn, 1>(a, b, op)
{}
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;
@ -1101,100 +1124,75 @@ operator -= (Vec<_Tp1, cn>& a, const Vec<_Tp2, cn>& b)
template<typename _Tp, int cn> static inline Vec<_Tp, cn>
operator + (const Vec<_Tp, cn>& a, const Vec<_Tp, cn>& b)
{
Vec<_Tp, cn> c = a;
return c += b;
return Vec<_Tp, cn>(a, b, Matx_AddOp());
}
template<typename _Tp, int cn> static inline Vec<_Tp, cn>
operator - (const Vec<_Tp, cn>& a, const Vec<_Tp, cn>& b)
{
Vec<_Tp, cn> c = a;
return c -= b;
return Vec<_Tp, cn>(a, b, Matx_SubOp());
}
template<typename _Tp, int cn> static inline
Vec<_Tp, cn>& operator *= (Vec<_Tp, cn>& a, _Tp alpha)
Vec<_Tp, cn>& operator *= (Vec<_Tp, cn>& a, int alpha)
{
for( int i = 0; i < cn; i++ )
a[i] *= alpha;
a[i] = saturate_cast<_Tp>(a[i]*alpha);
return a;
}
template<int cn> static inline
Vec<float, cn>& operator *= (Vec<float, cn>& a, double alpha)
template<typename _Tp, int cn> static inline
Vec<_Tp, cn>& operator *= (Vec<_Tp, cn>& a, float alpha)
{
for( int i = 0; i < cn; i++ )
a[i] *= (float)alpha;
a[i] = saturate_cast<_Tp>(a[i]*alpha);
return a;
}
template<int cn> static inline
Vec<float, cn>& operator *= (Vec<float, cn>& a, int alpha)
template<typename _Tp, int cn> static inline
Vec<_Tp, cn>& operator *= (Vec<_Tp, cn>& a, double alpha)
{
for( int i = 0; i < cn; i++ )
a[i] *= (float)alpha;
a[i] = saturate_cast<_Tp>(a[i]*alpha);
return a;
}
template<typename _Tp, int cn> static inline Vec<_Tp, cn>
operator * (const Vec<_Tp, cn>& a, _Tp alpha)
operator * (const Vec<_Tp, cn>& a, int alpha)
{
Vec<_Tp, cn> c = a;
return c *= alpha;
return Vec<_Tp, cn>(a, alpha, Matx_ScaleOp());
}
template<typename _Tp, int cn> static inline Vec<_Tp, cn>
operator * (_Tp alpha, const Vec<_Tp, cn>& a)
operator * (int alpha, const Vec<_Tp, cn>& a)
{
Vec<_Tp, cn> c = a;
return c *= alpha;
return Vec<_Tp, cn>(a, alpha, Matx_ScaleOp());
}
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)
template<typename _Tp, int cn> static inline Vec<_Tp, cn>
operator * (const Vec<_Tp, cn>& a, float alpha)
{
Vec<float, cn> c = a;
return c *= (float)alpha;
return Vec<_Tp, cn>(a, alpha, Matx_ScaleOp());
}
template<int cn> static inline Vec<float, cn>
operator * (int alpha, const Vec<float, cn>& a)
template<typename _Tp, int cn> static inline Vec<_Tp, cn>
operator * (float alpha, const Vec<_Tp, cn>& a)
{
Vec<float, cn> c = a;
return c *= (float)alpha;
return Vec<_Tp, cn>(a, alpha, Matx_ScaleOp());
}
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)
template<typename _Tp, int cn> static inline Vec<_Tp, cn>
operator * (const Vec<_Tp, cn>& a, double alpha)
{
return Vec<_Tp, 4>(saturate_cast<_Tp>(a[0]*b[0] - a[1]*b[1] - a[2]*b[2] - a[3]*b[3]),
saturate_cast<_Tp>(a[0]*b[1] + a[1]*b[0] + a[2]*b[3] - a[3]*b[2]),
saturate_cast<_Tp>(a[0]*b[2] - a[1]*b[3] + a[2]*b[0] - a[3]*b[1]),
saturate_cast<_Tp>(a[0]*b[3] + a[1]*b[2] - a[2]*b[1] - a[3]*b[0]));
return Vec<_Tp, cn>(a, alpha, Matx_ScaleOp());
}
template<typename _Tp> static inline Vec<_Tp, 4>&
operator *= (Vec<_Tp, 4>& a, const Vec<_Tp, 4>& b)
template<typename _Tp, int cn> static inline Vec<_Tp, cn>
operator * (double alpha, const Vec<_Tp, cn>& a)
{
a = a*b;
return a;
}
return Vec<_Tp, cn>(a, alpha, Matx_ScaleOp());
}
template<typename _Tp, int cn> static inline Vec<_Tp, cn>
operator - (const Vec<_Tp, cn>& a)
@ -1203,7 +1201,7 @@ operator - (const Vec<_Tp, cn>& a)
for( int i = 0; i < cn; i++ ) t.val[i] = saturate_cast<_Tp>(-a.val[i]);
return t;
}
template<> inline Vec<float, 3> Vec<float, 3>::cross(const Vec<float, 3>& v) const
{
return Vec<float,3>(val[1]*v.val[2] - val[2]*v.val[1],

2
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
Unescape View File

@ -997,7 +997,7 @@ CV_EXPORTS_W double contourArea( InputArray contour, bool oriented=false );
CV_EXPORTS_W RotatedRect minAreaRect( InputArray points );
//! computes the minimal enclosing circle for a set of points
CV_EXPORTS_W void minEnclosingCircle( InputArray points,
Point2f& center, float& radius );
CV_OUT Point2f& center, CV_OUT float& radius );
//! matches two contours using one of the available algorithms
CV_EXPORTS_W double matchShapes( InputArray contour1, InputArray contour2,
int method, double parameter );

Write Preview
Loading…
Cancel
Save