fixed build on Wisual Studio+OpenCV2

This commit is contained in:
matlabbe
2016-01-19 18:18:53 -05:00
parent 7bfd76e747
commit 95d21a55f1
4 changed files with 10 additions and 6 deletions

View File

@@ -31,11 +31,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <rtabmap/core/RtabmapExp.h> #include <rtabmap/core/RtabmapExp.h>
#include <opencv2/core/types.hpp> #include <opencv2/core/core.hpp>
namespace RTABMAP_EXP rtabmap { namespace rtabmap {
class GeodeticCoords class RTABMAP_EXP GeodeticCoords
{ {
public: public:
GeodeticCoords(); GeodeticCoords();

View File

@@ -42,10 +42,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "rtabmap/core/GeodeticCoords.h" #include "rtabmap/core/GeodeticCoords.h"
#include <math.h> #include <cmath>
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
namespace rtabmap { namespace rtabmap {
inline double DEG2RAD(const double x) { return x*M_PI/180.0;} inline double DEG2RAD(const double x) { return x*M_PI/180.0;}
inline double square(const double & value) {return value*value;} inline double square(const double & value) {return value*value;}

View File

@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <rtabmap/utilite/ULogger.h> #include <rtabmap/utilite/ULogger.h>
#include <rtabmap/utilite/UConversion.h> #include <rtabmap/utilite/UConversion.h>
#include <rtabmap/utilite/UStl.h> #include <rtabmap/utilite/UStl.h>
#include <math.h> #include <cmath>
#include <stdlib.h> #include <stdlib.h>
#include <sstream> #include <sstream>
#include "SimpleIni.h" #include "SimpleIni.h"

View File

@@ -379,7 +379,7 @@ public:
int line, int line,
const char *function, const char *function,
const char* msg, const char* msg,
...) throw(UException); ...);
/** /**
* Get the time in the format "2008-7-13 12:23:44". * Get the time in the format "2008-7-13 12:23:44".