From ace4752a9d984f46b705d57aa49d051dedf6cd9d Mon Sep 17 00:00:00 2001 From: Andrea Ponza Date: Sat, 11 Apr 2020 17:36:03 +0200 Subject: [PATCH 1/3] remove Organized PCD to PNG tool, deprecated since pcl-1.7.1 (or possibly earlier, #204) --- tools/CMakeLists.txt | 3 - tools/organized_pcd_to_png.cpp | 131 --------------------------------- 2 files changed, 134 deletions(-) delete mode 100644 tools/organized_pcd_to_png.cpp diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 097c6e133a6..1911f7b9f40 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -183,9 +183,6 @@ else() PCL_ADD_EXECUTABLE(pcl_pcd2png COMPONENT ${SUBSYS_NAME} SOURCES pcd2png.cpp) target_link_libraries(pcl_pcd2png pcl_common pcl_io) - PCL_ADD_EXECUTABLE(pcl_organized_pcd_to_png COMPONENT ${SUBSYS_NAME} SOURCES organized_pcd_to_png.cpp) - target_link_libraries (pcl_organized_pcd_to_png pcl_common pcl_io) - PCL_ADD_EXECUTABLE(pcl_tiff2pcd COMPONENT ${SUBSYS_NAME} SOURCES tiff2pcd.cpp) target_link_libraries(pcl_tiff2pcd pcl_common pcl_io) diff --git a/tools/organized_pcd_to_png.cpp b/tools/organized_pcd_to_png.cpp deleted file mode 100644 index 0a2be3ae1c4..00000000000 --- a/tools/organized_pcd_to_png.cpp +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Software License Agreement (BSD License) - * - * Point Cloud Library (PCL) - www.pointclouds.org - * Copyright (c) 2013, 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. - * - */ - -#include -#include -#include -#include -#include - -using namespace pcl; -using namespace pcl::io; -using namespace pcl::console; - -void -printHelp (int, char **argv) -{ - print_error ("Syntax is: %s input.pcd output.png\n", argv[0]); -} - -bool -loadCloud (const std::string &filename, pcl::PCLPointCloud2 &cloud) -{ - TicToc tt; - print_highlight ("Loading "); print_value ("%s ", filename.c_str ()); - - tt.tic (); - if (loadPCDFile (filename, cloud) < 0) - return (false); - print_info ("[done, "); print_value ("%g", tt.toc ()); print_info (" ms : "); print_value ("%d", cloud.width * cloud.height); print_info (" points]\n"); - print_info ("Available dimensions: "); print_value ("%s\n", pcl::getFieldsList (cloud).c_str ()); - - return (true); -} - -void -saveImage (const std::string &filename, const PointCloud &image) -{ - TicToc tt; - tt.tic (); - - print_highlight ("Saving "); print_value ("%s ", filename.c_str ()); - io::savePNGFile (filename, image, "rgb"); - - print_info ("[done, "); print_value ("%g", tt.toc ()); print_info (" ms : "); print_value ("%d", image.width * image.height); print_info (" points]\n"); -} - -/* ---[ */ -int -main (int argc, char** argv) -{ - print_error ("This tool is deprecated, please use \"pcl_pcd2png\" instead!\n"); - print_info ("Convert the RGB information of an organized PCD file to a PNG image. For more information, use: %s -h\n", argv[0]); - - if (argc < 3) - { - printHelp (argc, argv); - return (-1); - } - - // Parse the command line arguments for .pcd files - std::vector pcd_file_indices = parse_file_extension_argument (argc, argv, ".pcd"); - if (pcd_file_indices.size () != 1) - { - print_error ("Need one input PCD file and one output PNG file.\n"); - return (-1); - } - - std::vector png_file_indices = parse_file_extension_argument (argc, argv, ".png"); - if (png_file_indices.size () != 1) - { - print_error ("Need one input PCD file and one output PNG file.\n"); - return (-1); - } - - // Load the first file - pcl::PCLPointCloud2 cloud; - if (!loadCloud (argv[pcd_file_indices[0]], cloud)) - return (-1); - - - PointCloud image; - fromPCLPointCloud2 (cloud, image); - - - // Check if the cloud is organized - if (!image.isOrganized ()) - { - PCL_ERROR ("Input cloud is not organized.\n"); - return (-1); - } - - // Save cloud - saveImage (argv[png_file_indices[0]], image); - - return (0); -} - From 3e3334928b341fd79decd6b461cfb0786c4ef923 Mon Sep 17 00:00:00 2001 From: Andrea Ponza Date: Sat, 11 Apr 2020 17:18:26 +0200 Subject: [PATCH 2/3] remove some recognition headers, deprecated since pcl-1.7.1 (or possibly earlier, #245) --- recognition/include/pcl/recognition/auxiliary.h | 2 -- recognition/include/pcl/recognition/bvh.h | 2 -- recognition/include/pcl/recognition/model_library.h | 2 -- recognition/include/pcl/recognition/obj_rec_ransac.h | 2 -- recognition/include/pcl/recognition/orr_graph.h | 2 -- recognition/include/pcl/recognition/orr_octree.h | 2 -- recognition/include/pcl/recognition/orr_octree_zprojection.h | 2 -- recognition/include/pcl/recognition/rigid_transform_space.h | 2 -- recognition/include/pcl/recognition/simple_octree.h | 2 -- recognition/include/pcl/recognition/trimmed_icp.h | 2 -- recognition/include/pcl/recognition/voxel_structure.h | 2 -- 11 files changed, 22 deletions(-) delete mode 100644 recognition/include/pcl/recognition/auxiliary.h delete mode 100644 recognition/include/pcl/recognition/bvh.h delete mode 100644 recognition/include/pcl/recognition/model_library.h delete mode 100644 recognition/include/pcl/recognition/obj_rec_ransac.h delete mode 100644 recognition/include/pcl/recognition/orr_graph.h delete mode 100644 recognition/include/pcl/recognition/orr_octree.h delete mode 100644 recognition/include/pcl/recognition/orr_octree_zprojection.h delete mode 100644 recognition/include/pcl/recognition/rigid_transform_space.h delete mode 100644 recognition/include/pcl/recognition/simple_octree.h delete mode 100644 recognition/include/pcl/recognition/trimmed_icp.h delete mode 100644 recognition/include/pcl/recognition/voxel_structure.h diff --git a/recognition/include/pcl/recognition/auxiliary.h b/recognition/include/pcl/recognition/auxiliary.h deleted file mode 100644 index 8825cc75a1f..00000000000 --- a/recognition/include/pcl/recognition/auxiliary.h +++ /dev/null @@ -1,2 +0,0 @@ -#include -#error "Using pcl/recognition/auxiliary.h is deprecated, please use pcl/recognition/ransac_based/auxiliary.h instead." \ No newline at end of file diff --git a/recognition/include/pcl/recognition/bvh.h b/recognition/include/pcl/recognition/bvh.h deleted file mode 100644 index a4a69528706..00000000000 --- a/recognition/include/pcl/recognition/bvh.h +++ /dev/null @@ -1,2 +0,0 @@ -#include -#error "Using pcl/recognition/bvh.h is deprecated, please use pcl/recognition/ransac_based/bvh.h instead." \ No newline at end of file diff --git a/recognition/include/pcl/recognition/model_library.h b/recognition/include/pcl/recognition/model_library.h deleted file mode 100644 index 4e3fcc31c72..00000000000 --- a/recognition/include/pcl/recognition/model_library.h +++ /dev/null @@ -1,2 +0,0 @@ -#include -#error "Using pcl/recognition/model_library.h is deprecated, please use pcl/recognition/ransac_based/model_library.h instead." \ No newline at end of file diff --git a/recognition/include/pcl/recognition/obj_rec_ransac.h b/recognition/include/pcl/recognition/obj_rec_ransac.h deleted file mode 100644 index 1cacff838ac..00000000000 --- a/recognition/include/pcl/recognition/obj_rec_ransac.h +++ /dev/null @@ -1,2 +0,0 @@ -#include -#error "Using pcl/recognition/obj_rec_ransac.h is deprecated, please use pcl/recognition/ransac_based/obj_rec_ransac.h instead." \ No newline at end of file diff --git a/recognition/include/pcl/recognition/orr_graph.h b/recognition/include/pcl/recognition/orr_graph.h deleted file mode 100644 index 436b3e8bace..00000000000 --- a/recognition/include/pcl/recognition/orr_graph.h +++ /dev/null @@ -1,2 +0,0 @@ -#include -#error "Using pcl/recognition/orr_graph.h is deprecated, please use pcl/recognition/ransac_based/orr_graph.h instead." \ No newline at end of file diff --git a/recognition/include/pcl/recognition/orr_octree.h b/recognition/include/pcl/recognition/orr_octree.h deleted file mode 100644 index 38b850c8cf0..00000000000 --- a/recognition/include/pcl/recognition/orr_octree.h +++ /dev/null @@ -1,2 +0,0 @@ -#include -#error "Using pcl/recognition/orr_octree.h is deprecated, please use pcl/recognition/ransac_based/orr_octree.h instead." \ No newline at end of file diff --git a/recognition/include/pcl/recognition/orr_octree_zprojection.h b/recognition/include/pcl/recognition/orr_octree_zprojection.h deleted file mode 100644 index edb05809a5a..00000000000 --- a/recognition/include/pcl/recognition/orr_octree_zprojection.h +++ /dev/null @@ -1,2 +0,0 @@ -#include -#error "Using pcl/recognition/orr_octree_zprojection.h is deprecated, please use pcl/recognition/ransac_based/orr_octree_zprojection.h instead." \ No newline at end of file diff --git a/recognition/include/pcl/recognition/rigid_transform_space.h b/recognition/include/pcl/recognition/rigid_transform_space.h deleted file mode 100644 index a62e3dfed3a..00000000000 --- a/recognition/include/pcl/recognition/rigid_transform_space.h +++ /dev/null @@ -1,2 +0,0 @@ -#include -#error "Using pcl/recognition/rigid_transform_space.h is deprecated, please use pcl/recognition/ransac_based/rigid_transform_space.h instead." \ No newline at end of file diff --git a/recognition/include/pcl/recognition/simple_octree.h b/recognition/include/pcl/recognition/simple_octree.h deleted file mode 100644 index 19f2a2baff2..00000000000 --- a/recognition/include/pcl/recognition/simple_octree.h +++ /dev/null @@ -1,2 +0,0 @@ -#include -#error "Using pcl/recognition/simple_octree.h is deprecated, please use pcl/recognition/ransac_based/simple_octree.h instead." \ No newline at end of file diff --git a/recognition/include/pcl/recognition/trimmed_icp.h b/recognition/include/pcl/recognition/trimmed_icp.h deleted file mode 100644 index 23fd030481a..00000000000 --- a/recognition/include/pcl/recognition/trimmed_icp.h +++ /dev/null @@ -1,2 +0,0 @@ -#include -#error "Using pcl/recognition/trimmed_icp.h is deprecated, please use pcl/recognition/ransac_based/trimmed_icp.h instead." \ No newline at end of file diff --git a/recognition/include/pcl/recognition/voxel_structure.h b/recognition/include/pcl/recognition/voxel_structure.h deleted file mode 100644 index 09ab880ba4a..00000000000 --- a/recognition/include/pcl/recognition/voxel_structure.h +++ /dev/null @@ -1,2 +0,0 @@ -#include -#error "Using pcl/recognition/voxel_structure.h is deprecated, please use pcl/recognition/ransac_based/voxel_structure.h instead." \ No newline at end of file From c0716e88aeede5d335b89b0a321f25f82cad457f Mon Sep 17 00:00:00 2001 From: Andrea Ponza Date: Sat, 11 Apr 2020 15:32:03 +0200 Subject: [PATCH 3/3] remove pxc_grabber.h, deprecated since pcl-1.8rc1 (#1395) --- io/CMakeLists.txt | 1 - io/include/pcl/io/pxc_grabber.h | 1 - 2 files changed, 2 deletions(-) delete mode 100644 io/include/pcl/io/pxc_grabber.h diff --git a/io/CMakeLists.txt b/io/CMakeLists.txt index 1741230d1a2..f2349710020 100644 --- a/io/CMakeLists.txt +++ b/io/CMakeLists.txt @@ -288,7 +288,6 @@ set(incs ${DSSDK_GRABBER_INCLUDES} ${RSSDK_GRABBER_INCLUDES} ${RSSDK2_GRABBER_INCLUDES} - "include/pcl/${SUBSYS_NAME}/pxc_grabber.h" # contains only depreciation note ) set(compression_incs diff --git a/io/include/pcl/io/pxc_grabber.h b/io/include/pcl/io/pxc_grabber.h deleted file mode 100644 index 245e64f8cb6..00000000000 --- a/io/include/pcl/io/pxc_grabber.h +++ /dev/null @@ -1 +0,0 @@ -#error "PXCGrabber was deprecated and removed, please use DepthSenseGrabber instead"