Enable legacy trackers in tracker module

Author: twistedfall

binding-generator/Cargo.toml

@@ -13,8 +13,8 @@ exclude = ["release.toml"]
 [lib]
 
 [dependencies]
-clang = { version = "2", features = ["clang_6_0"] }
-clang-sys = { version = "1", features = ["clang_6_0"] }
+clang = { version = "2", features = ["clang_9_0"] }
+clang-sys = { version = "1", features = ["clang_9_0"] }
 dunce = "1"
 percent-encoding = { version = "2", default-features = false }
 regex = "1"

binding-generator/src/element.rs

@@ -44,29 +44,28 @@ impl DefaultElement {
 		let mut entity = entity;
 		let mut parts = vec![];
 		while let Some(parent) = entity.get_semantic_parent() {
-			match parent.get_kind() {
+			let is_namespace_element = match parent.get_kind() {
+				EntityKind::Namespace => !parent.is_inline_namespace(),
 				EntityKind::ClassDecl
-				| EntityKind::Namespace
 				| EntityKind::StructDecl
 				| EntityKind::EnumDecl
 				| EntityKind::UnionDecl
 				| EntityKind::ClassTemplate
 				| EntityKind::ClassTemplatePartialSpecialization
 				| EntityKind::FunctionTemplate
 				| EntityKind::Method
-				| EntityKind::FunctionDecl => {
-					// handle anonymous enums inside classes and anonymous namespaces
-					if let Some(parent_name) = parent.get_name() {
-						parts.push(parent_name);
-					}
-				}
+				| EntityKind::FunctionDecl => true,
 				EntityKind::TranslationUnit
 				| EntityKind::UnexposedDecl
 				| EntityKind::LinkageSpec
 				| EntityKind::NotImplemented
-				| EntityKind::Constructor => {}
-				_ => {
-					unreachable!("Can't get kind of parent for cpp namespace: {:#?}", parent)
+				| EntityKind::Constructor => false,
+				_ => unreachable!("Can't get kind of parent for cpp namespace: {:#?}", parent),
+			};
+			if is_namespace_element {
+				// handle anonymous enums inside classes and anonymous namespaces
+				if let Some(parent_name) = parent.get_name() {
+					parts.push(parent_name);
 				}
 			}
 			entity = parent;

binding-generator/src/generator.rs

@@ -152,9 +152,7 @@ impl<'tu, V: GeneratorVisitor<'tu>> EntityWalkerVisitor<'tu> for OpenCvWalker<'t
 					unreachable!("Unsupported VarDecl: {:#?}", entity)
 				}
 			}
-			_ => {
-				unreachable!("Unsupported entity: {:#?}", entity)
-			}
+			_ => unreachable!("Unsupported entity: {:#?}", entity),
 		}
 		ControlFlow::Continue(())
 	}

binding-generator/src/settings.rs

@@ -284,6 +284,7 @@ pub static NO_SKIP_NAMESPACE_IN_LOCALNAME: LazyLock<HashMap<Option<SupportedModu
 			),
 			(Some(SupportedModule::Stitching), HashMap::from([("fisheye", "Fisheye")])),
 			(Some(SupportedModule::SuperRes), HashMap::from([("superres", "SuperRes")])),
+			(Some(SupportedModule::Tracking), HashMap::from([("legacy", "Legacy")])),
 		])
 	});
 

binding-generator/src/walker.rs

@@ -57,9 +57,7 @@ impl<'tu> EntityWalkerExt<'tu> for Entity<'tu> {
 					| EntityKind::Destructor
 					| EntityKind::LinkageSpec
 					| EntityKind::VarDecl => ControlFlow::Continue(()),
-					_ => {
-						unreachable!("Unsupported decl for file: {:#?}", root_decl)
-					}
+					_ => unreachable!("Unsupported decl for file: {:#?}", root_decl),
 				}
 				.into_entity_visit_result()
 			} else {
@@ -96,9 +94,7 @@ fn visit_cv_namespace<'tu>(ns: Entity<'tu>, visitor: &mut impl EntityWalkerVisit
 				/* ignoring */
 				ControlFlow::Continue(())
 			}
-			_ => {
-				unreachable!("Unsupported decl for OpenCV namespace: {:#?}", decl)
-			}
+			_ => unreachable!("Unsupported decl for OpenCV namespace: {:#?}", decl),
 		}
 		.into_entity_visit_result()
 	});

binding-generator/src/writer/rust_native/element.rs

@@ -55,9 +55,7 @@ impl DefaultRustNativeElement {
 						parts.push(parent.get_name().expect("Can't get parent name").into());
 					}
 				}
-				EntityKind::TranslationUnit | EntityKind::UnexposedDecl | EntityKind::FunctionTemplate => {
-					break;
-				}
+				EntityKind::TranslationUnit | EntityKind::UnexposedDecl | EntityKind::FunctionTemplate => break,
 				EntityKind::Namespace => {
 					let parent_namespace = parent.get_name().expect("Can't get parent name");
 					let no_skip_prefix = settings::NO_SKIP_NAMESPACE_IN_LOCALNAME
@@ -70,14 +68,10 @@ impl DefaultRustNativeElement {
 						});
 					if let Some(&prefix) = no_skip_prefix {
 						parts.push(prefix.into());
-					} else {
-						break;
 					}
 				}
 				EntityKind::Constructor | EntityKind::FunctionDecl | EntityKind::Method | EntityKind::NotImplemented => {}
-				_ => {
-					unreachable!("Can't get kind of parent: {parent:#?} for element: {entity:#?}")
-				}
+				_ => unreachable!("Can't get kind of parent: {parent:#?} for element: {entity:#?}"),
 			}
 			entity = parent;
 		}

src_cpp/tracking.hpp

@@ -0,0 +1,7 @@
+#include "ocvrs_common.hpp"
+#include <opencv2/tracking.hpp>
+#if (CV_VERSION_MAJOR >= 5) /* 5+ */ \
+	|| (CV_VERSION_MAJOR == 4 && CV_VERSION_MINOR >= 6) /* 4.6.0+ */ \
+	|| (CV_VERSION_MAJOR == 4 && CV_VERSION_MINOR == 5 && CV_VERSION_REVISION >= 1) /* 4.5.1+ */
+	#include <opencv2/tracking/tracking_legacy.hpp>
+#endif

src_cpp/video.hpp

@@ -0,0 +1,12 @@
+#include "ocvrs_common.hpp"
+#include <opencv2/video.hpp>
+// this is needed to support the legacy tracking module (see tracking.hpp)
+#if (CV_VERSION_MAJOR >= 5) /* 5+ */ \
+	|| (CV_VERSION_MAJOR == 4 && CV_VERSION_MINOR >= 6) /* 4.6.0+ */ \
+	|| (CV_VERSION_MAJOR == 4 && CV_VERSION_MINOR == 5 && CV_VERSION_REVISION >= 1) /* 4.5.1+ */
+	#if (CV_VERSION_MAJOR == 4 && CV_VERSION_MINOR == 5 && CV_VERSION_REVISION == 1) /* 4.5.1, header had a different name */
+		#include <opencv2/video/detail/tracking.private.hpp>
+	#else
+		#include <opencv2/video/detail/tracking.detail.hpp>
+	#endif
+#endif