diff --git a/modules/stitching/include/opencv2/stitching/detail/warpers.hpp b/modules/stitching/include/opencv2/stitching/detail/warpers.hpp index 5e36a6e679..9c64f5dd58 100644 --- a/modules/stitching/include/opencv2/stitching/detail/warpers.hpp +++ b/modules/stitching/include/opencv2/stitching/detail/warpers.hpp @@ -57,7 +57,7 @@ class CV_EXPORTS RotationWarper public: virtual ~RotationWarper() {} - virtual Point2f warp(const Point2f &pt, const Mat &K, const Mat &R) = 0; + virtual Point2f warpPoint(const Point2f &pt, const Mat &K, const Mat &R) = 0; virtual Rect buildMaps(Size src_size, const Mat &K, const Mat &R, Mat &xmap, Mat &ymap) = 0; @@ -91,7 +91,7 @@ template class CV_EXPORTS RotationWarperBase : public RotationWarper { public: - Point2f warp(const Point2f &pt, const Mat &K, const Mat &R); + Point2f warpPoint(const Point2f &pt, const Mat &K, const Mat &R); Rect buildMaps(Size src_size, const Mat &K, const Mat &R, Mat &xmap, Mat &ymap); @@ -131,7 +131,7 @@ public: void setScale(float scale) { projector_.scale = scale; } - Point2f warp(const Point2f &pt, const Mat &K, const Mat &R, const Mat &T); + Point2f warpPoint(const Point2f &pt, const Mat &K, const Mat &R, const Mat &T); Rect buildMaps(Size src_size, const Mat &K, const Mat &R, const Mat &T, Mat &xmap, Mat &ymap); diff --git a/modules/stitching/include/opencv2/stitching/detail/warpers_inl.hpp b/modules/stitching/include/opencv2/stitching/detail/warpers_inl.hpp index 65532bbe47..da20b90a23 100644 --- a/modules/stitching/include/opencv2/stitching/detail/warpers_inl.hpp +++ b/modules/stitching/include/opencv2/stitching/detail/warpers_inl.hpp @@ -50,7 +50,7 @@ namespace cv { namespace detail { template -Point2f RotationWarperBase

::warp(const Point2f &pt, const Mat &K, const Mat &R) +Point2f RotationWarperBase

::warpPoint(const Point2f &pt, const Mat &K, const Mat &R) { projector_.setCameraParams(K, R); Point2f uv; diff --git a/modules/stitching/src/warpers.cpp b/modules/stitching/src/warpers.cpp index 539bb08ad9..3aa308cd6e 100644 --- a/modules/stitching/src/warpers.cpp +++ b/modules/stitching/src/warpers.cpp @@ -78,7 +78,7 @@ void ProjectorBase::setCameraParams(const Mat &K, const Mat &R, const Mat &T) } -Point2f PlaneWarper::warp(const Point2f &pt, const Mat &K, const Mat &R, const Mat &T) +Point2f PlaneWarper::warpPoint(const Point2f &pt, const Mat &K, const Mat &R, const Mat &T) { projector_.setCameraParams(K, R, T); Point2f uv;