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
+2 -1
View File
@@ -187,7 +187,8 @@ cv::Mat CameraImages::captureImage()
if(fileName.size())
{
ULOGGER_DEBUG("Loading image : %s", fullPath.c_str());
#if CV_MAJOR_VERSION >=2 and CV_MINOR_VERSION >=4
#if CV_MAJOR_VERSION >=2 && CV_MINOR_VERSION >=4
img = cv::imread(fullPath.c_str(), cv::IMREAD_UNCHANGED);
#else
img = cv::imread(fullPath.c_str(), -1);