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 error when loading PNG images (OpenCV error for the color format)

Browse Source 
Unpaused automatically after initialization

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@315 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2011-09-15 21:02:48 +00:00
parent 176ca33e27
commit 3eb8bcbfa4
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
corelib/src/Camera.cpp
View File

@@ -382,7 +382,7 @@ SMState * CameraImages::takeImage()
{ {
_lastFileName = *fileNames.rbegin(); _lastFileName = *fileNames.rbegin();
std::string fullPath = _path + _lastFileName; std::string fullPath = _path + _lastFileName;
img = cvLoadImage(fullPath.c_str(), CV_LOAD_IMAGE_UNCHANGED); img = cvLoadImage(fullPath.c_str(), CV_LOAD_IMAGE_COLOR);
} }
} }
} }
@@ -401,7 +401,7 @@ SMState * CameraImages::takeImage()
if(fileName.size()) if(fileName.size())
{ {
ULOGGER_DEBUG("Loading image : %s\n", fullPath.c_str()); ULOGGER_DEBUG("Loading image : %s\n", fullPath.c_str());
img = cvLoadImage(fullPath.c_str(), CV_LOAD_IMAGE_UNCHANGED); img = cvLoadImage(fullPath.c_str(), CV_LOAD_IMAGE_COLOR);
} }
} }
} }

4
guilib/src/MainWindow.cpp
View File

@@ -607,6 +607,10 @@ void MainWindow::processRtabmapEventInit(int status, const QString & info)
else if((RtabmapEventInit::Status)status == RtabmapEventInit::kInitialized) else if((RtabmapEventInit::Status)status == RtabmapEventInit::kInitialized)
{ {
_initProgressDialog->setValue(_initProgressDialog->maximumSteps()); _initProgressDialog->setValue(_initProgressDialog->maximumSteps());
if(_state == kPaused)
{
this->pauseDetection();
}
} }
else else
{ {