# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1317280379 14400
# Node ID 50964af05a803896f7ccce62395804b54864d408
# Parent  76610dcf3b8d7789daa1e23bb39a5ba64246d301
solved issue with header inclusion

diff -r 76610dcf3b8d -r 50964af05a80 c/feature-based-tracking.cpp
--- a/c/feature-based-tracking.cpp	Wed Sep 28 13:27:20 2011 -0400
+++ b/c/feature-based-tracking.cpp	Thu Sep 29 03:12:59 2011 -0400
@@ -8,9 +8,10 @@
 #include "src/TrajectoryDBAccessBlob.h"
 
 #include "opencv2/core/core.hpp"
+#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/video/tracking.hpp"
+#include "opencv2/features2d/features2d.hpp"
 #include "opencv2/highgui/highgui.hpp"
-//#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/features2d/features2d.hpp"
 
 #include <boost/shared_ptr.hpp>
 #include <boost/foreach.hpp>
diff -r 76610dcf3b8d -r 50964af05a80 include/Motion.hpp
--- a/include/Motion.hpp	Wed Sep 28 13:27:20 2011 -0400
+++ b/include/Motion.hpp	Thu Sep 29 03:12:59 2011 -0400
@@ -32,7 +32,7 @@
 
   void shorten(void);
 
-  void write(TrajectoryDBAccess<cv::Point2f>& trajectoryDB, const string& positionsTableName, const string& velocitiesTableName) const;
+  void write(TrajectoryDBAccess<cv::Point2f>& trajectoryDB, const std::string& positionsTableName, const std::string& velocitiesTableName) const;
 
 #ifdef USE_OPENCV
   void draw(cv::Mat& img, const cv::Mat& homography, const cv::Scalar& color) const;