Skip to content

Commit

Permalink
copyright bump
Browse files Browse the repository at this point in the history
  • Loading branch information
@jlblancoc
jlblancoc committed Jan 10, 2024
1 parent 0b9fc58 commit fb2a9d7
Show file tree
Hide file tree
Showing 18 changed files with 26 additions and 29 deletions.
2 changes: 1 addition & 1 deletion examples/SO2_adaptor_example.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/***********************************************************************
* Software License Agreement (BSD License)
*
* Copyright 2011-2022 Jose Luis Blanco ([email protected]).
* Copyright 2011-2024 Jose Luis Blanco ([email protected]).
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion examples/SO3_adaptor_example.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/***********************************************************************
* Software License Agreement (BSD License)
*
* Copyright 2011-2022 Jose Luis Blanco ([email protected]).
* Copyright 2011-2024 Jose Luis Blanco ([email protected]).
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion examples/dynamic_pointcloud_example.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/***********************************************************************
* Software License Agreement (BSD License)
*
* Copyright 2011-2022 Jose Luis Blanco ([email protected]).
* Copyright 2011-2024 Jose Luis Blanco ([email protected]).
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion examples/example_with_cmake/pointcloud_example.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/***********************************************************************
* Software License Agreement (BSD License)
*
* Copyright 2011-2022 Jose Luis Blanco ([email protected]).
* Copyright 2011-2024 Jose Luis Blanco ([email protected]).
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion examples/example_with_pkgconfig/pointcloud_example.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/***********************************************************************
* Software License Agreement (BSD License)
*
* Copyright 2011-2022 Jose Luis Blanco ([email protected]).
* Copyright 2011-2024 Jose Luis Blanco ([email protected]).
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion examples/examples_gui/nanoflann_gui_example_R3/nanoflann_gui_example_R3.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/***********************************************************************
* Software License Agreement (BSD License)
*
* Copyright 2011-2022 Jose Luis Blanco ([email protected]).
* Copyright 2011-2024 Jose Luis Blanco ([email protected]).
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion examples/examples_gui/nanoflann_gui_example_bearings/nanoflann_gui_example_bearings.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/***********************************************************************
* Software License Agreement (BSD License)
*
* Copyright 2011-2022 Jose Luis Blanco ([email protected]).
* Copyright 2011-2024 Jose Luis Blanco ([email protected]).
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion examples/matrix_example.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/***********************************************************************
* Software License Agreement (BSD License)
*
* Copyright 2011-2022 Jose Luis Blanco ([email protected]).
* Copyright 2011-2024 Jose Luis Blanco ([email protected]).
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion examples/pointcloud_adaptor_example.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/***********************************************************************
* Software License Agreement (BSD License)
*
* Copyright 2011-2022 Jose Luis Blanco ([email protected]).
* Copyright 2011-2024 Jose Luis Blanco ([email protected]).
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion examples/pointcloud_custom_metric.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/***********************************************************************
* Software License Agreement (BSD License)
*
* Copyright 2011-2022 Jose Luis Blanco ([email protected]).
* Copyright 2011-2024 Jose Luis Blanco ([email protected]).
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion examples/pointcloud_custom_resultset.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/***********************************************************************
* Software License Agreement (BSD License)
*
* Copyright 2011-2022 Jose Luis Blanco ([email protected]).
* Copyright 2011-2024 Jose Luis Blanco ([email protected]).
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion examples/pointcloud_example.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/***********************************************************************
* Software License Agreement (BSD License)
*
* Copyright 2011-2022 Jose Luis Blanco ([email protected]).
* Copyright 2011-2024 Jose Luis Blanco ([email protected]).
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion examples/pointcloud_kdd_radius.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/***********************************************************************
* Software License Agreement (BSD License)
*
* Copyright 2011-2022 Jose Luis Blanco ([email protected]).
* Copyright 2011-2024 Jose Luis Blanco ([email protected]).
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion examples/saveload_example.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/***********************************************************************
* Software License Agreement (BSD License)
*
* Copyright 2011-2022 Jose Luis Blanco ([email protected]).
* Copyright 2011-2024 Jose Luis Blanco ([email protected]).
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion examples/utils.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/***********************************************************************
* Software License Agreement (BSD License)
*
* Copyright 2011-2022 Jose Luis Blanco ([email protected]).
* Copyright 2011-2024 Jose Luis Blanco ([email protected]).
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion examples/vector_of_vectors_example.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/***********************************************************************
* Software License Agreement (BSD License)
*
* Copyright 2011-2022 Jose Luis Blanco ([email protected]).
* Copyright 2011-2024 Jose Luis Blanco ([email protected]).
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down
21 changes: 9 additions & 12 deletions include/nanoflann.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Copyright 2008-2009 Marius Muja ([email protected]). All rights reserved.
* Copyright 2008-2009 David G. Lowe ([email protected]). All rights reserved.
* Copyright 2011-2023 Jose Luis Blanco ([email protected]).
* Copyright 2011-2024 Jose Luis Blanco ([email protected]).
* All rights reserved.
*
* THE BSD LICENSE
Expand Down Expand Up @@ -49,8 +49,8 @@
#include <atomic>
#include <cassert>
#include <cmath> // for abs()
#include <cstdlib> // for abs()
#include <cstdint>
#include <cstdlib> // for abs()
#include <functional> // std::reference_wrapper
#include <future>
#include <istream>
Expand Down Expand Up @@ -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; }
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand All @@ -920,7 +917,7 @@ class PooledAllocator
base_ = m;

remaining_ = blocksize - WORDSIZE;
loc_ = static_cast<char*>(m) + WORDSIZE;
loc_ = static_cast<char*>(m) + WORDSIZE;
}
void* rloc = loc_;
loc_ = static_cast<char*>(loc_) + size;
Expand Down Expand Up @@ -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;
Expand All @@ -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_;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/test_main.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/***********************************************************************
* Software License Agreement (BSD License)
*
* Copyright 2011-2022 Jose Luis Blanco ([email protected]).
* Copyright 2011-2024 Jose Luis Blanco ([email protected]).
* All rights reserved.
*
* THE BSD LICENSE
Expand Down

0 comments on commit fb2a9d7

Please sign in to comment.