summaryrefslogtreecommitdiff
path: root/src/types.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/types.h')
-rw-r--r--src/types.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/types.h b/src/types.h
index ac28f6f..ff0a089 100644
--- a/src/types.h
+++ b/src/types.h
@@ -1,7 +1,7 @@
#ifndef types_INC
#define types_INC
-#include <cv.h>
+#include <opencv2/core.hpp>
#include <Eigen/Dense>
#include <exception>
#define MAXLINE 8192
@@ -16,6 +16,7 @@ using Eigen::Vector2d;
using Eigen::Vector3d;
using Eigen::Vector4d;
+typedef Eigen::Matrix<double,2,1,Eigen::DontAlign> UVector2d;
// A struct for storing measurements.
typedef enum {BOTH,REFLECTION,MONO,HEIGHT} measurement_type;
typedef struct {
@@ -23,7 +24,7 @@ typedef struct {
int id;
Vector3d source, reflection;
double height;
- Vector2d Ssrc, Sref;
+ UVector2d Ssrc, Sref;
cv::Mat patch, refpatch;
double xcorrmax;
} measurement_t;