Merge pull request #19162 from alalek:backport_18985

2020-12-18 20:29:49 +00:00
parent cd3939a153 c2bc171ef6
commit ef27c11d50
3 changed files with 15 additions and 4 deletions
@@ -634,8 +634,10 @@ class JSWrapperGenerator(object):
                    ret_type = type_dict[ptr_type]
            for key in type_dict:
                if key in ret_type:
-                    ret_type = ret_type.replace(key, type_dict[key])
-
+                    # Replace types. Instead of ret_type.replace we use regular
+                    # expression to exclude false matches.
+                    # See https://github.com/opencv/opencv/issues/15514
+                    ret_type = re.sub('(^|[^\w])' + key + '($|[^\w])', type_dict[key], ret_type)
            if variant.constret and ret_type.startswith('const') == False:
                ret_type = 'const ' + ret_type
            if variant.refret and ret_type.endswith('&') == False: