Skip to content

Merge 3.4 #2274

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
Sep 25, 2019
Merged

Merge 3.4 #2274

merged 4 commits into from
Sep 25, 2019

Conversation

alalek
Copy link
Member

@alalek alalek commented Sep 25, 2019 •
edited
Loading

#2269 from shaikmoeed:hotfix/samples-motempl-python-update
#2271 from alalek:build_cxx11_warnings

Main PR: opencv/opencv#15593
Previous "Merge 3.4": #2267

force_builders=Custom
buildworker:Custom=linux-1,linux-2,linux-4
build_image:Custom=ubuntu-cuda:16.04

shaikmoeed and others added 4 commits September 23, 2019 18:51
@shaikmoeed @alalek
Merge pull request opencv#2269 from shaikmoeed:hotfix/samples-motempl…
4f524db 
…-python-update

* Fix bug: Invalid Syntax at line 14(draw_motion_comp method)

* Fix bug: TypeError- integer argument expected, got float

* Fix bug: clean up the camera by adding .release()
@mshabunin @alalek
backport: Fixed warnings produced by clang-9.0.0
cdd19eb 
83fc27c
@alalek
Merge pull request opencv#2271 from alalek:build_cxx11_warnings
1a15cbc
@alalek
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
26129cf
@alalek
Copy link
Member Author

alalek commented Sep 25, 2019

👍

@alalek alalek merged commit 26129cf into opencv:master Sep 25, 2019
@alalek alalek mentioned this pull request Oct 5, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@alalek @shaikmoeed @mshabunin