mirror of
https://github.com/opencv/opencv.git
synced 2026-07-29 15:23:05 +04:00
Merge pull request #27284 from dkurt:java_video_capture_read
Java VideoCapture buffered stream constructor #27284 ### Pull Request Readiness Checklist resolves #26809 See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [x] There is a reference to the original bug report and related work - [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [x] The feature is well documented and sample code can be built with the project CMake
This commit is contained in:
@@ -45,7 +45,9 @@ typedef std::vector<DMatch> vector_DMatch;
|
||||
typedef std::vector<String> vector_String;
|
||||
typedef std::vector<std::string> vector_string;
|
||||
typedef std::vector<Scalar> vector_Scalar;
|
||||
#ifdef HAVE_OPENCV_OBJDETECT
|
||||
typedef std::vector<aruco::Dictionary> vector_Dictionary;
|
||||
#endif // HAVE_OPENCV_OBJDETECT
|
||||
|
||||
typedef std::vector<std::vector<char> > vector_vector_char;
|
||||
typedef std::vector<std::vector<Point> > vector_vector_Point;
|
||||
|
||||
@@ -182,6 +182,29 @@ struct PyOpenCV_Converter
|
||||
}
|
||||
};
|
||||
|
||||
// There is conflict between "long long" and "int64".
|
||||
// They are the same type on some 32-bit platforms.
|
||||
template<typename T>
|
||||
struct PyOpenCV_Converter
|
||||
< T, typename std::enable_if< std::is_same<long long, T>::value && !std::is_same<long long, int64>::value >::type >
|
||||
{
|
||||
static inline PyObject* from(const long long& value)
|
||||
{
|
||||
return PyLong_FromLongLong(value);
|
||||
}
|
||||
|
||||
static inline bool to(PyObject* obj, long long& value, const ArgInfo& info)
|
||||
{
|
||||
CV_UNUSED(info);
|
||||
if(!obj || obj == Py_None)
|
||||
return true;
|
||||
else if(PyLong_Check(obj))
|
||||
value = PyLong_AsLongLong(obj);
|
||||
else
|
||||
return false;
|
||||
return value != (long long)-1 || !PyErr_Occurred();
|
||||
}
|
||||
};
|
||||
|
||||
// --- uchar
|
||||
template<> bool pyopencv_to(PyObject* obj, uchar& value, const ArgInfo& info);
|
||||
|
||||
@@ -190,6 +190,8 @@ class CppHeaderParser(object):
|
||||
angle_stack[-1] += 1
|
||||
elif arg_type == "struct":
|
||||
arg_type += " " + w
|
||||
elif prev_w in ["signed", "unsigned", "short", "long"] and w in ["char", "short", "int", "long"]:
|
||||
arg_type += " " + w
|
||||
elif arg_type and arg_type != "~":
|
||||
arg_name = " ".join(word_list[wi:])
|
||||
break
|
||||
|
||||
@@ -28,6 +28,7 @@ _PREDEFINED_TYPES = (
|
||||
PrimitiveTypeNode.int_("uint32_t"),
|
||||
PrimitiveTypeNode.int_("size_t"),
|
||||
PrimitiveTypeNode.int_("int64_t"),
|
||||
PrimitiveTypeNode.int_("long long"),
|
||||
PrimitiveTypeNode.float_("float"),
|
||||
PrimitiveTypeNode.float_("double"),
|
||||
PrimitiveTypeNode.bool_("bool"),
|
||||
|
||||
Reference in New Issue
Block a user