Fixed Windows+PCL1.8 build (std::vector/Eigen error)

introlab · Jun 26, 2017 · 653d4fe · 653d4fe
1 parent 5cc04b5
commit 653d4fe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/corelib/include/rtabmap/core/util3d_surface.h b/corelib/include/rtabmap/core/util3d_surface.h
@@ -177,7 +177,11 @@ void RTABMAP_EXP concatenateTextureMaterials(
 pcl::TextureMesh::Ptr RTABMAP_EXP assembleTextureMesh(
 		const cv::Mat & cloudMat,
 		const std::vector<std::vector<std::vector<unsigned int> > > & polygons,
+#if PCL_VERSION_COMPARE(>=, 1, 8, 0)
+		const std::vector<std::vector<Eigen::Vector2f, Eigen::aligned_allocator<Eigen::Vector2f> > > & texCoords,
+#else
 		const std::vector<std::vector<Eigen::Vector2f> > & texCoords,
+#endif
 		cv::Mat & textures,
 		bool mergeTextures = false);
 

diff --git a/corelib/src/util3d_surface.cpp b/corelib/src/util3d_surface.cpp
@@ -1194,7 +1194,11 @@ void concatenateTextureMaterials(pcl::TextureMesh & mesh, const cv::Size & image
 pcl::TextureMesh::Ptr assembleTextureMesh(
 		const cv::Mat & cloudMat,
 		const std::vector<std::vector<std::vector<unsigned int> > > & polygons,
+#if PCL_VERSION_COMPARE(>=, 1, 8, 0)
+		const std::vector<std::vector<Eigen::Vector2f, Eigen::aligned_allocator<Eigen::Vector2f> > > & texCoords,
+#else
 		const std::vector<std::vector<Eigen::Vector2f> > & texCoords,
+#endif
 		cv::Mat & textures,
 		bool mergeTextures)
 {