Skip to content

[Minor PR] Change Keymap wording for gray image in curve mode#19395

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
Ixarias:patch-1
Jan 29, 2021
Merged

[Minor PR] Change Keymap wording for gray image in curve mode#19395
opencv-pushbot merged 1 commit intoopencv:3.4from
Ixarias:patch-1

Conversation

@Ixarias
Copy link
Copy Markdown
Contributor

@Ixarias Ixarias commented Jan 25, 2021 •
edited
Loading

Instead of being a copy of line 76, line 79 instead correctly indicates that it will show a histogram for a gray image in curve mode, as given by the code block at line 103 referencing image "gray" instead of image "im".

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 Jan 25, 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".

@Ixarias Ixarias changed the base branch from master to 3.4 January 26, 2021 21:57
@Ixarias
Copy link
Copy Markdown
Contributor Author

Ixarias commented Jan 26, 2021 •
edited
Loading

Thanks for the detailed explanation. Here are the steps I took.

  • Changed the base branch to "3.4" in the PR
  • Checked out the "patch-1" branch
  • Checked that upstream was configured to https://github.com/opencv/opencv.git (GitHub Desktop did this automatically)
  • fetched upstream, rebased with git rebase -i --onto upstream/3.4 upstream/master (ran in terminal)
  • committed and pushed with git push --force

@Ixarias
Change Keymap wording for gray image in curve mode
3f14341 
Instead of being a copy of line 76, line 79 instead correctly indicates that it will show a histogram for a gray image in curve mode, as given by the code block at line 103 referencing image "gray" instead of image "im".
@opencv-pushbot opencv-pushbot merged commit ebd9145 into opencv:3.4 Jan 29, 2021
@alalek alalek mentioned this pull request Jan 31, 2021
Merged
@alalek alalek mentioned this pull request Apr 9, 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

bug category: samples

Projects

None yet

Milestone

3.4.14

Development

Successfully merging this pull request may close these issues.

3 participants

@Ixarias @alalek @opencv-pushbot