diff src/MatchFeatureFeeder.cpp @ 45:a1b7df871496 refactors

Replace char dist (inc dir in masked section) with float dist + separate dir
author Chris Cannam
date Thu, 13 Nov 2014 14:43:03 +0000
parents 6a5d165e5ea4
children b183534a2cf5
line wrap: on
line diff
--- a/src/MatchFeatureFeeder.cpp	Thu Nov 13 13:59:41 2014 +0000
+++ b/src/MatchFeatureFeeder.cpp	Thu Nov 13 14:43:03 2014 +0000
@@ -54,16 +54,19 @@
     } else {
         switch (finder->getExpandDirection
                 (pm1->m_frameCount-1, pm2->m_frameCount-1)) {
-        case ADVANCE_THIS:
+        case Matcher::AdvanceThis:
             feed1();
             break;
-        case ADVANCE_OTHER:
+        case Matcher::AdvanceOther:
             feed2();
             break;
-        case ADVANCE_BOTH:
+        case Matcher::AdvanceBoth:
             feed1();
             feed2();
             break;
+        case Matcher::AdvanceNone:
+            cerr << "finder says AdvanceNone!" << endl;
+            break;
         }
     }
 }