Commit c5e0fa98 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files

Merge pull request #2353 from alalek:python_fix_arginfo

parents d1fc1c64 47de8dd3

modules/line_descriptor/misc/python/pyopencv_LSDDetector.hpp

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


template<> struct pyopencvVecConverter<line_descriptor::KeyLine>

{

    static bool to(PyObject* obj, std::vector<line_descriptor::KeyLine>& value, const ArgInfo info)

    static bool to(PyObject* obj, std::vector<line_descriptor::KeyLine>& value, const ArgInfo& info)

    {

        return pyopencv_to_generic_vec(obj, value, info);

    }

modules/rgbd/misc/python/pyopencv_linemod.hpp

+4 −4
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


template<> struct pyopencvVecConverter<linemod::Match>

{

    static bool to(PyObject* obj, std::vector<linemod::Match>& value, const ArgInfo info)

    static bool to(PyObject* obj, std::vector<linemod::Match>& value, const ArgInfo& info)

    {

        return pyopencv_to_generic_vec(obj, value, info);

    }
@@ -16,7 +16,7 @@ template<> struct pyopencvVecConverter<linemod::Match> 


template<> struct pyopencvVecConverter<linemod::Template>

{

    static bool to(PyObject* obj, std::vector<linemod::Template>& value, const ArgInfo info)

    static bool to(PyObject* obj, std::vector<linemod::Template>& value, const ArgInfo& info)

    {

        return pyopencv_to_generic_vec(obj, value, info);

    }
@@ -29,7 +29,7 @@ template<> struct pyopencvVecConverter<linemod::Template> 


template<> struct pyopencvVecConverter<linemod::Feature>

{

    static bool to(PyObject* obj, std::vector<linemod::Feature>& value, const ArgInfo info)

    static bool to(PyObject* obj, std::vector<linemod::Feature>& value, const ArgInfo& info)

    {

        return pyopencv_to_generic_vec(obj, value, info);

    }
@@ -42,7 +42,7 @@ template<> struct pyopencvVecConverter<linemod::Feature> 


template<> struct pyopencvVecConverter<Ptr<linemod::Modality> >

{

    static bool to(PyObject* obj, std::vector<Ptr<linemod::Modality> >& value, const ArgInfo info)

    static bool to(PyObject* obj, std::vector<Ptr<linemod::Modality> >& value, const ArgInfo& info)

    {

        return pyopencv_to_generic_vec(obj, value, info);

    }

modules/surface_matching/include/opencv2/surface_matching/pose_3d.hpp

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ typedef Ptr<PoseCluster3D> PoseCluster3DPtr; 
* various helper methods to work with poses

*

*/

class CV_EXPORTS Pose3D

class CV_EXPORTS_W Pose3D

{

public:

  Pose3D()

modules/surface_matching/misc/python/pyopencv_ppf_match_3d.hpp

0 → 100644
+17 −0
Original line number Diff line number Diff line 
#ifdef HAVE_OPENCV_SURFACE_MATCHING



template<> struct pyopencvVecConverter<ppf_match_3d::Pose3DPtr >

{

    static bool to(PyObject* obj, std::vector<ppf_match_3d::Pose3DPtr >& value, const ArgInfo& info)

    {

        return pyopencv_to_generic_vec(obj, value, info);

    }



    static PyObject* from(const std::vector<ppf_match_3d::Pose3DPtr >& value)

    {

        return pyopencv_from_generic_vec(value);

    }

};



typedef std::vector<ppf_match_3d::Pose3DPtr> vector_Pose3DPtr;

#endif