mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-25 05:32:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #21785 from alalek:python_fix_subclass_order

Browse Source
This commit is contained in:
Alexander Alekhin 2022-03-28 12:16:56 +00:00
commit 56f21c4fd5
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/python/src2/gen2.py
View File

@ -1178,11 +1178,26 @@ class PythonWrapperGenerator(object):
classlist1 = [(classinfo.decl_idx, name, classinfo) for name, classinfo in classlist] classlist1 = [(classinfo.decl_idx, name, classinfo) for name, classinfo in classlist]
classlist1.sort() classlist1.sort()
published_types = set() # ensure toposort with base classes
for decl_idx, name, classinfo in classlist1: for decl_idx, name, classinfo in classlist1:
if classinfo.ismap: if classinfo.ismap:
continue continue
def _registerType(classinfo):
if classinfo.decl_idx in published_types:
#print(classinfo.decl_idx, classinfo.name, ' - already published')
return
published_types.add(classinfo.decl_idx)
if classinfo.base and classinfo.base in self.classes:
base_classinfo = self.classes[classinfo.base]
#print(classinfo.decl_idx, classinfo.name, ' - request publishing of base type ', base_classinfo.decl_idx, base_classinfo.name)
_registerType(base_classinfo)
#print(classinfo.decl_idx, classinfo.name, ' - published!')
self.code_type_publish.write(classinfo.gen_def(self)) self.code_type_publish.write(classinfo.gen_def(self))
_registerType(classinfo)
# step 3: generate the code for all the global functions # step 3: generate the code for all the global functions
for ns_name, ns in sorted(self.namespaces.items()): for ns_name, ns in sorted(self.namespaces.items()):