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

Merge pull request #804 from gpsinghsandhu:staticCast

Browse Source
This commit is contained in:
Andrey Kamaev
2013-04-12 14:59:26 +04:00
committed by OpenCV Buildbot
parent b696d49d5a 36aad46fe1
commit d2de68c14c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
} }