Skip to content

Enhance EdgeAwareInterpolation no. matches limitation #2209

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 3 commits into from
Aug 5, 2019

Conversation

tsenst
Copy link
Contributor

@tsenst tsenst commented Jul 29, 2019

Enhance limitation in EdgeAwareInterpolation method. Maximal number of matches to be interpolated was restriced to SHORT_MAX and now will be INT_MAX by substituting (short) by (int) types of the label storages.

@tsenst
Copy link
Contributor Author

tsenst commented Jul 29, 2019

The check with test_stereo failed on Win32 system. From my point of view no files of the stereo module have been changed. And the committed changes does not affect this module. Do I miss something?

@alalek
Copy link
Member

alalek commented Aug 1, 2019

stereo have flaky tests - just ignore them.

Merge pull request

Please remove these "merge" commits from the patch (something like git rebase -i upstream/master should help).


I believe this patch should go into 3.4 branch too. 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".

@tsenst tsenst changed the base branch from master to 3.4 August 2, 2019 09:10
@tsenst tsenst force-pushed the update_EdgeAwareInterpolator branch 2 times, most recently from b8489d3 to 8ecfbdc Compare August 2, 2019 12:26
@tsenst tsenst changed the base branch from 3.4 to master August 2, 2019 12:26
@tsenst tsenst changed the base branch from master to 3.4 August 2, 2019 12:30
senst added 2 commits August 2, 2019 15:40
…n of the maximal number of matches to be interpolated from SHORT_MAX to INT_MAX by substituting short by int types
…n of the maximal number of matches to be interpolated from SHORT_MAX to INT_MAX by substituting short by int types
@tsenst tsenst force-pushed the update_EdgeAwareInterpolator branch from 48b5b63 to a6d323c Compare August 2, 2019 13:45
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.

Thank you!

@alalek alalek merged commit 4c2ef47 into opencv:3.4 Aug 5, 2019
@alalek alalek mentioned this pull request Aug 5, 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.

2 participants