From 6598b97b969583d3ee68f33e1a7a2f89f93b6a02 Mon Sep 17 00:00:00 2001 From: Daniel Fernandes Date: Wed, 21 May 2014 17:57:35 -0500 Subject: [PATCH] Fixed MATLAB bridge MATLAB bridge.hpp was missing definition for Ptr --- modules/matlab/include/opencv2/matlab/bridge.hpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/matlab/include/opencv2/matlab/bridge.hpp b/modules/matlab/include/opencv2/matlab/bridge.hpp index e38053c2c..6d429061c 100644 --- a/modules/matlab/include/opencv2/matlab/bridge.hpp +++ b/modules/matlab/include/opencv2/matlab/bridge.hpp @@ -50,6 +50,7 @@ #include #include #include +#include namespace cv { namespace bridge { @@ -76,6 +77,7 @@ typedef cv::Ptr Ptr_LineSegmentDetector; typedef cv::Ptr Ptr_AlignMTB; typedef cv::Ptr Ptr_CalibrateDebevec; typedef cv::Ptr Ptr_CalibrateRobertson; +typedef cv::Ptr Ptr_DenseOpticalFlow; typedef cv::Ptr Ptr_MergeDebevec; typedef cv::Ptr Ptr_MergeMertens; typedef cv::Ptr Ptr_MergeRobertson; @@ -453,6 +455,11 @@ public: Ptr_CalibrateRobertson toPtrCalibrateRobertson() { return Ptr_CalibrateRobertson(); } operator Ptr_CalibrateRobertson() { return toPtrCalibrateRobertson(); } + // --------------------------- Ptr_DenseOpticalFlow ------------------- + Bridge& operator=(const Ptr_DenseOpticalFlow& ) { return *this; } + Ptr_DenseOpticalFlow toPtrDenseOpticalFlow() { return Ptr_DenseOpticalFlow(); } + operator Ptr_DenseOpticalFlow() { return toPtrDenseOpticalFlow(); } + // --------------------------- Ptr_MergeDebevec ----------------------- Bridge& operator=(const Ptr_MergeDebevec& ) { return *this; } Ptr_MergeDebevec toPtrMergeDebevec() { return Ptr_MergeDebevec(); }