From 8303597a865400a363ae574ccde819302495f498 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 2 Apr 2013 18:41:01 +0200
Subject: Just put everything new in. Conflict resolution will be later

---
 ftnoir_tracker_pt/point_extractor.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'ftnoir_tracker_pt/point_extractor.cpp')

diff --git a/ftnoir_tracker_pt/point_extractor.cpp b/ftnoir_tracker_pt/point_extractor.cpp
index 4aa1a658..b6e9ad3a 100644
--- a/ftnoir_tracker_pt/point_extractor.cpp
+++ b/ftnoir_tracker_pt/point_extractor.cpp
@@ -11,6 +11,14 @@
 using namespace cv;
 using namespace std;
 
+struct BlobInfo
+{
+    BlobInfo() : m00(0), m10(0), m01(0) {}
+    long m00;
+    long m10;
+    long m01;
+};
+
 // ----------------------------------------------------------------------------
 const vector<Vec2f>& PointExtractor::extract_points(Mat frame, float dt, bool draw_output)
 {
@@ -39,13 +47,6 @@ const vector<Vec2f>& PointExtractor::extract_points(Mat frame, float dt, bool dr
 
 	// find connected components...
 	// extract blobs with floodfill
-	struct BlobInfo
-	{
-		BlobInfo() : m00(0), m10(0), m01(0) {}
-		long m00;
-		long m10;
-		long m01;
-	};
 	vector<BlobInfo> blobs;
     int blob_count = 1;
 
-- 
cgit v1.2.3