Skip to content

fix truncate threshold example display issue in py_tutorials#18732

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
junxnone:master
Nov 6, 2020
Merged

fix truncate threshold example display issue in py_tutorials#18732
opencv-pushbot merged 1 commit intoopencv:3.4from
junxnone:master

Conversation

@junxnone
Copy link
Copy Markdown
Contributor

@junxnone junxnone commented Nov 5, 2020

Signed-off-by: junxnone junchen0102@gmail.com

resolves #18731

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
  • The PR is proposed to proper branch
  • There is reference to original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake

related issue #18731

@alalek
Copy link
Copy Markdown
Member

alalek commented Nov 6, 2020

Thank you for contribution!

As a bugfix 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".

@junxnone junxnone changed the base branch from master to 3.4 November 6, 2020 08:17
@junxnone junxnone closed this Nov 6, 2020
Signed-off-by: junxnone <junchen0102@gmail.com>
@junxnone junxnone reopened this Nov 6, 2020
@junxnone
Copy link
Copy Markdown
Contributor Author

junxnone commented Nov 6, 2020

sorry, I am not familiar with github PR rebase workflow.
as your suggestion, this PR looks like is point to 3.4 branch now.
please let me know, if any problems.

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 127a44f into opencv:3.4 Nov 6, 2020
@alalek alalek mentioned this pull request Nov 10, 2020
@alalek alalek mentioned this pull request Nov 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

truncate threshold example display issue in py_tutorials

3 participants