Merge pull request opencv#9855 from IgWod:extract-vector-typedefs

alalek · alalek · commit fee2049642ca · 2017-10-15T14:29:21.000Z
diff --git a/modules/dnn/misc/python/pyopencv_dnn.hpp b/modules/dnn/misc/python/pyopencv_dnn.hpp
@@ -2,8 +2,7 @@
 typedef dnn::DictValue LayerId;
 typedef std::vector<dnn::MatShape> vector_MatShape;
 typedef std::vector<std::vector<dnn::MatShape> > vector_vector_MatShape;
-typedef std::vector<size_t> vector_size_t;
-typedef std::vector<std::vector<Mat> > vector_vector_Mat;
+
 
 template<>
 bool pyopencv_to(PyObject *o, dnn::DictValue &dv, const char *name)
diff --git a/modules/python/src2/cv2.cpp b/modules/python/src2/cv2.cpp
@@ -89,6 +89,7 @@ typedef std::vector<char> vector_char;
 typedef std::vector<int> vector_int;
 typedef std::vector<float> vector_float;
 typedef std::vector<double> vector_double;
+typedef std::vector<size_t> vector_size_t;
 typedef std::vector<Point> vector_Point;
 typedef std::vector<Point2f> vector_Point2f;
 typedef std::vector<Point3f> vector_Point3f;
@@ -101,6 +102,7 @@ typedef std::vector<Rect> vector_Rect;
 typedef std::vector<Rect2d> vector_Rect2d;
 typedef std::vector<KeyPoint> vector_KeyPoint;
 typedef std::vector<Mat> vector_Mat;
+typedef std::vector<std::vector<Mat> > vector_vector_Mat;
 typedef std::vector<UMat> vector_UMat;
 typedef std::vector<DMatch> vector_DMatch;
 typedef std::vector<String> vector_String;
