Merge pull request #13415 from alalek:issue_13406

* python: add checks for drawKeypoints() symbol

* python: more hacks in hdr_parser.py
This commit is contained in:
Alexander Alekhin
2018-12-12 13:26:31 +03:00
committed by GitHub
parent 54de51ef3c
commit c8f934b5b1
2 changed files with 27 additions and 3 deletions
+9 -3
View File
@@ -831,7 +831,7 @@ class CppHeaderParser(object):
l = l[pos+2:]
state = SCAN
if l.startswith('CV__'): # just ignore this lines
if l.startswith('CV__') or l.startswith('__CV_'): # just ignore these lines
#print('IGNORE: ' + l)
state = SCAN
continue
@@ -845,11 +845,17 @@ class CppHeaderParser(object):
if not token:
block_head += " " + l
break
block_head = block_head.strip()
if len(block_head) > 0 and block_head[-1] == ')' and block_head.startswith('CV_ENUM_FLAGS('):
l = ''
token = ';'
else:
break
if token == "//":
block_head += " " + l[:pos]
break
l = ''
continue
if token == "/*":
block_head += " " + l[:pos]