Fix stitching Python bindings (and one stitching_detailed.cpp bug)#22329
Fix stitching Python bindings (and one stitching_detailed.cpp bug)#22329asmorkalov merged 1 commit intoopencv:4.xfrom
Conversation
|
Just looking at the tests above, it looks like the macOS-ARM64 build just failed to clone the repo due a timeout, not sure why, but can someone resubmit that test? (Ironically, macOS-ARM64 is the one platform I did test locally, so I am confident it'll work given all the others did!) |
|
The test seems to be failing because it is unable to clone |
|
No, it's connectivity issue. I re-triggered the failed jobs. |
|
@chinery Could you add test or at least python code snippet that reproduces the issue. Test data is required too. |
|
@asmorkalov I'll add a C++ test for point 1ii. Is there a place I can add Python test code? Or should I just put the snippet here? |
Add tests for stitching, range_width matcher and graph cuts seam finder
|
Don't worry have found the Python tests and added some |
|
Thanks a lot for the provided test cases! |
e2c01c1 to
bf402dd
Compare
|
The previous test failed due to some bad whitespace, I have just re-committed with that fixed |
|
HI @asmorkalov sorry could you retrigger the tests, they just seemed to fail on formatting before which I've hopefully fixed. |
|
Hi all, is there anything left to do before this can be approved? Thanks! |
|
Hi @asmorkalov, @alalek, sorry for the extra mention, but could you take a look and see if there's anything outstanding for this pull request? Thanks. |
|
Hello @chinery Thanks for the contribution! I apologize for the long wait. Too many PRs are in on-going state now.
|
No problem at all @asmorkalov. I remember thinking that the existing "apply2" method seemed to violate the established pattern (though I could not find this philosophy documented anywhere, so it was tricky to be sure from the code alone). Your proposal makes sense to fix the inconsistency, I'll do that and report back here shortly. One thing, could you clarify this comment?
I don't believe I've touched any of the motion estimation code, but I may have simply forgotten something I mentioned prior! |
|
It's my fault. Please do not mind |
|
No problem @asmorkalov! I've just pushed the changes, so I think the design philosophy matches now (no pun intended). Thanks for the continued help and patience. |
|
Looks good to me! Please squash commits and I'll merge it as single patch. |
bfdc7d4 to
ebb525d
Compare
|
After some silly git errors I've now squashed the commits @asmorkalov, thanks again! |
modules/stitching/include/opencv2/stitching/detail/matchers.hpp
Outdated
Show resolved
Hide resolved
ebb525d to
26a7647
Compare
|
@alalek Could you add exception to abi-complience checker for the API change. It safe for java, python, others. |
|
@alalek friendly reminder. |
Notes
This PR fixes two small issues in the header files for the stitching code, fixing two issues in Python and one minor one in the sample C++ code
stitching_detailed.cpp.BestOf2NearestRangeMatcherfixing BestOf2NearestRangeMatcher not working in Python or stitching_detailed.cpp #22315apply2in Python) now hasCV_WRAP_ASandCV_OUTto work correctly in PythonFeaturesMatcherversion of this function is marked asvirtualfixing a bug institching_detailed.cppwhere the--rangewidthargument did not do anything, andBestOf2NearestRangeMatcher's version is marked asCV_OVERRIDEcorrespondinglyGraphCutSeamFindermasks argument is now correctly marked asCV_IN_OUTfixing GraphCutSeamFinders find() method returns None instead of masks #20945I ran
opencv_test_stitchingand got no errors[ PASSED ] 21 tests.This is my first PR here so I hope I did everything correctly, please let me know if not!
Pull Request Readiness Checklist
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
Patch to opencv_extra has the same branch name.