diff --git a/examples/SO2_adaptor_example.cpp b/examples/SO2_adaptor_example.cpp index 776446f1..6c41d3cd 100644 --- a/examples/SO2_adaptor_example.cpp +++ b/examples/SO2_adaptor_example.cpp @@ -1,7 +1,7 @@ /*********************************************************************** * Software License Agreement (BSD License) * - * Copyright 2011-2022 Jose Luis Blanco (joseluisblancoc@gmail.com). + * Copyright 2011-2024 Jose Luis Blanco (joseluisblancoc@gmail.com). * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/examples/SO3_adaptor_example.cpp b/examples/SO3_adaptor_example.cpp index f7ed6a1f..534330e9 100644 --- a/examples/SO3_adaptor_example.cpp +++ b/examples/SO3_adaptor_example.cpp @@ -1,7 +1,7 @@ /*********************************************************************** * Software License Agreement (BSD License) * - * Copyright 2011-2022 Jose Luis Blanco (joseluisblancoc@gmail.com). + * Copyright 2011-2024 Jose Luis Blanco (joseluisblancoc@gmail.com). * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/examples/dynamic_pointcloud_example.cpp b/examples/dynamic_pointcloud_example.cpp index c444cbf5..ec05c9ed 100644 --- a/examples/dynamic_pointcloud_example.cpp +++ b/examples/dynamic_pointcloud_example.cpp @@ -1,7 +1,7 @@ /*********************************************************************** * Software License Agreement (BSD License) * - * Copyright 2011-2022 Jose Luis Blanco (joseluisblancoc@gmail.com). + * Copyright 2011-2024 Jose Luis Blanco (joseluisblancoc@gmail.com). * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/examples/example_with_cmake/pointcloud_example.cpp b/examples/example_with_cmake/pointcloud_example.cpp index ffe90624..b0cca599 100644 --- a/examples/example_with_cmake/pointcloud_example.cpp +++ b/examples/example_with_cmake/pointcloud_example.cpp @@ -1,7 +1,7 @@ /*********************************************************************** * Software License Agreement (BSD License) * - * Copyright 2011-2022 Jose Luis Blanco (joseluisblancoc@gmail.com). + * Copyright 2011-2024 Jose Luis Blanco (joseluisblancoc@gmail.com). * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/examples/example_with_pkgconfig/pointcloud_example.cpp b/examples/example_with_pkgconfig/pointcloud_example.cpp index ffe90624..b0cca599 100644 --- a/examples/example_with_pkgconfig/pointcloud_example.cpp +++ b/examples/example_with_pkgconfig/pointcloud_example.cpp @@ -1,7 +1,7 @@ /*********************************************************************** * Software License Agreement (BSD License) * - * Copyright 2011-2022 Jose Luis Blanco (joseluisblancoc@gmail.com). + * Copyright 2011-2024 Jose Luis Blanco (joseluisblancoc@gmail.com). * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/examples/examples_gui/nanoflann_gui_example_R3/nanoflann_gui_example_R3.cpp b/examples/examples_gui/nanoflann_gui_example_R3/nanoflann_gui_example_R3.cpp index 12e846c6..cf77e9bb 100644 --- a/examples/examples_gui/nanoflann_gui_example_R3/nanoflann_gui_example_R3.cpp +++ b/examples/examples_gui/nanoflann_gui_example_R3/nanoflann_gui_example_R3.cpp @@ -1,7 +1,7 @@ /*********************************************************************** * Software License Agreement (BSD License) * - * Copyright 2011-2022 Jose Luis Blanco (joseluisblancoc@gmail.com). + * Copyright 2011-2024 Jose Luis Blanco (joseluisblancoc@gmail.com). * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/examples/examples_gui/nanoflann_gui_example_bearings/nanoflann_gui_example_bearings.cpp b/examples/examples_gui/nanoflann_gui_example_bearings/nanoflann_gui_example_bearings.cpp index 04178b03..35fe2238 100644 --- a/examples/examples_gui/nanoflann_gui_example_bearings/nanoflann_gui_example_bearings.cpp +++ b/examples/examples_gui/nanoflann_gui_example_bearings/nanoflann_gui_example_bearings.cpp @@ -1,7 +1,7 @@ /*********************************************************************** * Software License Agreement (BSD License) * - * Copyright 2011-2022 Jose Luis Blanco (joseluisblancoc@gmail.com). + * Copyright 2011-2024 Jose Luis Blanco (joseluisblancoc@gmail.com). * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/examples/matrix_example.cpp b/examples/matrix_example.cpp index 7de0c57b..915e583b 100644 --- a/examples/matrix_example.cpp +++ b/examples/matrix_example.cpp @@ -1,7 +1,7 @@ /*********************************************************************** * Software License Agreement (BSD License) * - * Copyright 2011-2022 Jose Luis Blanco (joseluisblancoc@gmail.com). + * Copyright 2011-2024 Jose Luis Blanco (joseluisblancoc@gmail.com). * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/examples/pointcloud_adaptor_example.cpp b/examples/pointcloud_adaptor_example.cpp index 23ddad61..76cda362 100644 --- a/examples/pointcloud_adaptor_example.cpp +++ b/examples/pointcloud_adaptor_example.cpp @@ -1,7 +1,7 @@ /*********************************************************************** * Software License Agreement (BSD License) * - * Copyright 2011-2022 Jose Luis Blanco (joseluisblancoc@gmail.com). + * Copyright 2011-2024 Jose Luis Blanco (joseluisblancoc@gmail.com). * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/examples/pointcloud_custom_metric.cpp b/examples/pointcloud_custom_metric.cpp index 7a7c2ff7..4eb0f28f 100644 --- a/examples/pointcloud_custom_metric.cpp +++ b/examples/pointcloud_custom_metric.cpp @@ -1,7 +1,7 @@ /*********************************************************************** * Software License Agreement (BSD License) * - * Copyright 2011-2022 Jose Luis Blanco (joseluisblancoc@gmail.com). + * Copyright 2011-2024 Jose Luis Blanco (joseluisblancoc@gmail.com). * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/examples/pointcloud_custom_resultset.cpp b/examples/pointcloud_custom_resultset.cpp index ff1187ea..866f92bd 100644 --- a/examples/pointcloud_custom_resultset.cpp +++ b/examples/pointcloud_custom_resultset.cpp @@ -1,7 +1,7 @@ /*********************************************************************** * Software License Agreement (BSD License) * - * Copyright 2011-2022 Jose Luis Blanco (joseluisblancoc@gmail.com). + * Copyright 2011-2024 Jose Luis Blanco (joseluisblancoc@gmail.com). * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/examples/pointcloud_example.cpp b/examples/pointcloud_example.cpp index 6ab08892..cfa64f4c 100644 --- a/examples/pointcloud_example.cpp +++ b/examples/pointcloud_example.cpp @@ -1,7 +1,7 @@ /*********************************************************************** * Software License Agreement (BSD License) * - * Copyright 2011-2022 Jose Luis Blanco (joseluisblancoc@gmail.com). + * Copyright 2011-2024 Jose Luis Blanco (joseluisblancoc@gmail.com). * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/examples/pointcloud_kdd_radius.cpp b/examples/pointcloud_kdd_radius.cpp index 1c1c759b..e4c34fd0 100644 --- a/examples/pointcloud_kdd_radius.cpp +++ b/examples/pointcloud_kdd_radius.cpp @@ -1,7 +1,7 @@ /*********************************************************************** * Software License Agreement (BSD License) * - * Copyright 2011-2022 Jose Luis Blanco (joseluisblancoc@gmail.com). + * Copyright 2011-2024 Jose Luis Blanco (joseluisblancoc@gmail.com). * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/examples/saveload_example.cpp b/examples/saveload_example.cpp index bfb7f090..1d49980a 100644 --- a/examples/saveload_example.cpp +++ b/examples/saveload_example.cpp @@ -1,7 +1,7 @@ /*********************************************************************** * Software License Agreement (BSD License) * - * Copyright 2011-2022 Jose Luis Blanco (joseluisblancoc@gmail.com). + * Copyright 2011-2024 Jose Luis Blanco (joseluisblancoc@gmail.com). * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/examples/utils.h b/examples/utils.h index fc61a418..94278388 100644 --- a/examples/utils.h +++ b/examples/utils.h @@ -1,7 +1,7 @@ /*********************************************************************** * Software License Agreement (BSD License) * - * Copyright 2011-2022 Jose Luis Blanco (joseluisblancoc@gmail.com). + * Copyright 2011-2024 Jose Luis Blanco (joseluisblancoc@gmail.com). * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/examples/vector_of_vectors_example.cpp b/examples/vector_of_vectors_example.cpp index 6a1058de..06364359 100644 --- a/examples/vector_of_vectors_example.cpp +++ b/examples/vector_of_vectors_example.cpp @@ -1,7 +1,7 @@ /*********************************************************************** * Software License Agreement (BSD License) * - * Copyright 2011-2022 Jose Luis Blanco (joseluisblancoc@gmail.com). + * Copyright 2011-2024 Jose Luis Blanco (joseluisblancoc@gmail.com). * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/nanoflann.hpp b/include/nanoflann.hpp index b6d33151..233baf81 100644 --- a/include/nanoflann.hpp +++ b/include/nanoflann.hpp @@ -3,7 +3,7 @@ * * Copyright 2008-2009 Marius Muja (mariusm@cs.ubc.ca). All rights reserved. * Copyright 2008-2009 David G. Lowe (lowe@cs.ubc.ca). All rights reserved. - * Copyright 2011-2023 Jose Luis Blanco (joseluisblancoc@gmail.com). + * Copyright 2011-2024 Jose Luis Blanco (joseluisblancoc@gmail.com). * All rights reserved. * * THE BSD LICENSE @@ -49,8 +49,8 @@ #include #include #include // for abs() -#include // for abs() #include +#include // for abs() #include // std::reference_wrapper #include #include @@ -273,8 +273,7 @@ class RKNNResultSet indices = indices_; dists = dists_; count = 0; - if (capacity) - dists[capacity - 1] = maximumSearchDistanceSquared; + if (capacity) dists[capacity - 1] = maximumSearchDistanceSquared; } CountType size() const { return count; } @@ -832,7 +831,7 @@ struct SearchParameters */ class PooledAllocator { - static constexpr size_t WORDSIZE = 16; //WORDSIZE must >= 8 + static constexpr size_t WORDSIZE = 16; // WORDSIZE must >= 8 static constexpr size_t BLOCKSIZE = 8192; /* We maintain memory alignment to word boundaries by requiring that all @@ -903,9 +902,7 @@ class PooledAllocator /* Allocate new storage. */ const Size blocksize = - size > BLOCKSIZE - ? size + WORDSIZE - : BLOCKSIZE + WORDSIZE; + size > BLOCKSIZE ? size + WORDSIZE : BLOCKSIZE + WORDSIZE; // use the standard C malloc to allocate memory void* m = ::malloc(blocksize); @@ -920,7 +917,7 @@ class PooledAllocator base_ = m; remaining_ = blocksize - WORDSIZE; - loc_ = static_cast(m) + WORDSIZE; + loc_ = static_cast(m) + WORDSIZE; } void* rloc = loc_; loc_ = static_cast(loc_) + size; @@ -1302,7 +1299,7 @@ class KDTreeBaseClass } ElementType max_spread = -1; cutfeat = 0; - ElementType min_elem = 0, max_elem = 0; + ElementType min_elem = 0, max_elem = 0; for (Dimension i = 0; i < dims; ++i) { ElementType span = bbox[i].high - bbox[i].low; @@ -1315,8 +1312,8 @@ class KDTreeBaseClass { cutfeat = i; max_spread = spread; - min_elem = min_elem_; - max_elem = max_elem_; + min_elem = min_elem_; + max_elem = max_elem_; } } } diff --git a/tests/test_main.cpp b/tests/test_main.cpp index 66303d3b..3263f57f 100644 --- a/tests/test_main.cpp +++ b/tests/test_main.cpp @@ -1,7 +1,7 @@ /*********************************************************************** * Software License Agreement (BSD License) * - * Copyright 2011-2022 Jose Luis Blanco (joseluisblancoc@gmail.com). + * Copyright 2011-2024 Jose Luis Blanco (joseluisblancoc@gmail.com). * All rights reserved. * * THE BSD LICENSE