Commit 45f21e4f authored by Vadim Pisarevsky's avatar Vadim Pisarevsky Committed by OpenCV Buildbot

Merge pull request #2783 from daferna2:master

parents 2c134318 b3655233
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
#include <opencv2/imgproc.hpp> #include <opencv2/imgproc.hpp>
#include <opencv2/calib3d.hpp> #include <opencv2/calib3d.hpp>
#include <opencv2/photo.hpp> #include <opencv2/photo.hpp>
#include <opencv2/video.hpp>
namespace cv { namespace cv {
namespace bridge { namespace bridge {
...@@ -76,6 +77,7 @@ typedef cv::Ptr<LineSegmentDetector> Ptr_LineSegmentDetector; ...@@ -76,6 +77,7 @@ typedef cv::Ptr<LineSegmentDetector> Ptr_LineSegmentDetector;
typedef cv::Ptr<AlignMTB> Ptr_AlignMTB; typedef cv::Ptr<AlignMTB> Ptr_AlignMTB;
typedef cv::Ptr<CalibrateDebevec> Ptr_CalibrateDebevec; typedef cv::Ptr<CalibrateDebevec> Ptr_CalibrateDebevec;
typedef cv::Ptr<CalibrateRobertson> Ptr_CalibrateRobertson; typedef cv::Ptr<CalibrateRobertson> Ptr_CalibrateRobertson;
typedef cv::Ptr<DenseOpticalFlow> Ptr_DenseOpticalFlow;
typedef cv::Ptr<MergeDebevec> Ptr_MergeDebevec; typedef cv::Ptr<MergeDebevec> Ptr_MergeDebevec;
typedef cv::Ptr<MergeMertens> Ptr_MergeMertens; typedef cv::Ptr<MergeMertens> Ptr_MergeMertens;
typedef cv::Ptr<MergeRobertson> Ptr_MergeRobertson; typedef cv::Ptr<MergeRobertson> Ptr_MergeRobertson;
...@@ -453,6 +455,11 @@ public: ...@@ -453,6 +455,11 @@ public:
Ptr_CalibrateRobertson toPtrCalibrateRobertson() { return Ptr_CalibrateRobertson(); } Ptr_CalibrateRobertson toPtrCalibrateRobertson() { return Ptr_CalibrateRobertson(); }
operator Ptr_CalibrateRobertson() { return toPtrCalibrateRobertson(); } 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 ----------------------- // --------------------------- Ptr_MergeDebevec -----------------------
Bridge& operator=(const Ptr_MergeDebevec& ) { return *this; } Bridge& operator=(const Ptr_MergeDebevec& ) { return *this; }
Ptr_MergeDebevec toPtrMergeDebevec() { return Ptr_MergeDebevec(); } Ptr_MergeDebevec toPtrMergeDebevec() { return Ptr_MergeDebevec(); }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment