i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-02 17:40:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed Windows build

Browse Source
This commit is contained in:
matlabbe
2016-01-05 15:29:29 -05:00
parent 1b2f1baf3d
commit 2108f449b3
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
corelib/include/rtabmap/core/Registration.h
View File

@@ -28,12 +28,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef REGISTRATION_H_ #ifndef REGISTRATION_H_
#define REGISTRATION_H_ #define REGISTRATION_H_
#include "rtabmap/core/RtabmapExp.h" // DLL export/import defines
#include <rtabmap/core/Parameters.h> #include <rtabmap/core/Parameters.h>
#include <rtabmap/core/Signature.h> #include <rtabmap/core/Signature.h>
namespace rtabmap { namespace rtabmap {
class Registration class RTABMAP_EXP Registration
{ {
public: public:
virtual ~Registration() {} virtual ~Registration() {}

4
corelib/include/rtabmap/core/RegistrationIcp.h
View File

@@ -28,13 +28,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef REGISTRATIONICP_H_ #ifndef REGISTRATIONICP_H_
#define REGISTRATIONICP_H_ #define REGISTRATIONICP_H_
#include "rtabmap/core/RtabmapExp.h" // DLL export/import defines
#include <rtabmap/core/Registration.h> #include <rtabmap/core/Registration.h>
#include <rtabmap/core/Signature.h> #include <rtabmap/core/Signature.h>
namespace rtabmap { namespace rtabmap {
// Geometrical registration // Geometrical registration
class RegistrationIcp : public Registration class RTABMAP_EXP RegistrationIcp : public Registration
{ {
public: public:
RegistrationIcp(const ParametersMap & parameters = ParametersMap()); RegistrationIcp(const ParametersMap & parameters = ParametersMap());

4
corelib/include/rtabmap/core/RegistrationVis.h
View File

@@ -28,13 +28,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef REGISTRATIONVIS_H_ #ifndef REGISTRATIONVIS_H_
#define REGISTRATIONVIS_H_ #define REGISTRATIONVIS_H_
#include "rtabmap/core/RtabmapExp.h" // DLL export/import defines
#include <rtabmap/core/Registration.h> #include <rtabmap/core/Registration.h>
#include <rtabmap/core/Signature.h> #include <rtabmap/core/Signature.h>
namespace rtabmap { namespace rtabmap {
// Visual registration // Visual registration
class RegistrationVis : public Registration class RTABMAP_EXP RegistrationVis : public Registration
{ {
public: public:
RegistrationVis(const ParametersMap & parameters = ParametersMap()); RegistrationVis(const ParametersMap & parameters = ParametersMap());

2
corelib/src/util3d_features.cpp
View File

@@ -362,7 +362,7 @@ std::map<int, cv::Point3f> generateWords3DMono(
int oi=0; int oi=0;
for(unsigned int i=0; i<indexes.size(); ++i) for(unsigned int i=0; i<indexes.size(); ++i)
{ {
std::multimap<int, cv::Point3f>::iterator iter = words3D.find(indexes[i]); std::map<int, cv::Point3f>::iterator iter = words3D.find(indexes[i]);
if(util3d::isFinite(iter->second)) if(util3d::isFinite(iter->second))
{ {
iter->second.x *= scale; iter->second.x *= scale;