mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 11:40:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11957 from alalek:issue_11956

Browse Source
This commit is contained in:
Alexander Alekhin 2018-07-16 15:54:34 +00:00
commit 481829a81b
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/core/include/opencv2/core/matx.hpp
View File

@ -66,13 +66,14 @@ namespace cv
////////////////////////////// Small Matrix /////////////////////////// ////////////////////////////// Small Matrix ///////////////////////////
//! @cond IGNORED //! @cond IGNORED
struct CV_EXPORTS Matx_AddOp {}; // FIXIT Remove this (especially CV_EXPORTS modifier)
struct CV_EXPORTS Matx_SubOp {}; struct CV_EXPORTS Matx_AddOp { Matx_AddOp() {} Matx_AddOp(const Matx_AddOp&) {} };
struct CV_EXPORTS Matx_ScaleOp {}; struct CV_EXPORTS Matx_SubOp { Matx_SubOp() {} Matx_SubOp(const Matx_SubOp&) {} };
struct CV_EXPORTS Matx_MulOp {}; struct CV_EXPORTS Matx_ScaleOp { Matx_ScaleOp() {} Matx_ScaleOp(const Matx_ScaleOp&) {} };
struct CV_EXPORTS Matx_DivOp {}; struct CV_EXPORTS Matx_MulOp { Matx_MulOp() {} Matx_MulOp(const Matx_MulOp&) {} };
struct CV_EXPORTS Matx_MatMulOp {}; struct CV_EXPORTS Matx_DivOp { Matx_DivOp() {} Matx_DivOp(const Matx_DivOp&) {} };
struct CV_EXPORTS Matx_TOp {}; struct CV_EXPORTS Matx_MatMulOp { Matx_MatMulOp() {} Matx_MatMulOp(const Matx_MatMulOp&) {} };
struct CV_EXPORTS Matx_TOp { Matx_TOp() {} Matx_TOp(const Matx_TOp&) {} };
//! @endcond //! @endcond
/** @brief Template class for small matrices whose type and size are known at compilation time /** @brief Template class for small matrices whose type and size are known at compilation time
@ -118,7 +119,7 @@ public:
//! default constructor //! default constructor
Matx(); Matx();
Matx(_Tp v0); //!< 1x1 matrix explicit Matx(_Tp v0); //!< 1x1 matrix
Matx(_Tp v0, _Tp v1); //!< 1x2 or 2x1 matrix Matx(_Tp v0, _Tp v1); //!< 1x2 or 2x1 matrix
Matx(_Tp v0, _Tp v1, _Tp v2); //!< 1x3 or 3x1 matrix Matx(_Tp v0, _Tp v1, _Tp v2); //!< 1x3 or 3x1 matrix
Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3); //!< 1x4, 2x2 or 4x1 matrix Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3); //!< 1x4, 2x2 or 4x1 matrix

8
modules/core/test/test_operations.cpp
View File

@ -794,13 +794,13 @@ bool CV_OperationsTest::TestTemplateMat()
Size size(2, 5); Size size(2, 5);
TestType<float>(size, 1.f); TestType<float>(size, 1.f);
cv::Vec3f val1 = 1.f; cv::Vec3f val1(1.f);
TestType<cv::Vec3f>(size, val1); TestType<cv::Vec3f>(size, val1);
cv::Matx31f val2 = 1.f; cv::Matx31f val2(1.f);
TestType<cv::Matx31f>(size, val2); TestType<cv::Matx31f>(size, val2);
cv::Matx41f val3 = 1.f; cv::Matx41f val3(1.f);
TestType<cv::Matx41f>(size, val3); TestType<cv::Matx41f>(size, val3);
cv::Matx32f val4 = 1.f; cv::Matx32f val4(1.f);
TestType<cv::Matx32f>(size, val4); TestType<cv::Matx32f>(size, val4);
} }
catch (const test_excep& e) catch (const test_excep& e)