Merge pull request #804 from gpsinghsandhu:staticCast

pull/808/merge
Andrey Kamaev 12 years ago committed by OpenCV Buildbot
commit d2de68c14c
  1. 4
      modules/core/include/opencv2/core/operations.hpp

@ -686,7 +686,7 @@ template<typename _Tp> static inline
Scalar operator * (const Matx<_Tp, 4, 4>& a, const Scalar& b) Scalar operator * (const Matx<_Tp, 4, 4>& a, const Scalar& b)
{ {
Matx<double, 4, 1> c(Matx<double, 4, 4>(a), b, Matx_MatMulOp()); Matx<double, 4, 1> c(Matx<double, 4, 4>(a), b, Matx_MatMulOp());
return reinterpret_cast<const Scalar&>(c); return static_cast<const Scalar&>(c);
} }
@ -694,7 +694,7 @@ static inline
Scalar operator * (const Matx<double, 4, 4>& a, const Scalar& b) Scalar operator * (const Matx<double, 4, 4>& a, const Scalar& b)
{ {
Matx<double, 4, 1> c(a, b, Matx_MatMulOp()); Matx<double, 4, 1> c(a, b, Matx_MatMulOp());
return reinterpret_cast<const Scalar&>(c); return static_cast<const Scalar&>(c);
} }

Loading…
Cancel
Save