diff --git a/cuda/filters/include/pcl/cuda/filters/filter.h b/cuda/filters/include/pcl/cuda/filters/filter.h index ae26d836bba..a2c180f57b6 100644 --- a/cuda/filters/include/pcl/cuda/filters/filter.h +++ b/cuda/filters/include/pcl/cuda/filters/filter.h @@ -120,14 +120,6 @@ namespace pcl_cuda filter_limit_negative_ = limit_negative; } - /** \brief Get whether the data outside the interval (min/max) is to be - * returned (true) or inside (false). - * \param limit_negative the limit_negative flag - */ - PCL_DEPRECATED(1, 16, "use bool getFilterLimitsNegative() instead") - inline void - getFilterLimitsNegative (bool &limit_negative) { limit_negative = filter_limit_negative_; } - /** \brief Get whether the data outside the interval (min/max) is to be * returned (true) or inside (false). * \return true if data \b outside the interval [min; max] is to be returned, false otherwise diff --git a/cuda/filters/include/pcl/cuda/filters/voxel_grid.h b/cuda/filters/include/pcl/cuda/filters/voxel_grid.h deleted file mode 100644 index f54b3a195ad..00000000000 --- a/cuda/filters/include/pcl/cuda/filters/voxel_grid.h +++ /dev/null @@ -1,168 +0,0 @@ -/* - * Software License Agreement (BSD License) - * - * Copyright (c) 2011, Willow Garage, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * * Neither the name of Willow Garage, Inc. nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - -PCL_DEPRECATED_HEADER(1, 16, "The CUDA VoxelGrid filter does not work. Use the CPU VoxelGrid filter instead.") - -#include -#include -#include -#include -#include - -namespace pcl_cuda -{ - /////////////////////////////////////////////////////////////////////////////////////////// - /** \brief @b VoxelGrid assembles a local 3D grid over a given PointCloud, and downsamples + filters the data. - */ - template - class VoxelGrid: public Filter - { - public: - using Filter::filter_name_; - - using PointCloud = typename PCLCUDABase::PointCloud; - using PointCloudPtr = typename PointCloud::Ptr; - using PointCloudConstPtr = typename PointCloud::ConstPtr; - - /** \brief Empty constructor. */ - VoxelGrid () - { - filter_name_ = "VoxelGrid"; - }; - - protected: - /** \brief Filter a Point Cloud. - * \param output the resultant point cloud message - */ - void - applyFilter (PointCloud &output) - { - std::cerr << "applyFilter" << std::endl; - } - }; - - /////////////////////////////////////////////////////////////////////////////////////////// - template <> - class VoxelGrid >: public Filter > - { - public: - /** \brief Empty constructor. */ - VoxelGrid () - { - filter_name_ = "VoxelGridAOS"; - }; - - protected: - /** \brief Filter a Point Cloud. - * \param output the resultant point cloud message - */ - void - applyFilter (PointCloud &output) - { - // Allocate enough space - output.resize (input_->points.size ()); - // Copy data - Device::type::iterator nr_points = thrust::copy_if (input_->points.begin (), input_->points.end (), output.begin (), isFiniteAOS ()); - output.resize (nr_points - output.begin ()); - - //std::cerr << "[applyFilterAOS]: "; - //std::cerr << input_->points.size () << " " << output.size () << std::endl; - } - }; - - ////////////////////////////////////////////////////////////////////////////////////////// - template <> - class VoxelGrid >: public Filter > - { - public: - /** \brief Empty constructor. */ - VoxelGrid () : zip_(false) - { - filter_name_ = "VoxelGridSOA"; - }; - - inline void - setZip (bool zip) - { - zip_ = zip; - } - - - protected: - /** \brief Filter a Point Cloud. - * \param output the resultant point cloud message - */ - void - applyFilter (PointCloud &output) - { - if (!zip_) - { - // Allocate enough space - output.resize (input_->size ()); - // Copy data - Device::type::iterator nr_points = thrust::copy_if (input_->points_x.begin (), input_->points_x.end (), output.points_x.begin (), isFiniteSOA ()); - nr_points = thrust::copy_if (input_->points_y.begin (), input_->points_y.end (), output.points_y.begin (), isFiniteSOA ()); - nr_points = thrust::copy_if (input_->points_z.begin (), input_->points_z.end (), output.points_z.begin (), isFiniteSOA ()); - output.resize (nr_points - output.points_z.begin ()); - - //std::cerr << "[applyFilterSOA]: "; - //std::cerr << input_->size () << " " << output.size () << std::endl; - } - - else - { - output = *input_; - PointCloud::zip_iterator result = thrust::remove_if (output.zip_begin (), output.zip_end (), isFiniteZIPSOA ()); - PointCloud::iterator_tuple result_tuple = result.get_iterator_tuple (); - PointCloud::float_iterator xiter = thrust::get<0> (result_tuple), - yiter = thrust::get<1> (result_tuple), - ziter = thrust::get<2> (result_tuple); - - unsigned badpoints = distance (xiter, output.points_x.end ()); - unsigned goodpoints = distance (output.points_x.begin (), xiter); - - output.resize (goodpoints); - - //std::cerr << "[applyFilterSOA-ZIP]: "; - //std::cerr << input_->size () << " " << output.size () << std::endl; - } - } - - private: - bool zip_; - }; -} diff --git a/filters/include/pcl/filters/voxel_grid.h b/filters/include/pcl/filters/voxel_grid.h index 0ec5735fc07..011ed07b0b6 100644 --- a/filters/include/pcl/filters/voxel_grid.h +++ b/filters/include/pcl/filters/voxel_grid.h @@ -478,16 +478,6 @@ namespace pcl filter_limit_negative_ = limit_negative; } - /** \brief Get whether the data outside the interval (min/max) is to be returned (true) or inside (false). - * \param[out] limit_negative true if data \b outside the interval [min; max] is to be returned, false otherwise - */ - PCL_DEPRECATED(1, 16, "use bool getFilterLimitsNegative() instead") - inline void - getFilterLimitsNegative (bool &limit_negative) const - { - limit_negative = filter_limit_negative_; - } - /** \brief Get whether the data outside the interval (min/max) is to be returned (true) or inside (false). * \return true if data \b outside the interval [min; max] is to be returned, false otherwise */ @@ -827,16 +817,6 @@ namespace pcl filter_limit_negative_ = limit_negative; } - /** \brief Get whether the data outside the interval (min/max) is to be returned (true) or inside (false). - * \param[out] limit_negative true if data \b outside the interval [min; max] is to be returned, false otherwise - */ - PCL_DEPRECATED(1, 16, "use bool getFilterLimitsNegative() instead") - inline void - getFilterLimitsNegative (bool &limit_negative) const - { - limit_negative = filter_limit_negative_; - } - /** \brief Get whether the data outside the interval (min/max) is to be returned (true) or inside (false). * \return true if data \b outside the interval [min; max] is to be returned, false otherwise */ diff --git a/geometry/CMakeLists.txt b/geometry/CMakeLists.txt index 6f3d527c9cd..618e836ff6b 100644 --- a/geometry/CMakeLists.txt +++ b/geometry/CMakeLists.txt @@ -12,7 +12,6 @@ if(NOT build) endif() set(incs - "include/pcl/${SUBSYS_NAME}/boost.h" "include/pcl/${SUBSYS_NAME}/get_boundary.h" "include/pcl/${SUBSYS_NAME}/line_iterator.h" "include/pcl/${SUBSYS_NAME}/mesh_base.h" diff --git a/geometry/include/pcl/geometry/boost.h b/geometry/include/pcl/geometry/boost.h deleted file mode 100644 index 2512b4e0eb1..00000000000 --- a/geometry/include/pcl/geometry/boost.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Software License Agreement (BSD License) - * - * Point Cloud Library (PCL) - www.pointclouds.org - * Copyright (c) 2009-2012, Willow Garage, Inc. - * Copyright (c) 2012-, Open Perception, Inc. - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the copyright holder(s) nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - * $Id$ - * - */ - -#pragma once - -#ifdef __GNUC__ -#pragma GCC system_header -#endif -PCL_DEPRECATED_HEADER(1, 16, "Please include the needed boost headers directly.") - -#include -#include diff --git a/gpu/containers/src/device_memory.cpp b/gpu/containers/src/device_memory.cpp index 0bc38a684d2..96729ec2668 100644 --- a/gpu/containers/src/device_memory.cpp +++ b/gpu/containers/src/device_memory.cpp @@ -37,7 +37,6 @@ #include #include #include // used for HAVE_CUDA -#include // used for PCL_DEPRECATED #include @@ -164,16 +163,6 @@ pcl::gpu::DeviceMemory2D::empty() const #else -////////////////////////// XADD /////////////////////////////// - -template -PCL_DEPRECATED(1, 16, "Removed in favour of c++11 atomics") -static inline _Tp CV_XADD(std::atomic<_Tp>* addr, std::atomic<_Tp> delta) -{ - _Tp tmp = addr->fetch_add(delta); - return tmp; -} - //////////////////////// DeviceArray ///////////////////////////// pcl::gpu::DeviceMemory::DeviceMemory() diff --git a/outofcore/CMakeLists.txt b/outofcore/CMakeLists.txt index 1d668c5ea8e..5ac9da94a88 100644 --- a/outofcore/CMakeLists.txt +++ b/outofcore/CMakeLists.txt @@ -34,7 +34,6 @@ set(incs "include/pcl/${SUBSYS_NAME}/outofcore_iterator_base.h" "include/pcl/${SUBSYS_NAME}/outofcore_breadth_first_iterator.h" "include/pcl/${SUBSYS_NAME}/outofcore_depth_first_iterator.h" - "include/pcl/${SUBSYS_NAME}/boost.h" "include/pcl/${SUBSYS_NAME}/octree_base.h" "include/pcl/${SUBSYS_NAME}/octree_base_node.h" "include/pcl/${SUBSYS_NAME}/octree_abstract_node_container.h" diff --git a/outofcore/include/pcl/outofcore/boost.h b/outofcore/include/pcl/outofcore/boost.h deleted file mode 100644 index c4821517e5b..00000000000 --- a/outofcore/include/pcl/outofcore/boost.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Software License Agreement (BSD License) - * - * Point Cloud Library (PCL) - www.pointclouds.org - * Copyright (c) 2010-2012, Willow Garage, Inc. - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * * Neither the name of Willow Garage, Inc. nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - * $Id: boost.h 6913 2012-08-22 09:37:26Z stfox88 $ - */ - -#pragma once - -#if defined __GNUC__ -# pragma GCC system_header -#endif -PCL_DEPRECATED_HEADER(1, 16, "Please include the needed boost headers directly.") - -#include -#include diff --git a/visualization/CMakeLists.txt b/visualization/CMakeLists.txt index 5259b8bc537..b05114f1ab0 100644 --- a/visualization/CMakeLists.txt +++ b/visualization/CMakeLists.txt @@ -57,7 +57,6 @@ if(NOT (${VTK_VERSION} VERSION_LESS 9.0)) endif() set(incs - "include/pcl/${SUBSYS_NAME}/boost.h" "include/pcl/${SUBSYS_NAME}/cloud_viewer.h" "include/pcl/${SUBSYS_NAME}/histogram_visualizer.h" "include/pcl/${SUBSYS_NAME}/image_viewer.h" diff --git a/visualization/include/pcl/visualization/area_picking_event.h b/visualization/include/pcl/visualization/area_picking_event.h index eba9764da2a..501b747efda 100644 --- a/visualization/include/pcl/visualization/area_picking_event.h +++ b/visualization/include/pcl/visualization/area_picking_event.h @@ -54,10 +54,6 @@ namespace pcl : cloud_indices_ (std::move(cloud_indices)) {} - PCL_DEPRECATED(1,16,"This constructor is deprecated!") - AreaPickingEvent(int /*nb_points*/, const pcl::Indices& indices) - : AreaPickingEvent ({{"",indices}}) {} - /** \brief For situations where a whole area is selected, return the points indices. * \param[out] indices indices of the points under the area selected by user. * \return true, if the area selected by the user contains points, false otherwise diff --git a/visualization/include/pcl/visualization/boost.h b/visualization/include/pcl/visualization/boost.h deleted file mode 100644 index a1978ca68ee..00000000000 --- a/visualization/include/pcl/visualization/boost.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Software License Agreement (BSD License) - * - * Point Cloud Library (PCL) - www.pointclouds.org - * Copyright (c) 2012-, Open Perception, Inc. - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * * Neither the name of the copyright holder(s) nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - * $Id: lmeds.h 1370 2011-06-19 01:06:01Z jspricke $ - * - */ - -#pragma once - -#if defined __GNUC__ -# pragma GCC system_header -#endif -PCL_DEPRECATED_HEADER(1, 16, "Please include the needed boost headers directly.") - -#include -#define BOOST_PARAMETER_MAX_ARITY 7 -#include -#include -#include -#include -#include -#include