From 92fd42e58eaa7d902f94fb653de265af4b0ee44d Mon Sep 17 00:00:00 2001
From: Pavel Rojtberg <pavel.rojtberg@igd.fraunhofer.de>
Date: Wed, 11 Apr 2018 16:30:53 +0200
Subject: [PATCH] linemod: export Template::features for python

---
 modules/rgbd/include/opencv2/rgbd/linemod.hpp |  2 +-
 modules/rgbd/misc/python/pyopencv_linemod.hpp | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/modules/rgbd/include/opencv2/rgbd/linemod.hpp b/modules/rgbd/include/opencv2/rgbd/linemod.hpp
index 8d6f2e30c..9982aa0f9 100644
--- a/modules/rgbd/include/opencv2/rgbd/linemod.hpp
+++ b/modules/rgbd/include/opencv2/rgbd/linemod.hpp
@@ -80,7 +80,7 @@ struct CV_EXPORTS_W_SIMPLE Template
   CV_PROP int width;
   CV_PROP int height;
   CV_PROP int pyramid_level;
-  std::vector<Feature> features; // FIXIT: CV_PROP
+  CV_PROP std::vector<Feature> features;
 
   void read(const FileNode& fn);
   void write(FileStorage& fs) const;
diff --git a/modules/rgbd/misc/python/pyopencv_linemod.hpp b/modules/rgbd/misc/python/pyopencv_linemod.hpp
index 543889229..8bcd5c47d 100644
--- a/modules/rgbd/misc/python/pyopencv_linemod.hpp
+++ b/modules/rgbd/misc/python/pyopencv_linemod.hpp
@@ -27,6 +27,19 @@ template<> struct pyopencvVecConverter<linemod::Template>
     }
 };
 
+template<> struct pyopencvVecConverter<linemod::Feature>
+{
+    static bool to(PyObject* obj, std::vector<linemod::Feature>& value, const ArgInfo info)
+    {
+        return pyopencv_to_generic_vec(obj, value, info);
+    }
+
+    static PyObject* from(const std::vector<linemod::Feature>& value)
+    {
+        return pyopencv_from_generic_vec(value);
+    }
+};
+
 template<> struct pyopencvVecConverter<Ptr<linemod::Modality> >
 {
     static bool to(PyObject* obj, std::vector<Ptr<linemod::Modality> >& value, const ArgInfo info)
@@ -42,5 +55,6 @@ template<> struct pyopencvVecConverter<Ptr<linemod::Modality> >
 
 typedef std::vector<linemod::Match> vector_Match;
 typedef std::vector<linemod::Template> vector_Template;
+typedef std::vector<linemod::Feature> vector_Feature;
 typedef std::vector<Ptr<linemod::Modality> > vector_Ptr_Modality;
 #endif