mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #21180 from tezz-io:4.x

Browse Source 
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.
This commit is contained in:
Tejas M R 2021-12-05 18:17:44 +05:30 committed by GitHub
parent 73318fd514
commit 676a724491
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/stitching/include/opencv2/stitching/detail/matchers.hpp
View File

@ -59,7 +59,7 @@ struct CV_EXPORTS_W_SIMPLE ImageFeatures
{ {
CV_PROP_RW int img_idx; CV_PROP_RW int img_idx;
CV_PROP_RW Size img_size; CV_PROP_RW Size img_size;
std::vector<KeyPoint> keypoints; CV_PROP_RW std::vector<KeyPoint> keypoints;
CV_PROP_RW UMat descriptors; CV_PROP_RW UMat descriptors;
CV_WRAP std::vector<KeyPoint> getKeypoints() { return keypoints; }; CV_WRAP std::vector<KeyPoint> getKeypoints() { return keypoints; };
}; };

3
modules/stitching/misc/python/test/test_stitching.py
View File

@ -28,6 +28,9 @@ class stitching_detail_test(NewOpenCVTests):
imgFea = cv.detail.computeImageFeatures2(finder,img) imgFea = cv.detail.computeImageFeatures2(finder,img)
self.assertIsNotNone(imgFea) self.assertIsNotNone(imgFea)
# Added Test for PR #21180
self.assertIsNotNone(imgFea.keypoints)
matcher = cv.detail_BestOf2NearestMatcher(False, 0.3) matcher = cv.detail_BestOf2NearestMatcher(False, 0.3)
self.assertIsNotNone(matcher) self.assertIsNotNone(matcher)
matcher = cv.detail_AffineBestOf2NearestMatcher(False, False, 0.3) matcher = cv.detail_AffineBestOf2NearestMatcher(False, False, 0.3)