(4.x) Merge 3.4 #3231
Merged
(4.x) Merge 3.4 #3231
Conversation
This file contains hidden or 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
This is to quiet the -Wunused-but-set-parameter clang diagnostic warning.
…-fix Fix infinite loop on ArUco apriltag refinement * Fix infinite loop on ArUco apriltag refinement Software entered infinite loop when image height was smaller than 10*cv::getNumThreads(). With high core count machines this could happen with very reasonable image sizes. Fix is to ensure that chunksize is at least 1. * Test aruco detection with different number of threads Test ensures that different aruco detection methods do not produce different results based on number of threads. Test was created after observing infinite loop caused by small image and large number of threads when using apriltag corner refinement. * Test refactoring. * Syntax fix for pre-C++11 compilers. Co-authored-by: Alexander Smorkalov <[email protected]>
Aruco improvements * add writeDictionary(), dict distance, fix readDictionary(), readDetectorParameters() * add aruco_dict_utils.cpp * add py test_write_read_dict * update tutorial
…_test Fix warning for Aruco threading test
Merged
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.
#3200 from AleksandrPanov:aruco_improvements
#3219 from vrabaud:34_remove_unused
#3220 from buq2:aruco-apriltag-infinite-loop-fix
#3230 from AleksandrPanov:fix_ArucoThreading_test
Main PR: opencv/opencv#21878
Previous "Merge 3.4": #3221