diff c/feature-based-tracking.cpp @ 400:7ef1071e3cc3

clean up of input classes for list of images and video files
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Mon, 29 Jul 2013 18:06:55 -0400
parents c389fae9689a
children b829ebdc18e6
line wrap: on
line diff
--- a/c/feature-based-tracking.cpp	Mon Jul 29 17:12:45 2013 -0400
+++ b/c/feature-based-tracking.cpp	Mon Jul 29 18:06:55 2013 -0400
@@ -82,18 +82,17 @@
   // BruteForceMatcher<Hamming> descMatcher;
   // vector<DMatch> matches;
 
-  InputFrameProviderIface* capture = nullptr;
+  InputFrameProviderIface* capture = 0;
   if(!params.listFilename.empty() && !params.folderData.empty())
-	  capture = new InputFrameListModule(params.folderData, params.listFilename);
+    capture = new InputFrameListModule(params.folderData, params.listFilename);
   else if(!params.videoFilename.empty())
-	 capture = new InputVideoFileModule(params.videoFilename);
+    capture = new InputVideoFileModule(params.videoFilename);
   else
-	  cout << "No valid input parameters";
-
-  if(!capture->isOpen())
-  {
-	  cout << "Video filename " << params.videoFilename << " could not be opened. Exiting." << endl;
-	  exit(0);
+    cout << "No valid input parameters";
+  
+  if(!capture->isOpen()) {
+    cout << "Video filename " << params.videoFilename << " could not be opened. Exiting." << endl;
+    exit(0);
   }
   
   Size videoSize = capture->getSize();
@@ -136,7 +135,7 @@
   if (params.nFrames > 0)
     lastFrameNum = MIN(params.frame1+static_cast<unsigned int>(params.nFrames), nFrames);
   
-  //capture.set(CV_CAP_PROP_POS_FRAMES, params.frame1);
+  capture->setFrameNumber(params.frame1);
   for (unsigned int frameNum = params.frame1; (frameNum < lastFrameNum) && !::interruptionKey(key); frameNum++) {
       bool success = capture->getNextFrame(frame);