# HG changeset patch
# User Francois Belisle <belisle.francois@gmail.com>
# Date 1338919825 14400
# Node ID e841ba9981e29d6b801958aeed073452da27c00c
# Parent  746d02cea65fd4cba1e20883262c1b733922b6c3# Parent  48f83ff769fd25da66b5f59d1ff7c92c48a611a2
Merged.

diff -r 746d02cea65f -r e841ba9981e2 c/feature-based-tracking.cpp
--- a/c/feature-based-tracking.cpp	Tue Jun 05 14:08:46 2012 -0400
+++ b/c/feature-based-tracking.cpp	Tue Jun 05 14:10:25 2012 -0400
@@ -75,8 +75,8 @@
   float minTotalFeatureDisplacement = params.nDisplacements*params.minFeatureDisplacement;
   Size window = Size(params.windowSize, params.windowSize);
 
-  BruteForceMatcher<Hamming> descMatcher;
-  vector<DMatch> matches;
+  // BruteForceMatcher<Hamming> descMatcher;
+  // vector<DMatch> matches;
   Size videoSize;
 
   // if( argc == 1 || (argc == 2 && strlen(argv[1]) == 1 && isdigit(argv[1][0]))) // if no parameter or number parameter