From de4c0e93fdc5b5e53eeab3145e39748b2d8f10a6 Mon Sep 17 00:00:00 2001 From: Lars Glud Date: Thu, 26 Sep 2024 21:29:23 +0200 Subject: [PATCH] Remove unnecessary PCL_EXPORTS when: * a method was templated * the full definition was present in the header --- common/include/pcl/common/colors.h | 4 ++-- common/include/pcl/common/intersections.h | 12 ++++++------ common/include/pcl/common/io.h | 6 +++--- common/include/pcl/point_cloud.h | 4 +--- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/common/include/pcl/common/colors.h b/common/include/pcl/common/colors.h index 7c1fc883c66..136fe77781a 100644 --- a/common/include/pcl/common/colors.h +++ b/common/include/pcl/common/colors.h @@ -98,7 +98,7 @@ namespace pcl * www.srgb.com, www.color.org/srgb.html */ template - PCL_EXPORTS inline std::array + inline std::array RGB2sRGB_LUT() noexcept { static_assert(std::is_floating_point::value, "LUT value must be a floating point"); @@ -144,7 +144,7 @@ namespace pcl * Reference: Billmeyer and Saltzman’s Principles of Color Technology */ template - PCL_EXPORTS inline const std::array& + inline const std::array& XYZ2LAB_LUT() noexcept { static_assert(std::is_floating_point::value, "LUT value must be a floating point"); diff --git a/common/include/pcl/common/intersections.h b/common/include/pcl/common/intersections.h index 81b578e57f6..687a69d0a12 100644 --- a/common/include/pcl/common/intersections.h +++ b/common/include/pcl/common/intersections.h @@ -86,13 +86,13 @@ namespace pcl * \param[in] angular_tolerance tolerance in radians * \return true if succeeded/planes aren't parallel */ - template PCL_EXPORTS bool + template bool planeWithPlaneIntersection (const Eigen::Matrix &plane_a, const Eigen::Matrix &plane_b, Eigen::Matrix &line, double angular_tolerance = 0.1); - PCL_EXPORTS inline bool + inline bool planeWithPlaneIntersection (const Eigen::Vector4f &plane_a, const Eigen::Vector4f &plane_b, Eigen::VectorXf &line, @@ -101,7 +101,7 @@ namespace pcl return (planeWithPlaneIntersection (plane_a, plane_b, line, angular_tolerance)); } - PCL_EXPORTS inline bool + inline bool planeWithPlaneIntersection (const Eigen::Vector4d &plane_a, const Eigen::Vector4d &plane_b, Eigen::VectorXd &line, @@ -121,7 +121,7 @@ namespace pcl * \param[out] intersection_point the three coordinates x, y, z of the intersection point * \return true if succeeded/planes aren't parallel */ - template PCL_EXPORTS bool + template bool threePlanesIntersection (const Eigen::Matrix &plane_a, const Eigen::Matrix &plane_b, const Eigen::Matrix &plane_c, @@ -129,7 +129,7 @@ namespace pcl double determinant_tolerance = 1e-6); - PCL_EXPORTS inline bool + inline bool threePlanesIntersection (const Eigen::Vector4f &plane_a, const Eigen::Vector4f &plane_b, const Eigen::Vector4f &plane_c, @@ -140,7 +140,7 @@ namespace pcl intersection_point, determinant_tolerance)); } - PCL_EXPORTS inline bool + inline bool threePlanesIntersection (const Eigen::Vector4d &plane_a, const Eigen::Vector4d &plane_b, const Eigen::Vector4d &plane_c, diff --git a/common/include/pcl/common/io.h b/common/include/pcl/common/io.h index 984b7306553..8cbb94e20ea 100644 --- a/common/include/pcl/common/io.h +++ b/common/include/pcl/common/io.h @@ -277,7 +277,7 @@ namespace pcl * \ingroup common */ template - PCL_EXPORTS bool + bool concatenate (const pcl::PointCloud &cloud1, const pcl::PointCloud &cloud2, pcl::PointCloud &cloud_out) @@ -295,7 +295,7 @@ namespace pcl * \return true if successful, false otherwise * \ingroup common */ - PCL_EXPORTS inline bool + inline bool concatenate (const pcl::PCLPointCloud2 &cloud1, const pcl::PCLPointCloud2 &cloud2, pcl::PCLPointCloud2 &cloud_out) @@ -310,7 +310,7 @@ namespace pcl * \return true if successful, false otherwise * \ingroup common */ - PCL_EXPORTS inline bool + inline bool concatenate (const pcl::PolygonMesh &mesh1, const pcl::PolygonMesh &mesh2, pcl::PolygonMesh &mesh_out) diff --git a/common/include/pcl/point_cloud.h b/common/include/pcl/point_cloud.h index a5607bffced..f7b63ba7b1e 100644 --- a/common/include/pcl/point_cloud.h +++ b/common/include/pcl/point_cloud.h @@ -169,7 +169,7 @@ namespace pcl * \author Patrick Mihelich, Radu B. Rusu */ template - class PCL_EXPORTS PointCloud + class PointCloud { public: /** \brief Default constructor. Sets \ref is_dense to true, \ref width @@ -921,5 +921,3 @@ namespace pcl return (s); } } - -#define PCL_INSTANTIATE_PointCloud(T) template class PCL_EXPORTS pcl::PointCloud;