Mercurial Hosting > traffic-intelligence
diff c/InputVideoFileModule.cpp @ 429:2be846d36dec
reverted to stable OpenCV release 2.4.6
| author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
|---|---|
| date | Tue, 12 Nov 2013 00:38:47 -0500 |
| parents | 3c271a46b4d4 |
| children |
line wrap: on
line diff
--- a/c/InputVideoFileModule.cpp Tue Nov 05 23:42:28 2013 -0500 +++ b/c/InputVideoFileModule.cpp Tue Nov 12 00:38:47 2013 -0500 @@ -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)