fixed some warnings in Windows

fixed Transform::getNorm()

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@1436 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2014-06-23 15:19:17 +00:00
parent d1df15efdd
commit e9ae29f909
12 changed files with 49 additions and 34 deletions

View File

@@ -38,7 +38,7 @@ int main(int argc, char * argv[])
std::list<std::vector<float> > objectDescriptors;
//std::list<std::vector<float> > descriptors;
std::map<int, std::vector<float> > descriptors;
unsigned int dimension = 0;
int dimension = 0;
UTimer timer;
int objectDescriptorsSize= 400;
@@ -85,7 +85,7 @@ int main(int argc, char * argv[])
++iter;
std::vector<float> descriptor(dimension);
unsigned int i=0;
int i=0;
//get descriptor
for(;i<dimension && iter != strList.end(); ++i, ++iter)
@@ -129,7 +129,7 @@ int main(int argc, char * argv[])
UDEBUG("Creating data structures...");
// Create the data structure
dataTree = cv::Mat(descriptors.size(), dimension, CV_32F); // SURF descriptors are CV_32F
dataTree = cv::Mat((int)descriptors.size(), dimension, CV_32F); // SURF descriptors are CV_32F
{//scope
//std::list<std::vector<float> >::const_iterator iter = descriptors.begin();
std::map<int, std::vector<float> >::const_iterator iter = descriptors.begin();
@@ -143,7 +143,7 @@ int main(int argc, char * argv[])
}
}
queries = cv::Mat(objectDescriptors.size(), dimension, CV_32F); // SURF descriptors are CV_32F
queries = cv::Mat((int)objectDescriptors.size(), dimension, CV_32F); // SURF descriptors are CV_32F
{//scope
std::list<std::vector<float> >::const_iterator iter = objectDescriptors.begin();
for(unsigned int i=0; i < objectDescriptors.size(); ++i, ++iter)