From 5b913ba824fb17f5118a17f3445b5c074dd1410b Mon Sep 17 00:00:00 2001 From: Yangyan Li Date: Tue, 26 Nov 2013 13:29:53 -0800 Subject: [PATCH 1/2] Fix savePNGFile redefinition error (happens at least when compiled in VS2012). --- io/include/pcl/io/png_io.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io/include/pcl/io/png_io.h b/io/include/pcl/io/png_io.h index 7b638deb2ea..4c4611503b7 100644 --- a/io/include/pcl/io/png_io.h +++ b/io/include/pcl/io/png_io.h @@ -139,7 +139,7 @@ namespace pcl * \ingroup io * Warning: Converts to 16 bit (for png), labels using more than 16 bits will cause problems */ - PCL_DEPRECATED (void savePNGFile (const std::string& file_name, const pcl::PointCloud& cloud), + PCL_EXPORTS PCL_DEPRECATED (void savePNGFile (const std::string& file_name, const pcl::PointCloud& cloud), "pcl::io::savePNGFile (file_name, cloud) is deprecated, please use a new generic function " "pcl::io::savePNGFile (file_name, cloud, field_name) with \"label\" as the field name." ); From f3cf0b359fc64d79eda6a728d4d1f00835de0581 Mon Sep 17 00:00:00 2001 From: Yangyan Li Date: Tue, 26 Nov 2013 14:35:26 -0800 Subject: [PATCH 2/2] Add several PCL_EXPORTS as those functions are used in pcl_grabcut_2d project. --- .../include/pcl/segmentation/grabcut_segmentation.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/segmentation/include/pcl/segmentation/grabcut_segmentation.h b/segmentation/include/pcl/segmentation/grabcut_segmentation.h index 9a73553edd6..0552e5f3216 100644 --- a/segmentation/include/pcl/segmentation/grabcut_segmentation.h +++ b/segmentation/include/pcl/segmentation/grabcut_segmentation.h @@ -217,7 +217,7 @@ namespace pcl Eigen::Vector3f eigenvector; }; - class GMM + class PCL_EXPORTS GMM { public: /// Initialize GMM with ddesired number of gaussians. @@ -289,14 +289,14 @@ namespace pcl }; /** Build the initial GMMs using the Orchard and Bouman color clustering algorithm */ - void + PCL_EXPORTS void buildGMMs (const Image &image, const std::vector& indices, const std::vector &hardSegmentation, std::vector &components, GMM &background_GMM, GMM &foreground_GMM); /** Iteratively learn GMMs using GrabCut updating algorithm */ - void + PCL_EXPORTS void learnGMMs (const Image& image, const std::vector& indices, const std::vector& hard_segmentation,