Skip to content

Commit

Permalink
Merge pull request #363 from alicevision/fixMatchingClang4
Browse files Browse the repository at this point in the history
[matching] fix comparing int* to int (clang 4 crash)
  • Loading branch information
fabiencastan authored Mar 7, 2018
2 parents a761b0b + 460bded commit 9d0b543
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions src/aliceVision/matching/ArrayMatcher_kdtreeFlann.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,8 @@ class ArrayMatcher_kdtreeFlann : public ArrayMatcher<Scalar, Metric>
{
for (size_t j = 0; j < NN; ++j)
{
if (indices[i] > 0)
{
pvec_indices->emplace_back(IndMatch(i, vec_indices[i*NN+j]));
pvec_indices->emplace_back(i, vec_indices[i*NN+j]);
pvec_distances->emplace_back(vec_distances[i*NN+j]);
}
}
}
return true;
Expand Down

0 comments on commit 9d0b543

Please sign in to comment.