comparison src/MatchPipeline.cpp @ 200:f6be68852c1d

Fix off-by-one in durations
author Chris Cannam
date Fri, 27 Feb 2015 10:05:04 +0000
parents 24ddab06aace
children 175c8f044e7c
comparison
equal deleted inserted replaced
199:cca298ecfc72 200:f6be68852c1d
61 m_f2 = f2; 61 m_f2 = f2;
62 62
63 #ifdef DEBUG_MATCH_PIPELINE 63 #ifdef DEBUG_MATCH_PIPELINE
64 if (m_lastFrameIn1 == 1) { 64 if (m_lastFrameIn1 == 1) {
65 cerr << "features 1 -> "; 65 cerr << "features 1 -> ";
66 for (int i = 0; i < (int) m_f1.size(); ++i) { 66 for (int i = 0; i < int(m_f1.size()); ++i) {
67 cerr << m_f1[i] << " "; 67 cerr << m_f1[i] << " ";
68 } 68 }
69 cerr << endl; 69 cerr << endl;
70 } 70 }
71 #endif 71 #endif
80 m_c2 = c2; 80 m_c2 = c2;
81 81
82 #ifdef DEBUG_MATCH_PIPELINE 82 #ifdef DEBUG_MATCH_PIPELINE
83 if (m_lastFrameIn1 == 1) { 83 if (m_lastFrameIn1 == 1) {
84 cerr << "conditioned features 1 -> "; 84 cerr << "conditioned features 1 -> ";
85 for (int i = 0; i < (int) m_c1.size(); ++i) { 85 for (int i = 0; i < int(m_c1.size()); ++i) {
86 cerr << m_c1[i] << " "; 86 cerr << m_c1[i] << " ";
87 } 87 }
88 cerr << endl; 88 cerr << endl;
89 } 89 }
90 #endif 90 #endif
138 138
139 void 139 void
140 MatchPipeline::finish() 140 MatchPipeline::finish()
141 { 141 {
142 m_feeder.finish(); 142 m_feeder.finish();
143 m_feeder.getFinder()->setDurations(m_lastFrameIn1, m_lastFrameIn2); 143 m_feeder.getFinder()->setDurations(m_lastFrameIn1 + 1, m_lastFrameIn2 + 1);
144 } 144 }
145 145
146 int 146 int
147 MatchPipeline::retrievePath(bool smooth, std::vector<int> &pathx, std::vector<int> &pathy) 147 MatchPipeline::retrievePath(bool smooth, std::vector<int> &pathx, std::vector<int> &pathy)
148 { 148 {