MERGE branch STM 325:449 into trunk

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@450 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2012-03-03 01:46:30 +00:00
parent c4aff5f20a
commit a2eb8bcab6
100 changed files with 76652 additions and 5164 deletions

View File

@@ -5,13 +5,13 @@ SET(SRC_FILES
SET(INCLUDE_DIRS
${CMAKE_CURRENT_SOURCE_DIR}
${UTILITE_INCLUDE_DIR}
${UTILITE_INCLUDE_DIRS}
${OpenCV_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}/../include
)
SET(LIBRARIES
${UTILITE_LIBRARY}
${UTILITE_LIBRARIES}
${OpenCV_LIBS}
)

View File

@@ -92,7 +92,7 @@ protected:
if(save_)
{
std::string fileName = targetDir_ + "/";
fileName += uNumber2str(id_++);
fileName += uNumber2Str(id_++);
fileName += ".";
fileName += ext_;
cvSaveImage(fileName.c_str(), image);
@@ -225,11 +225,11 @@ int main(int argc, char * argv[])
imageWidth,
imageHeight,
imageRate,
uBool2str(show).c_str(),
uBool2Str(show).c_str(),
targetDirectory.c_str(),
extension.c_str(),
startId,
uBool2str(save).c_str());
uBool2Str(save).c_str());
UDirectory::makeDir(targetDirectory);