mirror of
https://github.com/opencv/opencv.git
synced 2025-06-07 17:44:04 +08:00
Avoid adding false UMat/GpuMat declaration
This commit is contained in:
parent
f40707dc68
commit
cefa602601
@ -954,7 +954,8 @@ class CppHeaderParser(object):
|
|||||||
has_mat = len(list(filter(lambda x: x[0] in {"Mat", "vector_Mat"}, args))) > 0
|
has_mat = len(list(filter(lambda x: x[0] in {"Mat", "vector_Mat"}, args))) > 0
|
||||||
if has_mat:
|
if has_mat:
|
||||||
_, _, _, gpumat_decl = self.parse_stmt(stmt, token, mat="cuda::GpuMat", docstring=docstring)
|
_, _, _, gpumat_decl = self.parse_stmt(stmt, token, mat="cuda::GpuMat", docstring=docstring)
|
||||||
decls.append(gpumat_decl)
|
if gpumat_decl != decl:
|
||||||
|
decls.append(gpumat_decl)
|
||||||
|
|
||||||
if self._generate_umat_decls:
|
if self._generate_umat_decls:
|
||||||
# If function takes as one of arguments Mat or vector<Mat> - we want to create the
|
# If function takes as one of arguments Mat or vector<Mat> - we want to create the
|
||||||
@ -963,7 +964,8 @@ class CppHeaderParser(object):
|
|||||||
has_mat = len(list(filter(lambda x: x[0] in {"Mat", "vector_Mat"}, args))) > 0
|
has_mat = len(list(filter(lambda x: x[0] in {"Mat", "vector_Mat"}, args))) > 0
|
||||||
if has_mat:
|
if has_mat:
|
||||||
_, _, _, umat_decl = self.parse_stmt(stmt, token, mat="UMat", docstring=docstring)
|
_, _, _, umat_decl = self.parse_stmt(stmt, token, mat="UMat", docstring=docstring)
|
||||||
decls.append(umat_decl)
|
if umat_decl != decl:
|
||||||
|
decls.append(umat_decl)
|
||||||
|
|
||||||
docstring = ""
|
docstring = ""
|
||||||
if stmt_type == "namespace":
|
if stmt_type == "namespace":
|
||||||
|
Loading…
Reference in New Issue
Block a user