Skip to content

Doc fixes#20721

Merged
alalek merged 2 commits intoopencv:masterfrom
YanivHollander:DocFixes
Oct 9, 2021
Merged

Doc fixes#20721
alalek merged 2 commits intoopencv:masterfrom
YanivHollander:DocFixes

Conversation

@YanivHollander
Copy link
Copy Markdown
Contributor

@YanivHollander YanivHollander commented Sep 20, 2021

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

@asmorkalov asmorkalov added category: documentation Documentation fix or update pr: needs rebase Rebase patch (and squash fixup commits) on the top of target branch labels Sep 20, 2021
@asmorkalov
Copy link
Copy Markdown
Contributor

asmorkalov commented Sep 20, 2021

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 need to re-open PR, apply changes "inplace".

@YanivHollander YanivHollander changed the base branch from master to 3.4 September 20, 2021 12:09
@YanivHollander YanivHollander changed the base branch from 3.4 to master September 20, 2021 12:13
@YanivHollander YanivHollander changed the base branch from master to 3.4 September 20, 2021 12:13
@YanivHollander
Copy link
Copy Markdown
Contributor Author

YanivHollander commented Sep 20, 2021 via email

@JulieBar JulieBar linked an issue Sep 23, 2021 that may be closed by this pull request
Typos in 'imgproc.hpp' Doxygen #20720
Closed
3 tasks
@alalek
Copy link
Copy Markdown
Member

alalek commented Sep 27, 2021

Reordering functions declarations affects bindings generated code. Need to properly validate that.

@asmorkalov
Copy link
Copy Markdown
Contributor

asmorkalov commented Oct 7, 2021

@YanivHollander Friendly reminder. 2k+ commits in PR say that you have not done actual rebase in git, but just changed target branch in the PR.

@alalek
Copy link
Copy Markdown
Member

alalek commented Oct 7, 2021

There is no conflict-free rebase for this patch. It should be backported separately (after this is reviewed and merged - see above).

@YanivHollander
Copy link
Copy Markdown
Contributor Author

YanivHollander commented Oct 7, 2021

Hi @asmaloney and @alalek,
Thank you for your comments. I guess that trying to contribute to this rather heaver traffic repository could be more complicated than I thought first. Being new to contributing on GitHub also levels up complexity for me. Can you please direct me to what is needed of me at this point, mostly following the label: backported is needed added by @alalek?

@asmaloney
Copy link
Copy Markdown
Contributor

asmaloney commented Oct 7, 2021

(Yaniv: You meant to @asmorkalov not me...)

alalek
alalek approved these changes Oct 9, 2021
View reviewed changes
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.

Thank you for contribution 👍

  • Validated Python bindings generatied code (docstrings are changed only)

@alalek alalek merged commit ac57be9 into opencv:master Oct 9, 2021
@alalek alalek mentioned this pull request Oct 15, 2021
Merged
a-sajjad72 pushed a commit to a-sajjad72/opencv that referenced this pull request Mar 30, 2023
@YanivHollander
Merge pull request opencv#20721 from YanivHollander:DocFixes
aacd23d 
Doc fixes

* Update imgproc.hpp

* Update imgproc.hpp
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

backport is needed Label for maintainers. Authors of PR can ignore this category: documentation Documentation fix or update

Projects

None yet

Milestone

4.5.4

Development

Successfully merging this pull request may close these issues.

Typos in 'imgproc.hpp' Doxygen

4 participants

@YanivHollander @asmorkalov @alalek @asmaloney