Skip to content

Rename variable name at detector_params.yml since it is differrent from c++ source code #3026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 25, 2021

Conversation

yossato
Copy link
Contributor

@yossato yossato commented Aug 24, 2021

Renamed a variable name minCornerDistance on a yml to minCornerDistanceRate since it is used as minCornerDistanceRate at

fs["minMarkerDistanceRate"] >> params->minMarkerDistanceRate;
and
fs["minCornerDistanceRate"] >> params->minCornerDistanceRate;
.

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

Copy link
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.

Nice catch! Thank you for contribution!

As a bugfix 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".

@yossato yossato changed the base branch from master to 3.4 August 24, 2021 22:31
@yossato
Copy link
Contributor Author

yossato commented Aug 25, 2021

Thank you for your comment. I think I could rebase this commit. Could you confirm it?

Copy link
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.

Well done 👍

@opencv-pushbot opencv-pushbot merged commit b323529 into opencv:3.4 Aug 25, 2021
@alalek alalek mentioned this pull request Aug 28, 2021
@alalek alalek mentioned this pull request Oct 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants