Skip to content
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

(r16.09 backport of) opencv 3.1.0: add patch fixing python use of FlannBasedMatcher.add #21508

Merged

Conversation

risicle
Copy link
Contributor

@risicle risicle commented Dec 29, 2016

This is essentially a backport/cherrypick of #21086/bcb1cf0db40541f63f0e478b9b2dbc60ec8a43b7, while master will presumably be moving to 3.2.0 it would be good to have this fix in stable.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Patch is from opencv/opencv#6009. Upstream doesn't
seem particularly enthusiastic about a 3.1.x point release, so who knows
when this fix would otherwise see the light of day.

Mostly a cherry-pick of bcb1cf0
@mention-bot
Copy link

@risicle, thanks for your PR! By analyzing the history of the files in this pull request, we identified @abbradar, @cpages and @bjornfor to be potential reviewers.

@risicle
Copy link
Contributor Author

risicle commented Dec 30, 2016

(travis "no space left on device" again)

@grahamc grahamc merged commit 954535f into NixOS:release-16.09 Dec 30, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants