third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2019-11-19 19:13:38 +00:00
parent cf93217365 9d14c0b37a
commit 318cba4ce3
19 changed files with 257 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/stitching/misc/python/pyopencv_stitching.hpp
+3 -3
View File
@@ -9,7 +9,7 @@ typedef std::vector<detail::CameraParams> vector_CameraParams;
template<> struct pyopencvVecConverter<detail::ImageFeatures>
{
static bool to(PyObject* obj, std::vector<detail::ImageFeatures>& value, const ArgInfo info)
static bool to(PyObject* obj, std::vector<detail::ImageFeatures>& value, const ArgInfo& info)
{
return pyopencv_to_generic_vec(obj, value, info);
}
@@ -22,7 +22,7 @@ template<> struct pyopencvVecConverter<detail::ImageFeatures>
template<> struct pyopencvVecConverter<detail::MatchesInfo>
{
static bool to(PyObject* obj, std::vector<detail::MatchesInfo>& value, const ArgInfo info)
static bool to(PyObject* obj, std::vector<detail::MatchesInfo>& value, const ArgInfo& info)
{
return pyopencv_to_generic_vec(obj, value, info);
}
@@ -35,7 +35,7 @@ template<> struct pyopencvVecConverter<detail::MatchesInfo>
template<> struct pyopencvVecConverter<detail::CameraParams>
{
static bool to(PyObject* obj, std::vector<detail::CameraParams>& value, const ArgInfo info)
static bool to(PyObject* obj, std::vector<detail::CameraParams>& value, const ArgInfo& info)
{
return pyopencv_to_generic_vec(obj, value, info);
}