Merge branch 2.4
This commit is contained in:
@@ -337,10 +337,10 @@ class CppHeaderParser(object):
|
||||
atype = arg[:pos+1].strip()
|
||||
if aname.endswith("&") or aname.endswith("*") or (aname in ["int", "string", "Mat"]):
|
||||
atype = (atype + " " + aname).strip()
|
||||
aname = "param"
|
||||
aname = ""
|
||||
else:
|
||||
atype = arg
|
||||
aname = "param"
|
||||
aname = ""
|
||||
if aname.endswith("]"):
|
||||
bidx = aname.find('[')
|
||||
atype += aname[bidx:]
|
||||
@@ -575,6 +575,8 @@ class CppHeaderParser(object):
|
||||
"""
|
||||
if not self.block_stack:
|
||||
return name
|
||||
if name.startswith("cv."):
|
||||
return name
|
||||
n = ""
|
||||
for b in self.block_stack:
|
||||
block_type, block_name = b[self.BLOCK_TYPE], b[self.BLOCK_NAME]
|
||||
|
Reference in New Issue
Block a user