potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2021-11-27 13:17:44 +00:00
parent d470cfe86e b55d8f46f4
commit 57ee14d62d
37 changed files with 527 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/js/generator/embindgen.py
+2 -2
View File
@@ -485,7 +485,7 @@ class JSWrapperGenerator(object):
arg_types.append(arg_type)
unwrapped_arg_types.append(arg_type)
# Function attribure
# Function attribute
func_attribs = ''
if '*' in ''.join(arg_types):
func_attribs += ', allow_raw_pointers()'
@@ -680,7 +680,7 @@ class JSWrapperGenerator(object):
def_args.append(arg.defval)
arg_types.append(orig_arg_types[-1])
# Function attribure
# Function attribute
func_attribs = ''
if '*' in ''.join(orig_arg_types):
func_attribs += ', allow_raw_pointers()'