# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1376451418 14400
# Node ID 3c271a46b4d473383d621762e091485cbc54d689
# Parent  365d8dee44f3dd75ab9b72b4b4b2b5739e08baa5
updated code for OpenCV 2.4.6

diff -r 365d8dee44f3 -r 3c271a46b4d4 c/InputVideoFileModule.cpp
--- 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)
diff -r 365d8dee44f3 -r 3c271a46b4d4 include/InputVideoFileModule.h
--- 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
 {