Mercurial Hosting > traffic-intelligence

changeset 409:3c271a46b4d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated code for OpenCV 2.4.6
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Tue, 13 Aug 2013 23:36:58 -0400
parents 365d8dee44f3
children 91954c76d12c
files c/InputVideoFileModule.cpp include/InputVideoFileModule.h
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/c/InputVideoFileModule.cpp	Tue Aug 13 23:36:45 2013 -0400
+++ b/c/InputVideoFileModule.cpp	Tue Aug 13 23:36:58 2013 -0400
@@ -6,8 +6,8 @@
 {
   mInit = mVideoCapture.open(videoPath.c_str());
   double frameCount;
-  frameCount = mVideoCapture.get(CV_CAP_PROP_FRAME_COUNT);	
-  mSize = cv::Size(mVideoCapture.get(CV_CAP_PROP_FRAME_WIDTH), mVideoCapture.get(CV_CAP_PROP_FRAME_HEIGHT));
+  frameCount = mVideoCapture.get(cv::CAP_PROP_FRAME_COUNT);	
+  mSize = cv::Size(mVideoCapture.get(cv::CAP_PROP_FRAME_WIDTH), mVideoCapture.get(cv::CAP_PROP_FRAME_HEIGHT));
   mNumberOfFrame = (unsigned int)frameCount;
 }
 
@@ -15,7 +15,7 @@
 
 
 void InputVideoFileModule::setFrameNumber(const unsigned int& frameNumber) {
-  mVideoCapture.set(CV_CAP_PROP_POS_FRAMES, frameNumber);
+  mVideoCapture.set(cv::CAP_PROP_POS_FRAMES, frameNumber);
 }
 
 bool InputVideoFileModule::getNextFrame(cv::Mat& outputPicture)
--- a/include/InputVideoFileModule.h	Tue Aug 13 23:36:45 2013 -0400
+++ b/include/InputVideoFileModule.h	Tue Aug 13 23:36:58 2013 -0400
@@ -4,7 +4,7 @@
 #include "InputFrameProviderIface.h"
 #include <string>
 #include "opencv2/core/core.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/highgui.hpp"
 
 class InputVideoFileModule : public InputFrameProviderIface
 {