Skip to content

Update samples#15170

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
sturkmen72:update_samples
Sep 5, 2019
Merged

Update samples#15170
opencv-pushbot merged 1 commit intoopencv:3.4from
sturkmen72:update_samples

Conversation

@sturkmen72
Copy link
Copy Markdown
Contributor

@sturkmen72 sturkmen72 commented Jul 28, 2019

This pullrequest changes

updates samples

force_builders_only=linux,windows,docs

@sturkmen72 sturkmen72 force-pushed the update_samples branch 2 times, most recently from adbd2c0 to 50d04be Compare July 30, 2019 15:19
@sturkmen72 sturkmen72 force-pushed the update_samples branch 2 times, most recently from 06c5bb3 to b284d30 Compare August 31, 2019 13:30
Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

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

Well done! Thank you 👍

I rebased patch onto 3.4 branch.

#include <opencv2/objdetect.hpp>
#include <opencv2/highgui.hpp>
#include <opencv2/imgproc.hpp>
#include <opencv2/videoio.hpp>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Probably we should keep separate include of "videoio" module - VideoCapture is used below.
(due compatibility "videoio" headers are included by "highgui" header, but this doesn't look consistent - lets show to Users which modules are used)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@alalek OK. let me add #include <opencv2/videoio.hpp> in all samples uses VideoCapture
please don't merge until i inform you.

@alalek
Copy link
Copy Markdown
Member

alalek commented Sep 4, 2019

@sturkmen72 Could you please take a look on build failures?

@sturkmen72
Copy link
Copy Markdown
Contributor Author

@alalek i think the PR is ready.

Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

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

Well done 👍

@opencv-pushbot opencv-pushbot merged commit f733951 into opencv:3.4 Sep 5, 2019
@alalek alalek mentioned this pull request Sep 5, 2019
@sturkmen72 sturkmen72 deleted the update_samples branch September 5, 2019 14:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants