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

@@ -319,7 +319,7 @@ void GraphViewer::updateGraph(const std::map<int, Transform> & poses,
{
for (int j = 0; j < map8S.cols; ++j)
{
char gray = map8S.at<char>(i, j);
unsigned char gray = map8S.at<unsigned char>(i, j);
if(gray == -1)
{
gray = 89;
@@ -332,7 +332,7 @@ void GraphViewer::updateGraph(const std::map<int, Transform> & poses,
{
gray = 0;
}
map8U.at<char>(i, j) = gray;
map8U.at<unsigned char>(i, j) = gray;
}
}
QImage image = uCvMat2QImage(map8U, false);

View File

@@ -270,7 +270,7 @@ MainWindow::MainWindow(PreferencesDialog * prefDialog, QWidget * parent) :
_ui->actionView_point_cloud_as_mesh->setEnabled(false);
_ui->actionReset_Odometry->setEnabled(false);
#if defined(Q_WS_MAC) or defined(Q_WS_WIN)
#if defined(Q_WS_MAC) || defined(Q_WS_WIN)
connect(_ui->actionOpen_working_directory, SIGNAL(triggered()), SLOT(openWorkingDirectory()));
#else
_ui->menuEdit->removeAction(_ui->actionOpen_working_directory);