Mercurial > hg > match-vamp

diff src/MatchFeatureFeeder.cpp @ 43:6a5d165e5ea4 refactors

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactor: m_ prefix
author Chris Cannam
date Thu, 13 Nov 2014 13:53:52 +0000
parents 16870e8770ae
children a1b7df871496 c2e152d8a9d4
line wrap: on
line diff
--- a/src/MatchFeatureFeeder.cpp	Thu Nov 13 13:43:37 2014 +0000
+++ b/src/MatchFeatureFeeder.cpp	Thu Nov 13 13:53:52 2014 +0000
@@ -43,17 +43,17 @@
 void
 MatchFeatureFeeder::feedBlock()
 {
-    if (pm1->frameCount < pm1->blockSize) {		// fill initial block
+    if (pm1->m_frameCount < pm1->m_blockSize) {		// fill initial block
         feed1();
         feed2();
     }
-    else if (pm1->runCount >= pm1->params.maxRunCount) {  // slope constraints
+    else if (pm1->m_runCount >= pm1->m_params.maxRunCount) {  // slope constraints
         feed2();
-    } else if (pm2->runCount >= pm2->params.maxRunCount) {
+    } else if (pm2->m_runCount >= pm2->m_params.maxRunCount) {
         feed1();
     } else {
         switch (finder->getExpandDirection
-                (pm1->frameCount-1, pm2->frameCount-1)) {
+                (pm1->m_frameCount-1, pm2->m_frameCount-1)) {
         case ADVANCE_THIS:
             feed1();
             break;