i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-02 01:20:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
matlabbe
2017-06-26 15:45:30 -04:00
parent 5cc04b58a4
commit 653d4fef4b
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
corelib/include/rtabmap/core/util3d_surface.h
View File

@@ -177,7 +177,11 @@ void RTABMAP_EXP concatenateTextureMaterials(
pcl::TextureMesh::Ptr RTABMAP_EXP assembleTextureMesh( pcl::TextureMesh::Ptr RTABMAP_EXP assembleTextureMesh(
const cv::Mat & cloudMat, const cv::Mat & cloudMat,
const std::vector<std::vector<std::vector<unsigned int> > > & polygons, 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, const std::vector<std::vector<Eigen::Vector2f> > & texCoords,
#endif
cv::Mat & textures, cv::Mat & textures,
bool mergeTextures = false); bool mergeTextures = false);

4
corelib/src/util3d_surface.cpp
View File

@@ -1194,7 +1194,11 @@ void concatenateTextureMaterials(pcl::TextureMesh & mesh, const cv::Size & image
pcl::TextureMesh::Ptr assembleTextureMesh( pcl::TextureMesh::Ptr assembleTextureMesh(
const cv::Mat & cloudMat, const cv::Mat & cloudMat,
const std::vector<std::vector<std::vector<unsigned int> > > & polygons, 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, const std::vector<std::vector<Eigen::Vector2f> > & texCoords,
#endif
cv::Mat & textures, cv::Mat & textures,
bool mergeTextures) bool mergeTextures)
{ {