diff --git a/modules/stitching/include/opencv2/stitching/detail/warpers.hpp b/modules/stitching/include/opencv2/stitching/detail/warpers.hpp index d0d7869d45..68377904b1 100644 --- a/modules/stitching/include/opencv2/stitching/detail/warpers.hpp +++ b/modules/stitching/include/opencv2/stitching/detail/warpers.hpp @@ -77,15 +77,7 @@ public: @param R Camera rotation matrix @return Backward-projected point */ -#if CV_VERSION_MAJOR == 4 - virtual Point2f warpPointBackward(const Point2f& pt, InputArray K, InputArray R) - { - CV_UNUSED(pt); CV_UNUSED(K); CV_UNUSED(R); - CV_Error(Error::StsNotImplemented, ""); - } -#else virtual Point2f warpPointBackward(const Point2f& pt, InputArray K, InputArray R) = 0; -#endif /** @brief Builds the projection maps according to the given camera data. diff --git a/modules/stitching/include/opencv2/stitching/warpers.hpp b/modules/stitching/include/opencv2/stitching/warpers.hpp index 0a5bf63de2..5928014652 100644 --- a/modules/stitching/include/opencv2/stitching/warpers.hpp +++ b/modules/stitching/include/opencv2/stitching/warpers.hpp @@ -72,15 +72,8 @@ namespace cv { @param R Camera rotation matrix @return Backward-projected point */ -#if CV_VERSION_MAJOR == 4 - CV_WRAP Point2f warpPointBackward(const Point2f& pt, InputArray K, InputArray R) - { - CV_UNUSED(pt); CV_UNUSED(K); CV_UNUSED(R); - CV_Error(Error::StsNotImplemented, ""); - } -#else CV_WRAP Point2f warpPointBackward(const Point2f &pt, InputArray K, InputArray R); -#endif + /** @brief Builds the projection maps according to the given camera data. @param src_size Source image size diff --git a/modules/stitching/src/warpers.cpp b/modules/stitching/src/warpers.cpp index 85ac939074..c492ec3975 100644 --- a/modules/stitching/src/warpers.cpp +++ b/modules/stitching/src/warpers.cpp @@ -93,12 +93,10 @@ Point2f PyRotationWarper::warpPoint(const Point2f &pt, InputArray K, InputArray return rw.get()->warpPoint(pt, K, R); } -#if CV_VERSION_MAJOR != 4 Point2f PyRotationWarper::warpPointBackward(const Point2f& pt, InputArray K, InputArray R) { return rw.get()->warpPointBackward(pt, K, R); } -#endif Rect PyRotationWarper::buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap) {