diff src/MatchPipeline.cpp @ 155:2b61e0cb6847 structure

Make path retrieval available directly in pipeline; some ctor/operator= fixes (hopefully to become obsolete later)
author Chris Cannam
date Fri, 23 Jan 2015 17:33:37 +0000
parents 6914a6a01ffc
children eeed3498fe96
line wrap: on
line diff
--- a/src/MatchPipeline.cpp	Fri Jan 23 14:55:19 2015 +0000
+++ b/src/MatchPipeline.cpp	Fri Jan 23 17:33:37 2015 +0000
@@ -131,21 +131,19 @@
 MatchPipeline::finish()
 {
     m_feeder.finish();
-    getFinder()->setDurations(m_lastFrameIn1, m_lastFrameIn2);
+    m_feeder.getFinder()->setDurations(m_lastFrameIn1, m_lastFrameIn2);
 }
 
-MatchFeatureFeeder *
-MatchPipeline::getFeeder()
+int
+MatchPipeline::retrievePath(bool smooth, std::vector<int> &pathx, std::vector<int> &pathy)
 {
-    return &m_feeder;
+    return m_feeder.getFinder()->retrievePath(smooth, pathx, pathy);
 }
 
-Finder *
-MatchPipeline::getFinder()
-{
-    return m_feeder.getFinder();
+void
+MatchPipeline::retrieveForwardPath(std::vector<int> &pathx, std::vector<int> &pathy) {
+    return m_feeder.retrieveForwardPath(pathx, pathy);
 }
 
 
 
-