Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove deprecated code for 1.14 release #5872

Merged
merged 2 commits into from
Nov 13, 2023
Merged

remove deprecated code for 1.14 release #5872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18107ea
remove deprecated code for 1.14 release
KStew8111 Nov 12, 2023
dc59415
remove function definitions
KStew8111 Nov 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions gpu/octree/include/pcl/gpu/octree/octree.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,6 @@ namespace pcl
*/
void radiusSearch(const Queries& centers, const Indices& indices, float radius, int max_results, NeighborIndices& result) const;

/** \brief Batch approximate nearest search on GPU
* \param[in] queries array of centers
* \param[out] result array of results ( one index for each query )
*/
PCL_DEPRECATED(1, 14, "use approxNearestSearch() which returns square distances instead")
void approxNearestSearch(const Queries& queries, NeighborIndices& result) const;

/** \brief Batch approximate nearest search on GPU
* \param[in] queries array of centers
* \param[out] result array of results ( one index for each query )
Expand Down
6 changes: 0 additions & 6 deletions gpu/octree/src/octree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,6 @@ void pcl::gpu::Octree::radiusSearch(const Queries& queries, const Indices& indic
static_cast<OctreeImpl*>(impl)->radiusSearch(q, indices, radius, results);
}

void pcl::gpu::Octree::approxNearestSearch(const Queries& queries, NeighborIndices& results) const
{
ResultSqrDists sqr_distance;
approxNearestSearch(queries, results, sqr_distance);
}

void pcl::gpu::Octree::approxNearestSearch(const Queries& queries, NeighborIndices& results, ResultSqrDists& sqr_distance) const
{
assert(queries.size() > 0);
Expand Down
45 changes: 0 additions & 45 deletions segmentation/include/pcl/segmentation/extract_labeled_clusters.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,33 +40,6 @@

namespace pcl {
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/** \brief Decompose a region of space into clusters based on the Euclidean distance
* between points
* \param[in] cloud the point cloud message
* \param[in] tree the spatial locator (e.g., kd-tree) used for nearest neighbors
* searching
* \note the tree has to be created as a spatial locator on \a cloud
* \param[in] tolerance the spatial cluster tolerance as a measure in L2 Euclidean space
* \param[out] labeled_clusters the resultant clusters containing point indices (as a
* vector of PointIndices)
* \param[in] min_pts_per_cluster minimum number of points that a cluster may contain
* (default: 1)
* \param[in] max_pts_per_cluster maximum number of points that a cluster may contain
* (default: max int)
* \param[in] max_label
* \ingroup segmentation
*/
template <typename PointT>
PCL_DEPRECATED(1, 14, "Use of max_label is deprecated")
void extractLabeledEuclideanClusters(
const PointCloud<PointT>& cloud,
const typename search::Search<PointT>::Ptr& tree,
float tolerance,
std::vector<std::vector<PointIndices>>& labeled_clusters,
unsigned int min_pts_per_cluster,
unsigned int max_pts_per_cluster,
unsigned int max_label);

/** \brief Decompose a region of space into clusters based on the Euclidean distance
* between points
* \param[in] cloud the point cloud message
Expand Down Expand Up @@ -190,24 +163,6 @@ class LabeledEuclideanClusterExtraction : public PCLBase<PointT> {
return (max_pts_per_cluster_);
}

/** \brief Set the maximum number of labels in the cloud.
* \param[in] max_label the maximum
*/
PCL_DEPRECATED(1, 14, "Max label is being deprecated")
inline void
setMaxLabels(unsigned int max_label)
{
max_label_ = max_label;
}

/** \brief Get the maximum number of labels */
PCL_DEPRECATED(1, 14, "Max label is being deprecated")
inline unsigned int
getMaxLabels() const
{
return (max_label_);
}

/** \brief Cluster extraction in a PointCloud given by <setInputCloud (), setIndices
* ()> \param[out] labeled_clusters the resultant point clusters
*/
Expand Down
28 changes: 0 additions & 28 deletions segmentation/include/pcl/segmentation/impl/extract_labeled_clusters.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,25 +40,6 @@
#include <pcl/segmentation/extract_labeled_clusters.h>

//////////////////////////////////////////////////////////////////////////////////////////////
template <typename PointT>
void
pcl::extractLabeledEuclideanClusters(
const PointCloud<PointT>& cloud,
const typename search::Search<PointT>::Ptr& tree,
float tolerance,
std::vector<std::vector<PointIndices>>& labeled_clusters,
unsigned int min_pts_per_cluster,
unsigned int max_pts_per_cluster,
unsigned int)
{
pcl::extractLabeledEuclideanClusters<PointT>(cloud,
tree,
tolerance,
labeled_clusters,
min_pts_per_cluster,
max_pts_per_cluster);
}

template <typename PointT>
void
pcl::extractLabeledEuclideanClusters(
Expand Down Expand Up @@ -179,15 +160,6 @@ pcl::LabeledEuclideanClusterExtraction<PointT>::extract(

#define PCL_INSTANTIATE_LabeledEuclideanClusterExtraction(T) \
template class PCL_EXPORTS pcl::LabeledEuclideanClusterExtraction<T>;
#define PCL_INSTANTIATE_extractLabeledEuclideanClusters_deprecated(T) \
template void PCL_EXPORTS pcl::extractLabeledEuclideanClusters<T>( \
const pcl::PointCloud<T>&, \
const typename pcl::search::Search<T>::Ptr&, \
float, \
std::vector<std::vector<pcl::PointIndices>>&, \
unsigned int, \
unsigned int, \
unsigned int);
#define PCL_INSTANTIATE_extractLabeledEuclideanClusters(T) \
template void PCL_EXPORTS pcl::extractLabeledEuclideanClusters<T>( \
const pcl::PointCloud<T>&, \
Expand Down
1 change: 0 additions & 1 deletion segmentation/src/extract_clusters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,5 @@ PCL_INSTANTIATE(extractEuclideanClusters, PCL_XYZ_POINT_TYPES)
PCL_INSTANTIATE(extractEuclideanClusters_indices, PCL_XYZ_POINT_TYPES)
#endif
PCL_INSTANTIATE(LabeledEuclideanClusterExtraction, PCL_XYZL_POINT_TYPES)
PCL_INSTANTIATE(extractLabeledEuclideanClusters_deprecated, PCL_XYZL_POINT_TYPES)
PCL_INSTANTIATE(extractLabeledEuclideanClusters, PCL_XYZL_POINT_TYPES)

25 changes: 0 additions & 25 deletions surface/include/pcl/surface/ear_clipping.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,17 +87,6 @@ namespace pcl
float
area (const Indices& vertices);

/** \brief Compute the signed area of a polygon.
* \param[in] vertices the vertices representing the polygon
*/
template <typename T = pcl::index_t, std::enable_if_t<!std::is_same<T, std::uint32_t>::value, pcl::index_t> = 0>
PCL_DEPRECATED(1, 14, "This method creates a useless copy of the vertices vector. Use area method which accepts Indices instead")
float
area (const std::vector<std::uint32_t>& vertices)
{
return area(Indices (vertices.cbegin(), vertices.cend()));
}

/** \brief Check if the triangle (u,v,w) is an ear.
* \param[in] u the first triangle vertex
* \param[in] v the second triangle vertex
Expand All @@ -107,20 +96,6 @@ namespace pcl
bool
isEar (int u, int v, int w, const Indices& vertices);

/** \brief Check if the triangle (u,v,w) is an ear.
* \param[in] u the first triangle vertex
* \param[in] v the second triangle vertex
* \param[in] w the third triangle vertex
* \param[in] vertices a set of input vertices
*/
template <typename T = pcl::index_t, std::enable_if_t<!std::is_same<T, std::uint32_t>::value, pcl::index_t> = 0>
PCL_DEPRECATED(1, 14, "This method creates a useless copy of the vertices vector. Use isEar method which accepts Indices instead")
bool
isEar (int u, int v, int w, const std::vector<std::uint32_t>& vertices)
{
return isEar(u, v, w, Indices (vertices.cbegin(), vertices.cend()));
}

/** \brief Check if p is inside the triangle (u,v,w).
* \param[in] u the first triangle vertex
* \param[in] v the second triangle vertex
Expand Down