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

Merged
merged 138 commits into from
Jan 9, 2023
Merged

(5.x) Merge 4.x #3413

merged 138 commits into from
Jan 9, 2023

Conversation

alalek
Copy link
Member

@alalek alalek commented Jan 8, 2023

#3003 from augustinmanecy:features2d-rw
#3285 from bebuch:4.x
#3287 from AleksandrPanov:wechat_fix_large_img
#3289 from AleksandrPanov:wechat_fix_output_qr_corners
#3313 from Qubiz:Qubiz-find-hdr-parser-path-using-OpenCV_SOURCE_DIR
#3321 from y-guyon:fix_get_subbox_chart_physical
#3322 from MisakiCoca:ellipse
#3323 from y-guyon:fix_polyanticlockwise
#3325 from AleksandrPanov:move_contrib_aruco_to_main_objdetect
#3331 from kishorgandham:4.x
#3334 from Biswa96:sfm-mingw-sincos
#3336 from berak:xphoto_fix_inpaint_fsr
#3339 from cudawarped:cudacodec_fix_memory_leak
#3340 from cudawarped:cudacodec_add_codecs
#3346 from AleksandrPanov:fix_win_warnings
#3347 from AleksandrPanov:wechat_fix_win_warnings
#3349 from sturkmen72:patch-3
#3350 from AleksandrPanov:wechat_remove_upscale
#3351 from bit1002lst:decode_multi_qrcodes
#3352 from AleksandrPanov:wechat_enable_tests
#3355 from cudawarped:cudacodec_add_resize_crop
#3357 from berak/patch-2
#3360 from cudawarped:nvcuvenc
#3363 from asenyaev:asen/cuda_pipelines_4.x
#3369 from sturkmen72:update_find_ellipses
#3378 from cudawarped:replace_texture_ref_with_texture_obj
#3380 from cudawarped:fix_video_writer_python_bindings
#3381 from cudawarped:fix_for_video_codec_sdk_12
#3383 from cudawarped:mirror_22633
#3386 from r2d3:convolve_cuda
#3389 from alalek:build_warnings_msvc
#3391 from asmorkalov:as/run_cuda_always
#3394 from AleksandrPanov:move_contrib_charuco_to_main_objdetect
#3396 from stopmosk:fix-aruco-tutorials
#3397 from alalek:objdetect_cleanup_aruco_ptr_filestorage
#3398 from alalek:issue_22206
#3399 from vrabaud:numpy_fix
#3402 from komakai:fix_aruco_objc
#3403 from asmorkalov:as/surf_link_fix
#3404 from cudawarped:fix_for_cuda_12
d6102ef Update dictionary.hpp (#3297)

Main PR: opencv/opencv#23113
Previous "Merge 4.x": #3333

cudawarped and others added 30 commits August 5, 2022 09:13
The argument size of get_subbox_chart_physical() is unused.
get_subbox_chart_physical() is called only in one place.
The local variable h could overflow the cast to int and lead to a
SIGILL in some environments.
To match the input data type.
Cast inner computation to double to prevent int overflows for any
input type.
… will get a floating point error in calCoherence method due to divide by zeor
sincos function is defined by mingw-w64 for both 32 bit and 64 bit environments.
Previously, sincos function was hidden for 64 bit mingw-w64 with __MINGW64__ macro.
This change also hides the sincos definition for 32 bit mingw-w64 with __MINGW32__ macro.
…using-OpenCV_SOURCE_DIR

matlab: Use OpenCV_SOURCE_DIR instead of CMAKE_SOURCE_DIR to find the modules root

* Set HDR_PARSER_PATH using OpenCV_SOURCE_DIR var

This sets the `HDR_PARSER_PATH` variable using `OpenCV_SOURCE_DIR` instead of using `CMAKE_SOURCE_DIR`.
This allows for more flexibility in how the user's project can be structured.

* Find OpenCV module root using OpenCV_SOURCE_DIR
add test

add dnn data search
Fix large image handling in WeChat QrCode detector
Add support for missing codecs to cudacodec
Set window_size to 1 if round down results in 0 for barcodes
Use T as temp var type in polyanticlockwise()
sfm: Fix redefinition error in 32 bit mingw-w64 environment
…ical

Remove unused size of get_subbox_chart_physical()
wechat qr code, enable 2 tests, enable dnn detector
alalek and others added 27 commits December 21, 2022 13:48
This change replaces references to a number of deprecated NumPy
type aliases (np.bool, np.int, np.float, np.complex, np.object,
np.str) with their recommended replacement (bool, int, float,
complex, object, str).

Those types were deprecated in 1.20 and are removed in 1.24,
cf numpy/numpy#22607.
Remove references to deprecated NumPy type aliases.
Fixed SURF linkage issue without nonfree.
…co_to_main_objdetect

Move contrib charuco to main objdetect
@alalek
Copy link
Member Author

alalek commented Jan 9, 2023

👍

@alalek alalek merged commit d980cc3 into opencv:5.x Jan 9, 2023
@alalek alalek mentioned this pull request Jan 18, 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.