i/rtabmap_ros
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap_ros.git synced 2026-10-04 00:37:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build for C++03

Browse Source
This commit is contained in:
matlabbe
2016-03-14 18:08:05 -04:00
parent 5c92025742
commit d6eb923bef
3 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
corelib/src/OdometryF2M.cpp
+3 -3
View File
@@ -305,9 +305,9 @@ Transform OdometryF2M::computeTransform(
{ {
if(matches.find(iter->first) == matches.end()) if(matches.find(iter->first) == matches.end())
{ {
iter = mapPoints.erase(iter); mapPoints.erase(iter++);
iterMapDescriptors = mapDescriptors.erase(iterMapDescriptors); mapDescriptors.erase(iterMapDescriptors++);
iterMapWords = mapWords.erase(iterMapWords); mapWords.erase(iterMapWords++);
++removed; ++removed;
} }
else else
guilib/src/ExportScansDialog.cpp
+1 -1
View File
@@ -26,7 +26,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "ExportScansDialog.h" #include "ExportScansDialog.h"
#include "ui_ExportScansDialog.h" #include "ui_exportScansDialog.h"
#include "rtabmap/gui/ProgressDialog.h" #include "rtabmap/gui/ProgressDialog.h"
#include "rtabmap/gui/CloudViewer.h" #include "rtabmap/gui/CloudViewer.h"
tools/StereoEval/io.h
+20 -4
View File
@@ -50,12 +50,24 @@ bool readHeader(FILE *fp, const char *imtype, char c1, char c2,
skipSpace(fp); skipSpace(fp);
skipComment(fp); skipComment(fp);
skipSpace(fp); skipSpace(fp);
fscanf(fp, "%d", width); int r = fscanf(fp, "%d", width);
if(r==0)
{
return false;
}
skipSpace(fp); skipSpace(fp);
fscanf(fp, "%d", height); r = fscanf(fp, "%d", height);
if(r==0)
{
return false;
}
if (thirdArg) { if (thirdArg) {
skipSpace(fp); skipSpace(fp);
fscanf(fp, "%d", nbands); r = fscanf(fp, "%d", nbands);
if(r==0)
{
return false;
}
} }
// skip SINGLE newline character after reading image height (or third arg) // skip SINGLE newline character after reading image height (or third arg)
c = getc(fp); c = getc(fp);
@@ -102,7 +114,11 @@ cv::Mat readPFM(const char* filename)
skipSpace(fp); skipSpace(fp);
float scalef; float scalef;
fscanf(fp, "%f", &scalef); // scale factor (if negative, little endian) int r = fscanf(fp, "%f", &scalef); // scale factor (if negative, little endian)
if(r==0)
{
return cv::Mat();
}
// skip SINGLE newline character after reading third arg // skip SINGLE newline character after reading third arg
char c = getc(fp); char c = getc(fp);