diff --git a/src/OpenCvSharp/Modules/core/Mat/Mat.cs b/src/OpenCvSharp/Modules/core/Mat/Mat.cs index a2c21bd1c..544acc363 100644 --- a/src/OpenCvSharp/Modules/core/Mat/Mat.cs +++ b/src/OpenCvSharp/Modules/core/Mat/Mat.cs @@ -115,6 +115,7 @@ protected Mat(Mat m) NativeMethods.HandleException( NativeMethods.core_Mat_new12(m.ptr, out ptr)); + pinLifetime = m.pinLifetime?.Ref(); if (ptr == IntPtr.Zero) throw new OpenCvSharpException("imread failed."); } @@ -312,10 +313,10 @@ public static Mat FromPixelData(int rows, int cols, MatType type, IntPtr data, l /// If the parameter is missing (set to AUTO_STEP ), no padding is assumed and the actual step is calculated as cols*elemSize() . protected Mat(int rows, int cols, MatType type, Array data, long step = 0) { - var handle = AllocGCHandle(data); + pinLifetime = new ArrayPinningLifetime(data); NativeMethods.HandleException( NativeMethods.core_Mat_new8(rows, cols, type, - handle.AddrOfPinnedObject(), new IntPtr(step), out ptr)); + pinLifetime.DataPtr, new IntPtr(step), out ptr)); } /// @@ -390,7 +391,7 @@ protected Mat(IEnumerable sizes, MatType type, Array data, IEnumerable sizes, MatType type, Array data, IEnumerable new IntPtr(s)).ToArray(); NativeMethods.HandleException( NativeMethods.core_Mat_new9(sizesArray.Length, sizesArray, - type, handle.AddrOfPinnedObject(), stepsArray, out ptr)); + type, pinLifetime.DataPtr, stepsArray, out ptr)); } } @@ -2472,6 +2473,9 @@ public Mat SubMat(int rowStart, int rowEnd, int colStart, int colEnd) NativeMethods.core_Mat_subMat1(ptr, rowStart, rowEnd, colStart, colEnd, out var ret)); GC.KeepAlive(this); var retVal = new Mat(ret); + + // If this is a managed array, keep the array pinned as long as the Mat is alive + retVal.pinLifetime = pinLifetime?.Ref(); return retVal; } diff --git a/src/OpenCvSharp/Modules/core/Mat/MatPinning.cs b/src/OpenCvSharp/Modules/core/Mat/MatPinning.cs new file mode 100644 index 000000000..e43ce07fd --- /dev/null +++ b/src/OpenCvSharp/Modules/core/Mat/MatPinning.cs @@ -0,0 +1,70 @@ +using System.Runtime.InteropServices; + +namespace OpenCvSharp; + +public partial class Mat +{ + private ArrayPinningLifetime? pinLifetime; + + /// + protected override void DisposeManaged() + { + pinLifetime?.Dispose(); + base.DisposeManaged(); + } + + /// + /// Pins an array and unpins it when all references are released. + /// + private class ArrayPinningLifetime : IDisposable + { + private GCHandle handle; + private int refCount; + + /// + /// Creates an instance of the class. + /// + /// The array to be pinned. + public ArrayPinningLifetime(Array array) + { + handle = GCHandle.Alloc(array, GCHandleType.Pinned); + } + + /// + /// Gets the data pointer of the pinned . + /// + /// Thrown when the handle has been deallocated. + public IntPtr DataPtr => handle.IsAllocated ? handle.AddrOfPinnedObject() : throw new ObjectDisposedException(nameof(ArrayPinningLifetime)); + + /// Increments the reference count of the pinned array. + /// Returns a reference to this instance. + public ArrayPinningLifetime Ref() + { + Interlocked.Increment(ref refCount); + return this; + } + + /// + /// Decrements the reference count of the pinned array. If the reference count reaches zero, the array will be + /// unpinned. + /// + public void Dispose() + { + if (Interlocked.Decrement(ref refCount) != 0 || !handle.IsAllocated) + { + return; + } + + handle.Free(); + GC.SuppressFinalize(this); + } + + ~ArrayPinningLifetime() + { + if (handle.IsAllocated) + { + handle.Free(); + } + } + } +}