From 676a724491de423c5d964d83594f7e99aa0d31c7 Mon Sep 17 00:00:00 2001 From: Tejas M R <52408360+tezz-io@users.noreply.github.com> Date: Sun, 5 Dec 2021 18:17:44 +0530 Subject: [PATCH] Merge pull request #21180 from tezz-io:4.x Added CV_PROP_RW macro to keypoints * Added CV_PROP_RW macro to keypoints As outlined in the feature request in the issue https://github.com/opencv/opencv/issues/21171 : the keypoints field has been made parsable by the bindings. * Added test for keypoints Added test to check if the CV_PROP_RW macro added in the previous commit makes keypoints public and accessible through the python API. --- .../stitching/include/opencv2/stitching/detail/matchers.hpp | 2 +- modules/stitching/misc/python/test/test_stitching.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/stitching/include/opencv2/stitching/detail/matchers.hpp b/modules/stitching/include/opencv2/stitching/detail/matchers.hpp index ef4684fd05..cd9749ca8b 100644 --- a/modules/stitching/include/opencv2/stitching/detail/matchers.hpp +++ b/modules/stitching/include/opencv2/stitching/detail/matchers.hpp @@ -59,7 +59,7 @@ struct CV_EXPORTS_W_SIMPLE ImageFeatures { CV_PROP_RW int img_idx; CV_PROP_RW Size img_size; - std::vector keypoints; + CV_PROP_RW std::vector keypoints; CV_PROP_RW UMat descriptors; CV_WRAP std::vector getKeypoints() { return keypoints; }; }; diff --git a/modules/stitching/misc/python/test/test_stitching.py b/modules/stitching/misc/python/test/test_stitching.py index 719f0583f2..0d66182fb8 100644 --- a/modules/stitching/misc/python/test/test_stitching.py +++ b/modules/stitching/misc/python/test/test_stitching.py @@ -28,6 +28,9 @@ class stitching_detail_test(NewOpenCVTests): imgFea = cv.detail.computeImageFeatures2(finder,img) self.assertIsNotNone(imgFea) + # Added Test for PR #21180 + self.assertIsNotNone(imgFea.keypoints) + matcher = cv.detail_BestOf2NearestMatcher(False, 0.3) self.assertIsNotNone(matcher) matcher = cv.detail_AffineBestOf2NearestMatcher(False, False, 0.3)