Implemented generic image

Author: DarthAffe

ScreenCapture.NET/Model/CaptureZone.cs

@@ -23,20 +23,12 @@ public sealed class CaptureZone<TColor> : ICaptureZone
     public int Id { get; }
 
     public Display Display { get; }
-
-#if NET7_0_OR_GREATER
-    public ColorFormat ColorFormat 
-    {
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        get => TColor.ColorFormat;
-    }
-#else
+    
     public ColorFormat ColorFormat
     {
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        get => IColor.GetColorFormat<TColor>();
+        get => TColor.ColorFormat;
     }
-#endif
 
     /// <summary>
     /// Gets the x-location of the region on the screen.
@@ -93,12 +85,18 @@ public ReadOnlySpan<TColor> Pixels
         get => MemoryMarshal.Cast<byte, TColor>(RawBuffer);
     }
 
-    public Image<TColor> Image
+    public RefImage<TColor> Image
     {
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         get => new(Pixels, 0, 0, Width, Height, Width);
     }
 
+    IImage ICaptureZone.Image
+    {
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        get => new Image<TColor>(InternalBuffer, 0, 0, Width, Height, Width);
+    }
+
     /// <summary>
     /// Gets or sets if the <see cref="CaptureZone{T}"/> should be automatically updated on every captured frame.
     /// </summary>
@@ -154,6 +152,14 @@ internal CaptureZone(int id, Display display, int x, int y, int width, int heigh
 
     #region Methods
 
+    public RefImage<T> GetRefImage<T>()
+        where T : struct, IColor
+    {
+        if (typeof(T) != typeof(TColor)) throw new ArgumentException("The requested Color-Format does not match the data.", nameof(T));
+
+        return new RefImage<T>(MemoryMarshal.Cast<byte, T>(RawBuffer), 0, 0, Width, Height, Width);
+    }
+
     public IDisposable Lock()
     {
         Monitor.Enter(_lock);
@@ -216,6 +222,7 @@ private class UnlockDisposable : IDisposable
         #region Constructors
 
         public UnlockDisposable(object @lock) => this._lock = @lock;
+        ~UnlockDisposable() => Dispose();
 
         #endregion
 
@@ -227,6 +234,8 @@ public void Dispose()
 
             Monitor.Exit(_lock);
             _disposed = true;
+
+            GC.SuppressFinalize(this);
         }
 
         #endregion

ScreenCapture.NET/Model/ColorFormat.cs …nCapture.NET/Model/Colors/ColorFormat.csScreenCapture.NET/Model/ColorFormat.cs renamed to ScreenCapture.NET/Model/Colors/ColorFormat.cs ScreenCapture.NET/Model/ColorFormat.cs renamed to ScreenCapture.NET/Model/Colors/ColorFormat.cs

@@ -1,4 +1,6 @@
-namespace ScreenCapture.NET;
+using System;
+
+namespace ScreenCapture.NET;
 
 public interface IColor
 {
@@ -7,16 +9,5 @@ public interface IColor
     byte B { get; }
     byte A { get; }
 
-#if NET7_0_OR_GREATER
-    public static abstract ColorFormat ColorFormat { get; }
-#else
-    public static ColorFormat GetColorFormat<TColor>()
-        where TColor : IColor
-    {
-        System.Type colorType = typeof(TColor);
-        if (colorType == typeof(ColorBGRA)) return ColorFormat.BGRA;
-
-        throw new System.ArgumentException($"Not ColorFormat registered for '{typeof(TColor).Name}'");
-    }
-#endif
+    public static virtual ColorFormat ColorFormat => throw new NotSupportedException();
 }

ScreenCapture.NET/Model/Colors/IColor.cs

@@ -8,6 +8,7 @@ public interface ICaptureZone
     /// Gets the unique id of this <see cref="ICaptureZone"/>.
     /// </summary>
     int Id { get; }
+
     Display Display { get; }
     /// <summary>
     /// Gets the x-location of the region on the screen.
@@ -40,6 +41,8 @@ public interface ICaptureZone
 
     ReadOnlySpan<byte> RawBuffer { get; }
 
+    IImage Image { get; }
+
     /// <summary>
     /// Gets or sets if the <see cref="ICaptureZone"/> should be automatically updated on every captured frame.
     /// </summary>
@@ -58,4 +61,7 @@ public interface ICaptureZone
     /// Only necessary if <see cref="AutoUpdate"/> is set to <c>false</c>.
     /// </summary>
     void RequestUpdate();
+
+    RefImage<TColor> GetRefImage<TColor>()
+        where TColor : struct, IColor;
 }

ScreenCapture.NET/Model/ICaptureZone.cs

@@ -0,0 +1,35 @@
+using System.Collections.Generic;
+
+namespace ScreenCapture.NET;
+
+public interface IImage : IEnumerable<IColor>
+{
+    int Width { get; }
+    int Height { get; }
+
+    IColor this[int x, int y] { get; }
+    IImage this[int x, int y, int width, int height] { get; }
+
+    IImageRows Rows { get; }
+    IImageColumns Columns { get; }
+
+    public interface IImageRows : IEnumerable<IImageRow>
+    {
+        IImageRow this[int column] { get; }
+    }
+
+    public interface IImageColumns : IEnumerable<IImageColumn>
+    {
+        IImageColumn this[int column] { get; }
+    }
+
+    public interface IImageRow : IEnumerable<IColor>
+    {
+        IColor this[int x] { get; }
+    }
+
+    public interface IImageColumn : IEnumerable<IColor>
+    {
+        IColor this[int y] { get; }
+    }
+}