Merge pull request #1051 from paroj:pyreg_fixup

8 years ago · 2ca605a13e
parent f9fb12d106 e3d8f7fae8
commit 2ca605a13e
4 changed files with 6 additions and 6 deletions
--- a/modules/reg/include/opencv2/reg/mapaffine.hpp
+++ b/modules/reg/include/opencv2/reg/mapaffine.hpp
@ -62,7 +62,7 @@ public:
     * \param[in] linTr Linear part of the affine transformation
     * \param[in] shift Displacement part of the affine transformation
     */
-    MapAffine(const cv::Matx<double, 2, 2>& linTr, const cv::Vec<double, 2>& shift);
+    CV_WRAP MapAffine(InputArray linTr, InputArray shift);

    /*!
     * Destructor
--- a/modules/reg/include/opencv2/reg/mapprojec.hpp
+++ b/modules/reg/include/opencv2/reg/mapprojec.hpp
@ -62,7 +62,7 @@ public:
     * Constructor providing explicit values
     * \param[in] projTr Projective transformation
     */
-    MapProjec(const cv::Matx<double, 3, 3>& projTr);
+    CV_WRAP MapProjec(InputArray projTr);

    /*!
     * Destructor
--- a/modules/reg/src/mapaffine.cpp
+++ b/modules/reg/src/mapaffine.cpp
@ -51,8 +51,8 @@ MapAffine::MapAffine()
 }

 ////////////////////////////////////////////////////////////////////////////////////////////////////
-MapAffine::MapAffine(const Matx<double, 2, 2>& linTr, const Vec<double, 2>& shift)
-    : linTr_(linTr), shift_(shift)
+MapAffine::MapAffine(InputArray linTr, InputArray shift)
+    : linTr_(linTr.getMat()), shift_(shift.getMat())
 {
 }

--- a/modules/reg/src/mapprojec.cpp
+++ b/modules/reg/src/mapprojec.cpp
@ -51,8 +51,8 @@ MapProjec::MapProjec()
 }

 ////////////////////////////////////////////////////////////////////////////////////////////////////
-MapProjec::MapProjec(const Matx<double, 3, 3>& projTr)
-    : projTr_(projTr)
+MapProjec::MapProjec(InputArray projTr)
+    : projTr_(projTr.getMat())
 {
 }