Show Mat data dump in Debug implementation

Author: twistedfall

binding-generator/src/class/desc.rs

@@ -1,8 +1,7 @@
 use std::rc::Rc;
 
-use crate::element::ExcludeKind;
-
 use super::{Class, ClassKind, TemplateKind};
+use crate::element::ExcludeKind;
 
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub struct ClassDesc<'tu, 'ge> {
@@ -114,6 +113,11 @@ impl<'tu, 'ge> ClassDesc<'tu, 'ge> {
 		Class::new_desc(Self::system("cv::String", "core"))
 	}
 
+	/// `std::String`
+	pub fn std_string() -> Class<'tu, 'ge> {
+		Class::new_desc(Self::system("std::string", "core"))
+	}
+
 	/// `cv::MatConstIterator`
 	pub fn cv_matconstiterator() -> Class<'tu, 'ge> {
 		Class::new_desc(Self::boxed("cv::MatConstIterator", "core"))

binding-generator/src/settings/func_inject.rs

@@ -1,6 +1,8 @@
 use crate::class::ClassDesc;
 use crate::field::{Field, FieldDesc};
-use crate::func::{FuncCppBody, FuncDesc, FuncKind, FuncRustBody, ReturnKind};
+use crate::func::FuncKind::{Constructor, InstanceMethod};
+use crate::func::ReturnKind::{Fallible, InfallibleNaked};
+use crate::func::{FuncCppBody, FuncDesc, FuncRustBody};
 use crate::type_ref::Constness::{Const, Mut};
 use crate::type_ref::{TypeRef, TypeRefDesc, TypeRefTypeHint};
 use crate::writer::rust_native::type_ref::Lifetime;
@@ -13,9 +15,9 @@ pub fn func_inject_factory(module: &str) -> Vec<FuncFactory> {
 		"core" => vec![
 			(|| {
 				Func::new_desc(FuncDesc::new(
-					FuncKind::InstanceMethod(ClassDesc::cv_matconstiterator()),
+					InstanceMethod(ClassDesc::cv_matconstiterator()),
 					Const,
-					ReturnKind::InfallibleNaked,
+					InfallibleNaked,
 					"type",
 					"core",
 					vec![],
@@ -26,9 +28,9 @@ pub fn func_inject_factory(module: &str) -> Vec<FuncFactory> {
 			}) as FuncFactory, // todo: remove this cast when MSRV allows
 			|| {
 				Func::new_desc(FuncDesc::new(
-					FuncKind::InstanceMethod(ClassDesc::cv_mat()),
+					InstanceMethod(ClassDesc::cv_mat()),
 					Const,
-					ReturnKind::Fallible,
+					Fallible,
 					"size",
 					"core",
 					vec![],
@@ -39,9 +41,22 @@ pub fn func_inject_factory(module: &str) -> Vec<FuncFactory> {
 			},
 			|| {
 				Func::new_desc(FuncDesc::new(
-					FuncKind::InstanceMethod(ClassDesc::cv_umat()),
+					InstanceMethod(ClassDesc::cv_mat()),
 					Const,
-					ReturnKind::Fallible,
+					Fallible,
+					"getDataDump",
+					"core",
+					vec![],
+					FuncCppBody::ManualCall("std::string();\nstd::ostringstream oss;\noss << *instance;\nret = oss.str()".into()),
+					FuncRustBody::Auto,
+					TypeRefDesc::std_string(),
+				))
+			},
+			|| {
+				Func::new_desc(FuncDesc::new(
+					InstanceMethod(ClassDesc::cv_umat()),
+					Const,
+					Fallible,
 					"size",
 					"core",
 					vec![],
@@ -52,9 +67,9 @@ pub fn func_inject_factory(module: &str) -> Vec<FuncFactory> {
 			},
 			|| {
 				Func::new_desc(FuncDesc::new(
-					FuncKind::Constructor(ClassDesc::cv_input_array()),
+					Constructor(ClassDesc::cv_input_array()),
 					Mut,
-					ReturnKind::Fallible,
+					Fallible,
 					"_InputArray",
 					"core",
 					vec![

binding-generator/src/type_ref/desc.rs

@@ -211,6 +211,11 @@ impl<'tu, 'ge> TypeRefDesc<'tu, 'ge> {
 		TypeRef::new_class(ClassDesc::cv_string())
 	}
 
+	/// `std::string`
+	pub fn std_string() -> TypeRef<'tu, 'ge> {
+		TypeRef::new_class(ClassDesc::std_string())
+	}
+
 	/// `std::vector<std::vector<double>>`
 	pub fn vector_of_vector_of_double() -> TypeRef<'tu, 'ge> {
 		TypeRef::new_vector(Vector::new_desc(VectorDesc::new(TypeRef::new_vector(Vector::new_desc(

src/manual/core/mat.rs

@@ -788,10 +788,19 @@ impl fmt::Debug for Mat {
 			.field("total", &self.total())
 			.field("is_continuous", &self.is_continuous())
 			.field("is_submatrix", &self.is_submatrix())
+			.field("data", &MatDataDumper(self))
 			.finish()
 	}
 }
 
+struct MatDataDumper<'r>(&'r Mat);
+
+impl fmt::Debug for MatDataDumper<'_> {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		f.write_str(&self.0.get_data_dump().map_err(|_| fmt::Error)?)
+	}
+}
+
 input_output_array! { UMat, from_umat, from_umat_mut }
 input_output_array_vector! { UMat, from_umat_vec, from_umat_vec_mut }