Skip to content

Commit 6a0affd

Browse files
authored
Merge pull request opencv#26147 from vrabaud:opencv_js
js: fix enum generation issues
2 parents 3073ba2 + 914a83f commit 6a0affd

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

modules/js/generator/embindgen.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def makeNamespacePrefixOverride(module_list):
132132
namespace_prefix_override = None
133133

134134
# Features to be exported
135-
export_enums = False
135+
export_enums = True
136136
export_consts = True
137137
with_wrapped_functions = True
138138
with_default_params = True
@@ -917,7 +917,7 @@ def gen(self, dst_file, src_files, core_bindings):
917917
if ns_name.split('.')[0] != 'cv':
918918
continue
919919
for name, enum in sorted(ns.enums.items()):
920-
if not name.endswith('.anonymous'):
920+
if '.unnamed_' not in name:
921921
name = name.replace("cv.", "")
922922
enum_values = []
923923
for enum_val in enum:
@@ -937,7 +937,10 @@ def gen(self, dst_file, src_files, core_bindings):
937937
for ns_name, ns in sorted(self.namespaces.items()):
938938
if ns_name.split('.')[0] != 'cv':
939939
continue
940+
# TODO CALIB_FIX_FOCAL_LENGTH is defined both in cv:: and cv::fisheye
941+
prefix = 'FISHEYE_' if 'fisheye' in ns_name else ''
940942
for name, const in sorted(ns.consts.items()):
943+
name = prefix + name
941944
# print("Gen consts: ", name, const)
942945
self.bindings.append(const_template.substitute(js_name=name, value=const))
943946

0 commit comments

Comments
 (0)