Just put everything new in. Conflict resolution will be later

1 files changed, 2 insertions, 2 deletions

diff --git a/ftnoir_tracker_pt/point_tracker.h b/ftnoir_tracker_pt/point_tracker.h
index 21baad19..7eee580d 100644
--- a/ftnoir_tracker_pt/point_tracker.h
+++ b/ftnoir_tracker_pt/point_tracker.h
@@ -8,8 +8,8 @@
 #ifndef POINTTRACKER_H

 #define POINTTRACKER_H

 

+#include <memory>

 #include <opencv2/opencv.hpp>

-#include <boost/shared_ptr.hpp>

 #include <list>

 

 // ----------------------------------------------------------------------------

@@ -76,7 +76,7 @@ public:
 	// f : (focal length)/(sensor width)

 	// dt : time since last call

 	bool track(const std::vector<cv::Vec2f>& points, float f, float dt);

-	boost::shared_ptr<PointModel> point_model;

+	std::auto_ptr<PointModel> point_model;

 

 	bool dynamic_pose_resolution;

 	float dt_reset;