# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1313554831 14400
# Node ID 336926453b285df7d59f0906caf047a139628092
# Parent  28907fde9855f3c6bf12a2e3dd82135f0f667fc7
added conversion function from keypoint vector to point vector and cleaned headers

diff -r 28907fde9855 -r 336926453b28 c/cvutils.cpp
--- a/c/cvutils.cpp	Tue Aug 16 19:35:07 2011 -0400
+++ b/c/cvutils.cpp	Wed Aug 17 00:20:31 2011 -0400
@@ -1,11 +1,22 @@
 #include "cvutils.hpp"
 
-#include "opencv/cv.h"
-#include "opencv/highgui.h"
+//#include "opencv/cv.h"
+#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/features2d/features2d.hpp"
 
 #include <iostream>
+#include <vector>
 
 using namespace std;
+using namespace cv;
+
+void keypPoints2Points(const vector<KeyPoint>& kpts, vector<Point2f>& points) {
+  points.clear();
+  points.resize(kpts.size());
+
+  for (unsigned int i=0; i<kpts.size(); i++)
+    points[i] = kpts[i].pt;
+}
 
 IplImage* allocateImage(const int& width, const int& height, const int& depth, const int& channels) { return ::allocateImage(cvSize(width, height), depth, channels);}
 
diff -r 28907fde9855 -r 336926453b28 include/cvutils.hpp
--- a/include/cvutils.hpp	Tue Aug 16 19:35:07 2011 -0400
+++ b/include/cvutils.hpp	Wed Aug 17 00:20:31 2011 -0400
@@ -1,7 +1,8 @@
 #ifndef CVUTILS_HPP
 #define CVUTILS_HPP
 
-#include "opencv2/highgui/highgui.hpp" // types are in opencv2/core/types_c.h
+#include "opencv2/core/core.hpp"
+#include "opencv2/features2d/features2d.hpp"
 
 class CvCapture;
 
@@ -9,6 +10,8 @@
 
 //static const int flipImage = CV_CVTIMG_FLIP;
 
+void keypPoints2Points(const std::vector<cv::KeyPoint>& kpts, std::vector<cv::Point2f>& points);
+
 /** Allocates a new IplImage. */
 IplImage* allocateImage(const int& width, const int& height, const int& depth, const int& channels);