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

fixed build on linux

Browse Source
This commit is contained in:
matlabbe
2018-02-16 19:54:49 -05:00
parent d24097f73d
commit 6e131dcd7e
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
corelib/src/DBDriverSqlite3.cpp
View File

@@ -1510,13 +1510,13 @@ void DBDriverSqlite3::loadNodeDataQuery(std::list<Signature *> & signatures, boo
{
float * dataFloat = (float*)data;
if(uStrNumCmp(_version, "0.16.1") >= 0 && dataSize == (scanLocalTransform.size()+3)*sizeof(float))
if(uStrNumCmp(_version, "0.16.1") >= 0 && dataSize == (int)((scanLocalTransform.size()+3)*sizeof(float)))
{
// new in 0.16.1
laserScanFormat = (int)dataFloat[2];
memcpy(scanLocalTransform.data(), dataFloat+3, scanLocalTransform.size()*sizeof(float));
}
else if(dataSize == (scanLocalTransform.size()+2)*sizeof(float))
else if(dataSize == (int)((scanLocalTransform.size()+2)*sizeof(float)))
{
memcpy(scanLocalTransform.data(), dataFloat+2, scanLocalTransform.size()*sizeof(float));
}
@@ -1914,13 +1914,13 @@ bool DBDriverSqlite3::getLaserScanInfoQuery(
if(dataSize > 0 && data)
{
float * dataFloat = (float*)data;
if(uStrNumCmp(_version, "0.16.1") >= 0 && dataSize == (localTransform.size()+3)*sizeof(float))
if(uStrNumCmp(_version, "0.16.1") >= 0 && dataSize == (int)((localTransform.size()+3)*sizeof(float)))
{
// new in 0.16.1
format = (int)dataFloat[2];
memcpy(localTransform.data(), dataFloat+3, localTransform.size()*sizeof(float));
}
else if(dataSize == (localTransform.size()+2)*sizeof(float))
else if(dataSize == (int)((localTransform.size()+2)*sizeof(float)))
{
memcpy(localTransform.data(), dataFloat+2, localTransform.size()*sizeof(float));
}

6
corelib/src/OctoMap.cpp
View File

@@ -548,7 +548,7 @@ void OctoMap::update(const std::map<int, Transform> & poses)
if(occupancyIter != cache_.end())
{
tmpGround = LaserScan::backwardCompatibility(occupancyIter->second.first.first);
UASSERT(tmpGround.size() == maxGroundPts);
UASSERT(tmpGround.size() == (int)maxGroundPts);
}
for (unsigned int i=0; i<maxGroundPts; ++i)
{
@@ -612,7 +612,7 @@ void OctoMap::update(const std::map<int, Transform> & poses)
if(occupancyIter != cache_.end())
{
tmpObstacle = LaserScan::backwardCompatibility(occupancyIter->second.first.second);
UASSERT(tmpObstacle.size() == maxObstaclePts);
UASSERT(tmpObstacle.size() == (int)maxObstaclePts);
}
for (unsigned int i=0; i<maxObstaclePts; ++i)
{
@@ -702,7 +702,7 @@ void OctoMap::update(const std::map<int, Transform> & poses)
unsigned int maxEmptyPts = occupancyIter->second.second.cols;
UDEBUG("%d: compute free cells (from %d empty points)", iter->first, (int)maxEmptyPts);
LaserScan tmpEmpty = LaserScan::backwardCompatibility(occupancyIter->second.second);
UASSERT(tmpEmpty.size() == maxEmptyPts);
UASSERT(tmpEmpty.size() == (int)maxEmptyPts);
for (unsigned int i=0; i<maxEmptyPts; ++i)
{
pcl::PointXYZ pt;

2
corelib/src/util3d.cpp
View File

@@ -2892,7 +2892,7 @@ pcl::PointCloud<pcl::PointXYZ>::Ptr loadCloud(
pcl::PointCloud<pcl::PointXYZ>::Ptr cloud(new pcl::PointCloud<pcl::PointXYZ>);
if(UFile::getExtension(fileName).compare("bin") == 0)
{
cloud = util3d::loadBINCloud(path, 4); // Assume KITTI velodyne format
cloud = util3d::loadBINCloud(path); // Assume KITTI velodyne format
}
else if(UFile::getExtension(fileName).compare("pcd") == 0)
{

2
corelib/src/util3d_surface.cpp
View File

@@ -2700,7 +2700,7 @@ LaserScan adjustNormalsToViewPoint(
int ny = nx+1;
int nz = ny+1;
cv::Mat output = scan.data().clone();
for(unsigned int i=0; i<scan.size(); ++i)
for(int i=0; i<scan.size(); ++i)
{
float * ptr = output.ptr<float>(0, i);
if(uIsFinite(ptr[nx]) && uIsFinite(ptr[ny]) && uIsFinite(ptr[nz]))