Add Deref for MatStep

Author: twistedfall

src/manual/core/mat.rs

@@ -1,13 +1,13 @@
 use std::convert::TryInto;
 use std::ffi::c_void;
 use std::marker::PhantomData;
-use std::ops::Deref;
+use std::ops::{Deref, DerefMut};
 use std::{fmt, mem, ptr, slice};
 
 pub use mat_::*;
 
 use crate::boxed_ref::{BoxedRef, BoxedRefMut};
-use crate::core::{MatConstIterator, MatExpr, MatSize, Point, Rect, Scalar, Size, UMat};
+use crate::core::{MatConstIterator, MatExpr, MatSize, MatStep, Point, Rect, Scalar, Size, UMat};
 use crate::manual::core::DataType;
 use crate::prelude::*;
 use crate::{core, input_output_array, input_output_array_vector, Error, Result};
@@ -850,6 +850,23 @@ impl fmt::Debug for MatSize<'_> {
 	}
 }
 
+impl Deref for MatStep {
+	#[cfg(not(ocvrs_opencv_branch_5))]
+	type Target = [usize; 2];
+	#[cfg(ocvrs_opencv_branch_5)]
+	type Target = [usize; 3];
+
+	fn deref(&self) -> &Self::Target {
+		self.buf()
+	}
+}
+
+impl DerefMut for MatStep {
+	fn deref_mut(&mut self) -> &mut Self::Target {
+		self.buf_mut()
+	}
+}
+
 pub trait MatConstIteratorTraitManual: MatConstIteratorTrait {
 	#[inline]
 	fn has_elements(&self) -> bool {

tests/marshalling.rs

@@ -116,10 +116,10 @@ fn fixed_array_return() -> Result<()> {
 	// mutable fixed array return and modification
 	let m = Mat::new_rows_cols_with_default(5, 3, i32::opencv_type(), 1.into())?;
 	let mut mat_step = m.mat_step();
-	assert_eq!([12, 4], &mat_step.buf()[0..2]);
-	mat_step.buf_mut()[0] = 16;
-	mat_step.buf_mut()[1] = 2;
-	assert_eq!([16, 2], &mat_step.buf()[0..2]);
+	assert_eq!([12, 4], &mat_step[0..2]);
+	mat_step[0] = 16;
+	mat_step[1] = 2;
+	assert_eq!([16, 2], &mat_step[0..2]);
 
 	Ok(())
 }

tests/mat.rs

@@ -97,6 +97,9 @@ fn mat_for_rows_and_cols() -> Result<()> {
 	assert_eq!(mast_step_len, mat.mat_step().buf().len());
 	assert_eq!(7200, mat.mat_step().buf()[0]);
 	assert_eq!(24, mat.mat_step().buf()[1]);
+	assert_eq!(mast_step_len, mat.mat_step().len());
+	assert_eq!(7200, mat.mat_step()[0]);
+	assert_eq!(24, mat.mat_step()[1]);
 	assert_eq!(24, mat.elem_size()?);
 	assert_eq!(8, mat.elem_size1());
 	assert_eq!(900, mat.step1(0)?);