# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1314723876 14400
# Node ID 7150427c665e9cc94272d776750173c03e10cedd
# Parent  7bf8084e720f2611d8a9e5ce2323873d7ac2d0b5
added loading of mask

diff -r 7bf8084e720f -r 7150427c665e c/feature-based-tracking.cpp
--- a/c/feature-based-tracking.cpp	Mon Aug 29 19:20:37 2011 -0400
+++ b/c/feature-based-tracking.cpp	Tue Aug 30 13:04:36 2011 -0400
@@ -119,6 +119,11 @@
   //     return 1;
   //   }
 
+  // mask
+  Mat mask = imread(params.maskFilename, 0);
+  if (mask.empty())
+    mask = Mat::ones(videoSize, CV_8UC1);
+
   // database
   boost::shared_ptr<TrajectoryDBAccess<Point2f> > trajectoryDB = boost::shared_ptr<TrajectoryDBAccess<Point2f> >(new TrajectoryDBAccessList<Point2f>());
   //TrajectoryDBAccess<Point2f>* trajectoryDB = new TrajectoryDBAccessBlob<Point2f>();
@@ -207,7 +212,7 @@
       }
       
       // adding new features, using mask around existing feature positions
-      Mat featureMask = Mat::ones(videoSize, CV_8UC1);
+      Mat featureMask = mask.clone();
       for (unsigned int n=0;n<currPts.size(); n++)
 	for (int j=MAX(0, currPts[n].x-params.minFeatureDistanceKLT); j<MIN(videoSize.width, currPts[n].x+params.minFeatureDistanceKLT+1); j++)
 	  for (int i=MAX(0, currPts[n].y-params.minFeatureDistanceKLT); i<MIN(videoSize.height, currPts[n].y+params.minFeatureDistanceKLT+1); i++)