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 #3179

Merged
merged 34 commits into from
Feb 22, 2022
Merged

(5.x) Merge 4.x #3179

merged 34 commits into from
Feb 22, 2022

Conversation

alalek
Copy link
Member

@alalek alalek commented Feb 22, 2022

#3070 from asmorkalov:as/hw_optflow_destructor
#3072 from sergiomb2:master
#3079 from Kumataro:Kumataro-patch-1
#3081 from asmorkalov:as/stereo_bm_uniqueness_ratio
#3082 from sergiud:wordsize-undefined
#3083 from sergiud:win32-sfm-no-minmax-macros
#3089 from noahstier:tlv1_cuda_optimization
#3090 from kuloPo:add-hough_space_transform
#3091 from asmorkalov:as/async_warp
#3092 from aimbot6120:sample_optimization
#3093 from scloke:master
#3094 from thunderbirdtr:viz_samples
#3095 from JulieBar:remap_overflow
#3098 from cudawarped:rtsp_video_write
#3103 from aluaces:patch-1
#3105 from AleksandrPanov:fix_refineDetectedMarkers_shape
#3107 from saurabheights:patch-1
#3110 from Kumataro:4.x_fix3108
#3112 from berak:ximgproc_fix_edge_drawing
#3113 from TracelessLe:master
#3120 from AleksandrPanov:fix-aruco-tutorial
#3121 from paroj:colorfu
#3123 from sturkmen72:legacy_constants
#3124 from duanqn:duanqn/fix-typo
#3126 from AleksandrPanov:update_ArUco_tutorial
#3128 from alalek:cmake_fix_opengl
#3130 from ToFam:ed_segment_getter
#3132 from asmorkalov:as/stereo_prefilter
#3134 from asmorkalov:as/stereo_ub2
#3135 from paroj:ovisup
#3137 from savuor:backport_levmarqfromscratch
#3139 from cudawarped:pass_videocapture_params_to_videoreader
#3144 from cudawarped:test_cuda_event
#3145 from LeatherWang:fix_edline_core
#3148 from paroj:ovisup
#3151 from AleksandrPanov:rebase_aruco_speedup
#3153 from stal12:4.x
#3154 from doprea:4.x
#3157 from danopdev:4.x
#3158 from paroj:ovisfix
#3159 from sturkmen72:edge_drawing
#3160 from sturkmen72:upd_templates
#3165 from sturkmen72:patch-3
#3166 from aditya9710:my-readme-contribution
#3167 from cudawarped:issue_3163
#3168 from cudawarped:fix_gpumat_dataend_bug
#3169 from alalek:cmake_fix_sfm_build

Main PR: opencv/opencv#21651
Previous "Merge 4.x": #3142

force_builders=Custom,Win64 OpenCL
buildworker:Custom=linux-4,linux-6
build_image:Custom=ubuntu-cuda:18.04
buildworker:Win64 OpenCL=windows-2
build_image:Win64 OpenCL=msvs2019

LeatherWang and others added 30 commits January 5, 2022 16:57
notably, make param order match the argment order
(cherry picked from commit 1d207e772285dd2d99eed886c70cb342f0dba8e4)
Feature/aruco speedup (rebased with 4.x)

* initial commit of new aruco functionality

* add performance FHD tile tests and fix pyramid bugs

* remove global ArUco3 params (threshold)

* add ArUco params to test classes

Co-authored-by: Steffen Urban <urbste@googlemail.com>
@alalek
Copy link
Member Author

alalek commented Feb 22, 2022

👍

@alalek alalek merged commit cbd4bd7 into opencv:5.x Feb 22, 2022
@opencv-pushbot opencv-pushbot mentioned this pull request Apr 23, 2022
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.

9 participants