Skip to content

Update py_canny.markdown#20369

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
shreyastaware:master
Jul 24, 2021
Merged

Update py_canny.markdown#20369
opencv-pushbot merged 1 commit intoopencv:3.4from
shreyastaware:master

Conversation

@shreyastaware
Copy link
Copy Markdown

@shreyastaware shreyastaware commented Jul 7, 2021 •
edited
Loading

Fixed a word that was previously written as third argument but it is instead the fourth argument of cv.Canny() function

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

@alalek
Copy link
Copy Markdown
Member

alalek commented Jul 7, 2021

Thank you for contribution!

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

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".

@shreyastaware shreyastaware changed the base branch from master to 3.4 July 7, 2021 11:37
@shreyastaware
Copy link
Copy Markdown
Author

shreyastaware commented Jul 22, 2021

Hi @alalek can you tell me how I can proceed from step 2, I have done step 1 but am not able to comprehend how rebasing can be done? I am a total beginner, can you tell me in detail how I can do that?

Update py_canny.markdown
803ff8e 
Fixed a word that was previously written as third argument but it is instead the fourth argument of cv.Canny() function
@alalek
Copy link
Copy Markdown
Member

alalek commented Jul 23, 2021

Patch is rebased.
Please don't update "master" branch of your fork until PR merge.

@opencv-pushbot opencv-pushbot merged commit 000f762 into opencv:3.4 Jul 24, 2021
@alalek alalek mentioned this pull request Jul 24, 2021
Merged
@alalek alalek mentioned this pull request Oct 15, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek approved these changes

Assignees

@alalek alalek

Labels

category: documentation Documentation fix or update

Projects

None yet

Milestone

3.4.16

Development

Successfully merging this pull request may close these issues.

3 participants

@shreyastaware @alalek @opencv-pushbot