(4.x) Merge 3.4 #3215
Merged
(4.x) Merge 3.4 #3215
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…oints Fix objPoints order in GridBoard and CharucoBoard * fix gridBoard * fix charucoBoard * add rightBottomBorder * add test_aruco_utils and code refactoring/fix tests * fix axes and add charuco dict * add axes test, remove drawAxis(), update tutorial
…Candidates * fix search for one contour in _filterTooCloseCandidates() * add regression_3192 test * add regression_2492 test
alalek
commented
Mar 26, 2022
| @@ -285,7 +287,8 @@ CV_EXPORTS_W void detectCharucoDiamond(InputArray image, InputArrayOfArrays mark | |||
| InputArray markerIds, float squareMarkerLengthRate, | |||
| OutputArrayOfArrays diamondCorners, OutputArray diamondIds, | |||
| InputArray cameraMatrix = noArray(), | |||
| InputArray distCoeffs = noArray()); | |||
| InputArray distCoeffs = noArray(), | |||
| Ptr<Dictionary> dictionary = getPredefinedDictionary(PREDEFINED_DICTIONARY_NAME(0))); | |||
There was a problem hiding this comment.
Ptr<Dictionary>
@AleksandrPanov Why is not a const reference?
There was a problem hiding this comment.
const Dictionary& does not work for python binding.
Or do you suggest const Ptr<Dictionary>&?
alalek
commented
Mar 26, 2022
| @@ -678,7 +611,7 @@ TEST(Charuco, testCharucoCornersCollinear_false) | |||
| } | |||
|
|
|||
| // test that ChArUco board detection is subpixel accurate | |||
| TEST(Charuco, testBoardSubpixelCoords) | |||
| TEST(Charuco, DISABLED_testBoardSubpixelCoords) // FIXIT: https://github.com/opencv/opencv_contrib/pull/3213 | |||
There was a problem hiding this comment.
@AleksandrPanov Disabled this test. It is completely rewritten in 4.x branch (see #3213). Main question is "why?"
|
👍 |
Merged
Closed
6 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#3174 from AleksandrPanov:fix_gridboard_objPoints
#3181 from sturkmen72:bug-fix-edge_drawing
#3186 from AleksandrPanov:fix_CORNER_REFINE_CONTOUR
#3201 from AleksandrPanov:fix_filterTooCloseCandidates
Main PR: opencv/opencv#21784
Previous "Merge 3.4": #3173