Skip to content

Grammar fixes for python core operations docs#15832

Merged
alalek merged 4 commits intoopencv:3.4from
collinbrake:feature_grammar_fixes_4
Nov 8, 2019
Merged

Grammar fixes for python core operations docs#15832
alalek merged 4 commits intoopencv:3.4from
collinbrake:feature_grammar_fixes_4

Conversation

@collinbrake
Copy link
Copy Markdown
Contributor

@collinbrake collinbrake commented Nov 1, 2019

This pullrequest improves the grammar in the following sections:

  • Basic Operations on Images
  • Arithmetic Operations on Images
  • Performance Measurement and Improvement Techniques

@alalek
Copy link
Copy Markdown
Member

alalek commented Nov 2, 2019

Please fix whitespace issues:

doc/py_tutorials/py_core/py_basic_ops/py_basic_ops.markdown:73: trailing whitespace.
+Image properties include number of rows, columns, and channels; type of image data; number of pixels;

@collinbrake
Copy link
Copy Markdown
Contributor Author

collinbrake commented Nov 4, 2019 •
edited
Loading

@alalek Does my commit above fix the issue, or are there more cases of trailing whitespace? Also, should I squash the two commits above or keep as is?

asmorkalov
asmorkalov reviewed Nov 5, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@asmorkalov asmorkalov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@collinbrake Please squash commits. You can check trailing white spaces on your side with git command git diff --check.

doc/py_tutorials/py_core/py_basic_ops/py_basic_ops.markdown Outdated
are always on faces :D ) and performance (because we search in a small area).

ROI is again obtained using Numpy indexing. Here I am selecting the ball and copying it to another
ROI is obtained by using Numpy indexing again. Here I am selecting the ball and copying it to another
Copy link
Copy Markdown
Contributor

@asmorkalov asmorkalov Nov 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMHO, this line changed its meaning.

@collinbrake
Copy link
Copy Markdown
Contributor Author

collinbrake commented Nov 6, 2019

@asmorkalov I am going to revert these changes on a different branch -- closing pull request.

@collinbrake collinbrake closed this Nov 6, 2019
@alalek
Copy link
Copy Markdown
Member

alalek commented Nov 6, 2019

No need to re-create new PRs.
Just push changes into source branch of your fork.

@collinbrake collinbrake reopened this Nov 6, 2019
@asmorkalov
Copy link
Copy Markdown
Contributor

asmorkalov commented Nov 8, 2019

@collinbrake The grammar fixes look good to me 👍. Please squash your commits.

@alalek alalek merged commit 35cebbd into opencv:3.4 Nov 8, 2019
@collinbrake
Copy link
Copy Markdown
Contributor Author

collinbrake commented Nov 8, 2019

@asmorkalov Thanks for your help with this! I was planning to squash the commits, so I probably should have labeled this PR as a work in progress until I got that finished.

@alalek alalek mentioned this pull request Nov 11, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@asmorkalov asmorkalov asmorkalov left review comments

Assignees

@asmorkalov asmorkalov

Labels

category: documentation Documentation fix or update

Projects

None yet

Milestone

3.4.9

Development

Successfully merging this pull request may close these issues.

3 participants

@collinbrake @alalek @asmorkalov