mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix namespace conflicts (like cv::inpaint and cv::xphoto::inpaint)

Browse Source 
whitespace fix
This commit is contained in:
Alexander Mordvintsev 2014-08-21 17:31:01 +04:00
parent 74c77d826f
commit 2a9e252f77
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -509,7 +509,7 @@ class FuncInfo(object):
name = "getelem" name = "getelem"
else: else:
classname = "" classname = ""
return "pyopencv_" + classname + name return "pyopencv_" + self.namespace.replace('.','_') + '_' + classname + name
def get_wrapper_prototype(self): def get_wrapper_prototype(self):
full_fname = self.get_wrapper_name() full_fname = self.get_wrapper_name()
@ -760,7 +760,7 @@ class PythonWrapperGenerator(object):
del chunks[-2] del chunks[-2]
base = '_'.join(chunks) base = '_'.join(chunks)
if base not in self.classes: if base not in self.classes:
print("Generator error: unable to resolve base %s for %s" print("Generator error: unable to resolve base %s for %s"
% (classinfo.bases[0], classinfo.name)) % (classinfo.bases[0], classinfo.name))
sys.exit(-1) sys.exit(-1)
classinfo.bases[0] = "::".join(chunks) classinfo.bases[0] = "::".join(chunks)