Merge branch 'master' into vs/docs-issue3

Author: ViralBShah

Project.toml

@@ -1,15 +1,15 @@
 name = "OpenCV"
 uuid = "f878e3a2-a245-4720-8660-60795d644f2a"
 authors = ["Archit Rungta <architrungta120@gmail.com>"]
-version = "4.8.0"
+version = "4.10.0"
 
 [deps]
 CxxWrap = "1f15a43c-97ca-5a2a-ae31-89f07a497df4"
 FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
 OpenCV_jll = "33b9d88c-85f9-5d73-bd91-4e2b95a9aa0b"
 
 [compat]
-CxxWrap = "0.16, 0.17"
-FileIO = "1.16, 1.17"
+CxxWrap = "0.17"
+FileIO = "1.17"
 OpenCV_jll = "4.13"
 julia = "1.10"

gen/CMakeLists.txt

@@ -115,7 +115,6 @@ execute_process(
                 )
 
 file(COPY ${CMAKE_CURRENT_BINARY_DIR}/gen/cpp_files/ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/gen/autogen_cpp)
-file(COPY ${CMAKE_CURRENT_BINARY_DIR}/gen/jl_cxx_files/ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/gen/autogen_jl)
 
 ocv_glob_module_sources()
 ocv_module_include_directories()

gen/gen3_cpp.py

@@ -253,6 +253,26 @@ def gen(srcfiles, preprocessor_definitions):
     nsi = sorted(namespaces.items(), key =lambda x: x[0])
     added_methods = set()
 
+    # Pre-populate the `enums` list across all namespaces so the per-namespace
+    # `register_types` emission below can filter out enum typedefs. Without this,
+    # enum return/arg types (e.g. cv::ORB::ScoreType) leak into `mod.add_type<...>`
+    # in the generated C++ — but the Julia side declares them as `const X = Int64`
+    # (not a wrapped type), so loading the .so trips CxxWrap's
+    # "No appropriate factory for type ..." at @wrapmodule time.
+    for _, ns in nsi:
+        for e1, e2 in ns.enums.items():
+            # Push every form a type can appear in: hdr_parser normalizes arg
+            # types via `::` -> `_` and strips `cv::` (see hdr_parser.parse_arg,
+            # ~line 385), giving e.g. `ORB_ScoreType`. But parse_tree.py reads
+            # `decl[4]` (the *original* return type) into self.rettype, so a
+            # nested enum return reaches us as `ORB::ScoreType` (cv:: stripped,
+            # `::` preserved). Cover both shapes — plus the fully-qualified
+            # form — so `tp in enums` matches in every code path.
+            enums.append(e2[0])                                                 # cv::ORB::ScoreType
+            enums.append(e2[1])
+            enums.append(e2[0].replace("cv::", ""))                             # ORB::ScoreType
+            enums.append(e2[0].replace("cv::", "").replace("::", '_'))          # ORB_ScoreType
+
     for name, ns in nsi:
         cpp_code.write("using namespace %s;\n" % name.replace(".", "::"))
 
@@ -299,14 +319,9 @@ def sort_classes(classes):
 };
                                     """ % (cl.name.replace('.', '::'), cl.base.replace('.', '::')))
 
-        for e1,e2 in ns.enums.items():
-            # cpp_code.write('\n    mod.add_bits<{0}>("{1}", jlcxx::julia_type("CppEnum"));'.format(e2[0], e2[1]))
-            enums.append(e2[0])
-            enums.append(e2[1])
-            enums.append(e2[0].replace("cv::", "").replace("::", '_'))
-
-
         for tp in ns.register_types:
+            if tp in enums:
+                continue   # enum typedefs are passed as int64, not wrapped as types
             cpp_code.write('   mod.add_type<%s>("%s");\n' %(tp, normalize_class_name(tp)))
 
     # print(enums)