Skip to content

Keep a local copy of features from flann::GenericIndex constructor#14898

Merged
alalek merged 2 commits intoopencv:3.4from
UnderscoreAsterisk:flann-warnings-and-4376
Jun 26, 2019
Merged

Keep a local copy of features from flann::GenericIndex constructor#14898
alalek merged 2 commits intoopencv:3.4from
UnderscoreAsterisk:flann-warnings-and-4376

Conversation

@UnderscoreAsterisk
Copy link
Copy Markdown
Contributor

@UnderscoreAsterisk UnderscoreAsterisk commented Jun 26, 2019

This pullrequest changes

  1. Keep a local copy of features matrix in flann::GenericIndex constructor. This fixes FLANN Index params should be copied to avoid dangling pointer #4376 and flann::Index does not copy features matrix #12606
  2. Suppress some warnings in MSVC regarding implicit type conversions

@UnderscoreAsterisk UnderscoreAsterisk changed the title Flann warnings and 4376 Keep a local copy of features from flann::GenericIndex constructor Jun 26, 2019
@savuor savuor self-assigned this Jun 26, 2019
@savuor
Copy link
Copy Markdown
Contributor

savuor commented Jun 26, 2019 •
edited by alalek
Loading

👍

@alalek
Copy link
Copy Markdown
Member

alalek commented Jun 26, 2019

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

@UnderscoreAsterisk UnderscoreAsterisk changed the base branch from master to 3.4 June 26, 2019 13:37
@UnderscoreAsterisk UnderscoreAsterisk force-pushed the flann-warnings-and-4376 branch from 7b3fec1 to a3d68ad Compare June 26, 2019 13:44
@alalek alalek merged commit 5b521bb into opencv:3.4 Jun 26, 2019
@alalek alalek mentioned this pull request Jun 26, 2019
Merged
This was referenced Jun 26, 2019
Closed
Closed
@UnderscoreAsterisk UnderscoreAsterisk deleted the flann-warnings-and-4376 branch June 27, 2019 10:22
@UnderscoreAsterisk UnderscoreAsterisk mentioned this pull request Aug 24, 2019
Merged
arnaudbrejeon pushed a commit to arnaudbrejeon/opencv that referenced this pull request Jan 23, 2020
@UnderscoreAsterisk @arnaudbrejeon
Merge pull request opencv#14898 from UnderscoreAsterisk:flann-warning…
17979da 
…s-and-4376

Keep a local copy of `features` from `flann::GenericIndex ` constructor (opencv#14898)

* Fix warnings on Windows

* Fix opencv#4376
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@savuor savuor

Labels

category: flann

Projects

None yet

Milestone

3.4.7

Development

Successfully merging this pull request may close these issues.

3 participants

@UnderscoreAsterisk @savuor @alalek