Fixed VS 2010 and option Za bug.

pull/6205/head
aravind 9 years ago
parent 88a33a4e4f
commit dccbf50059
  1. 12
      modules/core/include/opencv2/core/matx.hpp

@ -1022,17 +1022,17 @@ Vec<_Tp, cn> Vec<_Tp, cn>::cross(const Vec<_Tp, cn>&) const
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],
val[2]*v.val[0] - val[0]*v.val[2],
val[0]*v.val[1] - val[1]*v.val[0]);
return Vec<float,3>(this->val[1]*v.val[2] - this->val[2]*v.val[1],
this->val[2]*v.val[0] - this->val[0]*v.val[2],
this->val[0]*v.val[1] - this->val[1]*v.val[0]);
}
template<> inline
Vec<double, 3> Vec<double, 3>::cross(const Vec<double, 3>& v) const
{
return Vec<double,3>(val[1]*v.val[2] - val[2]*v.val[1],
val[2]*v.val[0] - val[0]*v.val[2],
val[0]*v.val[1] - val[1]*v.val[0]);
return Vec<double,3>(this->val[1]*v.val[2] - this->val[2]*v.val[1],
this->val[2]*v.val[0] - this->val[0]*v.val[2],
this->val[0]*v.val[1] - this->val[1]*v.val[0]);
}
template<typename _Tp, int cn> template<typename T2> inline

Loading…
Cancel
Save