diff --git a/modules/matlab/include/opencv2/matlab/bridge.hpp b/modules/matlab/include/opencv2/matlab/bridge.hpp index 2d697b2051..652512a7eb 100644 --- a/modules/matlab/include/opencv2/matlab/bridge.hpp +++ b/modules/matlab/include/opencv2/matlab/bridge.hpp @@ -47,6 +47,7 @@ #include #include #include +#include #include namespace cv { @@ -62,11 +63,14 @@ typedef std::vector vector_int; typedef std::vector vector_float; typedef std::vector vector_String; typedef std::vector vector_uchar; +typedef std::vector > vector_vector_char; +typedef std::vector > vector_vector_DMatch; typedef std::vector vector_Rect; typedef std::vector vector_KeyPoint; typedef cv::Ptr Ptr_StereoBM; typedef cv::Ptr Ptr_StereoSGBM; typedef cv::Ptr Ptr_FeatureDetector; +typedef cv::Ptr Ptr_CLAHE; // ---------------------------------------------------------------------------- @@ -379,7 +383,16 @@ public: vector_uchar toVectorUchar() { return vector_uchar(); } operator vector_uchar() { return toVectorUchar(); } - + // ------------------------ vector_vector_char ------------------------------ + Bridge& operator=(const vector_vector_char& ) { return *this; } + vector_vector_char toVectorVectorChar() { return vector_vector_char(); } + operator vector_vector_char() { return toVectorVectorChar(); } + + // ------------------------ vector_vector_DMatch --------------------------- + Bridge& operator=(const vector_vector_DMatch& ) { return *this; } + vector_vector_DMatch toVectorVectorDMatch() { return vector_vector_DMatch(); } + operator vector_vector_DMatch() { return toVectorVectorDMatch(); } + @@ -402,6 +415,10 @@ public: Ptr_FeatureDetector toPtrFeatureDetector() { return Ptr_FeatureDetector(); } operator Ptr_FeatureDetector() { return toPtrFeatureDetector(); } + // --------------------------- Ptr_CLAHE -------------------------------- + Bridge& operator=(const Ptr_CLAHE& ) { return *this; } + Ptr_CLAHE toPtrCLAHE() { return Ptr_CLAHE(); } + operator Ptr_CLAHE() { return toPtrCLAHE(); } }; // class Bridge