Skip to content

Fix typo in calib3d tutorial code#20085

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
changh95:fix_typo_calib3d_sample_code
May 17, 2021
Merged

Fix typo in calib3d tutorial code#20085
opencv-pushbot merged 1 commit intoopencv:3.4from
changh95:fix_typo_calib3d_sample_code

Conversation

@changh95
Copy link
Copy Markdown
Contributor

@changh95 changh95 commented May 14, 2021

There was a typo in the tutorial code on camera calibration.
The original author probably meant to say 'undistorted', but the corresponding variable was named 'undistorsed'.

This PR fixes this typo issue.

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 May 14, 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".

@changh95 changh95 changed the base branch from master to 3.4 May 16, 2021 05:45
@changh95
Copy link
Copy Markdown
Contributor Author

changh95 commented May 16, 2021

@alalek , thanks for a detailed guide! I've done as requested. (1. changing the base branch, 2. rebasing the commits from master onto 3.4 branch after setting the upstream, 3. force pushing the rebased commits). But please double check if I've done as what you've meant - I'm quite new to git so I may have done something wrong :(

One other thing - I believe this typo exists in OpenCV 4 as well. Shall I make another PR to apply the changes to OpenCV4?

Many thanks,

@alalek
Copy link
Copy Markdown
Member

alalek commented May 16, 2021

Shall I make another PR to apply the changes to OpenCV4?

Not needed. We merge all updates from 3.4 branch to master/4.x branch automatically (using "git merge" designed for that).

We will merge changes from 3.4 into master regularly (weekly/bi-weekly).

@opencv-pushbot opencv-pushbot merged commit 72655a9 into opencv:3.4 May 17, 2021
@alalek alalek mentioned this pull request May 18, 2021
Merged
@alalek alalek mentioned this pull request Jun 4, 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: calib3d category: documentation Documentation fix or update

Projects

None yet

Milestone

3.4.15

Development

Successfully merging this pull request may close these issues.

3 participants

@changh95 @alalek @opencv-pushbot