From e3d8f7fae83ce73100465bdb4dad589405b2708f Mon Sep 17 00:00:00 2001 From: Pavel Rojtberg Date: Tue, 7 Mar 2017 16:55:06 +0100 Subject: [PATCH] reg: enable Affine and Projective Mappers for python bindings --- modules/reg/include/opencv2/reg/mapaffine.hpp | 2 +- modules/reg/include/opencv2/reg/mapprojec.hpp | 2 +- modules/reg/src/mapaffine.cpp | 4 ++-- modules/reg/src/mapprojec.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/reg/include/opencv2/reg/mapaffine.hpp b/modules/reg/include/opencv2/reg/mapaffine.hpp index 1843d8431..868b661f2 100644 --- 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& linTr, const cv::Vec& shift); + CV_WRAP MapAffine(InputArray linTr, InputArray shift); /*! * Destructor diff --git a/modules/reg/include/opencv2/reg/mapprojec.hpp b/modules/reg/include/opencv2/reg/mapprojec.hpp index 356b18552..5802a74a4 100644 --- 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& projTr); + CV_WRAP MapProjec(InputArray projTr); /*! * Destructor diff --git a/modules/reg/src/mapaffine.cpp b/modules/reg/src/mapaffine.cpp index b9d38d7b6..7bdc221b5 100644 --- a/modules/reg/src/mapaffine.cpp +++ b/modules/reg/src/mapaffine.cpp @@ -51,8 +51,8 @@ MapAffine::MapAffine() } //////////////////////////////////////////////////////////////////////////////////////////////////// -MapAffine::MapAffine(const Matx& linTr, const Vec& shift) - : linTr_(linTr), shift_(shift) +MapAffine::MapAffine(InputArray linTr, InputArray shift) + : linTr_(linTr.getMat()), shift_(shift.getMat()) { } diff --git a/modules/reg/src/mapprojec.cpp b/modules/reg/src/mapprojec.cpp index 9b653b443..86a3759a0 100644 --- a/modules/reg/src/mapprojec.cpp +++ b/modules/reg/src/mapprojec.cpp @@ -51,8 +51,8 @@ MapProjec::MapProjec() } //////////////////////////////////////////////////////////////////////////////////////////////////// -MapProjec::MapProjec(const Matx& projTr) - : projTr_(projTr) +MapProjec::MapProjec(InputArray projTr) + : projTr_(projTr.getMat()) { }