Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(5.x) Merge 4.x #3501

Merged
merged 40 commits into from
Jul 5, 2023
Merged

(5.x) Merge 4.x #3501

merged 40 commits into from
Jul 5, 2023

Conversation

asmorkalov
Copy link
Contributor

@asmorkalov asmorkalov commented May 31, 2023

Main PR: opencv/opencv#23718

#3410 from stopmosk:fix-aruco-charuco-calib-tutorials-and-faq
#3420 from AleksandrPanov:remove_duplication_from_aruco
#3422 from SpaceIm:fix/alphamat-header
#3423 from matijazigic:fix_optflow_rlof
#3426 from tomoaki0705:handleNonBitExact
#3430 from savuor/stddev_calib_omnidir
#3434 from asmorkalov:as/xcode_warning_supression
#3435 from asmorkalov:as/xcode_warning_supression3.4
#3436 from mshabunin:fix-clang-warnings
#3451 from vovka643:4.x_deprecated_backends
#3462 from Kumataro:3.4-fixc3457
#3463 from LaurentBerger:typo_in_viz
#3464 from vovka643:4.x_generate_charuco
#3465 from 747:hough-segment-fix
#3468 from cudawarped:cudacodec_fix_colour_conversion
#3469 from smeng9:patch-aruco-doc
#3470 from cudawarped:cudacodec_fix_display_size
#3483 from SinM9:wechat_qrcode_perf_tests
#3484 from Konano:patch-2
#3485 from asmorkalov:as/cuda_codec_get
#3496 from mshabunin:add-editorconfig
#3482 from MaximMilashchenko:barcode-perf-tests
#3480 from Konano:patch-1

Previous "Merge 4.x": #3432

stopmosk and others added 30 commits January 4, 2023 17:58
…ssion

-Wunused-but-set-variable warnings fix after XCode update with clang 13.1
changed CAP_OPENNI flag to CAP_OPENNI2 in linemod sample
Fix flipped image in documentation
Add `threshold` parameter to cuda::HoughSegmentDetector
…onversion

`cudacodec::VideoReader`: fix nv12 to bgr/bgra/grey conversion
…size

`cudacodec::VideoReader`: force output frame resolution to be display not coded size
text: change default char_whitelist parameter.
…pencv#3480)

* fix(wechat_qrcode): Initialize nBytes after the count value is determined

* fix(wechat_qrcode): Incorrect count data repair

* chore: format expr

* fix(wechat_qrcode): Avoid null pointer exception

* fix(wechat_qrcode): return when bytes_ is empty

* test(wechat_qrcode): add test case

---------

Co-authored-by: GZTime <Time.GZ@outlook.com>
fix(wechat_qrcode): fixed memory leaks
asmorkalov and others added 10 commits May 3, 2023 11:39
…tutorials-and-faq

Update aruco and charuco calibration tutorials and faq
Promote cv::VideoCapture properties in VideoReader
moved aruco_dict_utils.cpp from opencv_contrib to opencv
---------

Co-authored-by: Maksim Milaschenko <m.milaschenko@yadro.com>
Co-authored-by: Maksim Shabunin <maksim.shabunin@gmail.com>
@asmorkalov asmorkalov changed the base branch from 4.x to 5.x June 1, 2023 06:36
@asmorkalov asmorkalov merged commit ec51e4f into opencv:5.x Jul 5, 2023
1 check failed
@asmorkalov asmorkalov mentioned this pull request Jul 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet