Skip to content

Merge 3.4#19378

Merged
alalek merged 13 commits intoopencv:masterfrom
alalek:merge-3.4
Jan 22, 2021
Merged

Merge 3.4#19378
alalek merged 13 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Jan 22, 2021

#19312 from VadimLevin:dev/vlevin/clear-msg-for-failed-overload-resolution
#19334 from alalek:fix_19134
#19336 from kyshel:patch-1
#19339 from ichisadashioko:modules_highgui_src_window_w32_typo
#19352 from mshabunin:new-forum-links
#19376 from alalek:fixup_19105

Previous "Merge 3.4": #19338

build_image:Docs=docs-js

test_overload_resolution('wrong second arg type (keyword arg)', 5, point=(1, 2, 3))
test_overload_resolution('wrong second arg type', 5, 2)
test_overload_resolution('wrong first arg', 3.4, (12, 21))
# FIXIT: test_overload_resolution('wrong first arg, no second arg', 4.5)
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Test case temporary disabled.
Fix will be pushed as a separate PR soon (it is not suitable for the merge process)

@alalek
Copy link
Copy Markdown
Member Author

alalek commented Jan 22, 2021

👍

@alalek alalek merged commit cd59516 into opencv:master Jan 22, 2021
@alalek alalek mentioned this pull request Jan 25, 2021
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.

5 participants