Skip to content

fix issue 21187: markdown file: gray image does not have three dimensions#21188

Merged
alalek merged 2 commits intoopencv:3.4from
UncleLLD:fix-markdown-error
Dec 6, 2021
Merged

fix issue 21187: markdown file: gray image does not have three dimensions#21188
alalek merged 2 commits intoopencv:3.4from
UncleLLD:fix-markdown-error

Conversation

@UncleLLD
Copy link
Copy Markdown
Contributor

@UncleLLD UncleLLD commented Dec 3, 2021 •
edited by alalek
Loading

#21187

fix gray image does not have three dimensions

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
force_builders_only=linux,docs

@UncleLLD
Copy link
Copy Markdown
Contributor Author

UncleLLD commented Dec 3, 2021

I followed the tutorial and found that this problem exists in multiple versions. Although it can be easily solved, this problem has not been raised. Therefore, I think it should be raised and modified.

@alalek
Copy link
Copy Markdown
Member

alalek commented Dec 3, 2021

Thank you for contribution!

It makes sense to check and fix similar other cases.

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

Please:

  • change "base" branch of this PR: 4.x => 3.4 (use "Edit" button near PR title)
  • rebase your commits from 4.x onto 3.4 branch. For example:
    git rebase -i --onto upstream/3.4 upstream/4.x
    (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".

@UncleLLD UncleLLD changed the base branch from 4.x to 3.4 December 3, 2021 15:47
@UncleLLD
Copy link
Copy Markdown
Contributor Author

UncleLLD commented Dec 3, 2021

Sorry, I didn't see the branch clearly and submitted it on version 4.x. Now it has been changed into 3.4. Please check it

@alalek alalek merged commit 5aef565 into opencv:3.4 Dec 6, 2021
@UncleLLD UncleLLD deleted the fix-markdown-error branch December 8, 2021 01:54
@alalek alalek mentioned this pull request Dec 11, 2021
Merged
@alalek alalek mentioned this pull request Dec 30, 2021
Merged
@alalek alalek mentioned this pull request Feb 22, 2022
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.17

Development

Successfully merging this pull request may close these issues.

2 participants

@UncleLLD @alalek