Skip to content

stitching_detailed: use correct match_conf default#15756

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
dankamongmen:dankamongmen/stitching_surf_default
Oct 22, 2019
Merged

stitching_detailed: use correct match_conf default#15756
opencv-pushbot merged 1 commit intoopencv:3.4from
dankamongmen:dankamongmen/stitching_surf_default

Conversation

@dankamongmen
Copy link
Copy Markdown
Contributor

This pullrequest changes

The usage function states that the default for match_conf is
0.65 if the default SURF feature finder is used, and 0.3 for
orbs. Indeed, if --feature orbs is used, match_conf is set
to 0.3f. This is a NOP, because the real default is also set
to 0.3f. Change it to 0.65f when SURF is in play.

@alalek
Copy link
Copy Markdown
Member

alalek commented Oct 22, 2019

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).

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

@dankamongmen dankamongmen changed the base branch from master to 3.4 October 22, 2019 11:56
@dankamongmen dankamongmen force-pushed the dankamongmen/stitching_surf_default branch 2 times, most recently from 520e8cf to d9230dc Compare October 22, 2019 12:02
@dankamongmen
Copy link
Copy Markdown
Contributor Author

Ugh, sorry for going to the wrong branch -- I should have read the contribution guide more closely :(. I've rebased and resolved conflicts. PTAL.

The usage function states that the default for match_conf is
0.65 if the default SURF feature finder is used, and 0.3 for
orbs. Indeed, if --feature orbs is used, match_conf is set
to 0.3f. This is a NOP, because the real default is also set
to 0.3f. Change it to 0.65f when SURF is in play.
@dankamongmen dankamongmen force-pushed the dankamongmen/stitching_surf_default branch from d9230dc to 6e9eca2 Compare October 22, 2019 12:03
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!

opencv-pushbot pushed a commit that referenced this pull request Oct 22, 2019
@opencv-pushbot opencv-pushbot merged commit 6e9eca2 into opencv:3.4 Oct 22, 2019
@alalek alalek mentioned this pull request Oct 24, 2019
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