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,12 +5,12 @@ SET(SRC_FILES
SET(INCLUDE_DIRS
${CMAKE_CURRENT_SOURCE_DIR}
${UTILITE_INCLUDE_DIR}
${UTILITE_INCLUDE_DIRS}
${OpenCV_INCLUDE_DIRS}
)
SET(LIBRARIES
${UTILITE_LIBRARY}
${UTILITE_LIBRARIES}
${OpenCV_LIBS}
)

View File

@@ -84,16 +84,16 @@ int main(int argc, char * argv[])
while(imagesExist)
{
std::string fileNameTarget = uNumber2str(counterJoined);
std::string fileNameTarget = uNumber2Str(counterJoined);
if(inv)
{
fileNameA = uNumber2str(counterImages+1);
fileNameB = uNumber2str(counterImages);
fileNameA = uNumber2Str(counterImages+1);
fileNameB = uNumber2Str(counterImages);
}
else
{
fileNameA = uNumber2str(counterImages);
fileNameB = uNumber2str(counterImages+1);
fileNameA = uNumber2Str(counterImages);
fileNameB = uNumber2Str(counterImages+1);
}
while(fileNameA.size() < sizeFileName)