Skip to content

Commit 653d4fe

Browse files
committed
Fixed Windows+PCL1.8 build (std::vector/Eigen error)
1 parent 5cc04b5 commit 653d4fe

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

corelib/include/rtabmap/core/util3d_surface.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,11 @@ void RTABMAP_EXP concatenateTextureMaterials(
177177
pcl::TextureMesh::Ptr RTABMAP_EXP assembleTextureMesh(
178178
const cv::Mat & cloudMat,
179179
const std::vector<std::vector<std::vector<unsigned int> > > & polygons,
180+
#if PCL_VERSION_COMPARE(>=, 1, 8, 0)
181+
const std::vector<std::vector<Eigen::Vector2f, Eigen::aligned_allocator<Eigen::Vector2f> > > & texCoords,
182+
#else
180183
const std::vector<std::vector<Eigen::Vector2f> > & texCoords,
184+
#endif
181185
cv::Mat & textures,
182186
bool mergeTextures = false);
183187

corelib/src/util3d_surface.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,7 +1194,11 @@ void concatenateTextureMaterials(pcl::TextureMesh & mesh, const cv::Size & image
11941194
pcl::TextureMesh::Ptr assembleTextureMesh(
11951195
const cv::Mat & cloudMat,
11961196
const std::vector<std::vector<std::vector<unsigned int> > > & polygons,
1197+
#if PCL_VERSION_COMPARE(>=, 1, 8, 0)
1198+
const std::vector<std::vector<Eigen::Vector2f, Eigen::aligned_allocator<Eigen::Vector2f> > > & texCoords,
1199+
#else
11971200
const std::vector<std::vector<Eigen::Vector2f> > & texCoords,
1201+
#endif
11981202
cv::Mat & textures,
11991203
bool mergeTextures)
12001204
{

0 commit comments

Comments
 (0)