Merge branch 'master' of ssh://github.com/dav1d-wright/nanoflann into…

… dav1d-wright-master
jlblancoc · Oct 9, 2021 · 431bd40 · 431bd40
2 parents 6fb746e + bef2b48
commit 431bd40
Show file tree

Hide file tree

Showing 3 changed files with 267 additions and 211 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 nanoflann UNRELEASED
   * CMake variables prefixed now with `NANOFLANN_` for easier integration of nanoflann as a Git submodule.
+  * Fixes for IndexType which are not of integral types [PR #154](https://github.com/jlblancoc/nanoflann/pull/154)
   * save/load API upgraded from C `FILE*` to C++ file streams (By Dominic Kempf, Heidelberg University, [PR](https://github.com/jlblancoc/nanoflann/pull/157)).
 
 nanoflann 1.3.2: Released Nov 5, 2020

diff --git a/examples/pointcloud_kdd_radius.cpp b/examples/pointcloud_kdd_radius.cpp
@@ -66,7 +66,7 @@ void kdtree_demo(const size_t N)
 	// ----------------------------------------------------------------
 	{
 		size_t num_results = 5;
-		std::vector<size_t>   ret_index(num_results);
+		std::vector<uint32_t>   ret_index(num_results);
 		std::vector<num_t> out_dist_sqr(num_results);
 
 		num_results = index.knnSearch(&query_pt[0], num_results, &ret_index[0], &out_dist_sqr[0]);
@@ -86,7 +86,7 @@ void kdtree_demo(const size_t N)
 	// ----------------------------------------------------------------
 	{
 		const num_t search_radius = static_cast<num_t>(0.1);
-		std::vector<std::pair<size_t,num_t> >   ret_matches;
+		std::vector<std::pair<uint32_t, num_t> >   ret_matches;
 
 		nanoflann::SearchParams params;
 		//params.sorted = false;