Mercurial > hg > match-vamp

changeset 200:f6be68852c1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix off-by-one in durations
author Chris Cannam
date Fri, 27 Feb 2015 10:05:04 +0000
parents cca298ecfc72
children 2fed1f101172
files src/MatchFeatureFeeder.cpp src/MatchPipeline.cpp
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/MatchFeatureFeeder.cpp	Fri Feb 27 09:29:37 2015 +0000
+++ b/src/MatchFeatureFeeder.cpp	Fri Feb 27 10:05:04 2015 +0000
@@ -72,6 +72,10 @@
     while (!m_q1.empty() || !m_q2.empty()) {
         feedBlock();
     }
+
+//    cerr << "MatchFeatureFeeder::finish: have " << m_pm1->getFrameCount()
+//         << " reference and " << m_pm2->getFrameCount() << " other frames"
+//         << endl;
 }
 
 void
--- a/src/MatchPipeline.cpp	Fri Feb 27 09:29:37 2015 +0000
+++ b/src/MatchPipeline.cpp	Fri Feb 27 10:05:04 2015 +0000
@@ -63,7 +63,7 @@
 #ifdef DEBUG_MATCH_PIPELINE
     if (m_lastFrameIn1 == 1) {
         cerr << "features 1 -> ";
-        for (int i = 0; i < (int) m_f1.size(); ++i) {
+        for (int i = 0; i < int(m_f1.size()); ++i) {
             cerr << m_f1[i] << " ";
         }
         cerr << endl;
@@ -82,7 +82,7 @@
 #ifdef DEBUG_MATCH_PIPELINE
     if (m_lastFrameIn1 == 1) {
         cerr << "conditioned features 1 -> ";
-        for (int i = 0; i < (int) m_c1.size(); ++i) {
+        for (int i = 0; i < int(m_c1.size()); ++i) {
             cerr << m_c1[i] << " ";
         }
         cerr << endl;
@@ -140,7 +140,7 @@
 MatchPipeline::finish()
 {
     m_feeder.finish();
-    m_feeder.getFinder()->setDurations(m_lastFrameIn1, m_lastFrameIn2);
+    m_feeder.getFinder()->setDurations(m_lastFrameIn1 + 1, m_lastFrameIn2 + 1);
 }
 
 int