Skip to content

Fix for failing QRCodeDetectorTest.testDetectAndDecodeMulti test#20097

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
komakai:fix_qrcode_test
May 17, 2021
Merged

Fix for failing QRCodeDetectorTest.testDetectAndDecodeMulti test#20097
opencv-pushbot merged 1 commit intoopencv:3.4from
komakai:fix_qrcode_test

Conversation

@komakai
Copy link
Copy Markdown
Contributor

@komakai komakai commented May 16, 2021

Pull Request Readiness Checklist

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
  • The PR is proposed to proper branch

Possible fix for failing test
https://build.opencv.org.cn/job/precommit/job/ubuntu-20.04-arm64/1868/

Assuming that QRCodeDetector.detectAndDecodeMulti does not guarantee the QR Codes are returned in any specific order then this I think this fix is reasonable

@komakai komakai mentioned this pull request May 16, 2021
Merged
4 tasks
@komakai komakai force-pushed the fix_qrcode_test branch from f8ff0d0 to c1dfb11 Compare May 16, 2021 11:53
@alalek
Copy link
Copy Markdown
Member

alalek commented May 17, 2021

Thank you!

Please target this patch into 3.4 branch.
We will merge changes from 3.4 into master regularly (weekly/bi-weekly).

Please:

  • change "base" branch of this PR: master => 3.4 (use "Edit" button near PR title)
  • rebase your commits from master onto 3.4 branch. For example:
    git rebase -i --onto upstream/3.4 upstream/master
    (check list of your commits, save and quit (Esc + "wq" + Enter)
    where upstream is configured by following this GitHub guide and fetched (git fetch upstream).
  • push rebased commits into source branch of your fork (with --force option)

Note: no needs to re-open PR, apply changes "inplace".

Replaces #20037

@komakai komakai changed the base branch from master to 3.4 May 17, 2021 11:08
@komakai komakai force-pushed the fix_qrcode_test branch from c1dfb11 to e53a4ce Compare May 17, 2021 11:09
@komakai
Copy link
Copy Markdown
Contributor Author

komakai commented May 17, 2021

Please target this patch into 3.4 branch.

👍

alalek
alalek approved these changes May 17, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well done!

@opencv-pushbot opencv-pushbot merged commit 1ae16be into opencv:3.4 May 17, 2021
@alalek alalek mentioned this pull request May 18, 2021
Merged
@alalek alalek mentioned this pull request Jun 4, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek approved these changes

Assignees

@alalek alalek

Labels

category: java bindings category: objdetect platform: arm ARM boards related issues: RPi, NVIDIA TK/TX, etc test

Projects

None yet

Milestone

3.4.15

Development

Successfully merging this pull request may close these issues.

3 participants

@komakai @alalek @opencv-pushbot