generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2783 from daferna2:master

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-06-12 21:41:28 +04:00 committed by OpenCV Buildbot
commit 45f21e4f12
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/matlab/include/opencv2/matlab/bridge.hpp
View File

@ -50,6 +50,7 @@
#include <opencv2/imgproc.hpp>
#include <opencv2/calib3d.hpp>
#include <opencv2/photo.hpp>
#include <opencv2/video.hpp>
namespace cv {
namespace bridge {
@ -76,6 +77,7 @@ typedef cv::Ptr<LineSegmentDetector> Ptr_LineSegmentDetector;
typedef cv::Ptr<AlignMTB> Ptr_AlignMTB;
typedef cv::Ptr<CalibrateDebevec> Ptr_CalibrateDebevec;
typedef cv::Ptr<CalibrateRobertson> Ptr_CalibrateRobertson;
typedef cv::Ptr<DenseOpticalFlow> Ptr_DenseOpticalFlow;
typedef cv::Ptr<MergeDebevec> Ptr_MergeDebevec;
typedef cv::Ptr<MergeMertens> Ptr_MergeMertens;
typedef cv::Ptr<MergeRobertson> 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(); }