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 compilation

Browse Source
This commit is contained in:
Mathieu Labbé
2015-02-28 15:46:04 -05:00
parent 1588b0b25c
commit 395dac5777
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
corelib/include/rtabmap/core/impl/util3d.hpp
View File

@@ -405,7 +405,7 @@ std::vector<pcl::IndicesPtr> extractClusters(
if(maxSize < cluster_indices[i].indices.size())
{
maxSize = cluster_indices[i].indices.size();
maxSize = (unsigned int)cluster_indices[i].indices.size();
maxIndex = i;
}
}
@@ -477,7 +477,7 @@ void occupancy2DFromCloud3D(
ground = cv::Mat();
if(groundCloud->size())
{
ground = cv::Mat(groundCloud->size(), 1, CV_32FC2);
ground = cv::Mat((int)groundCloud->size(), 1, CV_32FC2);
for(unsigned int i=0;i<groundCloud->size(); ++i)
{
ground.at<cv::Vec2f>(i)[0] = groundCloud->at(i).x;
@@ -488,7 +488,7 @@ void occupancy2DFromCloud3D(
obstacles = cv::Mat();
if(obstaclesCloud->size())
{
obstacles = cv::Mat(obstaclesCloud->size(), 1, CV_32FC2);
obstacles = cv::Mat((int)obstaclesCloud->size(), 1, CV_32FC2);
for(unsigned int i=0;i<obstaclesCloud->size(); ++i)
{
obstacles.at<cv::Vec2f>(i)[0] = obstaclesCloud->at(i).x;

4
corelib/src/DBDriver.cpp
View File

@@ -504,7 +504,7 @@ void DBDriver::loadLinks(int signatureId, std::map<int, Link> & links, Link::Typ
{
const Signature * s = _trashSignatures.at(signatureId);
UASSERT(s != 0);
for(std::multimap<int, Link>::const_iterator nIter = s->getLinks().begin();
for(std::map<int, Link>::const_iterator nIter = s->getLinks().begin();
nIter!=s->getLinks().end();
++nIter)
{
@@ -556,7 +556,7 @@ void DBDriver::getAllNodeIds(std::set<int> & ids, bool ignoreChildren) const
bool hasNeighbors = !ignoreChildren;
if(ignoreChildren)
{
for(std::multimap<int, Link>::const_iterator nIter = sIter->second->getLinks().begin();
for(std::map<int, Link>::const_iterator nIter = sIter->second->getLinks().begin();
nIter!=sIter->second->getLinks().end();
++nIter)
{

4
corelib/src/Graph.cpp
View File

@@ -804,7 +804,7 @@ std::list<std::pair<int, Transform> > computePath(
if(nodeIter->second.costSoFar() > newCostSoFar)
{
// update the cost in the priority queue
for(std::map<float, int>::iterator mapIter=pqmap.begin(); mapIter!=pqmap.end(); ++mapIter)
for(std::multimap<float, int>::iterator mapIter=pqmap.begin(); mapIter!=pqmap.end(); ++mapIter)
{
if(mapIter->second == nodeIter->first)
{
@@ -911,7 +911,7 @@ float computePathLength(
UASSERT(fromIndex < path.size() && toIndex < path.size() && fromIndex <= toIndex);
if(fromIndex >= toIndex)
{
toIndex = path.size()-1;
toIndex = (unsigned int)path.size()-1;
}
float x=0, y=0, z=0;
for(unsigned int i=fromIndex; i<toIndex-1; ++i)

14
corelib/src/util3d.cpp
View File

@@ -1525,7 +1525,7 @@ Transform icp(const pcl::PointCloud<pcl::PointXYZ>::ConstPtr & cloud_source,
if(inliers)
{
*inliers = correspondences.size();
*inliers = (int)correspondences.size();
}
}
else
@@ -1615,7 +1615,7 @@ Transform icpPointToPlane(
if(inliers)
{
*inliers = correspondences.size();
*inliers = (int)correspondences.size();
}
}
else
@@ -1704,7 +1704,7 @@ Transform icp2D(const pcl::PointCloud<pcl::PointXYZ>::ConstPtr & cloud_source,
if(inliers)
{
*inliers = correspondences.size();
*inliers = (int)correspondences.size();
}
}
else
@@ -2054,7 +2054,7 @@ void occupancy2DFromLaserScan(
ground = cv::Mat();
if(groundIndices.size())
{
ground = cv::Mat(groundIndices.size(), 1, CV_32FC2);
ground = cv::Mat((int)groundIndices.size(), 1, CV_32FC2);
int i=0;
for(std::list<int>::iterator iter=groundIndices.begin();iter!=groundIndices.end(); ++iter)
{
@@ -2070,7 +2070,7 @@ void occupancy2DFromLaserScan(
obstacles = cv::Mat();
if(obstaclesCloud->size())
{
obstacles = cv::Mat(obstaclesCloud->size(), 1, CV_32FC2);
obstacles = cv::Mat((int)obstaclesCloud->size(), 1, CV_32FC2);
for(unsigned int i=0;i<obstaclesCloud->size(); ++i)
{
obstacles.at<cv::Vec2f>(i)[0] = obstaclesCloud->at(i).x;
@@ -2549,7 +2549,7 @@ pcl::IndicesPtr concatenate(const std::vector<pcl::IndicesPtr> & indices)
unsigned int totalSize = 0;
for(unsigned int i=0; i<indices.size(); ++i)
{
totalSize += indices[i]->size();
totalSize += (unsigned int)indices[i]->size();
}
pcl::IndicesPtr ind(new std::vector<int>(totalSize));
unsigned int io = 0;
@@ -2567,7 +2567,7 @@ pcl::IndicesPtr concatenate(const pcl::IndicesPtr & indicesA, const pcl::Indices
{
pcl::IndicesPtr ind(new std::vector<int>(*indicesA));
ind->resize(ind->size()+indicesB->size());
unsigned int oi = indicesA->size();
unsigned int oi = (unsigned int)indicesA->size();
for(unsigned int i=0; i<indicesB->size(); ++i)
{
ind->at(oi++) = indicesB->at(i);