Skip to content

Add documentation and example program for intersectConvexConvex#14518

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
SSteve:intersectConvexConvex-example
Oct 20, 2019
Merged

Add documentation and example program for intersectConvexConvex#14518
opencv-pushbot merged 1 commit intoopencv:3.4from
SSteve:intersectConvexConvex-example

Conversation

@SSteve
Copy link
Copy Markdown
Contributor

@SSteve SSteve commented May 9, 2019 •
edited
Loading

This pullrequest changes

I expanded the documentation for intersectConvexConvex and added a sample program illustrating its use.

force_builders_only=Linux x64,Docs

@asmorkalov
Copy link
Copy Markdown
Contributor

asmorkalov commented Oct 18, 2019

@SSteve The patch introduces build warnings. Please take a look on CI logs: https://pullrequest.opencv.org/buildbot/builders/precommit_linux64/builds/23294/steps/compile%20release/logs/warnings%20%286%29

@SSteve SSteve force-pushed the intersectConvexConvex-example branch 2 times, most recently from 03bf42e to 3461dd7 Compare October 19, 2019 17:13
@SSteve
Copy link
Copy Markdown
Contributor Author

SSteve commented Oct 19, 2019

Warnings have been eliminated.

@asmorkalov asmorkalov self-requested a review October 19, 2019 19:04
@asmorkalov
Copy link
Copy Markdown
Contributor

asmorkalov commented Oct 19, 2019

👍

@alalek
Copy link
Copy Markdown
Member

alalek commented Oct 19, 2019

This patch should go into 3.4 branch first. We will merge changes from 3.4 into master regularly (weekly/bi-weekly).

So, please:

  • change "base" branch of this PR: master => 3.4 (use "Edit" button near PR title)
  • rebase your commits from master onto 3.4 branch. For example:
    git rebase -i --onto upstream/3.4 upstream/master
    (check list of your commits, save and quit (Esc + "wq" + Enter)
    where upstream is configured by following this GitHub guide and fetched (git fetch upstream).
  • push rebased commits into source branch of your fork (with --force option)

Note: no needs to re-open PR, apply changes "inplace".

@SSteve SSteve changed the base branch from master to 3.4 October 19, 2019 23:27
@SSteve SSteve force-pushed the intersectConvexConvex-example branch from 3461dd7 to 725029b Compare October 19, 2019 23:34
@SSteve
Copy link
Copy Markdown
Contributor Author

SSteve commented Oct 19, 2019

Ok, I think that was successful.

@SSteve
Copy link
Copy Markdown
Contributor Author

SSteve commented Oct 20, 2019

Oh, look, new warnings! I'll get to work on them.

@SSteve SSteve force-pushed the intersectConvexConvex-example branch 2 times, most recently from d46353e to ffed8ae Compare October 20, 2019 01:44
@SSteve
Copy link
Copy Markdown
Contributor Author

SSteve commented Oct 20, 2019

Oh, I see why all the new errors. OpenCV 4 uses c++11 but OpenCV 3.4 doesn't. Ok, I'll take out all the c++11 code.

@SSteve SSteve force-pushed the intersectConvexConvex-example branch from ffed8ae to acb3b3b Compare October 20, 2019 05:09
@SSteve
Copy link
Copy Markdown
Contributor Author

SSteve commented Oct 20, 2019

Looks like I've got a 3.4-compatible version!

opencv-pushbot pushed a commit that referenced this pull request Oct 20, 2019
@alalek
Merge pull request #14518 from SSteve:intersectConvexConvex-example
6576e8b
@opencv-pushbot opencv-pushbot merged commit acb3b3b into opencv:3.4 Oct 20, 2019
@SSteve SSteve deleted the intersectConvexConvex-example branch October 20, 2019 14:29
@alalek alalek mentioned this pull request Oct 24, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@asmorkalov asmorkalov Awaiting requested review from asmorkalov

Assignees

@asmorkalov asmorkalov

Labels

category: documentation Documentation fix or update category: imgproc category: samples

Projects

None yet

Milestone

3.4.9

Development

Successfully merging this pull request may close these issues.

4 participants

@SSteve @asmorkalov @alalek @opencv-pushbot