diff --git a/src/ImageSharp.Drawing/Primitives/Region.cs b/src/ImageSharp.Drawing/Primitives/Region.cs index c85e373fb3..27f039f122 100644 --- a/src/ImageSharp.Drawing/Primitives/Region.cs +++ b/src/ImageSharp.Drawing/Primitives/Region.cs @@ -1,6 +1,7 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. +using System; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Primitives @@ -19,7 +20,7 @@ public abstract class Region /// Gets the bounding box that entirely surrounds this region. /// /// - /// This should always contains all possible points returned from . + /// This should always contains all possible points returned from . /// public abstract Rectangle Bounds { get; } @@ -28,8 +29,8 @@ public abstract class Region /// /// The position along the y axis to find intersections. /// The buffer. - /// The point in the buffer to start setting offset. + /// A instance in the context of the caller. /// The number of intersections found. - public abstract int Scan(float y, float[] buffer, int offset); + public abstract int Scan(float y, Span buffer, Configuration configuration); } } \ No newline at end of file diff --git a/src/ImageSharp.Drawing/Primitives/ShapeRegion.cs b/src/ImageSharp.Drawing/Primitives/ShapeRegion.cs index cfd1945d08..9f5611dc04 100644 --- a/src/ImageSharp.Drawing/Primitives/ShapeRegion.cs +++ b/src/ImageSharp.Drawing/Primitives/ShapeRegion.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. using System; +using SixLabors.Memory; using SixLabors.Primitives; using SixLabors.Shapes; @@ -39,21 +40,23 @@ public ShapeRegion(IPath shape) public override Rectangle Bounds { get; } /// - public override int Scan(float y, float[] buffer, int offset) + public override int Scan(float y, Span buffer, Configuration configuration) { var start = new PointF(this.Bounds.Left - 1, y); var end = new PointF(this.Bounds.Right + 1, y); - // TODO: This is a temporary workaround because of the lack of Span API-s on IPath. We should use MemoryManager.Allocate() here! - var innerBuffer = new PointF[buffer.Length]; - int count = this.Shape.FindIntersections(start, end, innerBuffer, 0); - - for (int i = 0; i < count; i++) + using (IBuffer tempBuffer = configuration.MemoryAllocator.Allocate(buffer.Length)) { - buffer[i + offset] = innerBuffer[i].X; - } + Span innerBuffer = tempBuffer.GetSpan(); + int count = this.Shape.FindIntersections(start, end, innerBuffer); - return count; + for (int i = 0; i < count; i++) + { + buffer[i] = innerBuffer[i].X; + } + + return count; + } } } } \ No newline at end of file diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/BrushApplicator.cs b/src/ImageSharp.Drawing/Processing/Drawing/Brushes/BrushApplicator.cs index c546663353..7672681dac 100644 --- a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/BrushApplicator.cs +++ b/src/ImageSharp.Drawing/Processing/Drawing/Brushes/BrushApplicator.cs @@ -3,8 +3,8 @@ using System; using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.Memory; namespace SixLabors.ImageSharp.Processing.Drawing.Brushes { @@ -65,13 +65,13 @@ internal BrushApplicator(ImageFrame target, GraphicsOptions options) /// scanlineBuffer will be > scanlineWidth but provide and offset in case we want to share a larger buffer across runs. internal virtual void Apply(Span scanline, int x, int y) { - MemoryManager memoryManager = this.Target.MemoryManager; + MemoryAllocator memoryAllocator = this.Target.MemoryAllocator; - using (IBuffer amountBuffer = memoryManager.Allocate(scanline.Length)) - using (IBuffer overlay = memoryManager.Allocate(scanline.Length)) + using (IBuffer amountBuffer = memoryAllocator.Allocate(scanline.Length)) + using (IBuffer overlay = memoryAllocator.Allocate(scanline.Length)) { - Span amountSpan = amountBuffer.Span; - Span overlaySpan = overlay.Span; + Span amountSpan = amountBuffer.GetSpan(); + Span overlaySpan = overlay.GetSpan(); for (int i = 0; i < scanline.Length; i++) { @@ -88,7 +88,7 @@ internal virtual void Apply(Span scanline, int x, int y) } Span destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length); - this.Blender.Blend(memoryManager, destinationRow, destinationRow, overlaySpan, amountSpan); + this.Blender.Blend(memoryAllocator, destinationRow, destinationRow, overlaySpan, amountSpan); } } } diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/ImageBrush{TPixel}.cs b/src/ImageSharp.Drawing/Processing/Drawing/Brushes/ImageBrush{TPixel}.cs index c2e3a16eff..7798488566 100644 --- a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/ImageBrush{TPixel}.cs +++ b/src/ImageSharp.Drawing/Processing/Drawing/Brushes/ImageBrush{TPixel}.cs @@ -3,8 +3,8 @@ using System; using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Processing.Drawing.Brushes @@ -118,11 +118,11 @@ public override void Dispose() internal override void Apply(Span scanline, int x, int y) { // Create a span for colors - using (IBuffer amountBuffer = this.Target.MemoryManager.Allocate(scanline.Length)) - using (IBuffer overlay = this.Target.MemoryManager.Allocate(scanline.Length)) + using (IBuffer amountBuffer = this.Target.MemoryAllocator.Allocate(scanline.Length)) + using (IBuffer overlay = this.Target.MemoryAllocator.Allocate(scanline.Length)) { - Span amountSpan = amountBuffer.Span; - Span overlaySpan = overlay.Span; + Span amountSpan = amountBuffer.GetSpan(); + Span overlaySpan = overlay.GetSpan(); int sourceY = (y - this.offsetY) % this.yLength; int offsetX = x - this.offsetX; @@ -138,7 +138,7 @@ internal override void Apply(Span scanline, int x, int y) } Span destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length); - this.Blender.Blend(this.source.MemoryManager, destinationRow, destinationRow, overlaySpan, amountSpan); + this.Blender.Blend(this.source.MemoryAllocator, destinationRow, destinationRow, overlaySpan, amountSpan); } } } diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/PatternBrush{TPixel}.cs b/src/ImageSharp.Drawing/Processing/Drawing/Brushes/PatternBrush{TPixel}.cs index 765f2a1326..21f2066fb4 100644 --- a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/PatternBrush{TPixel}.cs +++ b/src/ImageSharp.Drawing/Processing/Drawing/Brushes/PatternBrush{TPixel}.cs @@ -4,9 +4,9 @@ using System; using System.Numerics; using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Primitives; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Processing.Drawing.Brushes @@ -151,13 +151,13 @@ public override void Dispose() internal override void Apply(Span scanline, int x, int y) { int patternY = y % this.pattern.Rows; - MemoryManager memoryManager = this.Target.MemoryManager; + MemoryAllocator memoryAllocator = this.Target.MemoryAllocator; - using (IBuffer amountBuffer = memoryManager.Allocate(scanline.Length)) - using (IBuffer overlay = memoryManager.Allocate(scanline.Length)) + using (IBuffer amountBuffer = memoryAllocator.Allocate(scanline.Length)) + using (IBuffer overlay = memoryAllocator.Allocate(scanline.Length)) { - Span amountSpan = amountBuffer.Span; - Span overlaySpan = overlay.Span; + Span amountSpan = amountBuffer.GetSpan(); + Span overlaySpan = overlay.GetSpan(); for (int i = 0; i < scanline.Length; i++) { @@ -168,7 +168,7 @@ internal override void Apply(Span scanline, int x, int y) } Span destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length); - this.Blender.Blend(memoryManager, destinationRow, destinationRow, overlaySpan, amountSpan); + this.Blender.Blend(memoryAllocator, destinationRow, destinationRow, overlaySpan, amountSpan); } } } diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/RecolorBrush{TPixel}.cs b/src/ImageSharp.Drawing/Processing/Drawing/Brushes/RecolorBrush{TPixel}.cs index 324c54e186..a7da2cc5b8 100644 --- a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/RecolorBrush{TPixel}.cs +++ b/src/ImageSharp.Drawing/Processing/Drawing/Brushes/RecolorBrush{TPixel}.cs @@ -4,8 +4,8 @@ using System; using System.Numerics; using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Processing.Drawing.Brushes @@ -136,13 +136,13 @@ public override void Dispose() /// internal override void Apply(Span scanline, int x, int y) { - MemoryManager memoryManager = this.Target.MemoryManager; + MemoryAllocator memoryAllocator = this.Target.MemoryAllocator; - using (IBuffer amountBuffer = memoryManager.Allocate(scanline.Length)) - using (IBuffer overlay = memoryManager.Allocate(scanline.Length)) + using (IBuffer amountBuffer = memoryAllocator.Allocate(scanline.Length)) + using (IBuffer overlay = memoryAllocator.Allocate(scanline.Length)) { - Span amountSpan = amountBuffer.Span; - Span overlaySpan = overlay.Span; + Span amountSpan = amountBuffer.GetSpan(); + Span overlaySpan = overlay.GetSpan(); for (int i = 0; i < scanline.Length; i++) { @@ -156,7 +156,7 @@ internal override void Apply(Span scanline, int x, int y) } Span destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length); - this.Blender.Blend(memoryManager, destinationRow, destinationRow, overlaySpan, amountSpan); + this.Blender.Blend(memoryAllocator, destinationRow, destinationRow, overlaySpan, amountSpan); } } } diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/SolidBrush{TPixel}.cs b/src/ImageSharp.Drawing/Processing/Drawing/Brushes/SolidBrush{TPixel}.cs index f2054ee0d7..791c307bfc 100644 --- a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/SolidBrush{TPixel}.cs +++ b/src/ImageSharp.Drawing/Processing/Drawing/Brushes/SolidBrush{TPixel}.cs @@ -3,8 +3,8 @@ using System; using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Processing.Drawing.Brushes @@ -58,8 +58,8 @@ private class SolidBrushApplicator : BrushApplicator public SolidBrushApplicator(ImageFrame source, TPixel color, GraphicsOptions options) : base(source, options) { - this.Colors = source.MemoryManager.Allocate(source.Width); - this.Colors.Span.Fill(color); + this.Colors = source.MemoryAllocator.Allocate(source.Width); + this.Colors.GetSpan().Fill(color); } /// @@ -75,7 +75,7 @@ public SolidBrushApplicator(ImageFrame source, TPixel color, GraphicsOpt /// /// The color /// - internal override TPixel this[int x, int y] => this.Colors.Span[x]; + internal override TPixel this[int x, int y] => this.Colors.GetSpan()[x]; /// public override void Dispose() @@ -88,24 +88,24 @@ internal override void Apply(Span scanline, int x, int y) { Span destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length); - MemoryManager memoryManager = this.Target.MemoryManager; + MemoryAllocator memoryAllocator = this.Target.MemoryAllocator; if (this.Options.BlendPercentage == 1f) { - this.Blender.Blend(memoryManager, destinationRow, destinationRow, this.Colors.Span, scanline); + this.Blender.Blend(memoryAllocator, destinationRow, destinationRow, this.Colors.GetSpan(), scanline); } else { - using (IBuffer amountBuffer = memoryManager.Allocate(scanline.Length)) + using (IBuffer amountBuffer = memoryAllocator.Allocate(scanline.Length)) { - Span amountSpan = amountBuffer.Span; + Span amountSpan = amountBuffer.GetSpan(); for (int i = 0; i < scanline.Length; i++) { amountSpan[i] = scanline[i] * this.Options.BlendPercentage; } - this.Blender.Blend(memoryManager, destinationRow, destinationRow, this.Colors.Span, amountSpan); + this.Blender.Blend(memoryAllocator, destinationRow, destinationRow, this.Colors.GetSpan(), amountSpan); } } } diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Processors/DrawImageProcessor.cs b/src/ImageSharp.Drawing/Processing/Drawing/Processors/DrawImageProcessor.cs index 7b6e36d9d1..506df3886c 100644 --- a/src/ImageSharp.Drawing/Processing/Drawing/Processors/DrawImageProcessor.cs +++ b/src/ImageSharp.Drawing/Processing/Drawing/Processors/DrawImageProcessor.cs @@ -4,9 +4,9 @@ using System; using System.Threading.Tasks; using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing.Processors; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Processing.Drawing.Processors @@ -133,11 +133,11 @@ protected override void OnFrameApply(ImageFrame source, Rectangle source int width = maxX - minX; - MemoryManager memoryManager = this.Image.GetConfiguration().MemoryManager; + MemoryAllocator memoryAllocator = this.Image.GetConfiguration().MemoryAllocator; - using (IBuffer amount = memoryManager.Allocate(width)) + using (IBuffer amount = memoryAllocator.Allocate(width)) { - amount.Span.Fill(this.Opacity); + amount.GetSpan().Fill(this.Opacity); Parallel.For( minY, @@ -147,7 +147,7 @@ protected override void OnFrameApply(ImageFrame source, Rectangle source { Span background = source.GetPixelRowSpan(y).Slice(minX, width); Span foreground = targetImage.GetPixelRowSpan(y - locationY).Slice(targetX, width); - blender.Blend(memoryManager, background, background, foreground, amount.Span); + blender.Blend(memoryAllocator, background, background, foreground, amount.GetSpan()); }); } } diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs b/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs index 645ff03537..4214041a79 100644 --- a/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs +++ b/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs @@ -4,10 +4,10 @@ using System; using System.Threading.Tasks; using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing.Drawing.Brushes; using SixLabors.ImageSharp.Processing.Processors; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Processing.Drawing.Processors @@ -77,13 +77,13 @@ protected override void OnFrameApply(ImageFrame source, Rectangle source startY = 0; } - using (IBuffer amount = source.MemoryManager.Allocate(width)) + using (IBuffer amount = source.MemoryAllocator.Allocate(width)) using (BrushApplicator applicator = this.brush.CreateApplicator( source, sourceRectangle, this.options)) { - amount.Span.Fill(1f); + amount.GetSpan().Fill(1f); Parallel.For( minY, @@ -94,7 +94,7 @@ protected override void OnFrameApply(ImageFrame source, Rectangle source int offsetY = y - startY; int offsetX = minX - startX; - applicator.Apply(amount.Span, offsetX, offsetY); + applicator.Apply(amount.GetSpan(), offsetX, offsetY); }); } } diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillRegionProcessor.cs b/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillRegionProcessor.cs index 95ac3fe298..c81f4028bf 100644 --- a/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillRegionProcessor.cs +++ b/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillRegionProcessor.cs @@ -3,11 +3,11 @@ using System; using System.Runtime.CompilerServices; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Primitives; using SixLabors.ImageSharp.Processing.Drawing.Brushes; using SixLabors.ImageSharp.Processing.Processors; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Processing.Drawing.Processors @@ -96,36 +96,35 @@ protected override void OnFrameApply(ImageFrame source, Rectangle source using (BrushApplicator applicator = this.Brush.CreateApplicator(source, rect, this.Options)) { int scanlineWidth = maxX - minX; - using (BasicArrayBuffer buffer = source.MemoryManager.AllocateFake(maxIntersections)) - using (BasicArrayBuffer scanline = source.MemoryManager.AllocateFake(scanlineWidth)) + using (IBuffer bBuffer = source.MemoryAllocator.Allocate(maxIntersections)) + using (IBuffer bScanline = source.MemoryAllocator.Allocate(scanlineWidth)) { bool scanlineDirty = true; float subpixelFraction = 1f / subpixelCount; float subpixelFractionPoint = subpixelFraction / subpixelCount; + + Span buffer = bBuffer.GetSpan(); + Span scanline = bScanline.GetSpan(); + for (int y = minY; y < maxY; y++) { if (scanlineDirty) { - // clear the buffer - for (int x = 0; x < scanlineWidth; x++) - { - scanline[x] = 0; - } - + scanline.Clear(); scanlineDirty = false; } float yPlusOne = y + 1; for (float subPixel = (float)y; subPixel < yPlusOne; subPixel += subpixelFraction) { - int pointsFound = region.Scan(subPixel + offset, buffer.Array, 0); + int pointsFound = region.Scan(subPixel + offset, buffer, configuration); if (pointsFound == 0) { // nothing on this line skip continue; } - QuickSort(new Span(buffer.Array, 0, pointsFound)); + QuickSort(buffer.Slice(0, pointsFound)); for (int point = 0; point < pointsFound; point += 2) { @@ -181,7 +180,7 @@ protected override void OnFrameApply(ImageFrame source, Rectangle source } } - applicator.Apply(scanline.Span, minX, y); + applicator.Apply(scanline, minX, y); } } } @@ -189,31 +188,45 @@ protected override void OnFrameApply(ImageFrame source, Rectangle source } [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static void Swap(Span data, int left, int right) + private static void Swap(ref float left, ref float right) { - float tmp = data[left]; - data[left] = data[right]; - data[right] = tmp; + float tmp = left; + left = right; + right = tmp; } private static void QuickSort(Span data) { - QuickSort(data, 0, data.Length - 1); + if (data.Length < 2) + { + return; + } + else if (data.Length == 2) + { + if (data[0] > data[1]) + { + Swap(ref data[0], ref data[1]); + } + + return; + } + + QuickSort(ref data[0], 0, data.Length - 1); } - private static void QuickSort(Span data, int lo, int hi) + private static void QuickSort(ref float data0, int lo, int hi) { if (lo < hi) { - int p = Partition(data, lo, hi); - QuickSort(data, lo, p); - QuickSort(data, p + 1, hi); + int p = Partition(ref data0, lo, hi); + QuickSort(ref data0, lo, p); + QuickSort(ref data0, p + 1, hi); } } - private static int Partition(Span data, int lo, int hi) + private static int Partition(ref float data0, int lo, int hi) { - float pivot = data[lo]; + float pivot = Unsafe.Add(ref data0, lo); int i = lo - 1; int j = hi + 1; while (true) @@ -222,20 +235,20 @@ private static int Partition(Span data, int lo, int hi) { i = i + 1; } - while (data[i] < pivot && i < hi); + while (Unsafe.Add(ref data0, i) < pivot && i < hi); do { j = j - 1; } - while (data[j] > pivot && j > lo); + while (Unsafe.Add(ref data0, j) > pivot && j > lo); if (i >= j) { return j; } - Swap(data, i, j); + Swap(ref Unsafe.Add(ref data0, i), ref Unsafe.Add(ref data0, j)); } } } diff --git a/src/ImageSharp/Advanced/AdvancedImageExtensions.cs b/src/ImageSharp/Advanced/AdvancedImageExtensions.cs index cbd8db748f..18b1d994b3 100644 --- a/src/ImageSharp/Advanced/AdvancedImageExtensions.cs +++ b/src/ImageSharp/Advanced/AdvancedImageExtensions.cs @@ -3,8 +3,8 @@ using System; using System.Runtime.InteropServices; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.Memory; namespace SixLabors.ImageSharp.Advanced { @@ -23,6 +23,52 @@ public static Configuration GetConfiguration(this Image source) where TPixel : struct, IPixel => GetConfiguration((IConfigurable)source); + /// + /// Gets the representation of the pixels as a of contiguous memory in the source image's pixel format + /// stored in row major order. + /// + /// The type of the pixel. + /// The source. + /// The + public static Span GetPixelSpan(this ImageFrame source) + where TPixel : struct, IPixel + => source.GetPixelMemory().Span; + + /// + /// Gets the representation of the pixels as a of contiguous memory in the source image's pixel format + /// stored in row major order. + /// + /// The type of the pixel. + /// The source. + /// The + public static Span GetPixelSpan(this Image source) + where TPixel : struct, IPixel + => source.Frames.RootFrame.GetPixelSpan(); + + /// + /// Gets the representation of the pixels as a of contiguous memory + /// at row beginning from the the first pixel on that row. + /// + /// The type of the pixel. + /// The source. + /// The row. + /// The + public static Span GetPixelRowSpan(this ImageFrame source, int rowIndex) + where TPixel : struct, IPixel + => source.PixelBuffer.GetRowSpan(rowIndex); + + /// + /// Gets the representation of the pixels as of of contiguous memory + /// at row beginning from the the first pixel on that row. + /// + /// The type of the pixel. + /// The source. + /// The row. + /// The + public static Span GetPixelRowSpan(this Image source, int rowIndex) + where TPixel : struct, IPixel + => source.Frames.RootFrame.GetPixelRowSpan(rowIndex); + /// /// Returns a reference to the 0th element of the Pixel buffer, /// allowing direct manipulation of pixel data through unsafe operations. @@ -31,9 +77,10 @@ public static Configuration GetConfiguration(this Image source) /// The Pixel format. /// The source image frame /// A pinnable reference the first root of the pixel buffer. + [Obsolete("This method will be removed in our next release! Please use MemoryMarshal.GetReference(source.GetPixelSpan())!")] public static ref TPixel DangerousGetPinnableReferenceToPixelBuffer(this ImageFrame source) where TPixel : struct, IPixel - => ref DangerousGetPinnableReferenceToPixelBuffer((IPixelSource)source); + => ref DangerousGetPinnableReferenceToPixelBuffer((IPixelSource)source); /// /// Returns a reference to the 0th element of the Pixel buffer, @@ -43,59 +90,68 @@ public static ref TPixel DangerousGetPinnableReferenceToPixelBuffer(this /// The Pixel format. /// The source image /// A pinnable reference the first root of the pixel buffer. + [Obsolete("This method will be removed in our next release! Please use MemoryMarshal.GetReference(source.GetPixelSpan())!")] public static ref TPixel DangerousGetPinnableReferenceToPixelBuffer(this Image source) where TPixel : struct, IPixel - => ref source.Frames.RootFrame.DangerousGetPinnableReferenceToPixelBuffer(); + => ref source.Frames.RootFrame.DangerousGetPinnableReferenceToPixelBuffer(); /// - /// Gets the representation of the pixels as an area of contiguous memory in the given pixel format. + /// Gets the representation of the pixels as a of contiguous memory in the source image's pixel format + /// stored in row major order. /// - /// The type of the pixel. - /// The source. - /// The - internal static Span GetPixelSpan(this ImageFrame source) + /// The Pixel format. + /// The source + /// The + internal static Memory GetPixelMemory(this ImageFrame source) where TPixel : struct, IPixel - => GetSpan(source); + { + return source.PixelBuffer.Buffer.Memory; + } /// - /// Gets the representation of the pixels as an area of contiguous memory at row 'y' beginning from the the first pixel on that row. + /// Gets the representation of the pixels as a of contiguous memory in the source image's pixel format + /// stored in row major order. /// - /// The type of the pixel. - /// The source. - /// The row. - /// The - internal static Span GetPixelRowSpan(this ImageFrame source, int row) + /// The Pixel format. + /// The source + /// The + internal static Memory GetPixelMemory(this Image source) where TPixel : struct, IPixel - => GetSpan(source, row); + { + return source.Frames.RootFrame.GetPixelMemory(); + } /// - /// Gets the representation of the pixels as an area of contiguous memory in the given pixel format. + /// Gets the representation of the pixels as a of contiguous memory + /// at row beginning from the the first pixel on that row. /// /// The type of the pixel. /// The source. + /// The row. /// The - internal static Span GetPixelSpan(this Image source) + internal static Memory GetPixelRowMemory(this ImageFrame source, int rowIndex) where TPixel : struct, IPixel - => source.Frames.RootFrame.GetPixelSpan(); + => source.PixelBuffer.GetRowMemory(rowIndex); /// - /// Gets the representation of the pixels as an area of contiguous memory at row 'y' beginning from the the first pixel on that row. + /// Gets the representation of the pixels as of of contiguous memory + /// at row beginning from the the first pixel on that row. /// /// The type of the pixel. /// The source. - /// The row. + /// The row. /// The - internal static Span GetPixelRowSpan(this Image source, int row) + internal static Memory GetPixelRowMemory(this Image source, int rowIndex) where TPixel : struct, IPixel - => source.Frames.RootFrame.GetPixelRowSpan(row); + => source.Frames.RootFrame.GetPixelRowMemory(rowIndex); /// - /// Gets the assigned to 'source'. + /// Gets the assigned to 'source'. /// /// The source image /// Returns the configuration. - internal static MemoryManager GetMemoryManager(this IConfigurable source) - => GetConfiguration(source).MemoryManager; + internal static MemoryAllocator GetMemoryAllocator(this IConfigurable source) + => GetConfiguration(source).MemoryAllocator; /// /// Gets the span to the backing buffer. @@ -105,7 +161,7 @@ internal static MemoryManager GetMemoryManager(this IConfigurable source) /// The span retuned from Pixel source private static Span GetSpan(IPixelSource source) where TPixel : struct, IPixel - => source.PixelBuffer.Span; + => source.PixelBuffer.GetSpan(); /// /// Gets the span to the backing buffer at the given row. @@ -131,7 +187,7 @@ private static Span GetSpan(IPixelSource source, int row /// private static Span GetSpan(Buffer2D source, int row) where TPixel : struct, IPixel - => source.Span.Slice(row * source.Width, source.Width); + => source.GetSpan().Slice(row * source.Width, source.Width); /// /// Gets the configuration. @@ -149,6 +205,6 @@ private static Configuration GetConfiguration(IConfigurable source) /// A reference to the element. private static ref TPixel DangerousGetPinnableReferenceToPixelBuffer(IPixelSource source) where TPixel : struct, IPixel - => ref MemoryMarshal.GetReference(source.PixelBuffer.Span); + => ref MemoryMarshal.GetReference(source.PixelBuffer.GetSpan()); } } diff --git a/src/ImageSharp/Advanced/IPixelSource.cs b/src/ImageSharp/Advanced/IPixelSource.cs index a321e877ba..27b3170e63 100644 --- a/src/ImageSharp/Advanced/IPixelSource.cs +++ b/src/ImageSharp/Advanced/IPixelSource.cs @@ -1,8 +1,8 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.Memory; namespace SixLabors.ImageSharp.Advanced { diff --git a/src/ImageSharp/Common/Helpers/ParallelFor.cs b/src/ImageSharp/Common/Helpers/ParallelFor.cs index da91259051..7061475a7c 100644 --- a/src/ImageSharp/Common/Helpers/ParallelFor.cs +++ b/src/ImageSharp/Common/Helpers/ParallelFor.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; namespace SixLabors.ImageSharp { @@ -24,7 +24,7 @@ public static void WithConfiguration(int fromInclusive, int toExclusive, Configu /// The value type of the buffer /// The start index, inclusive. /// The end index, exclusive. - /// The used for getting the and + /// The used for getting the and /// The length of the requested parallel buffer /// The delegate that is invoked once per iteration. public static void WithTemporaryBuffer( @@ -35,12 +35,12 @@ public static void WithTemporaryBuffer( Action> body) where T : struct { - MemoryManager memoryManager = configuration.MemoryManager; + MemoryAllocator memoryAllocator = configuration.MemoryAllocator; ParallelOptions parallelOptions = configuration.ParallelOptions; IBuffer InitBuffer() { - return memoryManager.Allocate(bufferLength); + return memoryAllocator.Allocate(bufferLength); } void CleanUpBuffer(IBuffer buffer) diff --git a/src/ImageSharp/Configuration.cs b/src/ImageSharp/Configuration.cs index eb08bc579c..e84674355e 100644 --- a/src/ImageSharp/Configuration.cs +++ b/src/ImageSharp/Configuration.cs @@ -12,8 +12,8 @@ #if !NETSTANDARD1_1 using SixLabors.ImageSharp.IO; #endif -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.Processing; +using SixLabors.Memory; namespace SixLabors.ImageSharp { @@ -75,9 +75,9 @@ public Configuration(params IConfigurationModule[] configurationModules) public ImageFormatManager ImageFormatsManager { get; set; } = new ImageFormatManager(); /// - /// Gets or sets the that is currently in use. + /// Gets or sets the that is currently in use. /// - public MemoryManager MemoryManager { get; set; } = ArrayPoolMemoryManager.CreateDefault(); + public MemoryAllocator MemoryAllocator { get; set; } = ArrayPoolMemoryAllocator.CreateDefault(); /// /// Gets the maximum header size of all the formats. @@ -116,7 +116,7 @@ public Configuration ShallowCopy() { ParallelOptions = this.ParallelOptions, ImageFormatsManager = this.ImageFormatsManager, - MemoryManager = this.MemoryManager, + MemoryAllocator = this.MemoryAllocator, ImageOperationsProvider = this.ImageOperationsProvider, ReadOrigin = this.ReadOrigin, diff --git a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs index 26bd97b810..3c6e05a8b7 100644 --- a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs +++ b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs @@ -4,9 +4,9 @@ using System; using System.IO; using System.Runtime.CompilerServices; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.MetaData; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.Memory; namespace SixLabors.ImageSharp.Formats.Bmp { @@ -71,7 +71,7 @@ internal sealed class BmpDecoderCore private readonly Configuration configuration; - private readonly MemoryManager memoryManager; + private readonly MemoryAllocator memoryAllocator; /// /// Initializes a new instance of the class. @@ -81,7 +81,7 @@ internal sealed class BmpDecoderCore public BmpDecoderCore(Configuration configuration, IBmpDecoderOptions options) { this.configuration = configuration; - this.memoryManager = configuration.MemoryManager; + this.memoryAllocator = configuration.MemoryAllocator; } /// @@ -213,9 +213,9 @@ private void ReadRle8(PixelAccessor pixels, byte[] colors, int w var color = default(TPixel); var rgba = new Rgba32(0, 0, 0, 255); - using (Buffer2D buffer = this.memoryManager.AllocateClean2D(width, height)) + using (Buffer2D buffer = this.memoryAllocator.AllocateClean2D(width, height)) { - this.UncompressRle8(width, buffer.Span); + this.UncompressRle8(width, buffer.GetSpan()); for (int y = 0; y < height; y++) { @@ -337,12 +337,12 @@ private void ReadRgbPalette(PixelAccessor pixels, byte[] colors, padding = 4 - padding; } - using (IManagedByteBuffer row = this.memoryManager.AllocateCleanManagedByteBuffer(arrayWidth + padding)) + using (IManagedByteBuffer row = this.memoryAllocator.AllocateCleanManagedByteBuffer(arrayWidth + padding)) { TPixel color = default; var rgba = new Rgba32(0, 0, 0, 255); - Span rowSpan = row.Span; + Span rowSpan = row.GetSpan(); for (int y = 0; y < height; y++) { @@ -389,7 +389,7 @@ private void ReadRgb16(PixelAccessor pixels, int width, int heig var color = default(TPixel); var rgba = new Rgba32(0, 0, 0, 255); - using (IManagedByteBuffer buffer = this.memoryManager.AllocateManagedByteBuffer(stride)) + using (IManagedByteBuffer buffer = this.memoryAllocator.AllocateManagedByteBuffer(stride)) { for (int y = 0; y < height; y++) { @@ -427,14 +427,14 @@ private void ReadRgb24(PixelAccessor pixels, int width, int heig { int padding = CalculatePadding(width, 3); - using (IManagedByteBuffer row = this.memoryManager.AllocatePaddedPixelRowBuffer(width, 3, padding)) + using (IManagedByteBuffer row = this.memoryAllocator.AllocatePaddedPixelRowBuffer(width, 3, padding)) { for (int y = 0; y < height; y++) { this.stream.Read(row); int newY = Invert(y, height, inverted); Span pixelSpan = pixels.GetRowSpan(newY); - PixelOperations.Instance.PackFromBgr24Bytes(row.Span, pixelSpan, width); + PixelOperations.Instance.PackFromBgr24Bytes(row.GetSpan(), pixelSpan, width); } } } @@ -452,14 +452,14 @@ private void ReadRgb32(PixelAccessor pixels, int width, int heig { int padding = CalculatePadding(width, 4); - using (IManagedByteBuffer row = this.memoryManager.AllocatePaddedPixelRowBuffer(width, 4, padding)) + using (IManagedByteBuffer row = this.memoryAllocator.AllocatePaddedPixelRowBuffer(width, 4, padding)) { for (int y = 0; y < height; y++) { this.stream.Read(row); int newY = Invert(y, height, inverted); Span pixelSpan = pixels.GetRowSpan(newY); - PixelOperations.Instance.PackFromBgra32Bytes(row.Span, pixelSpan, width); + PixelOperations.Instance.PackFromBgra32Bytes(row.GetSpan(), pixelSpan, width); } } } diff --git a/src/ImageSharp/Formats/Bmp/BmpEncoder.cs b/src/ImageSharp/Formats/Bmp/BmpEncoder.cs index 9edd0fcd4e..23b01ae9e8 100644 --- a/src/ImageSharp/Formats/Bmp/BmpEncoder.cs +++ b/src/ImageSharp/Formats/Bmp/BmpEncoder.cs @@ -22,7 +22,7 @@ public sealed class BmpEncoder : IImageEncoder, IBmpEncoderOptions public void Encode(Image image, Stream stream) where TPixel : struct, IPixel { - var encoder = new BmpEncoderCore(this, image.GetMemoryManager()); + var encoder = new BmpEncoderCore(this, image.GetMemoryAllocator()); encoder.Encode(image, stream); } } diff --git a/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs b/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs index 2b0c907338..d8bf90c7c0 100644 --- a/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs +++ b/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs @@ -3,8 +3,8 @@ using System; using System.IO; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.Memory; namespace SixLabors.ImageSharp.Formats.Bmp { @@ -20,16 +20,16 @@ internal sealed class BmpEncoderCore private readonly BmpBitsPerPixel bitsPerPixel; - private readonly MemoryManager memoryManager; + private readonly MemoryAllocator memoryAllocator; /// /// Initializes a new instance of the class. /// /// The encoder options - /// The memory manager - public BmpEncoderCore(IBmpEncoderOptions options, MemoryManager memoryManager) + /// The memory manager + public BmpEncoderCore(IBmpEncoderOptions options, MemoryAllocator memoryAllocator) { - this.memoryManager = memoryManager; + this.memoryAllocator = memoryAllocator; this.bitsPerPixel = options.BitsPerPixel; } @@ -109,7 +109,7 @@ private void WriteImage(Stream stream, ImageFrame image) private IManagedByteBuffer AllocateRow(int width, int bytesPerPixel) { - return this.memoryManager.AllocatePaddedPixelRowBuffer(width, bytesPerPixel, this.padding); + return this.memoryAllocator.AllocatePaddedPixelRowBuffer(width, bytesPerPixel, this.padding); } /// @@ -126,7 +126,7 @@ private void Write32Bit(Stream stream, PixelAccessor pixels) for (int y = pixels.Height - 1; y >= 0; y--) { Span pixelSpan = pixels.GetRowSpan(y); - PixelOperations.Instance.ToBgra32Bytes(pixelSpan, row.Span, pixelSpan.Length); + PixelOperations.Instance.ToBgra32Bytes(pixelSpan, row.GetSpan(), pixelSpan.Length); stream.Write(row.Array, 0, row.Length()); } } @@ -146,7 +146,7 @@ private void Write24Bit(Stream stream, PixelAccessor pixels) for (int y = pixels.Height - 1; y >= 0; y--) { Span pixelSpan = pixels.GetRowSpan(y); - PixelOperations.Instance.ToBgr24Bytes(pixelSpan, row.Span, pixelSpan.Length); + PixelOperations.Instance.ToBgr24Bytes(pixelSpan, row.GetSpan(), pixelSpan.Length); stream.Write(row.Array, 0, row.Length()); } } diff --git a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs index 4fbd4baf51..fc73f55a1e 100644 --- a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs +++ b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs @@ -7,9 +7,9 @@ using System.Runtime.InteropServices; using System.Text; using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.MetaData; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Formats.Gif @@ -87,7 +87,7 @@ public GifDecoderCore(Configuration configuration, IGifDecoderOptions options) /// public FrameDecodingMode DecodingMode { get; } - private MemoryManager MemoryManager => this.configuration.MemoryManager; + private MemoryAllocator MemoryAllocator => this.configuration.MemoryAllocator; /// /// Decodes the stream to the image. @@ -293,7 +293,7 @@ private void ReadComments() continue; } - using (IManagedByteBuffer commentsBuffer = this.MemoryManager.AllocateManagedByteBuffer(length)) + using (IManagedByteBuffer commentsBuffer = this.MemoryAllocator.AllocateManagedByteBuffer(length)) { this.stream.Read(commentsBuffer.Array, 0, length); string comments = this.TextEncoding.GetString(commentsBuffer.Array, 0, length); @@ -321,15 +321,15 @@ private void ReadFrame(ref Image image, ref ImageFrame p if (imageDescriptor.LocalColorTableFlag) { int length = imageDescriptor.LocalColorTableSize * 3; - localColorTable = this.configuration.MemoryManager.AllocateManagedByteBuffer(length, true); + localColorTable = this.configuration.MemoryAllocator.AllocateManagedByteBuffer(length, true); this.stream.Read(localColorTable.Array, 0, length); } - indices = this.configuration.MemoryManager.AllocateManagedByteBuffer(imageDescriptor.Width * imageDescriptor.Height, true); + indices = this.configuration.MemoryAllocator.AllocateManagedByteBuffer(imageDescriptor.Width * imageDescriptor.Height, true); - this.ReadFrameIndices(imageDescriptor, indices.Span); - ReadOnlySpan colorTable = MemoryMarshal.Cast((localColorTable ?? this.globalColorTable).Span); - this.ReadFrameColors(ref image, ref previousFrame, indices.Span, colorTable, imageDescriptor); + this.ReadFrameIndices(imageDescriptor, indices.GetSpan()); + ReadOnlySpan colorTable = MemoryMarshal.Cast((localColorTable ?? this.globalColorTable).GetSpan()); + this.ReadFrameColors(ref image, ref previousFrame, indices.GetSpan(), colorTable, imageDescriptor); // Skip any remaining blocks this.Skip(0); @@ -350,7 +350,7 @@ private void ReadFrame(ref Image image, ref ImageFrame p private void ReadFrameIndices(in GifImageDescriptor imageDescriptor, Span indices) { int dataSize = this.stream.ReadByte(); - using (var lzwDecoder = new LzwDecoder(this.configuration.MemoryManager, this.stream)) + using (var lzwDecoder = new LzwDecoder(this.configuration.MemoryAllocator, this.stream)) { lzwDecoder.DecodePixels(imageDescriptor.Width, imageDescriptor.Height, dataSize, indices); } @@ -528,7 +528,7 @@ private void ReadLogicalScreenDescriptorAndGlobalColorTable(Stream stream) { int globalColorTableLength = this.logicalScreenDescriptor.GlobalColorTableSize * 3; - this.globalColorTable = this.MemoryManager.AllocateManagedByteBuffer(globalColorTableLength, true); + this.globalColorTable = this.MemoryAllocator.AllocateManagedByteBuffer(globalColorTableLength, true); // Read the global color table data from the stream stream.Read(this.globalColorTable.Array, 0, globalColorTableLength); diff --git a/src/ImageSharp/Formats/Gif/GifEncoder.cs b/src/ImageSharp/Formats/Gif/GifEncoder.cs index fb072bcb7a..a07928b04f 100644 --- a/src/ImageSharp/Formats/Gif/GifEncoder.cs +++ b/src/ImageSharp/Formats/Gif/GifEncoder.cs @@ -34,7 +34,7 @@ public sealed class GifEncoder : IImageEncoder, IGifEncoderOptions public void Encode(Image image, Stream stream) where TPixel : struct, IPixel { - var encoder = new GifEncoderCore(image.GetConfiguration().MemoryManager, this); + var encoder = new GifEncoderCore(image.GetConfiguration().MemoryAllocator, this); encoder.Encode(image, stream); } } diff --git a/src/ImageSharp/Formats/Gif/GifEncoderCore.cs b/src/ImageSharp/Formats/Gif/GifEncoderCore.cs index 747867c805..f84b13f5fc 100644 --- a/src/ImageSharp/Formats/Gif/GifEncoderCore.cs +++ b/src/ImageSharp/Formats/Gif/GifEncoderCore.cs @@ -7,10 +7,10 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Text; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.MetaData; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing.Quantization; +using SixLabors.Memory; namespace SixLabors.ImageSharp.Formats.Gif { @@ -19,7 +19,7 @@ namespace SixLabors.ImageSharp.Formats.Gif /// internal sealed class GifEncoderCore { - private readonly MemoryManager memoryManager; + private readonly MemoryAllocator memoryAllocator; /// /// A reusable buffer used to reduce allocations. @@ -49,11 +49,11 @@ internal sealed class GifEncoderCore /// /// Initializes a new instance of the class. /// - /// The to use for buffer allocations. + /// The to use for buffer allocations. /// The options for the encoder. - public GifEncoderCore(MemoryManager memoryManager, IGifEncoderOptions options) + public GifEncoderCore(MemoryAllocator memoryAllocator, IGifEncoderOptions options) { - this.memoryManager = memoryManager; + this.memoryAllocator = memoryAllocator; this.textEncoding = options.TextEncoding ?? GifConstants.DefaultEncoding; this.quantizer = options.Quantizer; this.ignoreMetadata = options.IgnoreMetadata; @@ -317,10 +317,10 @@ private void WriteColorTable(QuantizedFrame image, Stream stream int colorTableLength = (int)Math.Pow(2, this.bitDepth) * 3; // The maximium number of colors for the bit depth Rgb24 rgb = default; - using (IManagedByteBuffer colorTable = this.memoryManager.AllocateManagedByteBuffer(colorTableLength)) + using (IManagedByteBuffer colorTable = this.memoryAllocator.AllocateManagedByteBuffer(colorTableLength)) { ref TPixel paletteRef = ref MemoryMarshal.GetReference(image.Palette.AsSpan()); - ref Rgb24 rgb24Ref = ref Unsafe.As(ref MemoryMarshal.GetReference(colorTable.Span)); + ref Rgb24 rgb24Ref = ref Unsafe.As(ref MemoryMarshal.GetReference(colorTable.GetSpan())); for (int i = 0; i < pixelCount; i++) { ref TPixel entry = ref Unsafe.Add(ref paletteRef, i); @@ -342,7 +342,7 @@ private void WriteColorTable(QuantizedFrame image, Stream stream private void WriteImageData(QuantizedFrame image, Stream stream) where TPixel : struct, IPixel { - using (var encoder = new LzwEncoder(this.memoryManager, image.Pixels, (byte)this.bitDepth)) + using (var encoder = new LzwEncoder(this.memoryAllocator, image.Pixels, (byte)this.bitDepth)) { encoder.Encode(stream); } diff --git a/src/ImageSharp/Formats/Gif/LzwDecoder.cs b/src/ImageSharp/Formats/Gif/LzwDecoder.cs index 9f9e070e20..977870936a 100644 --- a/src/ImageSharp/Formats/Gif/LzwDecoder.cs +++ b/src/ImageSharp/Formats/Gif/LzwDecoder.cs @@ -5,7 +5,7 @@ using System.IO; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; namespace SixLabors.ImageSharp.Formats.Gif { @@ -48,18 +48,18 @@ internal sealed class LzwDecoder : IDisposable /// Initializes a new instance of the class /// and sets the stream, where the compressed data should be read from. /// - /// The to use for buffer allocations. + /// The to use for buffer allocations. /// The stream to read from. /// is null. - public LzwDecoder(MemoryManager memoryManager, Stream stream) + public LzwDecoder(MemoryAllocator memoryAllocator, Stream stream) { Guard.NotNull(stream, nameof(stream)); this.stream = stream; - this.prefix = memoryManager.Allocate(MaxStackSize, true); - this.suffix = memoryManager.Allocate(MaxStackSize, true); - this.pixelStack = memoryManager.Allocate(MaxStackSize + 1, true); + this.prefix = memoryAllocator.Allocate(MaxStackSize, true); + this.suffix = memoryAllocator.Allocate(MaxStackSize, true); + this.pixelStack = memoryAllocator.Allocate(MaxStackSize + 1, true); } /// @@ -102,9 +102,9 @@ public void DecodePixels(int width, int height, int dataSize, Span pixels) int data = 0; int first = 0; - ref int prefixRef = ref MemoryMarshal.GetReference(this.prefix.Span); - ref int suffixRef = ref MemoryMarshal.GetReference(this.suffix.Span); - ref int pixelStackRef = ref MemoryMarshal.GetReference(this.pixelStack.Span); + ref int prefixRef = ref MemoryMarshal.GetReference(this.prefix.GetSpan()); + ref int suffixRef = ref MemoryMarshal.GetReference(this.suffix.GetSpan()); + ref int pixelStackRef = ref MemoryMarshal.GetReference(this.pixelStack.GetSpan()); ref byte pixelsRef = ref MemoryMarshal.GetReference(pixels); for (code = 0; code < clearCode; code++) diff --git a/src/ImageSharp/Formats/Gif/LzwEncoder.cs b/src/ImageSharp/Formats/Gif/LzwEncoder.cs index 1dc7e99e83..de9de5e153 100644 --- a/src/ImageSharp/Formats/Gif/LzwEncoder.cs +++ b/src/ImageSharp/Formats/Gif/LzwEncoder.cs @@ -5,7 +5,7 @@ using System.IO; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; namespace SixLabors.ImageSharp.Formats.Gif { @@ -168,16 +168,16 @@ internal sealed class LzwEncoder : IDisposable /// /// Initializes a new instance of the class. /// - /// The to use for buffer allocations. + /// The to use for buffer allocations. /// The array of indexed pixels. /// The color depth in bits. - public LzwEncoder(MemoryManager memoryManager, byte[] indexedPixels, int colorDepth) + public LzwEncoder(MemoryAllocator memoryAllocator, byte[] indexedPixels, int colorDepth) { this.pixelArray = indexedPixels; this.initialCodeSize = Math.Max(2, colorDepth); - this.hashTable = memoryManager.Allocate(HashSize, true); - this.codeTable = memoryManager.Allocate(HashSize, true); + this.hashTable = memoryAllocator.Allocate(HashSize, true); + this.codeTable = memoryAllocator.Allocate(HashSize, true); } /// @@ -246,7 +246,7 @@ private void ClearBlock(Stream stream) [MethodImpl(MethodImplOptions.AggressiveInlining)] private void ResetCodeTable() { - this.hashTable.Span.Fill(-1); + this.hashTable.GetSpan().Fill(-1); } /// @@ -293,8 +293,8 @@ private void Compress(int intialBits, Stream stream) this.Output(this.clearCode, stream); - ref int hashTableRef = ref MemoryMarshal.GetReference(this.hashTable.Span); - ref int codeTableRef = ref MemoryMarshal.GetReference(this.codeTable.Span); + ref int hashTableRef = ref MemoryMarshal.GetReference(this.hashTable.GetSpan()); + ref int codeTableRef = ref MemoryMarshal.GetReference(this.codeTable.GetSpan()); while (this.position < this.pixelArray.Length) { diff --git a/src/ImageSharp/Formats/Jpeg/Components/Block8x8F.CopyTo.cs b/src/ImageSharp/Formats/Jpeg/Components/Block8x8F.CopyTo.cs index 43cc3e9dba..4db6d74317 100644 --- a/src/ImageSharp/Formats/Jpeg/Components/Block8x8F.CopyTo.cs +++ b/src/ImageSharp/Formats/Jpeg/Components/Block8x8F.CopyTo.cs @@ -4,7 +4,7 @@ using System.Numerics; using System.Runtime.CompilerServices; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; // ReSharper disable InconsistentNaming namespace SixLabors.ImageSharp.Formats.Jpeg.Components diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.cs index 080bf83338..11b5c60d15 100644 --- a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.cs +++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.cs @@ -7,7 +7,7 @@ using System.Numerics; using SixLabors.ImageSharp.Common.Tuples; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters { diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/IJpegComponent.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/IJpegComponent.cs index efa746819d..253b20c39c 100644 --- a/src/ImageSharp/Formats/Jpeg/Components/Decoder/IJpegComponent.cs +++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/IJpegComponent.cs @@ -1,7 +1,7 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegBlockPostProcessor.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegBlockPostProcessor.cs index b586d520a6..2baefff9b6 100644 --- a/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegBlockPostProcessor.cs +++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegBlockPostProcessor.cs @@ -3,7 +3,7 @@ using System.Runtime.InteropServices; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegComponentPostProcessor.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegComponentPostProcessor.cs index fe18f8438c..2b442fcdc9 100644 --- a/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegComponentPostProcessor.cs +++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegComponentPostProcessor.cs @@ -3,7 +3,7 @@ using System; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder @@ -26,11 +26,11 @@ internal class JpegComponentPostProcessor : IDisposable /// /// Initializes a new instance of the class. /// - public JpegComponentPostProcessor(MemoryManager memoryManager, JpegImagePostProcessor imagePostProcessor, IJpegComponent component) + public JpegComponentPostProcessor(MemoryAllocator memoryAllocator, JpegImagePostProcessor imagePostProcessor, IJpegComponent component) { this.Component = component; this.ImagePostProcessor = imagePostProcessor; - this.ColorBuffer = memoryManager.Allocate2D( + this.ColorBuffer = memoryAllocator.Allocate2D( imagePostProcessor.PostProcessorBufferSize.Width, imagePostProcessor.PostProcessorBufferSize.Height); diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegImagePostProcessor.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegImagePostProcessor.cs index 38340b2380..99408cf576 100644 --- a/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegImagePostProcessor.cs +++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegImagePostProcessor.cs @@ -4,12 +4,10 @@ using System; using System.Linq; using System.Numerics; - using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.Memory; using SixLabors.Primitives; - using JpegColorConverter = SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters.JpegColorConverter; namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder @@ -49,17 +47,17 @@ internal class JpegImagePostProcessor : IDisposable /// /// Initializes a new instance of the class. /// - /// The to use for buffer allocations. + /// The to use for buffer allocations. /// The representing the uncompressed spectral Jpeg data - public JpegImagePostProcessor(MemoryManager memoryManager, IRawJpegData rawJpeg) + public JpegImagePostProcessor(MemoryAllocator memoryAllocator, IRawJpegData rawJpeg) { this.RawJpeg = rawJpeg; IJpegComponent c0 = rawJpeg.Components.First(); this.NumberOfPostProcessorSteps = c0.SizeInBlocks.Height / BlockRowsPerStep; this.PostProcessorBufferSize = new Size(c0.SizeInBlocks.Width * 8, PixelRowsPerStep); - this.ComponentProcessors = rawJpeg.Components.Select(c => new JpegComponentPostProcessor(memoryManager, this, c)).ToArray(); - this.rgbaBuffer = memoryManager.Allocate(rawJpeg.ImageSizeInPixels.Width); + this.ComponentProcessors = rawJpeg.Components.Select(c => new JpegComponentPostProcessor(memoryAllocator, this, c)).ToArray(); + this.rgbaBuffer = memoryAllocator.Allocate(rawJpeg.ImageSizeInPixels.Width); this.colorConverter = JpegColorConverter.GetConverter(rawJpeg.ColorSpace); } @@ -155,11 +153,11 @@ private void ConvertColorsInto(ImageFrame destination) int y = yy - this.PixelRowCounter; var values = new JpegColorConverter.ComponentValues(buffers, y); - this.colorConverter.ConvertToRgba(values, this.rgbaBuffer.Span); + this.colorConverter.ConvertToRgba(values, this.rgbaBuffer.GetSpan()); Span destRow = destination.GetPixelRowSpan(yy); - PixelOperations.Instance.PackFromVector4(this.rgbaBuffer.Span, destRow, destination.Width); + PixelOperations.Instance.PackFromVector4(this.rgbaBuffer.GetSpan(), destRow, destination.Width); } } } diff --git a/src/ImageSharp/Formats/Jpeg/Components/GenericBlock8x8.cs b/src/ImageSharp/Formats/Jpeg/Components/GenericBlock8x8.cs index 9aceb78b2a..825a7f5f0e 100644 --- a/src/ImageSharp/Formats/Jpeg/Components/GenericBlock8x8.cs +++ b/src/ImageSharp/Formats/Jpeg/Components/GenericBlock8x8.cs @@ -4,10 +4,9 @@ using System; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; - using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.Memory; // ReSharper disable InconsistentNaming namespace SixLabors.ImageSharp.Formats.Jpeg.Components diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangComponent.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangComponent.cs index bb3bd01aa3..75cea5551f 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangComponent.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangComponent.cs @@ -6,7 +6,7 @@ using SixLabors.ImageSharp.Formats.Jpeg.Components; using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder @@ -56,9 +56,9 @@ public GolangComponent(byte identifier, int index) /// /// Initializes /// - /// The to use for buffer allocations. + /// The to use for buffer allocations. /// The instance - public void InitializeDerivedData(MemoryManager memoryManager, GolangJpegDecoderCore decoder) + public void InitializeDerivedData(MemoryAllocator memoryAllocator, GolangJpegDecoderCore decoder) { // For 4-component images (either CMYK or YCbCrK), we only support two // hv vectors: [0x11 0x11 0x11 0x11] and [0x22 0x11 0x11 0x22]. @@ -81,7 +81,7 @@ public void InitializeDerivedData(MemoryManager memoryManager, GolangJpegDecoder this.SubSamplingDivisors = c0.SamplingFactors.DivideBy(this.SamplingFactors); } - this.SpectralBlocks = memoryManager.Allocate2D(this.SizeInBlocks.Width, this.SizeInBlocks.Height, true); + this.SpectralBlocks = memoryAllocator.Allocate2D(this.SizeInBlocks.Width, this.SizeInBlocks.Height, true); } /// diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/GolangJpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/GolangJpegDecoderCore.cs index 86f97d2248..34a6e2f0fd 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/GolangJpegDecoderCore.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/GolangJpegDecoderCore.cs @@ -705,7 +705,7 @@ private void ProcessStartOfFrameMarker(int remaining, bool metadataOnly) foreach (GolangComponent component in this.Components) { - component.InitializeDerivedData(this.configuration.MemoryManager, this); + component.InitializeDerivedData(this.configuration.MemoryAllocator, this); } } } @@ -812,7 +812,7 @@ private JpegColorSpace DeduceJpegColorSpace() private Image PostProcessIntoImage() where TPixel : struct, IPixel { - using (var postProcessor = new JpegImagePostProcessor(this.configuration.MemoryManager, this)) + using (var postProcessor = new JpegImagePostProcessor(this.configuration.MemoryAllocator, this)) { var image = new Image(this.configuration, this.ImageWidth, this.ImageHeight, this.MetaData); postProcessor.PostProcess(image.Frames.RootFrame); diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/DoubleBufferedStreamReader.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/DoubleBufferedStreamReader.cs index eb91590e81..7aeee43c2e 100644 --- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/DoubleBufferedStreamReader.cs +++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/DoubleBufferedStreamReader.cs @@ -5,7 +5,7 @@ using System.IO; using System.Runtime.CompilerServices; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; // TODO: This could be useful elsewhere. namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components @@ -38,13 +38,13 @@ internal class DoubleBufferedStreamReader : IDisposable /// /// Initializes a new instance of the class. /// - /// The to use for buffer allocations. + /// The to use for buffer allocations. /// The input stream. - public DoubleBufferedStreamReader(MemoryManager memoryManager, Stream stream) + public DoubleBufferedStreamReader(MemoryAllocator memoryAllocator, Stream stream) { this.stream = stream; this.length = (int)stream.Length; - this.managedBuffer = memoryManager.AllocateCleanManagedByteBuffer(ChunkLength); + this.managedBuffer = memoryAllocator.AllocateCleanManagedByteBuffer(ChunkLength); this.bufferChunk = this.managedBuffer.Array; } diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrameComponent.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrameComponent.cs index ccbb5c6c01..eefe8b97ea 100644 --- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrameComponent.cs +++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrameComponent.cs @@ -7,7 +7,7 @@ using SixLabors.ImageSharp.Formats.Jpeg.Components; using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components @@ -17,11 +17,11 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components /// internal class PdfJsFrameComponent : IDisposable, IJpegComponent { - private readonly MemoryManager memoryManager; + private readonly MemoryAllocator memoryAllocator; - public PdfJsFrameComponent(MemoryManager memoryManager, PdfJsFrame frame, byte id, int horizontalFactor, int verticalFactor, byte quantizationTableIndex, int index) + public PdfJsFrameComponent(MemoryAllocator memoryAllocator, PdfJsFrame frame, byte id, int horizontalFactor, int verticalFactor, byte quantizationTableIndex, int index) { - this.memoryManager = memoryManager; + this.memoryAllocator = memoryAllocator; this.Frame = frame; this.Id = id; this.HorizontalSamplingFactor = horizontalFactor; @@ -129,14 +129,14 @@ public void Init() this.SubSamplingDivisors = c0.SamplingFactors.DivideBy(this.SamplingFactors); } - this.SpectralBlocks = this.memoryManager.Allocate2D(blocksPerColumnForMcu, blocksPerLineForMcu + 1, true); + this.SpectralBlocks = this.memoryAllocator.Allocate2D(blocksPerColumnForMcu, blocksPerLineForMcu + 1, true); } [MethodImpl(MethodImplOptions.AggressiveInlining)] public ref Block8x8 GetBlockReference(int column, int row) { int offset = ((this.WidthInBlocks + 1) * row) + column; - return ref Unsafe.Add(ref MemoryMarshal.GetReference(this.SpectralBlocks.Span), offset); + return ref Unsafe.Add(ref MemoryMarshal.GetReference(this.SpectralBlocks.GetSpan()), offset); } [MethodImpl(MethodImplOptions.AggressiveInlining)] diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs index 875a862638..2789f0cc00 100644 --- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs +++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs @@ -4,7 +4,7 @@ using System; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components { @@ -37,17 +37,17 @@ internal unsafe struct PdfJsHuffmanTable /// /// Initializes a new instance of the struct. /// - /// The to use for buffer allocations. + /// The to use for buffer allocations. /// The code lengths /// The huffman values - public PdfJsHuffmanTable(MemoryManager memoryManager, ReadOnlySpan lengths, ReadOnlySpan values) + public PdfJsHuffmanTable(MemoryAllocator memoryAllocator, ReadOnlySpan lengths, ReadOnlySpan values) { const int length = 257; - using (IBuffer huffsize = memoryManager.Allocate(length)) - using (IBuffer huffcode = memoryManager.Allocate(length)) + using (IBuffer huffsize = memoryAllocator.Allocate(length)) + using (IBuffer huffcode = memoryAllocator.Allocate(length)) { - ref short huffsizeRef = ref MemoryMarshal.GetReference(huffsize.Span); - ref short huffcodeRef = ref MemoryMarshal.GetReference(huffcode.Span); + ref short huffsizeRef = ref MemoryMarshal.GetReference(huffsize.GetSpan()); + ref short huffcodeRef = ref MemoryMarshal.GetReference(huffcode.GetSpan()); GenerateSizeTable(lengths, ref huffsizeRef); GenerateCodeTable(ref huffsizeRef, ref huffcodeRef, length); diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsScanDecoder.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsScanDecoder.cs index 49bc105391..c9f1c555d8 100644 --- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsScanDecoder.cs +++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsScanDecoder.cs @@ -2,13 +2,14 @@ // Licensed under the Apache License, Version 2.0. using System; + #if DEBUG using System.Diagnostics; #endif using System.Runtime.CompilerServices; using System.Runtime.InteropServices; - using SixLabors.ImageSharp.Formats.Jpeg.Components; +using SixLabors.Memory; namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components { @@ -166,7 +167,7 @@ private void DecodeScanBaseline( if (componentsLength == 1) { PdfJsFrameComponent component = components[this.compIndex]; - ref short blockDataRef = ref MemoryMarshal.GetReference(MemoryMarshal.Cast(component.SpectralBlocks.Span)); + ref short blockDataRef = ref MemoryMarshal.GetReference(MemoryMarshal.Cast(component.SpectralBlocks.GetSpan())); ref PdfJsHuffmanTable dcHuffmanTable = ref dcHuffmanTables[component.DCHuffmanTableId]; ref PdfJsHuffmanTable acHuffmanTable = ref acHuffmanTables[component.ACHuffmanTableId]; @@ -188,7 +189,7 @@ private void DecodeScanBaseline( for (int i = 0; i < componentsLength; i++) { PdfJsFrameComponent component = components[i]; - ref short blockDataRef = ref MemoryMarshal.GetReference(MemoryMarshal.Cast(component.SpectralBlocks.Span)); + ref short blockDataRef = ref MemoryMarshal.GetReference(MemoryMarshal.Cast(component.SpectralBlocks.GetSpan())); ref PdfJsHuffmanTable dcHuffmanTable = ref dcHuffmanTables[component.DCHuffmanTableId]; ref PdfJsHuffmanTable acHuffmanTable = ref acHuffmanTables[component.ACHuffmanTableId]; int h = component.HorizontalSamplingFactor; @@ -224,7 +225,7 @@ private void DecodeScanProgressive( if (componentsLength == 1) { PdfJsFrameComponent component = components[this.compIndex]; - ref short blockDataRef = ref MemoryMarshal.GetReference(MemoryMarshal.Cast(component.SpectralBlocks.Span)); + ref short blockDataRef = ref MemoryMarshal.GetReference(MemoryMarshal.Cast(component.SpectralBlocks.GetSpan())); ref PdfJsHuffmanTable huffmanTable = ref huffmanTables[isAC ? component.ACHuffmanTableId : component.DCHuffmanTableId]; for (int n = 0; n < this.mcuToRead; n++) @@ -267,7 +268,7 @@ private void DecodeScanProgressive( for (int i = 0; i < componentsLength; i++) { PdfJsFrameComponent component = components[i]; - ref short blockDataRef = ref MemoryMarshal.GetReference(MemoryMarshal.Cast(component.SpectralBlocks.Span)); + ref short blockDataRef = ref MemoryMarshal.GetReference(MemoryMarshal.Cast(component.SpectralBlocks.GetSpan())); ref PdfJsHuffmanTable huffmanTable = ref huffmanTables[isAC ? component.ACHuffmanTableId : component.DCHuffmanTableId]; int h = component.HorizontalSamplingFactor; int v = component.VerticalSamplingFactor; diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs index 752e72dd2e..937439ed0b 100644 --- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs +++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs @@ -11,12 +11,12 @@ using SixLabors.ImageSharp.Formats.Jpeg.Components; using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder; using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.MetaData; using SixLabors.ImageSharp.MetaData.Profiles.Exif; using SixLabors.ImageSharp.MetaData.Profiles.Icc; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Primitives; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort @@ -219,7 +219,7 @@ public IImageInfo Identify(Stream stream) public void ParseStream(Stream stream, bool metadataOnly = false) { this.MetaData = new ImageMetaData(); - this.InputStream = new DoubleBufferedStreamReader(this.configuration.MemoryManager, stream); + this.InputStream = new DoubleBufferedStreamReader(this.configuration.MemoryAllocator, stream); // Check for the Start Of Image marker. this.InputStream.Read(this.markerBuffer, 0, 2); @@ -675,7 +675,7 @@ private void ProcessStartOfFrameMarker(int remaining, PdfJsFileMarker frameMarke maxV = v; } - var component = new PdfJsFrameComponent(this.configuration.MemoryManager, this.Frame, this.temp[index], h, v, this.temp[index + 2], i); + var component = new PdfJsFrameComponent(this.configuration.MemoryAllocator, this.Frame, this.temp[index], h, v, this.temp[index + 2], i); this.Frame.Components[i] = component; this.Frame.ComponentIds[i] = component.Id; @@ -703,17 +703,17 @@ private void ProcessDefineHuffmanTablesMarker(int remaining) throw new ImageFormatException($"DHT has wrong length: {remaining}"); } - using (IManagedByteBuffer huffmanData = this.configuration.MemoryManager.AllocateCleanManagedByteBuffer(256)) + using (IManagedByteBuffer huffmanData = this.configuration.MemoryAllocator.AllocateCleanManagedByteBuffer(256)) { - ref byte huffmanDataRef = ref MemoryMarshal.GetReference(huffmanData.Span); + ref byte huffmanDataRef = ref MemoryMarshal.GetReference(huffmanData.GetSpan()); for (int i = 2; i < remaining;) { byte huffmanTableSpec = (byte)this.InputStream.ReadByte(); this.InputStream.Read(huffmanData.Array, 0, 16); - using (IManagedByteBuffer codeLengths = this.configuration.MemoryManager.AllocateCleanManagedByteBuffer(17)) + using (IManagedByteBuffer codeLengths = this.configuration.MemoryAllocator.AllocateCleanManagedByteBuffer(17)) { - ref byte codeLengthsRef = ref MemoryMarshal.GetReference(codeLengths.Span); + ref byte codeLengthsRef = ref MemoryMarshal.GetReference(codeLengths.GetSpan()); int codeLengthSum = 0; for (int j = 1; j < 17; j++) @@ -721,7 +721,7 @@ private void ProcessDefineHuffmanTablesMarker(int remaining) codeLengthSum += Unsafe.Add(ref codeLengthsRef, j) = Unsafe.Add(ref huffmanDataRef, j - 1); } - using (IManagedByteBuffer huffmanValues = this.configuration.MemoryManager.AllocateCleanManagedByteBuffer(256)) + using (IManagedByteBuffer huffmanValues = this.configuration.MemoryAllocator.AllocateCleanManagedByteBuffer(256)) { this.InputStream.Read(huffmanValues.Array, 0, codeLengthSum); @@ -730,8 +730,8 @@ private void ProcessDefineHuffmanTablesMarker(int remaining) this.BuildHuffmanTable( huffmanTableSpec >> 4 == 0 ? this.dcHuffmanTables : this.acHuffmanTables, huffmanTableSpec & 15, - codeLengths.Span, - huffmanValues.Span); + codeLengths.GetSpan(), + huffmanValues.GetSpan()); } } } @@ -817,7 +817,7 @@ private void ProcessStartOfScanMarker() [MethodImpl(MethodImplOptions.AggressiveInlining)] private void BuildHuffmanTable(PdfJsHuffmanTables tables, int index, ReadOnlySpan codeLengths, ReadOnlySpan values) { - tables[index] = new PdfJsHuffmanTable(this.configuration.MemoryManager, codeLengths, values); + tables[index] = new PdfJsHuffmanTable(this.configuration.MemoryAllocator, codeLengths, values); } /// @@ -834,7 +834,7 @@ private ushort ReadUint16() private Image PostProcessIntoImage() where TPixel : struct, IPixel { - using (var postProcessor = new JpegImagePostProcessor(this.configuration.MemoryManager, this)) + using (var postProcessor = new JpegImagePostProcessor(this.configuration.MemoryAllocator, this)) { var image = new Image(this.configuration, this.ImageWidth, this.ImageHeight, this.MetaData); postProcessor.PostProcess(image.Frames.RootFrame); diff --git a/src/ImageSharp/Formats/Png/PngChunk.cs b/src/ImageSharp/Formats/Png/PngChunk.cs index c91f39d7ff..c75f9465af 100644 --- a/src/ImageSharp/Formats/Png/PngChunk.cs +++ b/src/ImageSharp/Formats/Png/PngChunk.cs @@ -1,7 +1,7 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; namespace SixLabors.ImageSharp.Formats.Png { diff --git a/src/ImageSharp/Formats/Png/PngDecoderCore.cs b/src/ImageSharp/Formats/Png/PngDecoderCore.cs index cc98b8450b..67e32f212f 100644 --- a/src/ImageSharp/Formats/Png/PngDecoderCore.cs +++ b/src/ImageSharp/Formats/Png/PngDecoderCore.cs @@ -13,9 +13,9 @@ using SixLabors.ImageSharp.Advanced; using SixLabors.ImageSharp.Formats.Png.Filters; using SixLabors.ImageSharp.Formats.Png.Zlib; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.MetaData; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.Memory; namespace SixLabors.ImageSharp.Formats.Png { @@ -188,7 +188,7 @@ public PngDecoderCore(Configuration configuration, IPngDecoderOptions options) this.ignoreMetadata = options.IgnoreMetadata; } - private MemoryManager MemoryManager => this.configuration.MemoryManager; + private MemoryAllocator MemoryAllocator => this.configuration.MemoryAllocator; /// /// Decodes the stream to the image. @@ -410,8 +410,8 @@ private void InitializeImage(ImageMetaData metadata, out Image i this.bytesPerSample = this.header.BitDepth / 8; } - this.previousScanline = this.MemoryManager.AllocateCleanManagedByteBuffer(this.bytesPerScanline); - this.scanline = this.configuration.MemoryManager.AllocateCleanManagedByteBuffer(this.bytesPerScanline); + this.previousScanline = this.MemoryAllocator.AllocateCleanManagedByteBuffer(this.bytesPerScanline); + this.scanline = this.configuration.MemoryAllocator.AllocateCleanManagedByteBuffer(this.bytesPerScanline); } /// @@ -531,7 +531,7 @@ private void DecodePixelData(Stream compressedStream, ImageFrame } this.currentRowBytesRead = 0; - Span scanlineSpan = this.scanline.Span; + Span scanlineSpan = this.scanline.GetSpan(); var filterType = (FilterType)scanlineSpan[0]; switch (filterType) @@ -546,17 +546,17 @@ private void DecodePixelData(Stream compressedStream, ImageFrame case FilterType.Up: - UpFilter.Decode(scanlineSpan, this.previousScanline.Span); + UpFilter.Decode(scanlineSpan, this.previousScanline.GetSpan()); break; case FilterType.Average: - AverageFilter.Decode(scanlineSpan, this.previousScanline.Span, this.bytesPerPixel); + AverageFilter.Decode(scanlineSpan, this.previousScanline.GetSpan(), this.bytesPerPixel); break; case FilterType.Paeth: - PaethFilter.Decode(scanlineSpan, this.previousScanline.Span, this.bytesPerPixel); + PaethFilter.Decode(scanlineSpan, this.previousScanline.GetSpan(), this.bytesPerPixel); break; default: @@ -639,7 +639,7 @@ private void DecodeInterlacedPixelData(Stream compressedStream, ImageFra } Span rowSpan = image.GetPixelRowSpan(this.currentRow); - this.ProcessInterlacedDefilteredScanline(this.scanline.Span, rowSpan, Adam7FirstColumn[this.pass], Adam7ColumnIncrement[this.pass]); + this.ProcessInterlacedDefilteredScanline(this.scanline.GetSpan(), rowSpan, Adam7FirstColumn[this.pass], Adam7ColumnIncrement[this.pass]); this.SwapBuffers(); @@ -727,11 +727,11 @@ private void ProcessDefilteredScanline(ReadOnlySpan defilteredScan if (this.header.BitDepth == 16) { int length = this.header.Width * 3; - using (IBuffer compressed = this.configuration.MemoryManager.Allocate(length)) + using (IBuffer compressed = this.configuration.MemoryAllocator.Allocate(length)) { // TODO: Should we use pack from vector here instead? - this.From16BitTo8Bit(scanlineBuffer, compressed.Span, length); - PixelOperations.Instance.PackFromRgb24Bytes(compressed.Span, rowSpan, this.header.Width); + this.From16BitTo8Bit(scanlineBuffer, compressed.GetSpan(), length); + PixelOperations.Instance.PackFromRgb24Bytes(compressed.GetSpan(), rowSpan, this.header.Width); } } else @@ -744,12 +744,12 @@ private void ProcessDefilteredScanline(ReadOnlySpan defilteredScan if (this.header.BitDepth == 16) { int length = this.header.Width * 3; - using (IBuffer compressed = this.configuration.MemoryManager.Allocate(length)) + using (IBuffer compressed = this.configuration.MemoryAllocator.Allocate(length)) { // TODO: Should we use pack from vector here instead? - this.From16BitTo8Bit(scanlineBuffer, compressed.Span, length); + this.From16BitTo8Bit(scanlineBuffer, compressed.GetSpan(), length); - Span rgb24Span = MemoryMarshal.Cast(compressed.Span); + Span rgb24Span = MemoryMarshal.Cast(compressed.GetSpan()); for (int x = 0; x < this.header.Width; x++) { ref Rgb24 rgb24 = ref rgb24Span[x]; @@ -785,11 +785,11 @@ private void ProcessDefilteredScanline(ReadOnlySpan defilteredScan if (this.header.BitDepth == 16) { int length = this.header.Width * 4; - using (IBuffer compressed = this.configuration.MemoryManager.Allocate(length)) + using (IBuffer compressed = this.configuration.MemoryAllocator.Allocate(length)) { // TODO: Should we use pack from vector here instead? - this.From16BitTo8Bit(scanlineBuffer, compressed.Span, length); - PixelOperations.Instance.PackFromRgba32Bytes(compressed.Span, rowSpan, this.header.Width); + this.From16BitTo8Bit(scanlineBuffer, compressed.GetSpan(), length); + PixelOperations.Instance.PackFromRgba32Bytes(compressed.GetSpan(), rowSpan, this.header.Width); } } else @@ -984,9 +984,9 @@ private void ProcessInterlacedDefilteredScanline(ReadOnlySpan defi if (this.header.BitDepth == 16) { int length = this.header.Width * 3; - using (IBuffer compressed = this.configuration.MemoryManager.Allocate(length)) + using (IBuffer compressed = this.configuration.MemoryAllocator.Allocate(length)) { - Span compressedSpan = compressed.Span; + Span compressedSpan = compressed.GetSpan(); // TODO: Should we use pack from vector here instead? this.From16BitTo8Bit(scanlineBuffer, compressedSpan, length); @@ -1054,9 +1054,9 @@ private void ProcessInterlacedDefilteredScanline(ReadOnlySpan defi if (this.header.BitDepth == 16) { int length = this.header.Width * 4; - using (IBuffer compressed = this.configuration.MemoryManager.Allocate(length)) + using (IBuffer compressed = this.configuration.MemoryAllocator.Allocate(length)) { - Span compressedSpan = compressed.Span; + Span compressedSpan = compressed.GetSpan(); // TODO: Should we use pack from vector here instead? this.From16BitTo8Bit(scanlineBuffer, compressedSpan, length); @@ -1229,7 +1229,7 @@ private void ValidateChunk(in PngChunk chunk) { this.crc.Reset(); this.crc.Update(this.chunkTypeBuffer); - this.crc.Update(chunk.Data.Span); + this.crc.Update(chunk.Data.GetSpan()); if (this.crc.Value != chunk.Crc) { @@ -1273,7 +1273,7 @@ private void SkipChunkDataAndCrc(in PngChunk chunk) private IManagedByteBuffer ReadChunkData(int length) { // We rent the buffer here to return it afterwards in Decode() - IManagedByteBuffer buffer = this.configuration.MemoryManager.AllocateCleanManagedByteBuffer(length); + IManagedByteBuffer buffer = this.configuration.MemoryAllocator.AllocateCleanManagedByteBuffer(length); this.currentStream.Read(buffer.Array, 0, length); diff --git a/src/ImageSharp/Formats/Png/PngEncoder.cs b/src/ImageSharp/Formats/Png/PngEncoder.cs index b39a6353ec..fab1b51850 100644 --- a/src/ImageSharp/Formats/Png/PngEncoder.cs +++ b/src/ImageSharp/Formats/Png/PngEncoder.cs @@ -63,7 +63,7 @@ public sealed class PngEncoder : IImageEncoder, IPngEncoderOptions public void Encode(Image image, Stream stream) where TPixel : struct, IPixel { - using (var encoder = new PngEncoderCore(image.GetMemoryManager(), this)) + using (var encoder = new PngEncoderCore(image.GetMemoryAllocator(), this)) { encoder.Encode(image, stream); } diff --git a/src/ImageSharp/Formats/Png/PngEncoderCore.cs b/src/ImageSharp/Formats/Png/PngEncoderCore.cs index f17c9009a6..7ec82c57c8 100644 --- a/src/ImageSharp/Formats/Png/PngEncoderCore.cs +++ b/src/ImageSharp/Formats/Png/PngEncoderCore.cs @@ -8,9 +8,9 @@ using SixLabors.ImageSharp.Advanced; using SixLabors.ImageSharp.Formats.Png.Filters; using SixLabors.ImageSharp.Formats.Png.Zlib; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing.Quantization; +using SixLabors.Memory; namespace SixLabors.ImageSharp.Formats.Png { @@ -19,7 +19,7 @@ namespace SixLabors.ImageSharp.Formats.Png /// internal sealed class PngEncoderCore : IDisposable { - private readonly MemoryManager memoryManager; + private readonly MemoryAllocator memoryAllocator; /// /// The maximum block size, defaults at 64k for uncompressed blocks. @@ -144,11 +144,11 @@ internal sealed class PngEncoderCore : IDisposable /// /// Initializes a new instance of the class. /// - /// The to use for buffer allocations. + /// The to use for buffer allocations. /// The options for influencing the encoder - public PngEncoderCore(MemoryManager memoryManager, IPngEncoderOptions options) + public PngEncoderCore(MemoryAllocator memoryAllocator, IPngEncoderOptions options) { - this.memoryManager = memoryManager; + this.memoryAllocator = memoryAllocator; this.pngColorType = options.PngColorType; this.pngFilterMethod = options.PngFilterMethod; this.compressionLevel = options.CompressionLevel; @@ -283,11 +283,11 @@ private void CollectTPixelBytes(ReadOnlySpan rowSpan) { if (this.bytesPerPixel == 4) { - PixelOperations.Instance.ToRgba32Bytes(rowSpan, this.rawScanline.Span, this.width); + PixelOperations.Instance.ToRgba32Bytes(rowSpan, this.rawScanline.GetSpan(), this.width); } else { - PixelOperations.Instance.ToRgb24Bytes(rowSpan, this.rawScanline.Span, this.width); + PixelOperations.Instance.ToRgb24Bytes(rowSpan, this.rawScanline.GetSpan(), this.width); } } @@ -320,23 +320,23 @@ private IManagedByteBuffer EncodePixelRow(ReadOnlySpan rowSpan, switch (this.pngFilterMethod) { case PngFilterMethod.None: - NoneFilter.Encode(this.rawScanline.Span, this.result.Span); + NoneFilter.Encode(this.rawScanline.GetSpan(), this.result.GetSpan()); return this.result; case PngFilterMethod.Sub: - SubFilter.Encode(this.rawScanline.Span, this.sub.Span, this.bytesPerPixel, out int _); + SubFilter.Encode(this.rawScanline.GetSpan(), this.sub.GetSpan(), this.bytesPerPixel, out int _); return this.sub; case PngFilterMethod.Up: - UpFilter.Encode(this.rawScanline.Span, this.previousScanline.Span, this.up.Span, out int _); + UpFilter.Encode(this.rawScanline.GetSpan(), this.previousScanline.GetSpan(), this.up.GetSpan(), out int _); return this.up; case PngFilterMethod.Average: - AverageFilter.Encode(this.rawScanline.Span, this.previousScanline.Span, this.average.Span, this.bytesPerPixel, out int _); + AverageFilter.Encode(this.rawScanline.GetSpan(), this.previousScanline.GetSpan(), this.average.GetSpan(), this.bytesPerPixel, out int _); return this.average; case PngFilterMethod.Paeth: - PaethFilter.Encode(this.rawScanline.Span, this.previousScanline.Span, this.paeth.Span, this.bytesPerPixel, out int _); + PaethFilter.Encode(this.rawScanline.GetSpan(), this.previousScanline.GetSpan(), this.paeth.GetSpan(), this.bytesPerPixel, out int _); return this.paeth; default: @@ -354,21 +354,21 @@ private IManagedByteBuffer GetOptimalFilteredScanline() // Palette images don't compress well with adaptive filtering. if (this.pngColorType == PngColorType.Palette || this.bitDepth < 8) { - NoneFilter.Encode(this.rawScanline.Span, this.result.Span); + NoneFilter.Encode(this.rawScanline.GetSpan(), this.result.GetSpan()); return this.result; } - Span scanSpan = this.rawScanline.Span; - Span prevSpan = this.previousScanline.Span; + Span scanSpan = this.rawScanline.GetSpan(); + Span prevSpan = this.previousScanline.GetSpan(); // This order, while different to the enumerated order is more likely to produce a smaller sum // early on which shaves a couple of milliseconds off the processing time. - UpFilter.Encode(scanSpan, prevSpan, this.up.Span, out int currentSum); + UpFilter.Encode(scanSpan, prevSpan, this.up.GetSpan(), out int currentSum); int lowestSum = currentSum; IManagedByteBuffer actualResult = this.up; - PaethFilter.Encode(scanSpan, prevSpan, this.paeth.Span, this.bytesPerPixel, out currentSum); + PaethFilter.Encode(scanSpan, prevSpan, this.paeth.GetSpan(), this.bytesPerPixel, out currentSum); if (currentSum < lowestSum) { @@ -376,7 +376,7 @@ private IManagedByteBuffer GetOptimalFilteredScanline() actualResult = this.paeth; } - SubFilter.Encode(scanSpan, this.sub.Span, this.bytesPerPixel, out currentSum); + SubFilter.Encode(scanSpan, this.sub.GetSpan(), this.bytesPerPixel, out currentSum); if (currentSum < lowestSum) { @@ -384,7 +384,7 @@ private IManagedByteBuffer GetOptimalFilteredScanline() actualResult = this.sub; } - AverageFilter.Encode(scanSpan, prevSpan, this.average.Span, this.bytesPerPixel, out currentSum); + AverageFilter.Encode(scanSpan, prevSpan, this.average.GetSpan(), this.bytesPerPixel, out currentSum); if (currentSum < lowestSum) { @@ -460,11 +460,11 @@ private void WritePaletteChunk(Stream stream, in PngHeader header, Quant Rgba32 rgba = default; bool anyAlpha = false; - using (IManagedByteBuffer colorTable = this.memoryManager.AllocateManagedByteBuffer(colorTableLength)) - using (IManagedByteBuffer alphaTable = this.memoryManager.AllocateManagedByteBuffer(pixelCount)) + using (IManagedByteBuffer colorTable = this.memoryAllocator.AllocateManagedByteBuffer(colorTableLength)) + using (IManagedByteBuffer alphaTable = this.memoryAllocator.AllocateManagedByteBuffer(pixelCount)) { - Span colorTableSpan = colorTable.Span; - Span alphaTableSpan = alphaTable.Span; + Span colorTableSpan = colorTable.GetSpan(); + Span alphaTableSpan = alphaTable.GetSpan(); for (byte i = 0; i < pixelCount; i++) { @@ -552,16 +552,16 @@ private void WriteDataChunks(ImageFrame pixels, Stream stream) this.bytesPerScanline = this.width * this.bytesPerPixel; int resultLength = this.bytesPerScanline + 1; - this.previousScanline = this.memoryManager.AllocateCleanManagedByteBuffer(this.bytesPerScanline); - this.rawScanline = this.memoryManager.AllocateCleanManagedByteBuffer(this.bytesPerScanline); - this.result = this.memoryManager.AllocateCleanManagedByteBuffer(resultLength); + this.previousScanline = this.memoryAllocator.AllocateCleanManagedByteBuffer(this.bytesPerScanline); + this.rawScanline = this.memoryAllocator.AllocateCleanManagedByteBuffer(this.bytesPerScanline); + this.result = this.memoryAllocator.AllocateCleanManagedByteBuffer(resultLength); if (this.pngColorType != PngColorType.Palette) { - this.sub = this.memoryManager.AllocateCleanManagedByteBuffer(resultLength); - this.up = this.memoryManager.AllocateCleanManagedByteBuffer(resultLength); - this.average = this.memoryManager.AllocateCleanManagedByteBuffer(resultLength); - this.paeth = this.memoryManager.AllocateCleanManagedByteBuffer(resultLength); + this.sub = this.memoryAllocator.AllocateCleanManagedByteBuffer(resultLength); + this.up = this.memoryAllocator.AllocateCleanManagedByteBuffer(resultLength); + this.average = this.memoryAllocator.AllocateCleanManagedByteBuffer(resultLength); + this.paeth = this.memoryAllocator.AllocateCleanManagedByteBuffer(resultLength); } byte[] buffer; diff --git a/src/ImageSharp/Image.Decode.cs b/src/ImageSharp/Image.Decode.cs index 6b44c893bc..443ae6a373 100644 --- a/src/ImageSharp/Image.Decode.cs +++ b/src/ImageSharp/Image.Decode.cs @@ -4,8 +4,8 @@ using System.IO; using System.Linq; using SixLabors.ImageSharp.Formats; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.Memory; namespace SixLabors.ImageSharp { @@ -29,12 +29,12 @@ private static IImageFormat InternalDetectFormat(Stream stream, Configuration co return null; } - using (IManagedByteBuffer buffer = config.MemoryManager.AllocateManagedByteBuffer(maxHeaderSize)) + using (IManagedByteBuffer buffer = config.MemoryAllocator.AllocateManagedByteBuffer(maxHeaderSize)) { long startPosition = stream.Position; stream.Read(buffer.Array, 0, maxHeaderSize); stream.Position = startPosition; - return config.ImageFormatsManager.FormatDetectors.Select(x => x.DetectFormat(buffer.Span)).LastOrDefault(x => x != null); + return config.ImageFormatsManager.FormatDetectors.Select(x => x.DetectFormat(buffer.GetSpan())).LastOrDefault(x => x != null); } } diff --git a/src/ImageSharp/Image.WrapMemory.cs b/src/ImageSharp/Image.WrapMemory.cs new file mode 100644 index 0000000000..3988120e66 --- /dev/null +++ b/src/ImageSharp/Image.WrapMemory.cs @@ -0,0 +1,59 @@ +// Copyright (c) Six Labors and contributors. +// Licensed under the Apache License, Version 2.0. + +using System; +using SixLabors.ImageSharp.MetaData; +using SixLabors.ImageSharp.PixelFormats; +using SixLabors.Memory; + +namespace SixLabors.ImageSharp +{ + /// + /// Adds static methods allowing wrapping an existing memory area as an image. + /// + public static partial class Image + { + // TODO: This is a WIP API, should be public when finished. + + /// + /// Wraps an existing contigous memory area of 'width'x'height' pixels, + /// allowing to view/manipulate it as an ImageSharp instance. + /// + /// The pixel type + /// The + /// The pixel memory + /// The width of the memory image + /// The height of the memory image + /// The + /// An instance + internal static Image WrapMemory( + Configuration config, + Memory pixelMemory, + int width, + int height, + ImageMetaData metaData) + where TPixel : struct, IPixel + { + var buffer = new ConsumedBuffer(pixelMemory); + return new Image(config, buffer, width, height, metaData); + } + + /// + /// Wraps an existing contigous memory area of 'width'x'height' pixels, + /// allowing to view/manipulate it as an ImageSharp instance. + /// + /// The pixel type + /// The pixel memory + /// The width of the memory image + /// The height of the memory image + /// An instance + internal static Image WrapMemory( + Memory pixelMemory, + int width, + int height) + where TPixel : struct, IPixel + { + return WrapMemory(Configuration.Default, pixelMemory, width, height, new ImageMetaData()); + } + } +} \ No newline at end of file diff --git a/src/ImageSharp/ImageFrameCollection.cs b/src/ImageSharp/ImageFrameCollection.cs index c101b48d30..14a16b691e 100644 --- a/src/ImageSharp/ImageFrameCollection.cs +++ b/src/ImageSharp/ImageFrameCollection.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using SixLabors.ImageSharp.Advanced; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.Memory; namespace SixLabors.ImageSharp { @@ -29,6 +30,16 @@ internal ImageFrameCollection(Image parent, int width, int height, TPixe this.frames.Add(new ImageFrame(parent.GetConfiguration(), width, height, backgroundColor)); } + internal ImageFrameCollection(Image parent, int width, int height, IBuffer consumedBuffer) + { + Guard.NotNull(parent, nameof(parent)); + + this.parent = parent; + + // Frames are already cloned within the caller + this.frames.Add(new ImageFrame(parent.GetConfiguration(), width, height, consumedBuffer)); + } + internal ImageFrameCollection(Image parent, IEnumerable> frames) { Guard.NotNull(parent, nameof(parent)); diff --git a/src/ImageSharp/ImageFrame{TPixel}.cs b/src/ImageSharp/ImageFrame{TPixel}.cs index 0caacd8a8d..4fb09f0a96 100644 --- a/src/ImageSharp/ImageFrame{TPixel}.cs +++ b/src/ImageSharp/ImageFrame{TPixel}.cs @@ -6,9 +6,9 @@ using System.Runtime.CompilerServices; using System.Threading.Tasks; using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.MetaData; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp @@ -53,7 +53,7 @@ internal ImageFrame(Configuration configuration, Size size, ImageFrameMetaData m /// The height of the image in pixels. /// The meta data. internal ImageFrame(Configuration configuration, int width, int height, ImageFrameMetaData metaData) - : this(configuration, width, height, default, metaData) + : this(configuration, width, height, default(TPixel), metaData) { } @@ -85,12 +85,41 @@ internal ImageFrame(Configuration configuration, int width, int height, TPixel b Guard.NotNull(metaData, nameof(metaData)); this.configuration = configuration; - this.MemoryManager = configuration.MemoryManager; - this.PixelBuffer = this.MemoryManager.Allocate2D(width, height, false); + this.MemoryAllocator = configuration.MemoryAllocator; + this.PixelBuffer = this.MemoryAllocator.Allocate2D(width, height, false); this.MetaData = metaData; this.Clear(configuration.ParallelOptions, backgroundColor); } + /// + /// Initializes a new instance of the class wrapping an existing buffer. + /// + internal ImageFrame(Configuration configuration, int width, int height, IBuffer consumedBuffer) + : this(configuration, width, height, consumedBuffer, new ImageFrameMetaData()) + { + } + + /// + /// Initializes a new instance of the class wrapping an existing buffer. + /// + internal ImageFrame( + Configuration configuration, + int width, + int height, + IBuffer consumedBuffer, + ImageFrameMetaData metaData) + { + Guard.NotNull(configuration, nameof(configuration)); + Guard.MustBeGreaterThan(width, 0, nameof(width)); + Guard.MustBeGreaterThan(height, 0, nameof(height)); + Guard.NotNull(metaData, nameof(metaData)); + + this.configuration = configuration; + this.MemoryAllocator = configuration.MemoryAllocator; + this.PixelBuffer = new Buffer2D(consumedBuffer, width, height); + this.MetaData = metaData; + } + /// /// Initializes a new instance of the class. /// @@ -102,16 +131,16 @@ internal ImageFrame(Configuration configuration, ImageFrame source) Guard.NotNull(source, nameof(source)); this.configuration = configuration; - this.MemoryManager = configuration.MemoryManager; - this.PixelBuffer = this.MemoryManager.Allocate2D(source.PixelBuffer.Width, source.PixelBuffer.Height); - source.PixelBuffer.Span.CopyTo(this.PixelBuffer.Span); + this.MemoryAllocator = configuration.MemoryAllocator; + this.PixelBuffer = this.MemoryAllocator.Allocate2D(source.PixelBuffer.Width, source.PixelBuffer.Height); + source.PixelBuffer.GetSpan().CopyTo(this.PixelBuffer.GetSpan()); this.MetaData = source.MetaData.Clone(); } /// - /// Gets the to use for buffer allocations. + /// Gets the to use for buffer allocations. /// - public MemoryManager MemoryManager { get; } + public MemoryAllocator MemoryAllocator { get; } /// /// Gets the image pixels. Not private as Buffer2D requires an array in its constructor. @@ -213,33 +242,18 @@ internal void CopyTo(Buffer2D target) throw new ArgumentException("ImageFrame.CopyTo(): target must be of the same size!", nameof(target)); } - this.GetPixelSpan().CopyTo(target.Span); - } - - /// - /// Switches the buffers used by the image and the PixelAccessor meaning that the Image will "own" the buffer from the PixelAccessor and the PixelAccessor will now own the Images buffer. - /// - /// The pixel source. - internal void SwapPixelsBuffers(PixelAccessor pixelSource) - { - Guard.NotNull(pixelSource, nameof(pixelSource)); - - // Push my memory into the accessor (which in turn unpins the old buffer ready for the images use) - Buffer2D newPixels = pixelSource.SwapBufferOwnership(this.PixelBuffer); - this.PixelBuffer = newPixels; + this.GetPixelSpan().CopyTo(target.GetSpan()); } /// /// Switches the buffers used by the image and the pixelSource meaning that the Image will "own" the buffer from the pixelSource and the pixelSource will now own the Images buffer. /// /// The pixel source. - internal void SwapPixelsBuffers(ImageFrame pixelSource) + internal void SwapOrCopyPixelsBufferFrom(ImageFrame pixelSource) { Guard.NotNull(pixelSource, nameof(pixelSource)); - Buffer2D temp = this.PixelBuffer; - this.PixelBuffer = pixelSource.PixelBuffer; - pixelSource.PixelBuffer = temp; + Buffer2D.SwapOrCopyContent(this.PixelBuffer, pixelSource.PixelBuffer); } /// @@ -289,7 +303,7 @@ internal ImageFrame CloneAs() { Span sourceRow = this.GetPixelRowSpan(y); Span targetRow = target.GetPixelRowSpan(y); - Span tempRowSpan = tempRowBuffer.Span; + Span tempRowSpan = tempRowBuffer.GetSpan(); PixelOperations.Instance.ToScaledVector4(sourceRow, tempRowSpan, sourceRow.Length); PixelOperations.Instance.PackFromScaledVector4(tempRowSpan, targetRow, targetRow.Length); diff --git a/src/ImageSharp/Image{TPixel}.cs b/src/ImageSharp/Image{TPixel}.cs index 324385601f..ad754bc753 100644 --- a/src/ImageSharp/Image{TPixel}.cs +++ b/src/ImageSharp/Image{TPixel}.cs @@ -10,6 +10,7 @@ using SixLabors.ImageSharp.Formats; using SixLabors.ImageSharp.MetaData; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.Memory; namespace SixLabors.ImageSharp { @@ -78,7 +79,28 @@ internal Image(Configuration configuration, int width, int height, ImageMetaData this.configuration = configuration ?? Configuration.Default; this.PixelType = new PixelTypeInfo(Unsafe.SizeOf() * 8); this.MetaData = metadata ?? new ImageMetaData(); - this.frames = new ImageFrameCollection(this, width, height, default); + this.frames = new ImageFrameCollection(this, width, height, default(TPixel)); + } + + /// + /// Initializes a new instance of the class + /// consuming an external buffer instance. + /// + internal Image(Configuration configuration, IBuffer consumedBuffer, int width, int height) + : this(configuration, consumedBuffer, width, height, new ImageMetaData()) + { + } + + /// + /// Initializes a new instance of the class + /// consuming an external buffer instance. + /// + internal Image(Configuration configuration, IBuffer consumedBuffer, int width, int height, ImageMetaData metadata) + { + this.configuration = configuration; + this.PixelType = new PixelTypeInfo(Unsafe.SizeOf() * 8); + this.MetaData = metadata; + this.frames = new ImageFrameCollection(this, width, height, consumedBuffer); } /// @@ -211,13 +233,13 @@ public void Dispose() /// Switches the buffers used by the image and the pixelSource meaning that the Image will "own" the buffer from the pixelSource and the pixelSource will now own the Images buffer. /// /// The pixel source. - internal void SwapPixelsBuffers(Image pixelSource) + internal void SwapOrCopyPixelsBuffersFrom(Image pixelSource) { Guard.NotNull(pixelSource, nameof(pixelSource)); for (int i = 0; i < this.frames.Count; i++) { - this.frames[i].SwapPixelsBuffers(pixelSource.frames[i]); + this.frames[i].SwapOrCopyPixelsBufferFrom(pixelSource.frames[i]); } } } diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.Buffer{T}.cs b/src/ImageSharp/Memory/ArrayPoolMemoryAllocator.Buffer{T}.cs similarity index 74% rename from src/ImageSharp/Memory/ArrayPoolMemoryManager.Buffer{T}.cs rename to src/ImageSharp/Memory/ArrayPoolMemoryAllocator.Buffer{T}.cs index 5ca81b5ecb..d0f68c9c63 100644 --- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.Buffer{T}.cs +++ b/src/ImageSharp/Memory/ArrayPoolMemoryAllocator.Buffer{T}.cs @@ -5,17 +5,18 @@ using System.Buffers; using System.Runtime.InteropServices; -namespace SixLabors.ImageSharp.Memory +namespace SixLabors.Memory { /// /// Contains and /// - public partial class ArrayPoolMemoryManager + public partial class ArrayPoolMemoryAllocator { /// - /// The buffer implementation of + /// The buffer implementation of . + /// In this implementation is owned. /// - private class Buffer : IBuffer + private class Buffer : ManagedBufferBase where T : struct { /// @@ -28,7 +29,7 @@ private class Buffer : IBuffer /// /// /// By using a weak reference here, we are making sure that array pools and their retained arrays are always GC-ed - /// after a call to , regardless of having buffer instances still being in use. + /// after a call to , regardless of having buffer instances still being in use. /// private WeakReference> sourcePoolReference; @@ -45,12 +46,9 @@ public Buffer(byte[] data, int length, ArrayPool sourcePool) protected byte[] Data { get; private set; } /// - public Span Span => MemoryMarshal.Cast(this.Data.AsSpan()).Slice(0, this.length); - - /// - public void Dispose() + protected override void Dispose(bool disposing) { - if (this.Data == null || this.sourcePoolReference == null) + if (!disposing || this.Data == null || this.sourcePoolReference == null) { return; } @@ -63,10 +61,14 @@ public void Dispose() this.sourcePoolReference = null; this.Data = null; } + + public override Span GetSpan() => MemoryMarshal.Cast(this.Data.AsSpan()).Slice(0, this.length); + + protected override object GetPinnableObject() => this.Data; } /// - /// The implementation of . + /// The implementation of . /// private class ManagedByteBuffer : Buffer, IManagedByteBuffer { diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.CommonFactoryMethods.cs b/src/ImageSharp/Memory/ArrayPoolMemoryAllocator.CommonFactoryMethods.cs similarity index 75% rename from src/ImageSharp/Memory/ArrayPoolMemoryManager.CommonFactoryMethods.cs rename to src/ImageSharp/Memory/ArrayPoolMemoryAllocator.CommonFactoryMethods.cs index 53d7fc0216..78d6e27b21 100644 --- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.CommonFactoryMethods.cs +++ b/src/ImageSharp/Memory/ArrayPoolMemoryAllocator.CommonFactoryMethods.cs @@ -1,11 +1,11 @@ using SixLabors.ImageSharp.PixelFormats; -namespace SixLabors.ImageSharp.Memory +namespace SixLabors.Memory { /// /// Contains common factory methods and configuration constants. /// - public partial class ArrayPoolMemoryManager + public partial class ArrayPoolMemoryAllocator { /// /// The default value for: maximum size of pooled arrays in bytes. @@ -32,9 +32,9 @@ public partial class ArrayPoolMemoryManager /// This is the default. Should be good for most use cases. /// /// The memory manager - public static ArrayPoolMemoryManager CreateDefault() + public static ArrayPoolMemoryAllocator CreateDefault() { - return new ArrayPoolMemoryManager( + return new ArrayPoolMemoryAllocator( DefaultMaxPooledBufferSizeInBytes, DefaultBufferSelectorThresholdInBytes, DefaultLargePoolBucketCount, @@ -45,27 +45,27 @@ public static ArrayPoolMemoryManager CreateDefault() /// For environments with limited memory capabilities. Only small images are pooled, which can result in reduced througput. /// /// The memory manager - public static ArrayPoolMemoryManager CreateWithModeratePooling() + public static ArrayPoolMemoryAllocator CreateWithModeratePooling() { - return new ArrayPoolMemoryManager(1024 * 1024, 32 * 1024, 16, 24); + return new ArrayPoolMemoryAllocator(1024 * 1024, 32 * 1024, 16, 24); } /// /// Only pool small buffers like image rows. /// /// The memory manager - public static ArrayPoolMemoryManager CreateWithMinimalPooling() + public static ArrayPoolMemoryAllocator CreateWithMinimalPooling() { - return new ArrayPoolMemoryManager(64 * 1024, 32 * 1024, 8, 24); + return new ArrayPoolMemoryAllocator(64 * 1024, 32 * 1024, 8, 24); } /// /// RAM is not an issue for me, gimme maximum througput! /// /// The memory manager - public static ArrayPoolMemoryManager CreateWithAggressivePooling() + public static ArrayPoolMemoryAllocator CreateWithAggressivePooling() { - return new ArrayPoolMemoryManager(128 * 1024 * 1024, 32 * 1024 * 1024, 16, 32); + return new ArrayPoolMemoryAllocator(128 * 1024 * 1024, 32 * 1024 * 1024, 16, 32); } } } \ No newline at end of file diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs b/src/ImageSharp/Memory/ArrayPoolMemoryAllocator.cs similarity index 86% rename from src/ImageSharp/Memory/ArrayPoolMemoryManager.cs rename to src/ImageSharp/Memory/ArrayPoolMemoryAllocator.cs index 7b8c7ab326..90950d4b3c 100644 --- a/src/ImageSharp/Memory/ArrayPoolMemoryManager.cs +++ b/src/ImageSharp/Memory/ArrayPoolMemoryAllocator.cs @@ -4,12 +4,12 @@ using System.Buffers; using System.Runtime.CompilerServices; -namespace SixLabors.ImageSharp.Memory +namespace SixLabors.Memory { /// - /// Implements by allocating memory from . + /// Implements by allocating memory from . /// - public partial class ArrayPoolMemoryManager : MemoryManager + public partial class ArrayPoolMemoryAllocator : MemoryAllocator { /// /// The for small-to-medium buffers which is not kept clean. @@ -26,42 +26,42 @@ public partial class ArrayPoolMemoryManager : MemoryManager private readonly int maxArraysPerBucketLargePool; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// - public ArrayPoolMemoryManager() + public ArrayPoolMemoryAllocator() : this(DefaultMaxPooledBufferSizeInBytes, DefaultBufferSelectorThresholdInBytes) { } /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The maximum size of pooled arrays. Arrays over the thershold are gonna be always allocated. - public ArrayPoolMemoryManager(int maxPoolSizeInBytes) + public ArrayPoolMemoryAllocator(int maxPoolSizeInBytes) : this(maxPoolSizeInBytes, GetLargeBufferThresholdInBytes(maxPoolSizeInBytes)) { } /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The maximum size of pooled arrays. Arrays over the thershold are gonna be always allocated. /// Arrays over this threshold will be pooled in which has less buckets for memory safety. - public ArrayPoolMemoryManager(int maxPoolSizeInBytes, int poolSelectorThresholdInBytes) + public ArrayPoolMemoryAllocator(int maxPoolSizeInBytes, int poolSelectorThresholdInBytes) : this(maxPoolSizeInBytes, poolSelectorThresholdInBytes, DefaultLargePoolBucketCount, DefaultNormalPoolBucketCount) { } /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The maximum size of pooled arrays. Arrays over the thershold are gonna be always allocated. /// The threshold to pool arrays in which has less buckets for memory safety. /// Max arrays per bucket for the large array pool /// Max arrays per bucket for the normal array pool - public ArrayPoolMemoryManager(int maxPoolSizeInBytes, int poolSelectorThresholdInBytes, int maxArraysPerBucketLargePool, int maxArraysPerBucketNormalPool) + public ArrayPoolMemoryAllocator(int maxPoolSizeInBytes, int poolSelectorThresholdInBytes, int maxArraysPerBucketLargePool, int maxArraysPerBucketNormalPool) { - Guard.MustBeGreaterThan(maxPoolSizeInBytes, 0, nameof(maxPoolSizeInBytes)); + ImageSharp.Guard.MustBeGreaterThan(maxPoolSizeInBytes, 0, nameof(maxPoolSizeInBytes)); Guard.MustBeLessThanOrEqualTo(poolSelectorThresholdInBytes, maxPoolSizeInBytes, nameof(poolSelectorThresholdInBytes)); this.MaxPoolSizeInBytes = maxPoolSizeInBytes; diff --git a/src/ImageSharp/Memory/BasicArrayBuffer.cs b/src/ImageSharp/Memory/BasicArrayBuffer.cs index dd2f7ef866..5e3893d089 100644 --- a/src/ImageSharp/Memory/BasicArrayBuffer.cs +++ b/src/ImageSharp/Memory/BasicArrayBuffer.cs @@ -1,17 +1,20 @@ +// Copyright (c) Six Labors and contributors. +// Licensed under the Apache License, Version 2.0. + using System; using System.Runtime.CompilerServices; -namespace SixLabors.ImageSharp.Memory +namespace SixLabors.Memory { /// - /// Exposes an array through the interface. + /// Wraps an array as an instance. In this implementation is owned. /// - internal class BasicArrayBuffer : IBuffer + internal class BasicArrayBuffer : ManagedBufferBase where T : struct { public BasicArrayBuffer(T[] array, int length) { - DebugGuard.MustBeLessThanOrEqualTo(length, array.Length, nameof(length)); + ImageSharp.DebugGuard.MustBeLessThanOrEqualTo(length, array.Length, nameof(length)); this.Array = array; this.Length = length; } @@ -25,8 +28,6 @@ public BasicArrayBuffer(T[] array) public int Length { get; } - public Span Span => this.Array.AsSpan(0, this.Length); - /// /// Returns a reference to specified element of the buffer. /// @@ -39,13 +40,20 @@ public ref T this[int index] { DebugGuard.MustBeLessThan(index, this.Length, nameof(index)); - Span span = this.Span; + Span span = this.GetSpan(); return ref span[index]; } } - public void Dispose() + protected override void Dispose(bool disposing) + { + } + + public override Span GetSpan() => this.Array.AsSpan(0, this.Length); + + protected override object GetPinnableObject() { + return this.Array; } } } \ No newline at end of file diff --git a/src/ImageSharp/Memory/BasicByteBuffer.cs b/src/ImageSharp/Memory/BasicByteBuffer.cs index 96b69ad3bf..a8a30b1aa1 100644 --- a/src/ImageSharp/Memory/BasicByteBuffer.cs +++ b/src/ImageSharp/Memory/BasicByteBuffer.cs @@ -1,4 +1,7 @@ -namespace SixLabors.ImageSharp.Memory +// Copyright (c) Six Labors and contributors. +// Licensed under the Apache License, Version 2.0. + +namespace SixLabors.Memory { internal class BasicByteBuffer : BasicArrayBuffer, IManagedByteBuffer { diff --git a/src/ImageSharp/Memory/Buffer2DExtensions.cs b/src/ImageSharp/Memory/Buffer2DExtensions.cs index ac5ab09dbd..58e273123b 100644 --- a/src/ImageSharp/Memory/Buffer2DExtensions.cs +++ b/src/ImageSharp/Memory/Buffer2DExtensions.cs @@ -5,13 +5,22 @@ using System.Runtime.CompilerServices; using SixLabors.Primitives; -namespace SixLabors.ImageSharp.Memory +namespace SixLabors.Memory { /// /// Defines extension methods for . /// internal static class Buffer2DExtensions { + /// + /// Gets a to the backing buffer of . + /// + internal static Span GetSpan(this IBuffer2D buffer) + where T : struct + { + return buffer.Buffer.GetSpan(); + } + /// /// Gets a to the row 'y' beginning from the pixel at 'x'. /// @@ -24,7 +33,7 @@ internal static class Buffer2DExtensions public static Span GetRowSpan(this IBuffer2D buffer, int x, int y) where T : struct { - return buffer.Span.Slice((y * buffer.Width) + x, buffer.Width - x); + return buffer.GetSpan().Slice((y * buffer.Width) + x, buffer.Width - x); } /// @@ -38,7 +47,21 @@ public static Span GetRowSpan(this IBuffer2D buffer, int x, int y) public static Span GetRowSpan(this IBuffer2D buffer, int y) where T : struct { - return buffer.Span.Slice(y * buffer.Width, buffer.Width); + return buffer.GetSpan().Slice(y * buffer.Width, buffer.Width); + } + + /// + /// Gets a to the row 'y' beginning from the pixel at the first pixel on that row. + /// + /// The buffer + /// The y (row) coordinate + /// The element type + /// The + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Memory GetRowMemory(this IBuffer2D buffer, int y) + where T : struct + { + return buffer.Buffer.Memory.Slice(y * buffer.Width, buffer.Width); } /// diff --git a/src/ImageSharp/Memory/Buffer2D{T}.cs b/src/ImageSharp/Memory/Buffer2D{T}.cs index dc992368c9..b62156ffb8 100644 --- a/src/ImageSharp/Memory/Buffer2D{T}.cs +++ b/src/ImageSharp/Memory/Buffer2D{T}.cs @@ -5,7 +5,7 @@ using System.Runtime.CompilerServices; using SixLabors.Primitives; -namespace SixLabors.ImageSharp.Memory +namespace SixLabors.Memory { /// /// Represents a buffer of value type objects @@ -34,16 +34,15 @@ public Buffer2D(IBuffer wrappedBuffer, int width, int height) /// public int Height { get; private set; } - /// - /// Gets the span to the whole area. - /// - public Span Span => this.Buffer.Span; - /// /// Gets the backing /// public IBuffer Buffer { get; private set; } + public Memory Memory => this.Buffer.Memory; + + public Span Span => this.Buffer.GetSpan(); + /// /// Gets a reference to the element at the specified position. /// @@ -55,9 +54,9 @@ public Buffer2D(IBuffer wrappedBuffer, int width, int height) [MethodImpl(MethodImplOptions.AggressiveInlining)] get { - DebugGuard.MustBeLessThan(x, this.Width, nameof(x)); + ImageSharp.DebugGuard.MustBeLessThan(x, this.Width, nameof(x)); DebugGuard.MustBeLessThan(y, this.Height, nameof(y)); - Span span = this.Buffer.Span; + Span span = this.Buffer.GetSpan(); return ref span[(this.Width * y) + x]; } } @@ -70,13 +69,34 @@ public void Dispose() this.Buffer?.Dispose(); } + /// + /// Swaps the contents of 'destination' with 'source' if the buffers are owned (1), + /// copies the contents of 'source' to 'destination' otherwise (2). Buffers should be of same size in case 2! + /// + public static void SwapOrCopyContent(Buffer2D destination, Buffer2D source) + { + if (source.Buffer.IsMemoryOwner && destination.Buffer.IsMemoryOwner) + { + SwapContents(destination, source); + } + else + { + if (destination.Size() != source.Size()) + { + throw new InvalidOperationException("SwapOrCopyContents(): buffers should both owned or the same size!"); + } + + source.Span.CopyTo(destination.Span); + } + } + /// /// Swap the contents (, , ) of the two buffers. - /// Useful to transfer the contents of a temporary to a persistent + /// Useful to transfer the contents of a temporary to a persistent /// /// The first buffer /// The second buffer - public static void SwapContents(Buffer2D a, Buffer2D b) + private static void SwapContents(Buffer2D a, Buffer2D b) { Size aSize = a.Size(); Size bSize = b.Size(); diff --git a/src/ImageSharp/Memory/BufferArea{T}.cs b/src/ImageSharp/Memory/BufferArea{T}.cs index 990b494fc7..96036f6eec 100644 --- a/src/ImageSharp/Memory/BufferArea{T}.cs +++ b/src/ImageSharp/Memory/BufferArea{T}.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using SixLabors.Primitives; -namespace SixLabors.ImageSharp.Memory +namespace SixLabors.Memory { /// /// Represents a rectangular area inside a 2D memory buffer (). @@ -20,10 +20,10 @@ internal readonly struct BufferArea [MethodImpl(MethodImplOptions.AggressiveInlining)] public BufferArea(IBuffer2D destinationBuffer, Rectangle rectangle) { - DebugGuard.MustBeGreaterThanOrEqualTo(rectangle.X, 0, nameof(rectangle)); - DebugGuard.MustBeGreaterThanOrEqualTo(rectangle.Y, 0, nameof(rectangle)); - DebugGuard.MustBeLessThanOrEqualTo(rectangle.Width, destinationBuffer.Width, nameof(rectangle)); - DebugGuard.MustBeLessThanOrEqualTo(rectangle.Height, destinationBuffer.Height, nameof(rectangle)); + ImageSharp.DebugGuard.MustBeGreaterThanOrEqualTo(rectangle.X, 0, nameof(rectangle)); + ImageSharp.DebugGuard.MustBeGreaterThanOrEqualTo(rectangle.Y, 0, nameof(rectangle)); + ImageSharp.DebugGuard.MustBeLessThanOrEqualTo(rectangle.Width, destinationBuffer.Width, nameof(rectangle)); + ImageSharp.DebugGuard.MustBeLessThanOrEqualTo(rectangle.Height, destinationBuffer.Height, nameof(rectangle)); this.DestinationBuffer = destinationBuffer; this.Rectangle = rectangle; @@ -71,7 +71,7 @@ public BufferArea(IBuffer2D destinationBuffer) /// The position inside a row /// The row index /// The reference to the value - public ref T this[int x, int y] => ref this.DestinationBuffer.Span[this.GetIndexOf(x, y)]; + public ref T this[int x, int y] => ref this.DestinationBuffer.GetSpan()[this.GetIndexOf(x, y)]; /// /// Gets a reference to the [0,0] element. @@ -79,7 +79,7 @@ public BufferArea(IBuffer2D destinationBuffer) /// The reference to the [0,0] element [MethodImpl(MethodImplOptions.AggressiveInlining)] public ref T GetReferenceToOrigin() => - ref this.DestinationBuffer.Span[(this.Rectangle.Y * this.DestinationBuffer.Width) + this.Rectangle.X]; + ref this.DestinationBuffer.GetSpan()[(this.Rectangle.Y * this.DestinationBuffer.Width) + this.Rectangle.X]; /// /// Gets a span to row 'y' inside this area. @@ -93,7 +93,7 @@ public Span GetRowSpan(int y) int xx = this.Rectangle.X; int width = this.Rectangle.Width; - return this.DestinationBuffer.Span.Slice(yy + xx, width); + return this.DestinationBuffer.GetSpan().Slice(yy + xx, width); } /// @@ -119,7 +119,7 @@ public BufferArea GetSubArea(int x, int y, int width, int height) [MethodImpl(MethodImplOptions.AggressiveInlining)] public BufferArea GetSubArea(Rectangle rectangle) { - DebugGuard.MustBeLessThanOrEqualTo(rectangle.Width, this.Rectangle.Width, nameof(rectangle)); + ImageSharp.DebugGuard.MustBeLessThanOrEqualTo(rectangle.Width, this.Rectangle.Width, nameof(rectangle)); DebugGuard.MustBeLessThanOrEqualTo(rectangle.Height, this.Rectangle.Height, nameof(rectangle)); int x = this.Rectangle.X + rectangle.X; @@ -147,7 +147,7 @@ public void Clear() // Optimization for when the size of the area is the same as the buffer size. if (this.IsFullBufferArea) { - this.DestinationBuffer.Span.Clear(); + this.DestinationBuffer.GetSpan().Clear(); return; } diff --git a/src/ImageSharp/Memory/BufferExtensions.cs b/src/ImageSharp/Memory/BufferExtensions.cs index dd3114c21c..8ebf866bc5 100644 --- a/src/ImageSharp/Memory/BufferExtensions.cs +++ b/src/ImageSharp/Memory/BufferExtensions.cs @@ -6,13 +6,13 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -namespace SixLabors.ImageSharp.Memory +namespace SixLabors.Memory { internal static class BufferExtensions { [MethodImpl(MethodImplOptions.AggressiveInlining)] public static int Length(this IBuffer buffer) - where T : struct => buffer.Span.Length; + where T : struct => buffer.GetSpan().Length; /// /// Gets a to an offseted position inside the buffer. @@ -24,7 +24,7 @@ public static int Length(this IBuffer buffer) public static Span Slice(this IBuffer buffer, int start) where T : struct { - return buffer.Span.Slice(start); + return buffer.GetSpan().Slice(start); } /// @@ -38,7 +38,7 @@ public static Span Slice(this IBuffer buffer, int start) public static Span Slice(this IBuffer buffer, int start, int length) where T : struct { - return buffer.Span.Slice(start, length); + return buffer.GetSpan().Slice(start, length); } /// @@ -49,12 +49,12 @@ public static Span Slice(this IBuffer buffer, int start, int length) public static void Clear(this IBuffer buffer) where T : struct { - buffer.Span.Clear(); + buffer.GetSpan().Clear(); } - public static ref T DangerousGetPinnableReference(this IBuffer buffer) + public static ref T GetReference(this IBuffer buffer) where T : struct => - ref MemoryMarshal.GetReference(buffer.Span); + ref MemoryMarshal.GetReference(buffer.GetSpan()); public static void Read(this Stream stream, IManagedByteBuffer buffer) { diff --git a/src/ImageSharp/Memory/ConsumedBuffer.cs b/src/ImageSharp/Memory/ConsumedBuffer.cs new file mode 100644 index 0000000000..73468a3810 --- /dev/null +++ b/src/ImageSharp/Memory/ConsumedBuffer.cs @@ -0,0 +1,34 @@ +// Copyright (c) Six Labors and contributors. +// Licensed under the Apache License, Version 2.0. + +using System; + +namespace SixLabors.Memory +{ + /// + /// A buffer implementation that consumes an existing instance. + /// The ownership of the memory remains external. + /// + /// The value type + internal sealed class ConsumedBuffer : IBuffer + where T : struct + { + public ConsumedBuffer(Memory memory) + { + this.Memory = memory; + } + + public Memory Memory { get; } + + public bool IsMemoryOwner => false; + + public Span GetSpan() + { + return this.Memory.Span; + } + + public void Dispose() + { + } + } +} \ No newline at end of file diff --git a/src/ImageSharp/Memory/IBuffer2D{T}.cs b/src/ImageSharp/Memory/IBuffer2D{T}.cs index 2f60fd02a0..a92f30dd57 100644 --- a/src/ImageSharp/Memory/IBuffer2D{T}.cs +++ b/src/ImageSharp/Memory/IBuffer2D{T}.cs @@ -3,10 +3,10 @@ using System; -namespace SixLabors.ImageSharp.Memory +namespace SixLabors.Memory { /// - /// An interface that represents a pinned buffer of value type objects + /// An interface that represents a contigous buffer of value type objects /// interpreted as a 2D region of x elements. /// /// The value type. @@ -24,8 +24,8 @@ internal interface IBuffer2D int Height { get; } /// - /// Gets a to the backing buffer. + /// Gets the contigous buffer being wrapped. /// - Span Span { get; } + IBuffer Buffer { get; } } } \ No newline at end of file diff --git a/src/ImageSharp/Memory/IBuffer{T}.cs b/src/ImageSharp/Memory/IBuffer{T}.cs index db6bf5b389..847f2741da 100644 --- a/src/ImageSharp/Memory/IBuffer{T}.cs +++ b/src/ImageSharp/Memory/IBuffer{T}.cs @@ -2,20 +2,37 @@ // Licensed under the Apache License, Version 2.0. using System; +using System.Buffers; -namespace SixLabors.ImageSharp.Memory +namespace SixLabors.Memory { - /// /// - /// Represents a contigous memory buffer of value-type items "promising" a + /// Represents a contigous memory buffer of value-type items. + /// Depending on it's implementation, an can (1) OWN or (2) CONSUME the instance it wraps. + /// For a deeper understanding of the owner/consumer model, read the following docs:
+ /// https://gist.github.com/GrabYourPitchforks/4c3e1935fd4d9fa2831dbfcab35dffc6 + /// TODO: We need more SOC here! For owned buffers we should use . + /// For the consumption case we should not use buffers at all. We need to refactor Buffer2D{T} for this. /// /// The value type internal interface IBuffer : IDisposable where T : struct { /// - /// Gets the span to the memory "promised" by this buffer + /// Gets the ownerd/consumed by this buffer. /// - Span Span { get; } + Memory Memory { get; } + + /// + /// Gets a value indicating whether this instance is owning the . + /// + bool IsMemoryOwner { get; } + + /// + /// Gets the span to the memory "promised" by this buffer when it's OWNED (1). + /// Gets `this.Memory.Span` when the buffer CONSUMED (2). + /// + /// The + Span GetSpan(); } } \ No newline at end of file diff --git a/src/ImageSharp/Memory/IManagedByteBuffer.cs b/src/ImageSharp/Memory/IManagedByteBuffer.cs index 4d159ce863..a977eb68fe 100644 --- a/src/ImageSharp/Memory/IManagedByteBuffer.cs +++ b/src/ImageSharp/Memory/IManagedByteBuffer.cs @@ -1,7 +1,7 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -namespace SixLabors.ImageSharp.Memory +namespace SixLabors.Memory { /// /// Represents a byte buffer backed by a managed array. Useful for interop with classic .NET API-s. diff --git a/src/ImageSharp/Memory/ManagedBufferBase.cs b/src/ImageSharp/Memory/ManagedBufferBase.cs new file mode 100644 index 0000000000..606d1c9622 --- /dev/null +++ b/src/ImageSharp/Memory/ManagedBufferBase.cs @@ -0,0 +1,43 @@ +// Copyright (c) Six Labors and contributors. +// Licensed under the Apache License, Version 2.0. + +using System.Buffers; +using System.Runtime.InteropServices; + +namespace SixLabors.Memory +{ + /// + /// Provides a base class for implementations by implementing pinning logic for adaption. + /// + internal abstract class ManagedBufferBase : System.Buffers.MemoryManager, IBuffer + where T : struct + { + private GCHandle pinHandle; + + public bool IsMemoryOwner => true; + + /// + /// Gets the object that should be pinned. + /// + protected abstract object GetPinnableObject(); + + public override unsafe MemoryHandle Pin(int elementIndex = 0) + { + if (!this.pinHandle.IsAllocated) + { + this.pinHandle = GCHandle.Alloc(this.GetPinnableObject(), GCHandleType.Pinned); + } + + void* ptr = (void*)this.pinHandle.AddrOfPinnedObject(); + return new MemoryHandle(ptr, this.pinHandle); + } + + public override void Unpin() + { + if (this.pinHandle.IsAllocated) + { + this.pinHandle.Free(); + } + } + } +} \ No newline at end of file diff --git a/src/ImageSharp/Memory/MemoryManager.cs b/src/ImageSharp/Memory/MemoryAllocator.cs similarity index 74% rename from src/ImageSharp/Memory/MemoryManager.cs rename to src/ImageSharp/Memory/MemoryAllocator.cs index 52bdc897fc..2195444fd6 100644 --- a/src/ImageSharp/Memory/MemoryManager.cs +++ b/src/ImageSharp/Memory/MemoryAllocator.cs @@ -1,12 +1,12 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -namespace SixLabors.ImageSharp.Memory +namespace SixLabors.Memory { /// /// Memory managers are used to allocate memory for image processing operations. /// - public abstract class MemoryManager + public abstract class MemoryAllocator { /// /// Allocates an of size , optionally @@ -27,16 +27,6 @@ internal abstract IBuffer Allocate(int length, bool clear) /// The internal abstract IManagedByteBuffer AllocateManagedByteBuffer(int length, bool clear); - /// - /// Temporal workaround. A method providing a "Buffer" based on a generic array without the 'Unsafe.As()' hackery. - /// Should be replaced with 'Allocate()' as soon as SixLabors.Shapes has Span-based API-s! - /// - internal BasicArrayBuffer AllocateFake(int length, bool dummy = false) - where T : struct - { - return new BasicArrayBuffer(new T[length]); - } - /// /// Releases all retained resources not being in use. /// Eg: by resetting array pools and letting GC to free the arrays. diff --git a/src/ImageSharp/Memory/MemoryManagerExtensions.cs b/src/ImageSharp/Memory/MemoryAllocatorExtensions.cs similarity index 51% rename from src/ImageSharp/Memory/MemoryManagerExtensions.cs rename to src/ImageSharp/Memory/MemoryAllocatorExtensions.cs index 2060002450..ab4fc93b7d 100644 --- a/src/ImageSharp/Memory/MemoryManagerExtensions.cs +++ b/src/ImageSharp/Memory/MemoryAllocatorExtensions.cs @@ -1,11 +1,11 @@ using SixLabors.Primitives; -namespace SixLabors.ImageSharp.Memory +namespace SixLabors.Memory { /// - /// Extension methods for . + /// Extension methods for . /// - internal static class MemoryManagerExtensions + internal static class MemoryAllocatorExtensions { /// /// Allocates a of size . @@ -13,67 +13,67 @@ internal static class MemoryManagerExtensions /// returning, so it may contain data from an earlier use. /// /// Type of the data stored in the buffer - /// The + /// The /// Size of the buffer to allocate /// A buffer of values of type . - public static IBuffer Allocate(this MemoryManager memoryManager, int length) + public static IBuffer Allocate(this MemoryAllocator memoryAllocator, int length) where T : struct { - return memoryManager.Allocate(length, false); + return memoryAllocator.Allocate(length, false); } - public static IBuffer AllocateClean(this MemoryManager memoryManager, int length) + public static IBuffer AllocateClean(this MemoryAllocator memoryAllocator, int length) where T : struct { - return memoryManager.Allocate(length, true); + return memoryAllocator.Allocate(length, true); } - public static IManagedByteBuffer AllocateManagedByteBuffer(this MemoryManager memoryManager, int length) + public static IManagedByteBuffer AllocateManagedByteBuffer(this MemoryAllocator memoryAllocator, int length) { - return memoryManager.AllocateManagedByteBuffer(length, false); + return memoryAllocator.AllocateManagedByteBuffer(length, false); } - public static IManagedByteBuffer AllocateCleanManagedByteBuffer(this MemoryManager memoryManager, int length) + public static IManagedByteBuffer AllocateCleanManagedByteBuffer(this MemoryAllocator memoryAllocator, int length) { - return memoryManager.AllocateManagedByteBuffer(length, true); + return memoryAllocator.AllocateManagedByteBuffer(length, true); } - public static Buffer2D Allocate2D(this MemoryManager memoryManager, int width, int height, bool clear) + public static Buffer2D Allocate2D(this MemoryAllocator memoryAllocator, int width, int height, bool clear) where T : struct { - IBuffer buffer = memoryManager.Allocate(width * height, clear); + IBuffer buffer = memoryAllocator.Allocate(width * height, clear); return new Buffer2D(buffer, width, height); } - public static Buffer2D Allocate2D(this MemoryManager memoryManager, Size size) + public static Buffer2D Allocate2D(this MemoryAllocator memoryAllocator, Size size) where T : struct => - Allocate2D(memoryManager, size.Width, size.Height, false); + Allocate2D(memoryAllocator, size.Width, size.Height, false); - public static Buffer2D Allocate2D(this MemoryManager memoryManager, int width, int height) + public static Buffer2D Allocate2D(this MemoryAllocator memoryAllocator, int width, int height) where T : struct => - Allocate2D(memoryManager, width, height, false); + Allocate2D(memoryAllocator, width, height, false); - public static Buffer2D AllocateClean2D(this MemoryManager memoryManager, int width, int height) + public static Buffer2D AllocateClean2D(this MemoryAllocator memoryAllocator, int width, int height) where T : struct => - Allocate2D(memoryManager, width, height, true); + Allocate2D(memoryAllocator, width, height, true); /// /// Allocates padded buffers for BMP encoder/decoder. (Replacing old PixelRow/PixelArea) /// - /// The + /// The /// Pixel count in the row /// The pixel size in bytes, eg. 3 for RGB /// The padding /// A public static IManagedByteBuffer AllocatePaddedPixelRowBuffer( - this MemoryManager memoryManager, + this MemoryAllocator memoryAllocator, int width, int pixelSizeInBytes, int paddingInBytes) { int length = (width * pixelSizeInBytes) + paddingInBytes; - return memoryManager.AllocateManagedByteBuffer(length); + return memoryAllocator.AllocateManagedByteBuffer(length); } } } \ No newline at end of file diff --git a/src/ImageSharp/Memory/SimpleGcMemoryManager.cs b/src/ImageSharp/Memory/SimpleGcMemoryAllocator.cs similarity index 66% rename from src/ImageSharp/Memory/SimpleGcMemoryManager.cs rename to src/ImageSharp/Memory/SimpleGcMemoryAllocator.cs index f4518bbb9d..2d339f4c76 100644 --- a/src/ImageSharp/Memory/SimpleGcMemoryManager.cs +++ b/src/ImageSharp/Memory/SimpleGcMemoryAllocator.cs @@ -1,9 +1,9 @@ -namespace SixLabors.ImageSharp.Memory +namespace SixLabors.Memory { /// - /// Implements by newing up arrays by the GC on every allocation requests. + /// Implements by newing up arrays by the GC on every allocation requests. /// - public class SimpleGcMemoryManager : MemoryManager + public class SimpleGcMemoryAllocator : MemoryAllocator { /// internal override IBuffer Allocate(int length, bool clear) diff --git a/src/ImageSharp/PixelAccessor{TPixel}.cs b/src/ImageSharp/PixelAccessor{TPixel}.cs index 1e789f0a68..7ca066ff15 100644 --- a/src/ImageSharp/PixelAccessor{TPixel}.cs +++ b/src/ImageSharp/PixelAccessor{TPixel}.cs @@ -5,8 +5,8 @@ using System.Diagnostics; using System.Runtime.CompilerServices; using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.Memory; namespace SixLabors.ImageSharp { @@ -51,10 +51,7 @@ public PixelAccessor(IPixelSource image) /// public int Height { get; private set; } - /// - public Span Span => this.PixelBuffer.Span; - - private static PixelOperations Operations => PixelOperations.Instance; + public IBuffer Buffer => this.PixelBuffer.Buffer; /// /// Gets or sets the pixel at the specified position. @@ -68,14 +65,14 @@ public PixelAccessor(IPixelSource image) get { this.CheckCoordinates(x, y); - return this.Span[(y * this.Width) + x]; + return this.GetSpan()[(y * this.Width) + x]; } [MethodImpl(MethodImplOptions.AggressiveInlining)] set { this.CheckCoordinates(x, y); - Span span = this.Span; + Span span = this.GetSpan(); span[(y * this.Width) + x] = value; } } @@ -112,7 +109,7 @@ internal Buffer2D SwapBufferOwnership(Buffer2D pixels) /// The target pixel buffer accessor. internal void CopyTo(PixelAccessor target) { - this.PixelBuffer.Span.CopyTo(target.PixelBuffer.Span); + this.PixelBuffer.GetSpan().CopyTo(target.PixelBuffer.GetSpan()); } /// diff --git a/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs b/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs index 6635a5a2a0..6828f11dcc 100644 --- a/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs +++ b/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs @@ -6,7 +6,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders { using System; using System.Numerics; - using SixLabors.ImageSharp.Memory; + using SixLabors.Memory; /// @@ -38,7 +38,7 @@ public override TPixel Blend(TPixel background, TPixel source, float amount) } /// - public override void Blend(MemoryManager memoryManager, Span destination, Span background, Span source, Span amount) + public override void Blend(MemoryAllocator memoryManager, Span destination, Span background, Span source, Span amount) { Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length)); Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length)); @@ -77,7 +77,7 @@ public override TPixel Blend(TPixel background, TPixel source, float amount) } /// - public override void Blend(MemoryManager memoryManager, Span destination, Span background, Span source, Span amount) + public override void Blend(MemoryAllocator memoryManager, Span destination, Span background, Span source, Span amount) { Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length)); Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length)); @@ -116,7 +116,7 @@ public override TPixel Blend(TPixel background, TPixel source, float amount) } /// - public override void Blend(MemoryManager memoryManager, Span destination, Span background, Span source, Span amount) + public override void Blend(MemoryAllocator memoryManager, Span destination, Span background, Span source, Span amount) { Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length)); Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length)); @@ -155,7 +155,7 @@ public override TPixel Blend(TPixel background, TPixel source, float amount) } /// - public override void Blend(MemoryManager memoryManager, Span destination, Span background, Span source, Span amount) + public override void Blend(MemoryAllocator memoryManager, Span destination, Span background, Span source, Span amount) { Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length)); Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length)); @@ -194,7 +194,7 @@ public override TPixel Blend(TPixel background, TPixel source, float amount) } /// - public override void Blend(MemoryManager memoryManager, Span destination, Span background, Span source, Span amount) + public override void Blend(MemoryAllocator memoryManager, Span destination, Span background, Span source, Span amount) { Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length)); Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length)); @@ -233,7 +233,7 @@ public override TPixel Blend(TPixel background, TPixel source, float amount) } /// - public override void Blend(MemoryManager memoryManager, Span destination, Span background, Span source, Span amount) + public override void Blend(MemoryAllocator memoryManager, Span destination, Span background, Span source, Span amount) { Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length)); Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length)); @@ -272,7 +272,7 @@ public override TPixel Blend(TPixel background, TPixel source, float amount) } /// - public override void Blend(MemoryManager memoryManager, Span destination, Span background, Span source, Span amount) + public override void Blend(MemoryAllocator memoryManager, Span destination, Span background, Span source, Span amount) { Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length)); Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length)); @@ -311,7 +311,7 @@ public override TPixel Blend(TPixel background, TPixel source, float amount) } /// - public override void Blend(MemoryManager memoryManager, Span destination, Span background, Span source, Span amount) + public override void Blend(MemoryAllocator memoryManager, Span destination, Span background, Span source, Span amount) { Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length)); Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length)); @@ -350,7 +350,7 @@ public override TPixel Blend(TPixel background, TPixel source, float amount) } /// - public override void Blend(MemoryManager memoryManager, Span destination, Span background, Span source, Span amount) + public override void Blend(MemoryAllocator memoryManager, Span destination, Span background, Span source, Span amount) { Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length)); Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length)); @@ -389,7 +389,7 @@ public override TPixel Blend(TPixel background, TPixel source, float amount) } /// - public override void Blend(MemoryManager memoryManager, Span destination, Span background, Span source, Span amount) + public override void Blend(MemoryAllocator memoryManager, Span destination, Span background, Span source, Span amount) { Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length)); Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length)); @@ -428,7 +428,7 @@ public override TPixel Blend(TPixel background, TPixel source, float amount) } /// - public override void Blend(MemoryManager memoryManager, Span destination, Span background, Span source, Span amount) + public override void Blend(MemoryAllocator memoryManager, Span destination, Span background, Span source, Span amount) { Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length)); Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length)); @@ -467,7 +467,7 @@ public override TPixel Blend(TPixel background, TPixel source, float amount) } /// - public override void Blend(MemoryManager memoryManager, Span destination, Span background, Span source, Span amount) + public override void Blend(MemoryAllocator memoryManager, Span destination, Span background, Span source, Span amount) { Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length)); Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length)); @@ -506,7 +506,7 @@ public override TPixel Blend(TPixel background, TPixel source, float amount) } /// - public override void Blend(MemoryManager memoryManager, Span destination, Span background, Span source, Span amount) + public override void Blend(MemoryAllocator memoryManager, Span destination, Span background, Span source, Span amount) { Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length)); Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length)); @@ -545,7 +545,7 @@ public override TPixel Blend(TPixel background, TPixel source, float amount) } /// - public override void Blend(MemoryManager memoryManager, Span destination, Span background, Span source, Span amount) + public override void Blend(MemoryAllocator memoryManager, Span destination, Span background, Span source, Span amount) { Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length)); Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length)); @@ -584,7 +584,7 @@ public override TPixel Blend(TPixel background, TPixel source, float amount) } /// - public override void Blend(MemoryManager memoryManager, Span destination, Span background, Span source, Span amount) + public override void Blend(MemoryAllocator memoryManager, Span destination, Span background, Span source, Span amount) { Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length)); Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length)); @@ -623,7 +623,7 @@ public override TPixel Blend(TPixel background, TPixel source, float amount) } /// - public override void Blend(MemoryManager memoryManager, Span destination, Span background, Span source, Span amount) + public override void Blend(MemoryAllocator memoryManager, Span destination, Span background, Span source, Span amount) { Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length)); Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length)); @@ -662,7 +662,7 @@ public override TPixel Blend(TPixel background, TPixel source, float amount) } /// - public override void Blend(MemoryManager memoryManager, Span destination, Span background, Span source, Span amount) + public override void Blend(MemoryAllocator memoryManager, Span destination, Span background, Span source, Span amount) { Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length)); Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length)); @@ -701,7 +701,7 @@ public override TPixel Blend(TPixel background, TPixel source, float amount) } /// - public override void Blend(MemoryManager memoryManager, Span destination, Span background, Span source, Span amount) + public override void Blend(MemoryAllocator memoryManager, Span destination, Span background, Span source, Span amount) { Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length)); Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length)); @@ -740,7 +740,7 @@ public override TPixel Blend(TPixel background, TPixel source, float amount) } /// - public override void Blend(MemoryManager memoryManager, Span destination, Span background, Span source, Span amount) + public override void Blend(MemoryAllocator memoryManager, Span destination, Span background, Span source, Span amount) { Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length)); Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length)); @@ -779,7 +779,7 @@ public override TPixel Blend(TPixel background, TPixel source, float amount) } /// - public override void Blend(MemoryManager memoryManager, Span destination, Span background, Span source, Span amount) + public override void Blend(MemoryAllocator memoryManager, Span destination, Span background, Span source, Span amount) { Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length)); Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length)); @@ -818,7 +818,7 @@ public override TPixel Blend(TPixel background, TPixel source, float amount) } /// - public override void Blend(MemoryManager memoryManager, Span destination, Span background, Span source, Span amount) + public override void Blend(MemoryAllocator memoryManager, Span destination, Span background, Span source, Span amount) { Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length)); Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length)); diff --git a/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt b/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt index 485bc31ad5..07888a756d 100644 --- a/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt +++ b/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt @@ -80,7 +80,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders } /// - public override void Blend(MemoryManager memoryManager, Span destination, Span background, Span source, Span amount) + public override void Blend(MemoryAllocator memoryManager, Span destination, Span background, Span source, Span amount) { Guard.MustBeGreaterThanOrEqualTo(background.Length, destination.Length, nameof(background.Length)); Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length)); diff --git a/src/ImageSharp/PixelFormats/PixelBlender{TPixel}.cs b/src/ImageSharp/PixelFormats/PixelBlender{TPixel}.cs index 666fb38913..b8b97ea0a4 100644 --- a/src/ImageSharp/PixelFormats/PixelBlender{TPixel}.cs +++ b/src/ImageSharp/PixelFormats/PixelBlender{TPixel}.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. using System; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; namespace SixLabors.ImageSharp.PixelFormats { @@ -28,7 +28,7 @@ internal abstract class PixelBlender /// /// Blend 2 pixels together. /// - /// The + /// The /// The destination span. /// The background span. /// The source span. @@ -36,6 +36,6 @@ internal abstract class PixelBlender /// A value between 0 and 1 indicating the weight of the second source vector. /// At amount = 0, "from" is returned, at amount = 1, "to" is returned. /// - public abstract void Blend(MemoryManager memoryManager, Span destination, Span background, Span source, Span amount); + public abstract void Blend(MemoryAllocator memoryAllocator, Span destination, Span background, Span source, Span amount); } } diff --git a/src/ImageSharp/PixelFormats/Rgba32.PixelOperations.cs b/src/ImageSharp/PixelFormats/Rgba32.PixelOperations.cs index b1eba32750..ca4231906f 100644 --- a/src/ImageSharp/PixelFormats/Rgba32.PixelOperations.cs +++ b/src/ImageSharp/PixelFormats/Rgba32.PixelOperations.cs @@ -5,7 +5,7 @@ using System.Numerics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; namespace SixLabors.ImageSharp.PixelFormats { diff --git a/src/ImageSharp/Processing/Convolution/Processors/Convolution2DProcessor.cs b/src/ImageSharp/Processing/Convolution/Processors/Convolution2DProcessor.cs index ebadd28507..48503e9997 100644 --- a/src/ImageSharp/Processing/Convolution/Processors/Convolution2DProcessor.cs +++ b/src/ImageSharp/Processing/Convolution/Processors/Convolution2DProcessor.cs @@ -5,10 +5,10 @@ using System.Numerics; using System.Threading.Tasks; using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Primitives; using SixLabors.ImageSharp.Processing.Processors; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Processing.Convolution.Processors @@ -58,7 +58,7 @@ protected override void OnFrameApply(ImageFrame source, Rectangle source int maxY = endY - 1; int maxX = endX - 1; - using (Buffer2D targetPixels = configuration.MemoryManager.Allocate2D(source.Width, source.Height)) + using (Buffer2D targetPixels = configuration.MemoryAllocator.Allocate2D(source.Width, source.Height)) { source.CopyTo(targetPixels); @@ -124,7 +124,7 @@ protected override void OnFrameApply(ImageFrame source, Rectangle source } }); - Buffer2D.SwapContents(source.PixelBuffer, targetPixels); + Buffer2D.SwapOrCopyContent(source.PixelBuffer, targetPixels); } } } diff --git a/src/ImageSharp/Processing/Convolution/Processors/Convolution2PassProcessor.cs b/src/ImageSharp/Processing/Convolution/Processors/Convolution2PassProcessor.cs index 8f96546aeb..a080beb88d 100644 --- a/src/ImageSharp/Processing/Convolution/Processors/Convolution2PassProcessor.cs +++ b/src/ImageSharp/Processing/Convolution/Processors/Convolution2PassProcessor.cs @@ -4,10 +4,10 @@ using System; using System.Numerics; using System.Threading.Tasks; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Primitives; using SixLabors.ImageSharp.Processing.Processors; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Processing.Convolution.Processors @@ -45,7 +45,7 @@ protected override void OnFrameApply(ImageFrame source, Rectangle source { ParallelOptions parallelOptions = configuration.ParallelOptions; - using (Buffer2D firstPassPixels = configuration.MemoryManager.Allocate2D(source.Size())) + using (Buffer2D firstPassPixels = configuration.MemoryAllocator.Allocate2D(source.Size())) { this.ApplyConvolution(firstPassPixels, source.PixelBuffer, source.Bounds(), this.KernelX, parallelOptions); this.ApplyConvolution(source.PixelBuffer, firstPassPixels, sourceRectangle, this.KernelY, parallelOptions); diff --git a/src/ImageSharp/Processing/Convolution/Processors/ConvolutionProcessor.cs b/src/ImageSharp/Processing/Convolution/Processors/ConvolutionProcessor.cs index 8f7a1caab7..221cf19ecc 100644 --- a/src/ImageSharp/Processing/Convolution/Processors/ConvolutionProcessor.cs +++ b/src/ImageSharp/Processing/Convolution/Processors/ConvolutionProcessor.cs @@ -5,10 +5,10 @@ using System.Numerics; using System.Threading.Tasks; using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Primitives; using SixLabors.ImageSharp.Processing.Processors; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Processing.Convolution.Processors @@ -47,7 +47,7 @@ protected override void OnFrameApply(ImageFrame source, Rectangle source int maxY = endY - 1; int maxX = endX - 1; - using (Buffer2D targetPixels = configuration.MemoryManager.Allocate2D(source.Size())) + using (Buffer2D targetPixels = configuration.MemoryAllocator.Allocate2D(source.Size())) { source.CopyTo(targetPixels); @@ -96,7 +96,7 @@ protected override void OnFrameApply(ImageFrame source, Rectangle source } }); - Buffer2D.SwapContents(source.PixelBuffer, targetPixels); + Buffer2D.SwapOrCopyContent(source.PixelBuffer, targetPixels); } } } diff --git a/src/ImageSharp/Processing/Convolution/Processors/SobelProcessor.cs b/src/ImageSharp/Processing/Convolution/Processors/SobelProcessor.cs index bf97c67d7f..9fb9c56c4c 100644 --- a/src/ImageSharp/Processing/Convolution/Processors/SobelProcessor.cs +++ b/src/ImageSharp/Processing/Convolution/Processors/SobelProcessor.cs @@ -1,7 +1,6 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; namespace SixLabors.ImageSharp.Processing.Convolution.Processors diff --git a/src/ImageSharp/Processing/DefaultInternalImageProcessorContext.cs b/src/ImageSharp/Processing/DefaultInternalImageProcessorContext.cs index b71430e13e..a392b8d8e8 100644 --- a/src/ImageSharp/Processing/DefaultInternalImageProcessorContext.cs +++ b/src/ImageSharp/Processing/DefaultInternalImageProcessorContext.cs @@ -2,9 +2,9 @@ // Licensed under the Apache License, Version 2.0. using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing.Processors; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Processing @@ -36,7 +36,7 @@ public DefaultInternalImageProcessorContext(Image source, bool mutate) } /// - public MemoryManager MemoryManager => this.source.GetConfiguration().MemoryManager; + public MemoryAllocator MemoryAllocator => this.source.GetConfiguration().MemoryAllocator; /// public Image Apply() diff --git a/src/ImageSharp/Processing/Effects/Processors/OilPaintingProcessor.cs b/src/ImageSharp/Processing/Effects/Processors/OilPaintingProcessor.cs index 9a6d93d1a3..cdaa6113fe 100644 --- a/src/ImageSharp/Processing/Effects/Processors/OilPaintingProcessor.cs +++ b/src/ImageSharp/Processing/Effects/Processors/OilPaintingProcessor.cs @@ -5,9 +5,9 @@ using System.Numerics; using System.Threading.Tasks; using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing.Processors; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Processing.Effects.Processors @@ -66,7 +66,7 @@ protected override void OnFrameApply(ImageFrame source, Rectangle source int radius = this.BrushSize >> 1; int levels = this.Levels; - using (Buffer2D targetPixels = configuration.MemoryManager.Allocate2D(source.Size())) + using (Buffer2D targetPixels = configuration.MemoryAllocator.Allocate2D(source.Size())) { source.CopyTo(targetPixels); @@ -134,7 +134,7 @@ protected override void OnFrameApply(ImageFrame source, Rectangle source } }); - Buffer2D.SwapContents(source.PixelBuffer, targetPixels); + Buffer2D.SwapOrCopyContent(source.PixelBuffer, targetPixels); } } } diff --git a/src/ImageSharp/Processing/IImageProcessingContext{TPixel}.cs b/src/ImageSharp/Processing/IImageProcessingContext{TPixel}.cs index f56777bedb..4897cc58b4 100644 --- a/src/ImageSharp/Processing/IImageProcessingContext{TPixel}.cs +++ b/src/ImageSharp/Processing/IImageProcessingContext{TPixel}.cs @@ -1,9 +1,9 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing.Processors; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Processing @@ -16,10 +16,10 @@ public interface IImageProcessingContext where TPixel : struct, IPixel { /// - /// Gets a reference to the used to allocate buffers + /// Gets a reference to the used to allocate buffers /// for this context. /// - MemoryManager MemoryManager { get; } + MemoryAllocator MemoryAllocator { get; } /// /// Gets the image dimensions at the current point in the processing pipeline. diff --git a/src/ImageSharp/Processing/Overlays/Processors/BackgroundColorProcessor.cs b/src/ImageSharp/Processing/Overlays/Processors/BackgroundColorProcessor.cs index b676f6a122..cc7e2ad8b2 100644 --- a/src/ImageSharp/Processing/Overlays/Processors/BackgroundColorProcessor.cs +++ b/src/ImageSharp/Processing/Overlays/Processors/BackgroundColorProcessor.cs @@ -4,9 +4,9 @@ using System; using System.Threading.Tasks; using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing.Processors; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Processing.Overlays.Processors @@ -66,12 +66,12 @@ protected override void OnFrameApply(ImageFrame source, Rectangle source int width = maxX - minX; - using (IBuffer colors = source.MemoryManager.Allocate(width)) - using (IBuffer amount = source.MemoryManager.Allocate(width)) + using (IBuffer colors = source.MemoryAllocator.Allocate(width)) + using (IBuffer amount = source.MemoryAllocator.Allocate(width)) { // Be careful! Do not capture colorSpan & amountSpan in the lambda below! - Span colorSpan = colors.Span; - Span amountSpan = amount.Span; + Span colorSpan = colors.GetSpan(); + Span amountSpan = amount.GetSpan(); // TODO: Use Span.Fill? for (int i = 0; i < width; i++) @@ -90,7 +90,7 @@ protected override void OnFrameApply(ImageFrame source, Rectangle source Span destination = source.GetPixelRowSpan(y - startY).Slice(minX - startX, width); // This switched color & destination in the 2nd and 3rd places because we are applying the target color under the current one - blender.Blend(source.MemoryManager, destination, colors.Span, destination, amount.Span); + blender.Blend(source.MemoryAllocator, destination, colors.GetSpan(), destination, amount.GetSpan()); }); } } diff --git a/src/ImageSharp/Processing/Overlays/Processors/GlowProcessor.cs b/src/ImageSharp/Processing/Overlays/Processors/GlowProcessor.cs index ac5d3dc82e..51634ea2c1 100644 --- a/src/ImageSharp/Processing/Overlays/Processors/GlowProcessor.cs +++ b/src/ImageSharp/Processing/Overlays/Processors/GlowProcessor.cs @@ -5,10 +5,10 @@ using System.Numerics; using System.Threading.Tasks; using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Primitives; using SixLabors.ImageSharp.Processing.Processors; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Processing.Overlays.Processors @@ -112,10 +112,10 @@ protected override void OnFrameApply(ImageFrame source, Rectangle source } int width = maxX - minX; - using (IBuffer rowColors = source.MemoryManager.Allocate(width)) + using (IBuffer rowColors = source.MemoryAllocator.Allocate(width)) { // Be careful! Do not capture rowColorsSpan in the lambda below! - Span rowColorsSpan = rowColors.Span; + Span rowColorsSpan = rowColors.GetSpan(); for (int i = 0; i < width; i++) { @@ -128,9 +128,9 @@ protected override void OnFrameApply(ImageFrame source, Rectangle source configuration.ParallelOptions, y => { - using (IBuffer amounts = source.MemoryManager.Allocate(width)) + using (IBuffer amounts = source.MemoryAllocator.Allocate(width)) { - Span amountsSpan = amounts.Span; + Span amountsSpan = amounts.GetSpan(); int offsetY = y - startY; int offsetX = minX - startX; for (int i = 0; i < width; i++) @@ -141,7 +141,7 @@ protected override void OnFrameApply(ImageFrame source, Rectangle source Span destination = source.GetPixelRowSpan(offsetY).Slice(offsetX, width); - this.blender.Blend(source.MemoryManager, destination, destination, rowColors.Span, amountsSpan); + this.blender.Blend(source.MemoryAllocator, destination, destination, rowColors.GetSpan(), amountsSpan); } }); } diff --git a/src/ImageSharp/Processing/Overlays/Processors/VignetteProcessor.cs b/src/ImageSharp/Processing/Overlays/Processors/VignetteProcessor.cs index ec286db626..b73fab1791 100644 --- a/src/ImageSharp/Processing/Overlays/Processors/VignetteProcessor.cs +++ b/src/ImageSharp/Processing/Overlays/Processors/VignetteProcessor.cs @@ -5,10 +5,10 @@ using System.Numerics; using System.Threading.Tasks; using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Primitives; using SixLabors.ImageSharp.Processing.Processors; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Processing.Overlays.Processors @@ -114,10 +114,10 @@ protected override void OnFrameApply(ImageFrame source, Rectangle source } int width = maxX - minX; - using (IBuffer rowColors = source.MemoryManager.Allocate(width)) + using (IBuffer rowColors = source.MemoryAllocator.Allocate(width)) { // Be careful! Do not capture rowColorsSpan in the lambda below! - Span rowColorsSpan = rowColors.Span; + Span rowColorsSpan = rowColors.GetSpan(); for (int i = 0; i < width; i++) { @@ -130,9 +130,9 @@ protected override void OnFrameApply(ImageFrame source, Rectangle source configuration.ParallelOptions, y => { - using (IBuffer amounts = source.MemoryManager.Allocate(width)) + using (IBuffer amounts = source.MemoryAllocator.Allocate(width)) { - Span amountsSpan = amounts.Span; + Span amountsSpan = amounts.GetSpan(); int offsetY = y - startY; int offsetX = minX - startX; for (int i = 0; i < width; i++) @@ -143,7 +143,7 @@ protected override void OnFrameApply(ImageFrame source, Rectangle source Span destination = source.GetPixelRowSpan(offsetY).Slice(offsetX, width); - this.blender.Blend(source.MemoryManager, destination, destination, rowColors.Span, amountsSpan); + this.blender.Blend(source.MemoryAllocator, destination, destination, rowColors.GetSpan(), amountsSpan); } }); } diff --git a/src/ImageSharp/Processing/Processors/CloningImageProcessor.cs b/src/ImageSharp/Processing/Processors/CloningImageProcessor.cs index ec342dd9fe..8150d59218 100644 --- a/src/ImageSharp/Processing/Processors/CloningImageProcessor.cs +++ b/src/ImageSharp/Processing/Processors/CloningImageProcessor.cs @@ -67,7 +67,7 @@ public void Apply(Image source, Rectangle sourceRectangle) throw new ImageProcessingException($"An error occurred when processing the image using {this.GetType().Name}. The processor changed the number of frames."); } - source.SwapPixelsBuffers(cloned); + source.SwapOrCopyPixelsBuffersFrom(cloned); } } diff --git a/src/ImageSharp/Processing/Quantization/FrameQuantizers/WuFrameQuantizer{TPixel}.cs b/src/ImageSharp/Processing/Quantization/FrameQuantizers/WuFrameQuantizer{TPixel}.cs index bc7a2df715..4887519e34 100644 --- a/src/ImageSharp/Processing/Quantization/FrameQuantizers/WuFrameQuantizer{TPixel}.cs +++ b/src/ImageSharp/Processing/Quantization/FrameQuantizers/WuFrameQuantizer{TPixel}.cs @@ -7,8 +7,8 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; +using SixLabors.Memory; namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers { @@ -141,17 +141,17 @@ public WuFrameQuantizer(WuQuantizer quantizer) public override QuantizedFrame QuantizeFrame(ImageFrame image) { Guard.NotNull(image, nameof(image)); - MemoryManager memoryManager = image.MemoryManager; + MemoryAllocator memoryAllocator = image.MemoryAllocator; try { - this.vwt = memoryManager.AllocateClean(TableLength); - this.vmr = memoryManager.AllocateClean(TableLength); - this.vmg = memoryManager.AllocateClean(TableLength); - this.vmb = memoryManager.AllocateClean(TableLength); - this.vma = memoryManager.AllocateClean(TableLength); - this.m2 = memoryManager.AllocateClean(TableLength); - this.tag = memoryManager.AllocateClean(TableLength); + this.vwt = memoryAllocator.AllocateClean(TableLength); + this.vmr = memoryAllocator.AllocateClean(TableLength); + this.vmg = memoryAllocator.AllocateClean(TableLength); + this.vmb = memoryAllocator.AllocateClean(TableLength); + this.vma = memoryAllocator.AllocateClean(TableLength); + this.m2 = memoryAllocator.AllocateClean(TableLength); + this.tag = memoryAllocator.AllocateClean(TableLength); return base.QuantizeFrame(image); } @@ -177,14 +177,14 @@ protected override TPixel[] GetPalette() { this.Mark(ref this.colorCube[k], (byte)k); - float weight = Volume(ref this.colorCube[k], this.vwt.Span); + float weight = Volume(ref this.colorCube[k], this.vwt.GetSpan()); if (MathF.Abs(weight) > Constants.Epsilon) { - float r = Volume(ref this.colorCube[k], this.vmr.Span); - float g = Volume(ref this.colorCube[k], this.vmg.Span); - float b = Volume(ref this.colorCube[k], this.vmb.Span); - float a = Volume(ref this.colorCube[k], this.vma.Span); + float r = Volume(ref this.colorCube[k], this.vmr.GetSpan()); + float g = Volume(ref this.colorCube[k], this.vmg.GetSpan()); + float b = Volume(ref this.colorCube[k], this.vmb.GetSpan()); + float a = Volume(ref this.colorCube[k], this.vma.GetSpan()); ref TPixel color = ref this.palette[k]; color.PackFromVector4(new Vector4(r, g, b, a) / weight / 255F); @@ -209,12 +209,12 @@ private void QuantizePixel(ref Rgba32 rgba) int index = GetPaletteIndex(r + 1, g + 1, b + 1, a + 1); - Span vwtSpan = this.vwt.Span; - Span vmrSpan = this.vmr.Span; - Span vmgSpan = this.vmg.Span; - Span vmbSpan = this.vmb.Span; - Span vmaSpan = this.vma.Span; - Span m2Span = this.m2.Span; + Span vwtSpan = this.vwt.GetSpan(); + Span vmrSpan = this.vmr.GetSpan(); + Span vmgSpan = this.vmg.GetSpan(); + Span vmbSpan = this.vmb.GetSpan(); + Span vmaSpan = this.vma.GetSpan(); + Span m2Span = this.m2.GetSpan(); vwtSpan[index]++; vmrSpan[index] += rgba.R; @@ -246,7 +246,7 @@ protected override void FirstPass(ImageFrame source, int width, int heig } } - this.Get3DMoments(source.MemoryManager); + this.Get3DMoments(source.MemoryAllocator); this.BuildCube(); } @@ -464,42 +464,42 @@ private static long Top(ref Box cube, int direction, int position, Span mo /// /// Converts the histogram into moments so that we can rapidly calculate the sums of the above quantities over any desired box. /// - private void Get3DMoments(MemoryManager memoryManager) + private void Get3DMoments(MemoryAllocator memoryAllocator) { - Span vwtSpan = this.vwt.Span; - Span vmrSpan = this.vmr.Span; - Span vmgSpan = this.vmg.Span; - Span vmbSpan = this.vmb.Span; - Span vmaSpan = this.vma.Span; - Span m2Span = this.m2.Span; - - using (IBuffer volume = memoryManager.Allocate(IndexCount * IndexAlphaCount)) - using (IBuffer volumeR = memoryManager.Allocate(IndexCount * IndexAlphaCount)) - using (IBuffer volumeG = memoryManager.Allocate(IndexCount * IndexAlphaCount)) - using (IBuffer volumeB = memoryManager.Allocate(IndexCount * IndexAlphaCount)) - using (IBuffer volumeA = memoryManager.Allocate(IndexCount * IndexAlphaCount)) - using (IBuffer volume2 = memoryManager.Allocate(IndexCount * IndexAlphaCount)) - - using (IBuffer area = memoryManager.Allocate(IndexAlphaCount)) - using (IBuffer areaR = memoryManager.Allocate(IndexAlphaCount)) - using (IBuffer areaG = memoryManager.Allocate(IndexAlphaCount)) - using (IBuffer areaB = memoryManager.Allocate(IndexAlphaCount)) - using (IBuffer areaA = memoryManager.Allocate(IndexAlphaCount)) - using (IBuffer area2 = memoryManager.Allocate(IndexAlphaCount)) + Span vwtSpan = this.vwt.GetSpan(); + Span vmrSpan = this.vmr.GetSpan(); + Span vmgSpan = this.vmg.GetSpan(); + Span vmbSpan = this.vmb.GetSpan(); + Span vmaSpan = this.vma.GetSpan(); + Span m2Span = this.m2.GetSpan(); + + using (IBuffer volume = memoryAllocator.Allocate(IndexCount * IndexAlphaCount)) + using (IBuffer volumeR = memoryAllocator.Allocate(IndexCount * IndexAlphaCount)) + using (IBuffer volumeG = memoryAllocator.Allocate(IndexCount * IndexAlphaCount)) + using (IBuffer volumeB = memoryAllocator.Allocate(IndexCount * IndexAlphaCount)) + using (IBuffer volumeA = memoryAllocator.Allocate(IndexCount * IndexAlphaCount)) + using (IBuffer volume2 = memoryAllocator.Allocate(IndexCount * IndexAlphaCount)) + + using (IBuffer area = memoryAllocator.Allocate(IndexAlphaCount)) + using (IBuffer areaR = memoryAllocator.Allocate(IndexAlphaCount)) + using (IBuffer areaG = memoryAllocator.Allocate(IndexAlphaCount)) + using (IBuffer areaB = memoryAllocator.Allocate(IndexAlphaCount)) + using (IBuffer areaA = memoryAllocator.Allocate(IndexAlphaCount)) + using (IBuffer area2 = memoryAllocator.Allocate(IndexAlphaCount)) { - Span volumeSpan = volume.Span; - Span volumeRSpan = volumeR.Span; - Span volumeGSpan = volumeG.Span; - Span volumeBSpan = volumeB.Span; - Span volumeASpan = volumeA.Span; - Span volume2Span = volume2.Span; - - Span areaSpan = area.Span; - Span areaRSpan = areaR.Span; - Span areaGSpan = areaG.Span; - Span areaBSpan = areaB.Span; - Span areaASpan = areaA.Span; - Span area2Span = area2.Span; + Span volumeSpan = volume.GetSpan(); + Span volumeRSpan = volumeR.GetSpan(); + Span volumeGSpan = volumeG.GetSpan(); + Span volumeBSpan = volumeB.GetSpan(); + Span volumeASpan = volumeA.GetSpan(); + Span volume2Span = volume2.GetSpan(); + + Span areaSpan = area.GetSpan(); + Span areaRSpan = areaR.GetSpan(); + Span areaGSpan = areaG.GetSpan(); + Span areaBSpan = areaB.GetSpan(); + Span areaASpan = areaA.GetSpan(); + Span area2Span = area2.GetSpan(); for (int r = 1; r < IndexCount; r++) { @@ -577,12 +577,12 @@ private void Get3DMoments(MemoryManager memoryManager) /// The . private float Variance(ref Box cube) { - float dr = Volume(ref cube, this.vmr.Span); - float dg = Volume(ref cube, this.vmg.Span); - float db = Volume(ref cube, this.vmb.Span); - float da = Volume(ref cube, this.vma.Span); + float dr = Volume(ref cube, this.vmr.GetSpan()); + float dg = Volume(ref cube, this.vmg.GetSpan()); + float db = Volume(ref cube, this.vmb.GetSpan()); + float da = Volume(ref cube, this.vma.GetSpan()); - Span m2Span = this.m2.Span; + Span m2Span = this.m2.GetSpan(); float xx = m2Span[GetPaletteIndex(cube.R1, cube.G1, cube.B1, cube.A1)] @@ -603,7 +603,7 @@ private float Variance(ref Box cube) + m2Span[GetPaletteIndex(cube.R0, cube.G0, cube.B0, cube.A0)]; var vector = new Vector4(dr, dg, db, da); - return xx - (Vector4.Dot(vector, vector) / Volume(ref cube, this.vwt.Span)); + return xx - (Vector4.Dot(vector, vector) / Volume(ref cube, this.vwt.GetSpan())); } /// @@ -626,22 +626,22 @@ private float Variance(ref Box cube) /// The . private float Maximize(ref Box cube, int direction, int first, int last, out int cut, float wholeR, float wholeG, float wholeB, float wholeA, float wholeW) { - long baseR = Bottom(ref cube, direction, this.vmr.Span); - long baseG = Bottom(ref cube, direction, this.vmg.Span); - long baseB = Bottom(ref cube, direction, this.vmb.Span); - long baseA = Bottom(ref cube, direction, this.vma.Span); - long baseW = Bottom(ref cube, direction, this.vwt.Span); + long baseR = Bottom(ref cube, direction, this.vmr.GetSpan()); + long baseG = Bottom(ref cube, direction, this.vmg.GetSpan()); + long baseB = Bottom(ref cube, direction, this.vmb.GetSpan()); + long baseA = Bottom(ref cube, direction, this.vma.GetSpan()); + long baseW = Bottom(ref cube, direction, this.vwt.GetSpan()); float max = 0F; cut = -1; for (int i = first; i < last; i++) { - float halfR = baseR + Top(ref cube, direction, i, this.vmr.Span); - float halfG = baseG + Top(ref cube, direction, i, this.vmg.Span); - float halfB = baseB + Top(ref cube, direction, i, this.vmb.Span); - float halfA = baseA + Top(ref cube, direction, i, this.vma.Span); - float halfW = baseW + Top(ref cube, direction, i, this.vwt.Span); + float halfR = baseR + Top(ref cube, direction, i, this.vmr.GetSpan()); + float halfG = baseG + Top(ref cube, direction, i, this.vmg.GetSpan()); + float halfB = baseB + Top(ref cube, direction, i, this.vmb.GetSpan()); + float halfA = baseA + Top(ref cube, direction, i, this.vma.GetSpan()); + float halfW = baseW + Top(ref cube, direction, i, this.vwt.GetSpan()); if (MathF.Abs(halfW) < Constants.Epsilon) { @@ -685,11 +685,11 @@ private float Maximize(ref Box cube, int direction, int first, int last, out int /// Returns a value indicating whether the box has been split. private bool Cut(ref Box set1, ref Box set2) { - float wholeR = Volume(ref set1, this.vmr.Span); - float wholeG = Volume(ref set1, this.vmg.Span); - float wholeB = Volume(ref set1, this.vmb.Span); - float wholeA = Volume(ref set1, this.vma.Span); - float wholeW = Volume(ref set1, this.vwt.Span); + float wholeR = Volume(ref set1, this.vmr.GetSpan()); + float wholeG = Volume(ref set1, this.vmg.GetSpan()); + float wholeB = Volume(ref set1, this.vmb.GetSpan()); + float wholeA = Volume(ref set1, this.vma.GetSpan()); + float wholeW = Volume(ref set1, this.vwt.GetSpan()); float maxr = this.Maximize(ref set1, 3, set1.R0 + 1, set1.R1, out int cutr, wholeR, wholeG, wholeB, wholeA, wholeW); float maxg = this.Maximize(ref set1, 2, set1.G0 + 1, set1.G1, out int cutg, wholeR, wholeG, wholeB, wholeA, wholeW); @@ -773,7 +773,7 @@ private bool Cut(ref Box set1, ref Box set2) /// A label. private void Mark(ref Box cube, byte label) { - Span tagSpan = this.tag.Span; + Span tagSpan = this.tag.GetSpan(); for (int r = cube.R0 + 1; r <= cube.R1; r++) { @@ -866,7 +866,7 @@ private byte QuantizePixel(TPixel pixel) int b = rgba.B >> (8 - IndexBits); int a = rgba.A >> (8 - IndexAlphaBits); - Span tagSpan = this.tag.Span; + Span tagSpan = this.tag.GetSpan(); return tagSpan[GetPaletteIndex(r + 1, g + 1, b + 1, a + 1)]; } diff --git a/src/ImageSharp/Processing/Transforms/Processors/AffineTransformProcessor.cs b/src/ImageSharp/Processing/Transforms/Processors/AffineTransformProcessor.cs index 7c1a581b02..2e1a889836 100644 --- a/src/ImageSharp/Processing/Transforms/Processors/AffineTransformProcessor.cs +++ b/src/ImageSharp/Processing/Transforms/Processors/AffineTransformProcessor.cs @@ -9,9 +9,9 @@ using System.Runtime.InteropServices; using System.Threading.Tasks; using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing.Transforms.Resamplers; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Processing.Transforms.Processors @@ -111,10 +111,10 @@ protected override void OnFrameApply( int xLength = (int)MathF.Ceiling((radius.X * 2) + 2); int yLength = (int)MathF.Ceiling((radius.Y * 2) + 2); - MemoryManager memoryManager = configuration.MemoryManager; + MemoryAllocator memoryAllocator = configuration.MemoryAllocator; - using (Buffer2D yBuffer = memoryManager.Allocate2D(yLength, height)) - using (Buffer2D xBuffer = memoryManager.Allocate2D(xLength, height)) + using (Buffer2D yBuffer = memoryAllocator.Allocate2D(yLength, height)) + using (Buffer2D xBuffer = memoryAllocator.Allocate2D(xLength, height)) { Parallel.For( 0, diff --git a/src/ImageSharp/Processing/Transforms/Processors/CropProcessor.cs b/src/ImageSharp/Processing/Transforms/Processors/CropProcessor.cs index 848ea7b62e..2228c69fa0 100644 --- a/src/ImageSharp/Processing/Transforms/Processors/CropProcessor.cs +++ b/src/ImageSharp/Processing/Transforms/Processors/CropProcessor.cs @@ -6,7 +6,6 @@ using System.Linq; using System.Threading.Tasks; using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; using SixLabors.Primitives; diff --git a/src/ImageSharp/Processing/Transforms/Processors/FlipProcessor.cs b/src/ImageSharp/Processing/Transforms/Processors/FlipProcessor.cs index cf5ebf418a..5d4961f571 100644 --- a/src/ImageSharp/Processing/Transforms/Processors/FlipProcessor.cs +++ b/src/ImageSharp/Processing/Transforms/Processors/FlipProcessor.cs @@ -4,9 +4,9 @@ using System; using System.Threading.Tasks; using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing.Processors; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Processing.Transforms.Processors @@ -57,7 +57,7 @@ private void FlipX(ImageFrame source, Configuration configuration) int height = source.Height; int halfHeight = (int)Math.Ceiling(source.Height * .5F); - using (Buffer2D targetPixels = configuration.MemoryManager.Allocate2D(source.Size())) + using (Buffer2D targetPixels = configuration.MemoryAllocator.Allocate2D(source.Size())) { Parallel.For( 0, @@ -75,7 +75,7 @@ private void FlipX(ImageFrame source, Configuration configuration) altSourceRow.CopyTo(targetRow); }); - Buffer2D.SwapContents(source.PixelBuffer, targetPixels); + Buffer2D.SwapOrCopyContent(source.PixelBuffer, targetPixels); } } @@ -90,7 +90,7 @@ private void FlipY(ImageFrame source, Configuration configuration) int height = source.Height; int halfWidth = (int)Math.Ceiling(width * .5F); - using (Buffer2D targetPixels = configuration.MemoryManager.Allocate2D(source.Size())) + using (Buffer2D targetPixels = configuration.MemoryAllocator.Allocate2D(source.Size())) { Parallel.For( 0, @@ -109,7 +109,7 @@ private void FlipY(ImageFrame source, Configuration configuration) } }); - Buffer2D.SwapContents(source.PixelBuffer, targetPixels); + Buffer2D.SwapOrCopyContent(source.PixelBuffer, targetPixels); } } } diff --git a/src/ImageSharp/Processing/Transforms/Processors/ProjectiveTransformProcessor.cs b/src/ImageSharp/Processing/Transforms/Processors/ProjectiveTransformProcessor.cs index a55613decb..24a72fefb0 100644 --- a/src/ImageSharp/Processing/Transforms/Processors/ProjectiveTransformProcessor.cs +++ b/src/ImageSharp/Processing/Transforms/Processors/ProjectiveTransformProcessor.cs @@ -9,9 +9,9 @@ using System.Runtime.InteropServices; using System.Threading.Tasks; using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing.Transforms.Resamplers; +using SixLabors.Memory; using SixLabors.Primitives; // TODO: Doesn't work yet! Implement tests + Finish implementation + Document Matrix4x4 behavior @@ -117,10 +117,10 @@ protected override void OnFrameApply(ImageFrame source, ImageFrame yBuffer = memoryManager.Allocate2D(yLength, height)) - using (Buffer2D xBuffer = memoryManager.Allocate2D(xLength, height)) + using (Buffer2D yBuffer = memoryAllocator.Allocate2D(yLength, height)) + using (Buffer2D xBuffer = memoryAllocator.Allocate2D(xLength, height)) { Parallel.For( 0, diff --git a/src/ImageSharp/Processing/Transforms/Processors/ResizeProcessor.cs b/src/ImageSharp/Processing/Transforms/Processors/ResizeProcessor.cs index 773b16e73d..dfb3a82ff7 100644 --- a/src/ImageSharp/Processing/Transforms/Processors/ResizeProcessor.cs +++ b/src/ImageSharp/Processing/Transforms/Processors/ResizeProcessor.cs @@ -9,9 +9,9 @@ using System.Runtime.InteropServices; using System.Threading.Tasks; using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing.Transforms.Resamplers; +using SixLabors.Memory; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Processing.Transforms.Processors @@ -143,12 +143,12 @@ public ResizeProcessor(IResampler sampler, int width, int height, Size sourceSiz /// /// Computes the weights to apply at each pixel when resizing. /// - /// The to use for buffer allocations + /// The to use for buffer allocations /// The destination size /// The source size /// The // TODO: Made internal to simplify experimenting with weights data. Make it private when finished figuring out how to optimize all the stuff! - internal WeightsBuffer PrecomputeWeights(MemoryManager memoryManager, int destinationSize, int sourceSize) + internal WeightsBuffer PrecomputeWeights(MemoryAllocator memoryAllocator, int destinationSize, int sourceSize) { float ratio = (float)sourceSize / destinationSize; float scale = ratio; @@ -160,7 +160,7 @@ internal WeightsBuffer PrecomputeWeights(MemoryManager memoryManager, int destin IResampler sampler = this.Sampler; float radius = MathF.Ceiling(scale * sampler.Radius); - var result = new WeightsBuffer(memoryManager, sourceSize, destinationSize); + var result = new WeightsBuffer(memoryAllocator, sourceSize, destinationSize); for (int i = 0; i < destinationSize; i++) { @@ -226,14 +226,14 @@ protected override void BeforeImageApply(Image source, Image des if (!(this.Sampler is NearestNeighborResampler)) { // Since all image frame dimensions have to be the same we can calculate this for all frames. - MemoryManager memoryManager = source.GetMemoryManager(); + MemoryAllocator memoryAllocator = source.GetMemoryAllocator(); this.horizontalWeights = this.PrecomputeWeights( - memoryManager, + memoryAllocator, this.ResizeRectangle.Width, sourceRectangle.Width); this.verticalWeights = this.PrecomputeWeights( - memoryManager, + memoryAllocator, this.ResizeRectangle.Height, sourceRectangle.Height); } @@ -295,7 +295,7 @@ protected override void OnFrameApply(ImageFrame source, ImageFrame firstPassPixels = source.MemoryManager.Allocate2D(width, source.Height)) + using (Buffer2D firstPassPixels = source.MemoryAllocator.Allocate2D(width, source.Height)) { firstPassPixels.Buffer.Clear(); @@ -308,7 +308,7 @@ protected override void OnFrameApply(ImageFrame source, ImageFrame sourceRow = source.GetPixelRowSpan(y); - Span tempRowSpan = tempRowBuffer.Span; + Span tempRowSpan = tempRowBuffer.GetSpan(); PixelOperations.Instance.ToVector4(sourceRow, tempRowSpan, sourceRow.Length); diff --git a/src/ImageSharp/Processing/Transforms/Processors/WeightsBuffer.cs b/src/ImageSharp/Processing/Transforms/Processors/WeightsBuffer.cs index 42c95cd338..8c479992e2 100644 --- a/src/ImageSharp/Processing/Transforms/Processors/WeightsBuffer.cs +++ b/src/ImageSharp/Processing/Transforms/Processors/WeightsBuffer.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. using System; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; namespace SixLabors.ImageSharp.Processing.Transforms.Processors { @@ -16,12 +16,12 @@ internal class WeightsBuffer : IDisposable /// /// Initializes a new instance of the class. /// - /// The MemoryManager to use for allocations. + /// The to use for allocations. /// The size of the source window /// The size of the destination window - public WeightsBuffer(MemoryManager memoryManager, int sourceSize, int destinationSize) + public WeightsBuffer(MemoryAllocator memoryAllocator, int sourceSize, int destinationSize) { - this.dataBuffer = memoryManager.Allocate2D(sourceSize, destinationSize, true); + this.dataBuffer = memoryAllocator.Allocate2D(sourceSize, destinationSize, true); this.Weights = new WeightsWindow[destinationSize]; } diff --git a/src/ImageSharp/Processing/Transforms/Processors/WeightsWindow.cs b/src/ImageSharp/Processing/Transforms/Processors/WeightsWindow.cs index a211052728..440b19ecc7 100644 --- a/src/ImageSharp/Processing/Transforms/Processors/WeightsWindow.cs +++ b/src/ImageSharp/Processing/Transforms/Processors/WeightsWindow.cs @@ -5,7 +5,7 @@ using System.Numerics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; namespace SixLabors.ImageSharp.Processing.Transforms.Processors { @@ -57,7 +57,7 @@ internal WeightsWindow(int index, int left, Buffer2D buffer, int length) [MethodImpl(MethodImplOptions.AggressiveInlining)] public ref float GetStartReference() { - Span span = this.buffer.Span; + Span span = this.buffer.GetSpan(); return ref span[this.flatStartIndex]; } diff --git a/tests/ImageSharp.Benchmarks/Codecs/CopyPixels.cs b/tests/ImageSharp.Benchmarks/Codecs/CopyPixels.cs index ed849d76f4..610c356b7a 100644 --- a/tests/ImageSharp.Benchmarks/Codecs/CopyPixels.cs +++ b/tests/ImageSharp.Benchmarks/Codecs/CopyPixels.cs @@ -12,7 +12,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs using BenchmarkDotNet.Attributes; using SixLabors.ImageSharp.Advanced; - using SixLabors.ImageSharp.Memory; + using SixLabors.Memory; public class CopyPixels : BenchmarkBase { diff --git a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/DoubleBufferedStreams.cs b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/DoubleBufferedStreams.cs index 1d76d58a51..f91595df8b 100644 --- a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/DoubleBufferedStreams.cs +++ b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/DoubleBufferedStreams.cs @@ -29,8 +29,8 @@ public void CreateStreams() this.stream2 = new MemoryStream(this.buffer); this.stream3 = new MemoryStream(this.buffer); this.stream4 = new MemoryStream(this.buffer); - this.reader1 = new DoubleBufferedStreamReader(Configuration.Default.MemoryManager, this.stream2); - this.reader2 = new DoubleBufferedStreamReader(Configuration.Default.MemoryManager, this.stream2); + this.reader1 = new DoubleBufferedStreamReader(Configuration.Default.MemoryAllocator, this.stream2); + this.reader2 = new DoubleBufferedStreamReader(Configuration.Default.MemoryAllocator, this.stream2); } [GlobalCleanup] diff --git a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/YCbCrColorConversion.cs b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/YCbCrColorConversion.cs index ef0d55765a..5a8a623735 100644 --- a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/YCbCrColorConversion.cs +++ b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/YCbCrColorConversion.cs @@ -7,7 +7,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg using BenchmarkDotNet.Attributes; - using SixLabors.ImageSharp.Memory; + using SixLabors.Memory; [Config(typeof(Config.ShortClr))] public class YCbCrColorConversion @@ -76,7 +76,7 @@ private static Buffer2D[] CreateRandomValues( } // no need to dispose when buffer is not array owner - buffers[i] = Configuration.Default.MemoryManager.Allocate2D(values.Length, 1); + buffers[i] = Configuration.Default.MemoryAllocator.Allocate2D(values.Length, 1); } return buffers; diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs index af754ba344..ac396d42e5 100644 --- a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs +++ b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs @@ -6,7 +6,7 @@ namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk using System.Runtime.InteropServices; using BenchmarkDotNet.Attributes; - using SixLabors.ImageSharp.Memory; + using SixLabors.Memory; using SixLabors.ImageSharp.PixelFormats; [Config(typeof(Config.ShortClr))] @@ -23,8 +23,8 @@ public abstract class PackFromVector4 [GlobalSetup] public void Setup() { - this.destination = Configuration.Default.MemoryManager.Allocate(this.Count); - this.source = Configuration.Default.MemoryManager.Allocate(this.Count); + this.destination = Configuration.Default.MemoryAllocator.Allocate(this.Count); + this.source = Configuration.Default.MemoryAllocator.Allocate(this.Count); } [GlobalCleanup] @@ -37,8 +37,8 @@ public void Cleanup() [Benchmark(Baseline = true)] public void PerElement() { - ref Vector4 s = ref MemoryMarshal.GetReference(this.source.Span); - ref TPixel d = ref MemoryMarshal.GetReference(this.destination.Span); + ref Vector4 s = ref MemoryMarshal.GetReference(this.source.GetSpan()); + ref TPixel d = ref MemoryMarshal.GetReference(this.destination.GetSpan()); for (int i = 0; i < this.Count; i++) { @@ -49,13 +49,13 @@ public void PerElement() [Benchmark] public void CommonBulk() { - new PixelOperations().PackFromVector4(this.source.Span, this.destination.Span, this.Count); + new PixelOperations().PackFromVector4(this.source.GetSpan(), this.destination.GetSpan(), this.Count); } [Benchmark] public void OptimizedBulk() { - PixelOperations.Instance.PackFromVector4(this.source.Span, this.destination.Span, this.Count); + PixelOperations.Instance.PackFromVector4(this.source.GetSpan(), this.destination.GetSpan(), this.Count); } } diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs index 64327d378f..c4c09f67cd 100644 --- a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs +++ b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs @@ -5,7 +5,7 @@ namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk using BenchmarkDotNet.Attributes; - using SixLabors.ImageSharp.Memory; + using SixLabors.Memory; using SixLabors.ImageSharp.PixelFormats; public abstract class PackFromXyzw @@ -21,8 +21,8 @@ public abstract class PackFromXyzw [GlobalSetup] public void Setup() { - this.destination = Configuration.Default.MemoryManager.Allocate(this.Count); - this.source = Configuration.Default.MemoryManager.Allocate(this.Count * 4); + this.destination = Configuration.Default.MemoryAllocator.Allocate(this.Count); + this.source = Configuration.Default.MemoryAllocator.Allocate(this.Count * 4); } [GlobalCleanup] @@ -35,8 +35,8 @@ public void Cleanup() [Benchmark(Baseline = true)] public void PerElement() { - Span s = this.source.Span; - Span d = this.destination.Span; + Span s = this.source.GetSpan(); + Span d = this.destination.GetSpan(); for (int i = 0; i < this.Count; i++) { @@ -50,13 +50,13 @@ public void PerElement() [Benchmark] public void CommonBulk() { - new PixelOperations().PackFromRgba32Bytes(this.source.Span, this.destination.Span, this.Count); + new PixelOperations().PackFromRgba32Bytes(this.source.GetSpan(), this.destination.GetSpan(), this.Count); } [Benchmark] public void OptimizedBulk() { - PixelOperations.Instance.PackFromRgba32Bytes(this.source.Span, this.destination.Span, this.Count); + PixelOperations.Instance.PackFromRgba32Bytes(this.source.GetSpan(), this.destination.GetSpan(), this.Count); } } diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs index e44847274e..3b988757d6 100644 --- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs +++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs @@ -6,7 +6,7 @@ namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk using BenchmarkDotNet.Attributes; - using SixLabors.ImageSharp.Memory; + using SixLabors.Memory; using SixLabors.ImageSharp.PixelFormats; public abstract class ToVector4 @@ -22,8 +22,8 @@ public abstract class ToVector4 [GlobalSetup] public void Setup() { - this.source = Configuration.Default.MemoryManager.Allocate(this.Count); - this.destination = Configuration.Default.MemoryManager.Allocate(this.Count); + this.source = Configuration.Default.MemoryAllocator.Allocate(this.Count); + this.destination = Configuration.Default.MemoryAllocator.Allocate(this.Count); } [GlobalCleanup] @@ -36,8 +36,8 @@ public void Cleanup() [Benchmark(Baseline = true)] public void PerElement() { - Span s = this.source.Span; - Span d = this.destination.Span; + Span s = this.source.GetSpan(); + Span d = this.destination.GetSpan(); for (int i = 0; i < this.Count; i++) { @@ -49,13 +49,13 @@ public void PerElement() [Benchmark] public void CommonBulk() { - new PixelOperations().ToVector4(this.source.Span, this.destination.Span, this.Count); + new PixelOperations().ToVector4(this.source.GetSpan(), this.destination.GetSpan(), this.Count); } [Benchmark] public void OptimizedBulk() { - PixelOperations.Instance.ToVector4(this.source.Span, this.destination.Span, this.Count); + PixelOperations.Instance.ToVector4(this.source.GetSpan(), this.destination.GetSpan(), this.Count); } } diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs index 030d7ad766..16743eb73d 100644 --- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs +++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs @@ -6,7 +6,7 @@ namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk using BenchmarkDotNet.Attributes; - using SixLabors.ImageSharp.Memory; + using SixLabors.Memory; using SixLabors.ImageSharp.PixelFormats; public abstract class ToXyz @@ -22,8 +22,8 @@ public abstract class ToXyz [GlobalSetup] public void Setup() { - this.source = Configuration.Default.MemoryManager.Allocate(this.Count); - this.destination = Configuration.Default.MemoryManager.Allocate(this.Count * 3); + this.source = Configuration.Default.MemoryAllocator.Allocate(this.Count); + this.destination = Configuration.Default.MemoryAllocator.Allocate(this.Count * 3); } [GlobalCleanup] @@ -36,8 +36,8 @@ public void Cleanup() [Benchmark(Baseline = true)] public void PerElement() { - Span s = this.source.Span; - Span d = this.destination.Span; + Span s = this.source.GetSpan(); + Span d = this.destination.GetSpan(); var rgb = default(Rgb24); @@ -55,13 +55,13 @@ public void PerElement() [Benchmark] public void CommonBulk() { - new PixelOperations().ToRgb24Bytes(this.source.Span, this.destination.Span, this.Count); + new PixelOperations().ToRgb24Bytes(this.source.GetSpan(), this.destination.GetSpan(), this.Count); } [Benchmark] public void OptimizedBulk() { - PixelOperations.Instance.ToRgb24Bytes(this.source.Span, this.destination.Span, this.Count); + PixelOperations.Instance.ToRgb24Bytes(this.source.GetSpan(), this.destination.GetSpan(), this.Count); } } diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs index 4f58d15036..f947b6e8d8 100644 --- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs +++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs @@ -8,7 +8,7 @@ namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk { using BenchmarkDotNet.Attributes; - using SixLabors.ImageSharp.Memory; + using SixLabors.Memory; using SixLabors.ImageSharp.PixelFormats; public abstract class ToXyzw @@ -24,8 +24,8 @@ public abstract class ToXyzw [GlobalSetup] public void Setup() { - this.source = Configuration.Default.MemoryManager.Allocate(this.Count); - this.destination = Configuration.Default.MemoryManager.Allocate(this.Count * 4); + this.source = Configuration.Default.MemoryAllocator.Allocate(this.Count); + this.destination = Configuration.Default.MemoryAllocator.Allocate(this.Count * 4); } [GlobalCleanup] @@ -38,8 +38,8 @@ public void Cleanup() [Benchmark(Baseline = true)] public void PerElement() { - Span s = this.source.Span; - Span d = this.destination.Span; + Span s = this.source.GetSpan(); + Span d = this.destination.GetSpan(); var rgba = default(Rgba32); @@ -58,13 +58,13 @@ public void PerElement() [Benchmark] public void CommonBulk() { - new PixelOperations().ToRgba32Bytes(this.source.Span, this.destination.Span, this.Count); + new PixelOperations().ToRgba32Bytes(this.source.GetSpan(), this.destination.GetSpan(), this.Count); } [Benchmark] public void OptimizedBulk() { - PixelOperations.Instance.ToRgba32Bytes(this.source.Span, this.destination.Span, this.Count); + PixelOperations.Instance.ToRgba32Bytes(this.source.GetSpan(), this.destination.GetSpan(), this.Count); } } diff --git a/tests/ImageSharp.Benchmarks/General/Vectorization/VectorFetching.cs b/tests/ImageSharp.Benchmarks/General/Vectorization/VectorFetching.cs index aa7d926a4d..017f58ef74 100644 --- a/tests/ImageSharp.Benchmarks/General/Vectorization/VectorFetching.cs +++ b/tests/ImageSharp.Benchmarks/General/Vectorization/VectorFetching.cs @@ -5,7 +5,7 @@ namespace SixLabors.ImageSharp.Benchmarks.General.Vectorization using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using BenchmarkDotNet.Attributes; - using SixLabors.ImageSharp.Memory; + using SixLabors.Memory; /// /// This benchmark compares different methods for fetching memory data into diff --git a/tests/ImageSharp.Benchmarks/PixelBlenders/PorterDuffBulkVsPixel.cs b/tests/ImageSharp.Benchmarks/PixelBlenders/PorterDuffBulkVsPixel.cs index c088e8eed4..fe0678aca4 100644 --- a/tests/ImageSharp.Benchmarks/PixelBlenders/PorterDuffBulkVsPixel.cs +++ b/tests/ImageSharp.Benchmarks/PixelBlenders/PorterDuffBulkVsPixel.cs @@ -12,7 +12,7 @@ namespace SixLabors.ImageSharp.Benchmarks using CoreSize = SixLabors.Primitives.Size; using System.Numerics; - using SixLabors.ImageSharp.Memory; + using SixLabors.Memory; using SixLabors.ImageSharp.PixelFormats.PixelBlenders; public class PorterDuffBulkVsPixel : BenchmarkBase @@ -24,7 +24,7 @@ private void BulkVectorConvert(Span destination, Span ba Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length)); Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length)); - using (IBuffer buffer = Configuration.Default.MemoryManager.Allocate(destination.Length * 3)) + using (IBuffer buffer = Configuration.Default.MemoryAllocator.Allocate(destination.Length * 3)) { Span destinationSpan = buffer.Slice(0, destination.Length); Span backgroundSpan = buffer.Slice(destination.Length, destination.Length); @@ -59,16 +59,16 @@ public CoreSize BulkVectorConvert() { using (Image image = new Image(800, 800)) { - using (IBuffer amounts = Configuration.Default.MemoryManager.Allocate(image.Width)) + using (IBuffer amounts = Configuration.Default.MemoryAllocator.Allocate(image.Width)) { - amounts.Span.Fill(1); + amounts.GetSpan().Fill(1); using (PixelAccessor pixels = image.Lock()) { for (int y = 0; y < image.Height; y++) { Span span = pixels.GetRowSpan(y); - this.BulkVectorConvert(span, span, span, amounts.Span); + this.BulkVectorConvert(span, span, span, amounts.GetSpan()); } } return new CoreSize(image.Width, image.Height); @@ -81,15 +81,15 @@ public CoreSize BulkPixelConvert() { using (Image image = new Image(800, 800)) { - using (IBuffer amounts = Configuration.Default.MemoryManager.Allocate(image.Width)) + using (IBuffer amounts = Configuration.Default.MemoryAllocator.Allocate(image.Width)) { - amounts.Span.Fill(1); + amounts.GetSpan().Fill(1); using (PixelAccessor pixels = image.Lock()) { for (int y = 0; y < image.Height; y++) { Span span = pixels.GetRowSpan(y); - this.BulkPixelConvert(span, span, span, amounts.Span); + this.BulkPixelConvert(span, span, span, amounts.GetSpan()); } } diff --git a/tests/ImageSharp.Benchmarks/Samplers/Glow.cs b/tests/ImageSharp.Benchmarks/Samplers/Glow.cs index 51b1366490..b2fa47893b 100644 --- a/tests/ImageSharp.Benchmarks/Samplers/Glow.cs +++ b/tests/ImageSharp.Benchmarks/Samplers/Glow.cs @@ -14,7 +14,7 @@ namespace SixLabors.ImageSharp.Benchmarks using System; using System.Threading.Tasks; - using SixLabors.ImageSharp.Memory; + using SixLabors.Memory; using SixLabors.Primitives; using SixLabors.ImageSharp.Processing.Overlays.Processors; using SixLabors.ImageSharp.Processing.Processors; @@ -102,10 +102,10 @@ protected override void OnFrameApply(ImageFrame source, Rectangle source } int width = maxX - minX; - using (IBuffer rowColors = Configuration.Default.MemoryManager.Allocate(width)) + using (IBuffer rowColors = Configuration.Default.MemoryAllocator.Allocate(width)) using (PixelAccessor sourcePixels = source.Lock()) { - rowColors.Span.Fill(glowColor); + rowColors.GetSpan().Fill(glowColor); Parallel.For( minY, diff --git a/tests/ImageSharp.Tests/Advanced/AdvancedImageExtensionsTests.cs b/tests/ImageSharp.Tests/Advanced/AdvancedImageExtensionsTests.cs index 302b90e309..3662666520 100644 --- a/tests/ImageSharp.Tests/Advanced/AdvancedImageExtensionsTests.cs +++ b/tests/ImageSharp.Tests/Advanced/AdvancedImageExtensionsTests.cs @@ -1,15 +1,134 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. +using System; using System.Runtime.CompilerServices; using SixLabors.ImageSharp.Advanced; using SixLabors.ImageSharp.PixelFormats; using Xunit; +// ReSharper disable InconsistentNaming namespace SixLabors.ImageSharp.Tests.Advanced { + using System.Buffers; + + using SixLabors.Memory; + public class AdvancedImageExtensionsTests { + public class GetPixelMemory + { + [Theory] + [WithSolidFilledImages(1, 1, "Red", PixelTypes.Rgba32)] + [WithTestPatternImages(131, 127, PixelTypes.Rgba32 | PixelTypes.Bgr24)] + public void WhenMemoryIsOwned(TestImageProvider provider) + where TPixel : struct, IPixel + { + using (Image image0 = provider.GetImage()) + { + var targetBuffer = new TPixel[image0.Width * image0.Height]; + + // Act: + Memory memory = image0.GetPixelMemory(); + + // Assert: + Assert.Equal(image0.Width * image0.Height, memory.Length); + memory.Span.CopyTo(targetBuffer); + + using (Image image1 = provider.GetImage()) + { + // We are using a copy of the original image for assertion + image1.ComparePixelBufferTo(targetBuffer); + } + } + } + + + [Theory] + [WithSolidFilledImages(1, 1, "Red", PixelTypes.Rgba32 | PixelTypes.Bgr24)] + [WithTestPatternImages(131, 127, PixelTypes.Rgba32 | PixelTypes.Bgr24)] + public void WhenMemoryIsConsumed(TestImageProvider provider) + where TPixel : struct, IPixel + { + using (Image image0 = provider.GetImage()) + { + var targetBuffer = new TPixel[image0.Width * image0.Height]; + image0.GetPixelSpan().CopyTo(targetBuffer); + + var managerOfExeternalMemory = new TestMemoryManager(targetBuffer); + + Memory externalMemory = managerOfExeternalMemory.Memory; + + using (Image image1 = Image.WrapMemory(externalMemory, image0.Width, image0.Height)) + { + Memory internalMemory = image1.GetPixelMemory(); + Assert.Equal(targetBuffer.Length, internalMemory.Length); + Assert.True(Unsafe.AreSame(ref targetBuffer[0], ref internalMemory.Span[0])); + + image0.ComparePixelBufferTo(internalMemory.Span); + } + + // Make sure externalMemory works after destruction: + image0.ComparePixelBufferTo(externalMemory.Span); + } + } + + } + + [Theory] + [WithSolidFilledImages(1, 1, "Red", PixelTypes.Rgba32)] + [WithTestPatternImages(131, 127, PixelTypes.Rgba32 | PixelTypes.Bgr24)] + public void GetPixelRowMemory(TestImageProvider provider) + where TPixel : struct, IPixel + { + using (Image image = provider.GetImage()) + { + var targetBuffer = new TPixel[image.Width * image.Height]; + + // Act: + for (int y = 0; y < image.Height; y++) + { + Memory rowMemory = image.GetPixelRowMemory(y); + rowMemory.Span.CopyTo(targetBuffer.AsSpan(image.Width * y)); + } + + // Assert: + using (Image image1 = provider.GetImage()) + { + // We are using a copy of the original image for assertion + image1.ComparePixelBufferTo(targetBuffer); + } + } + } + + [Theory] + [WithSolidFilledImages(1, 1, "Red", PixelTypes.Rgba32)] + [WithTestPatternImages(131, 127, PixelTypes.Rgba32 | PixelTypes.Bgr24)] + public void GetPixelRowSpan(TestImageProvider provider) + where TPixel : struct, IPixel + { + using (Image image = provider.GetImage()) + { + var targetBuffer = new TPixel[image.Width * image.Height]; + + // Act: + for (int y = 0; y < image.Height; y++) + { + Span rowMemory = image.GetPixelRowSpan(y); + rowMemory.CopyTo(targetBuffer.AsSpan(image.Width * y)); + } + + // Assert: + using (Image image1 = provider.GetImage()) + { + // We are using a copy of the original image for assertion + image1.ComparePixelBufferTo(targetBuffer); + } + } + } + + #pragma warning disable 0618 + [Theory] [WithTestPatternImages(131, 127, PixelTypes.Rgba32 | PixelTypes.Bgr24)] public unsafe void DangerousGetPinnableReference_CopyToBuffer(TestImageProvider provider) diff --git a/tests/ImageSharp.Tests/Drawing/FillRegionProcessorTests.cs b/tests/ImageSharp.Tests/Drawing/FillRegionProcessorTests.cs index 8c619c8175..c664bcf9ce 100644 --- a/tests/ImageSharp.Tests/Drawing/FillRegionProcessorTests.cs +++ b/tests/ImageSharp.Tests/Drawing/FillRegionProcessorTests.cs @@ -4,7 +4,8 @@ using System.Numerics; using Moq; - +using System; +using SixLabors.Memory; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Primitives; using SixLabors.ImageSharp.Processing; @@ -13,13 +14,15 @@ using SixLabors.ImageSharp.Processing.Drawing.Pens; using SixLabors.ImageSharp.Processing.Drawing.Processors; using SixLabors.Primitives; - using Xunit; namespace SixLabors.ImageSharp.Tests.Drawing { + + public class FillRegionProcessorTests { + [Theory] [InlineData(true, 1, 4)] [InlineData(true, 2, 4)] @@ -29,21 +32,20 @@ public class FillRegionProcessorTests [InlineData(false, 16, 4)] // we always do 4 sub=pixels when antialising is off. public void MinimumAntialiasSubpixelDepth(bool antialias, int antialiasSubpixelDepth, int expectedAntialiasSubpixelDepth) { - var bounds = new SixLabors.Primitives.Rectangle(0, 0, 1, 1); + var bounds = new Rectangle(0, 0, 1, 1); var brush = new Mock>(); - var region = new Mock(); - region.Setup(x => x.Bounds).Returns(bounds); + var region = new MockRegion2(bounds); var options = new GraphicsOptions(antialias) { AntialiasSubpixelDepth = 1 }; - var processor = new FillRegionProcessor(brush.Object, region.Object, options); + var processor = new FillRegionProcessor(brush.Object, region, options); var img = new Image(1, 1); processor.Apply(img, bounds); - region.Verify(x => x.Scan(It.IsAny(), It.IsAny(), It.IsAny()), Times.Exactly(4)); + Assert.Equal(4, region.ScanInvocationCounter); } [Fact] @@ -52,7 +54,7 @@ public void FillOffCanvas() var bounds = new Rectangle(-100, -10, 10, 10); var brush = new Mock>(); var options = new GraphicsOptions(true); - var processor = new FillRegionProcessor(brush.Object, new MockRegion(), options); + var processor = new FillRegionProcessor(brush.Object, new MockRegion1(), options); var img = new Image(10, 10); processor.Apply(img, bounds); } @@ -71,13 +73,11 @@ public void DrawOffCanvas() } // Mocking the region throws an error in netcore2.0 - private class MockRegion : Region + private class MockRegion1 : Region { public override Rectangle Bounds => new Rectangle(-100, -10, 10, 10); - public override int MaxIntersections => 10; - - public override int Scan(float y, float[] buffer, int offset) + public override int Scan(float y, Span buffer, Configuration configuration) { if (y < 5) { @@ -87,6 +87,28 @@ public override int Scan(float y, float[] buffer, int offset) } return 0; } + + public override int MaxIntersections => 10; + } + + private class MockRegion2 : Region + { + public MockRegion2(Rectangle bounds) + { + this.Bounds = bounds; + } + + public override int MaxIntersections => 100; + + public override Rectangle Bounds { get; } + + public int ScanInvocationCounter { get; private set; } + + public override int Scan(float y, Span buffer, Configuration configuration) + { + this.ScanInvocationCounter++; + return 0; + } } } } diff --git a/tests/ImageSharp.Tests/Drawing/FillSolidBrushTests.cs b/tests/ImageSharp.Tests/Drawing/FillSolidBrushTests.cs index 83f4fbde6a..58fd4c767d 100644 --- a/tests/ImageSharp.Tests/Drawing/FillSolidBrushTests.cs +++ b/tests/ImageSharp.Tests/Drawing/FillSolidBrushTests.cs @@ -12,7 +12,10 @@ namespace SixLabors.ImageSharp.Tests.Drawing { - + using System; + + using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; + using SixLabors.Primitives; [GroupOutput("Drawing")] public class FillSolidBrushTests @@ -67,6 +70,19 @@ public void WhenColorIsOpaque_OverridePreviousColor(TestImageProvider(TestImageProvider provider, int x0, int y0, int w, int h) + where TPixel : struct, IPixel + { + FormattableString testDetails = $"(x{x0},y{y0},w{w},h{h})"; + var region = new RectangleF(x0, y0, w, h); + TPixel color = TestUtils.GetPixelOfNamedColor("Blue"); + + provider.RunValidatingProcessorTest(c => c.Fill(color, region), testDetails, ImageComparer.Exact); + } + public static readonly TheoryData BlendData = new TheoryData() { diff --git a/tests/ImageSharp.Tests/Drawing/Paths/ShapeRegionTests.cs b/tests/ImageSharp.Tests/Drawing/Paths/ShapeRegionTests.cs index 2a9ab3412e..40c5f950da 100644 --- a/tests/ImageSharp.Tests/Drawing/Paths/ShapeRegionTests.cs +++ b/tests/ImageSharp.Tests/Drawing/Paths/ShapeRegionTests.cs @@ -2,39 +2,64 @@ // Licensed under the Apache License, Version 2.0. using SixLabors.ImageSharp.Primitives; +using System; +using System.Collections.Generic; +using System.Numerics; +using Moq; +using SixLabors.Primitives; +using SixLabors.Shapes; +using Xunit; namespace SixLabors.ImageSharp.Tests.Drawing.Paths { - using System; - - using Moq; - using SixLabors.Primitives; - using SixLabors.Shapes; - - using Xunit; - public class ShapeRegionTests { - private readonly Mock pathMock; + public abstract class MockPath : IPath + { + public abstract RectangleF Bounds { get; } + public IPath AsClosedPath() => this; + + public abstract SegmentInfo PointAlongPath(float distanceAlongPath); + public abstract PointInfo Distance(PointF point); + public abstract IEnumerable Flatten(); + public abstract bool Contains(PointF point); + public abstract IPath Transform(Matrix3x2 matrix); + public abstract PathTypes PathType { get; } + public abstract int MaxIntersections { get; } + public abstract float Length { get; } + + public int FindIntersections(PointF start, PointF end, PointF[] buffer, int offset) + { + return this.FindIntersections(start, end, buffer, 0); + } + + public int FindIntersections(PointF s, PointF e, Span buffer) + { + Assert.Equal(this.TestYToScan, s.Y); + Assert.Equal(this.TestYToScan, e.Y); + Assert.True(s.X < this.Bounds.Left); + Assert.True(e.X > this.Bounds.Right); + + this.TestFindIntersectionsInvocationCounter++; + + return this.TestFindIntersectionsResult; + } + + public int TestFindIntersectionsInvocationCounter { get; private set; } + public virtual int TestYToScan => 10; + public virtual int TestFindIntersectionsResult => 3; + } + + private readonly Mock pathMock; private readonly RectangleF bounds; public ShapeRegionTests() { - this.pathMock = new Mock(); + this.pathMock = new Mock() { CallBase = true }; this.bounds = new RectangleF(10.5f, 10, 10, 10); this.pathMock.Setup(x => x.Bounds).Returns(this.bounds); - // wire up the 2 mocks to reference eachother - this.pathMock.Setup(x => x.AsClosedPath()).Returns(() => this.pathMock.Object); - } - - [Fact] - public void ShapeRegionWithPathCallsAsShape() - { - new ShapeRegion(this.pathMock.Object); - - this.pathMock.Verify(x => x.AsClosedPath()); } [Fact] @@ -68,59 +93,17 @@ public void ShapeRegionFromPathMaxIntersectionsProxyToShape() [Fact] public void ShapeRegionFromPathScanYProxyToShape() { - int yToScan = 10; - var region = new ShapeRegion(this.pathMock.Object); + MockPath path = this.pathMock.Object; + int yToScan = path.TestYToScan; + var region = new ShapeRegion(path); - this.pathMock - .Setup( - x => x.FindIntersections( - It.IsAny(), - It.IsAny(), - It.IsAny(), - It.IsAny())).Callback( - (s, e, b, o) => - { - Assert.Equal(yToScan, s.Y); - Assert.Equal(yToScan, e.Y); - Assert.True(s.X < this.bounds.Left); - Assert.True(e.X > this.bounds.Right); - }).Returns(0); - - int i = region.Scan(yToScan, new float[0], 0); - - this.pathMock.Verify( - x => x.FindIntersections(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny()), - Times.Once); - } + int i = region.Scan(yToScan, new float[path.TestFindIntersectionsResult], Configuration.Default); - [Fact] - public void ShapeRegionFromShapeScanYProxyToShape() - { - int yToScan = 10; - var region = new ShapeRegion(this.pathMock.Object); - - this.pathMock - .Setup( - x => x.FindIntersections( - It.IsAny(), - It.IsAny(), - It.IsAny(), - It.IsAny())).Callback( - (s, e, b, o) => - { - Assert.Equal(yToScan, s.Y); - Assert.Equal(yToScan, e.Y); - Assert.True(s.X < this.bounds.Left); - Assert.True(e.X > this.bounds.Right); - }).Returns(0); - - int i = region.Scan(yToScan, new float[0], 0); - - this.pathMock.Verify( - x => x.FindIntersections(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny()), - Times.Once); + Assert.Equal(path.TestFindIntersectionsResult, i); + Assert.Equal(1, path.TestFindIntersectionsInvocationCounter); } + [Fact] public void ShapeRegionFromShapeConvertsBoundsProxyToShape() { diff --git a/tests/ImageSharp.Tests/FakeImageOperationsProvider.cs b/tests/ImageSharp.Tests/FakeImageOperationsProvider.cs index cc2143afe1..ff4014e616 100644 --- a/tests/ImageSharp.Tests/FakeImageOperationsProvider.cs +++ b/tests/ImageSharp.Tests/FakeImageOperationsProvider.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing.Processors; @@ -55,7 +55,7 @@ public FakeImageOperations(Image source, bool mutate) public List Applied { get; } = new List(); - public MemoryManager MemoryManager => this.Source.GetConfiguration().MemoryManager; + public MemoryAllocator MemoryAllocator => this.Source.GetConfiguration().MemoryAllocator; public Image Apply() { diff --git a/tests/ImageSharp.Tests/Formats/GeneralFormatTests.cs b/tests/ImageSharp.Tests/Formats/GeneralFormatTests.cs index 0187b7e297..084b93b398 100644 --- a/tests/ImageSharp.Tests/Formats/GeneralFormatTests.cs +++ b/tests/ImageSharp.Tests/Formats/GeneralFormatTests.cs @@ -15,7 +15,7 @@ namespace SixLabors.ImageSharp.Tests using System; using System.Reflection; - using SixLabors.ImageSharp.Memory; + using SixLabors.Memory; using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing.Quantization; @@ -77,7 +77,7 @@ public void DecodeThenEncodeImageFromStreamShouldSucceed() public void QuantizeImageShouldPreserveMaximumColorPrecision(TestImageProvider provider, string quantizerName) where TPixel : struct, IPixel { - provider.Configuration.MemoryManager = ArrayPoolMemoryManager.CreateWithModeratePooling(); + provider.Configuration.MemoryAllocator = ArrayPoolMemoryAllocator.CreateWithModeratePooling(); IQuantizer quantizer = GetQuantizer(quantizerName); @@ -87,7 +87,7 @@ public void QuantizeImageShouldPreserveMaximumColorPrecision(TestImagePr image.DebugSave(provider, new PngEncoder() { PngColorType = PngColorType.Palette }, testOutputDetails: quantizerName); } - provider.Configuration.MemoryManager.ReleaseRetainedResources(); + provider.Configuration.MemoryAllocator.ReleaseRetainedResources(); //string path = TestEnvironment.CreateOutputDirectory("Quantize"); diff --git a/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.CopyToBufferArea.cs b/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.CopyToBufferArea.cs index aa7d101c0d..88be54dd0c 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.CopyToBufferArea.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.CopyToBufferArea.cs @@ -5,7 +5,7 @@ //#define BENCHMARKING using SixLabors.ImageSharp.Formats.Jpeg.Components; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils; using SixLabors.Primitives; @@ -44,7 +44,7 @@ public void Unscaled() { Block8x8F block = CreateRandomFloatBlock(0, 100); - using (var buffer = Configuration.Default.MemoryManager.Allocate2D(20, 20)) + using (var buffer = Configuration.Default.MemoryAllocator.Allocate2D(20, 20)) { BufferArea area = buffer.GetArea(5, 10, 8, 8); block.CopyTo(area); @@ -74,7 +74,7 @@ public void Scaled(int horizontalFactor, int verticalFactor) var start = new Point(50, 50); - using (var buffer = Configuration.Default.MemoryManager.Allocate2D(100, 100)) + using (var buffer = Configuration.Default.MemoryAllocator.Allocate2D(100, 100)) { BufferArea area = buffer.GetArea(start.X, start.Y, 8 * horizontalFactor, 8 * verticalFactor); block.CopyTo(area, horizontalFactor, verticalFactor); diff --git a/tests/ImageSharp.Tests/Formats/Jpg/DoubleBufferedStreamReaderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/DoubleBufferedStreamReaderTests.cs index be71e554f1..20b199441c 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/DoubleBufferedStreamReaderTests.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/DoubleBufferedStreamReaderTests.cs @@ -4,14 +4,14 @@ using System; using System.IO; using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; using Xunit; namespace SixLabors.ImageSharp.Tests.Formats.Jpg { public class DoubleBufferedStreamReaderTests { - private readonly MemoryManager manager = Configuration.Default.MemoryManager; + private readonly MemoryAllocator allocator = Configuration.Default.MemoryAllocator; [Fact] public void DoubleBufferedStreamReaderCanReadSingleByteFromOrigin() @@ -19,7 +19,7 @@ public void DoubleBufferedStreamReaderCanReadSingleByteFromOrigin() using (MemoryStream stream = this.CreateTestStream()) { byte[] expected = stream.ToArray(); - var reader = new DoubleBufferedStreamReader(this.manager, stream); + var reader = new DoubleBufferedStreamReader(this.allocator, stream); Assert.Equal(expected[0], reader.ReadByte()); @@ -35,7 +35,7 @@ public void DoubleBufferedStreamReaderCanReadSubsequentSingleByteCorrectly() using (MemoryStream stream = this.CreateTestStream()) { byte[] expected = stream.ToArray(); - var reader = new DoubleBufferedStreamReader(this.manager, stream); + var reader = new DoubleBufferedStreamReader(this.allocator, stream); for (int i = 0; i < expected.Length; i++) { @@ -67,7 +67,7 @@ public void DoubleBufferedStreamReaderCanReadMultipleBytesFromOrigin() { byte[] buffer = new byte[2]; byte[] expected = stream.ToArray(); - var reader = new DoubleBufferedStreamReader(this.manager, stream); + var reader = new DoubleBufferedStreamReader(this.allocator, stream); Assert.Equal(2, reader.Read(buffer, 0, 2)); Assert.Equal(expected[0], buffer[0]); @@ -86,7 +86,7 @@ public void DoubleBufferedStreamReaderCanReadSubsequentMultipleByteCorrectly() { byte[] buffer = new byte[2]; byte[] expected = stream.ToArray(); - var reader = new DoubleBufferedStreamReader(this.manager, stream); + var reader = new DoubleBufferedStreamReader(this.allocator, stream); for (int i = 0, o = 0; i < expected.Length / 2; i++, o += 2) { @@ -121,7 +121,7 @@ public void DoubleBufferedStreamReaderCanSkip() using (MemoryStream stream = this.CreateTestStream()) { byte[] expected = stream.ToArray(); - var reader = new DoubleBufferedStreamReader(this.manager, stream); + var reader = new DoubleBufferedStreamReader(this.allocator, stream); int skip = 50; int plusOne = 1; diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs index c97d625535..aed650b8e9 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs @@ -8,7 +8,7 @@ using SixLabors.ImageSharp.ColorSpaces.Conversion; using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder; using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; using Xunit; using Xunit.Abstractions; diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Baseline.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Baseline.cs index f178c29c0a..e266554d18 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Baseline.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Baseline.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. using System; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; using SixLabors.ImageSharp.PixelFormats; using Xunit; // ReSharper disable InconsistentNaming @@ -22,7 +22,7 @@ public void DecodeBaselineJpeg_Orig(TestImageProvider provider) } // For 32 bit test enviroments: - provider.Configuration.MemoryManager = ArrayPoolMemoryManager.CreateWithModeratePooling(); + provider.Configuration.MemoryAllocator = ArrayPoolMemoryAllocator.CreateWithModeratePooling(); using (Image image = provider.GetImage(GolangJpegDecoder)) { @@ -34,7 +34,7 @@ public void DecodeBaselineJpeg_Orig(TestImageProvider provider) appendPixelTypeToFileName: false); } - provider.Configuration.MemoryManager.ReleaseRetainedResources(); + provider.Configuration.MemoryAllocator.ReleaseRetainedResources(); } [Theory] diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Progressive.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Progressive.cs index c988f8f054..c793b40341 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Progressive.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Progressive.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. using System.Linq; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; using SixLabors.ImageSharp.PixelFormats; using Xunit; // ReSharper disable InconsistentNaming @@ -31,7 +31,7 @@ public void DecodeProgressiveJpeg_Orig(TestImageProvider provide } // For 32 bit test enviroments: - provider.Configuration.MemoryManager = ArrayPoolMemoryManager.CreateWithModeratePooling(); + provider.Configuration.MemoryAllocator = ArrayPoolMemoryAllocator.CreateWithModeratePooling(); using (Image image = provider.GetImage(GolangJpegDecoder)) { @@ -44,7 +44,7 @@ public void DecodeProgressiveJpeg_Orig(TestImageProvider provide appendPixelTypeToFileName: false); } - provider.Configuration.MemoryManager.ReleaseRetainedResources(); + provider.Configuration.MemoryAllocator.ReleaseRetainedResources(); } [Theory] diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs index 3667790a2c..6b3ef1dee8 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs @@ -10,7 +10,7 @@ using SixLabors.ImageSharp.Formats.Jpeg; using SixLabors.ImageSharp.Formats.Jpeg.GolangPort; using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils; using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; @@ -100,7 +100,7 @@ public void JpegDecoder_IsNotBoundToSinglePixelType(TestImageProvider image = provider.GetImage(decoder)) @@ -111,7 +111,7 @@ public void JpegDecoder_IsNotBoundToSinglePixelType(TestImageProvider(Image image, TestImageProvider provider) diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegImagePostProcessorTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegImagePostProcessorTests.cs index 45ee64cb44..843843f797 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/JpegImagePostProcessorTests.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegImagePostProcessorTests.cs @@ -49,7 +49,7 @@ public void DoProcessorStep(TestImageProvider provider) { string imageFile = provider.SourceFileOrDescription; using (PdfJsJpegDecoderCore decoder = JpegFixture.ParsePdfJsStream(imageFile)) - using (var pp = new JpegImagePostProcessor(Configuration.Default.MemoryManager, decoder)) + using (var pp = new JpegImagePostProcessor(Configuration.Default.MemoryAllocator, decoder)) using (var imageFrame = new ImageFrame(Configuration.Default, decoder.ImageWidth, decoder.ImageHeight)) { pp.DoPostProcessorStep(imageFrame); @@ -69,7 +69,7 @@ public void PostProcess(TestImageProvider provider) { string imageFile = provider.SourceFileOrDescription; using (PdfJsJpegDecoderCore decoder = JpegFixture.ParsePdfJsStream(imageFile)) - using (var pp = new JpegImagePostProcessor(Configuration.Default.MemoryManager, decoder)) + using (var pp = new JpegImagePostProcessor(Configuration.Default.MemoryAllocator, decoder)) using (var image = new Image(decoder.ImageWidth, decoder.ImageHeight)) { pp.PostProcess(image.Frames.RootFrame); diff --git a/tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs index 811af96757..46a688b49c 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs @@ -107,7 +107,7 @@ private void VerifySpectralCorrectness( this.Output.WriteLine($"Component{i}: {diff}"); averageDifference += diff.average; totalDifference += diff.total; - tolerance += libJpegComponent.SpectralBlocks.Buffer.Span.Length; + tolerance += libJpegComponent.SpectralBlocks.Buffer.GetSpan().Length; } averageDifference /= componentCount; diff --git a/tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.ComponentData.cs b/tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.ComponentData.cs index 90cc45e4aa..645ee45128 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.ComponentData.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.ComponentData.cs @@ -10,7 +10,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils using SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder; using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components; - using SixLabors.ImageSharp.Memory; + using SixLabors.Memory; using SixLabors.Primitives; internal static partial class LibJpegTools @@ -25,7 +25,7 @@ public ComponentData(int widthInBlocks, int heightInBlocks, int index) this.HeightInBlocks = heightInBlocks; this.WidthInBlocks = widthInBlocks; this.Index = index; - this.SpectralBlocks = Configuration.Default.MemoryManager.Allocate2D(this.WidthInBlocks, this.HeightInBlocks); + this.SpectralBlocks = Configuration.Default.MemoryAllocator.Allocate2D(this.WidthInBlocks, this.HeightInBlocks); } public Size Size => new Size(this.WidthInBlocks, this.HeightInBlocks); diff --git a/tests/ImageSharp.Tests/Image/ImageFramesCollectionTests.cs b/tests/ImageSharp.Tests/Image/ImageFramesCollectionTests.cs index a26d887201..3923970578 100644 --- a/tests/ImageSharp.Tests/Image/ImageFramesCollectionTests.cs +++ b/tests/ImageSharp.Tests/Image/ImageFramesCollectionTests.cs @@ -19,7 +19,7 @@ public ImageFramesCollectionTests() System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("en-US"); this.image = new Image(10, 10); - this.collection = new ImageFrameCollection(this.image, 10, 10, default); + this.collection = new ImageFrameCollection(this.image, 10, 10, default(Rgba32)); } [Fact] diff --git a/tests/ImageSharp.Tests/Image/ImageLoadTests.cs b/tests/ImageSharp.Tests/Image/ImageLoadTests.cs deleted file mode 100644 index 35d6b57226..0000000000 --- a/tests/ImageSharp.Tests/Image/ImageLoadTests.cs +++ /dev/null @@ -1,337 +0,0 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the Apache License, Version 2.0. - -using System; -using System.IO; -using SixLabors.ImageSharp.Formats; -using SixLabors.ImageSharp.IO; -using Moq; -using Xunit; -using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.PixelFormats; - -namespace SixLabors.ImageSharp.Tests -{ - /// - /// Tests the class. - /// - public partial class ImageLoadTests : IDisposable - { - private readonly Mock fileSystem; - private Image returnImage; - private Mock localDecoder; - private readonly string FilePath; - private readonly IImageFormatDetector localMimeTypeDetector; - private readonly Mock localImageFormatMock; - - public Configuration LocalConfiguration { get; private set; } - public byte[] Marker { get; private set; } - public MemoryStream DataStream { get; private set; } - public byte[] DecodedData { get; private set; } - - public ImageLoadTests() - { - this.returnImage = new Image(1, 1); - - this.localImageFormatMock = new Mock(); - - this.localDecoder = new Mock(); - this.localMimeTypeDetector = new MockImageFormatDetector(this.localImageFormatMock.Object); - this.localDecoder.Setup(x => x.Decode(It.IsAny(), It.IsAny())) - - .Callback((c, s) => - { - using (var ms = new MemoryStream()) - { - s.CopyTo(ms); - this.DecodedData = ms.ToArray(); - } - }) - .Returns(this.returnImage); - - this.fileSystem = new Mock(); - - this.LocalConfiguration = new Configuration - { - FileSystem = this.fileSystem.Object - }; - this.LocalConfiguration.ImageFormatsManager.AddImageFormatDetector(this.localMimeTypeDetector); - this.LocalConfiguration.ImageFormatsManager.SetDecoder(this.localImageFormatMock.Object, this.localDecoder.Object); - - TestFormat.RegisterGlobalTestFormat(); - this.Marker = Guid.NewGuid().ToByteArray(); - this.DataStream = TestFormat.GlobalTestFormat.CreateStream(this.Marker); - - this.FilePath = Guid.NewGuid().ToString(); - this.fileSystem.Setup(x => x.OpenRead(this.FilePath)).Returns(this.DataStream); - - TestFileSystem.RegisterGlobalTestFormat(); - TestFileSystem.Global.AddFile(this.FilePath, this.DataStream); - } - - [Fact] - public void LoadFromStream() - { - Image img = Image.Load(this.DataStream); - - Assert.NotNull(img); - - TestFormat.GlobalTestFormat.VerifyDecodeCall(this.Marker, Configuration.Default); - } - - [Fact] - public void LoadFromNoneSeekableStream() - { - NoneSeekableStream stream = new NoneSeekableStream(this.DataStream); - Image img = Image.Load(stream); - - Assert.NotNull(img); - - TestFormat.GlobalTestFormat.VerifyDecodeCall(this.Marker, Configuration.Default); - } - - [Fact] - public void LoadFromStreamWithType() - { - Image img = Image.Load(this.DataStream); - - Assert.NotNull(img); - Assert.Equal(TestFormat.GlobalTestFormat.Sample(), img); - - TestFormat.GlobalTestFormat.VerifyDecodeCall(this.Marker, Configuration.Default); - } - - - [Fact] - public void LoadFromStreamWithConfig() - { - Stream stream = new MemoryStream(); - Image img = Image.Load(this.LocalConfiguration, stream); - - Assert.NotNull(img); - - this.localDecoder.Verify(x => x.Decode(this.LocalConfiguration, stream)); - } - - [Fact] - public void LoadFromStreamWithTypeAndConfig() - { - Stream stream = new MemoryStream(); - Image img = Image.Load(this.LocalConfiguration, stream); - - Assert.NotNull(img); - Assert.Equal(this.returnImage, img); - - this.localDecoder.Verify(x => x.Decode(this.LocalConfiguration, stream)); - } - - - [Fact] - public void LoadFromStreamWithDecoder() - { - Stream stream = new MemoryStream(); - Image img = Image.Load(stream, this.localDecoder.Object); - - Assert.NotNull(img); - this.localDecoder.Verify(x => x.Decode(Configuration.Default, stream)); - } - - [Fact] - public void LoadFromStreamWithTypeAndDecoder() - { - Stream stream = new MemoryStream(); - Image img = Image.Load(stream, this.localDecoder.Object); - - Assert.NotNull(img); - Assert.Equal(this.returnImage, img); - this.localDecoder.Verify(x => x.Decode(Configuration.Default, stream)); - } - - [Fact] - public void LoadFromBytes() - { - Image img = Image.Load(this.DataStream.ToArray()); - - Assert.NotNull(img); - - TestFormat.GlobalTestFormat.VerifyDecodeCall(this.Marker, Configuration.Default); - } - - [Fact] - public void LoadFromBytesWithType() - { - Image img = Image.Load(this.DataStream.ToArray()); - - Assert.NotNull(img); - Assert.Equal(TestFormat.GlobalTestFormat.Sample(), img); - - TestFormat.GlobalTestFormat.VerifyDecodeCall(this.Marker, Configuration.Default); - - } - - [Fact] - public void LoadFromBytesWithConfig() - { - Image img = Image.Load(this.LocalConfiguration, this.DataStream.ToArray()); - - Assert.NotNull(img); - - this.localDecoder.Verify(x => x.Decode(this.LocalConfiguration, It.IsAny())); - - Assert.Equal(this.DataStream.ToArray(), this.DecodedData); - } - - [Fact] - public void LoadFromBytesWithTypeAndConfig() - { - Image img = Image.Load(this.LocalConfiguration, this.DataStream.ToArray()); - - Assert.NotNull(img); - Assert.Equal(this.returnImage, img); - - this.localDecoder.Verify(x => x.Decode(this.LocalConfiguration, It.IsAny())); - - Assert.Equal(this.DataStream.ToArray(), this.DecodedData); - } - - [Fact] - public void LoadFromBytesWithDecoder() - { - Image img = Image.Load(this.DataStream.ToArray(), this.localDecoder.Object); - - Assert.NotNull(img); - this.localDecoder.Verify(x => x.Decode(Configuration.Default, It.IsAny())); - Assert.Equal(this.DataStream.ToArray(), this.DecodedData); - } - - [Fact] - public void LoadFromBytesWithTypeAndDecoder() - { - Image img = Image.Load(this.DataStream.ToArray(), this.localDecoder.Object); - - Assert.NotNull(img); - Assert.Equal(this.returnImage, img); - this.localDecoder.Verify(x => x.Decode(Configuration.Default, It.IsAny())); - Assert.Equal(this.DataStream.ToArray(), this.DecodedData); - } - - [Fact] - public void LoadFromFile() - { - Image img = Image.Load(this.DataStream); - - Assert.NotNull(img); - - TestFormat.GlobalTestFormat.VerifyDecodeCall(this.Marker, Configuration.Default); - } - - [Fact] - public void LoadFromFileWithType() - { - Image img = Image.Load(this.DataStream); - - Assert.NotNull(img); - Assert.Equal(TestFormat.GlobalTestFormat.Sample(), img); - - TestFormat.GlobalTestFormat.VerifyDecodeCall(this.Marker, Configuration.Default); - } - - [Fact] - public void LoadFromFileWithConfig() - { - Image img = Image.Load(this.LocalConfiguration, this.FilePath); - - Assert.NotNull(img); - - this.localDecoder.Verify(x => x.Decode(this.LocalConfiguration, this.DataStream)); - } - - [Fact] - public void LoadFromFileWithTypeAndConfig() - { - Image img = Image.Load(this.LocalConfiguration, this.FilePath); - - Assert.NotNull(img); - Assert.Equal(this.returnImage, img); - - this.localDecoder.Verify(x => x.Decode(this.LocalConfiguration, this.DataStream)); - } - - [Fact] - public void LoadFromFileWithDecoder() - { - Image img = Image.Load(this.FilePath, this.localDecoder.Object); - - Assert.NotNull(img); - this.localDecoder.Verify(x => x.Decode(Configuration.Default, this.DataStream)); - } - - [Fact] - public void LoadFromFileWithTypeAndDecoder() - { - Image img = Image.Load(this.FilePath, this.localDecoder.Object); - - Assert.NotNull(img); - Assert.Equal(this.returnImage, img); - this.localDecoder.Verify(x => x.Decode(Configuration.Default, this.DataStream)); - } - - [Fact] - public void LoadFromPixelData_Pixels() - { - var img = Image.LoadPixelData(new Rgba32[] { - Rgba32.Black, Rgba32.White, - Rgba32.White, Rgba32.Black, - }, 2, 2); - - Assert.NotNull(img); - using (var px = img.Lock()) - { - Assert.Equal(Rgba32.Black, px[0, 0]); - Assert.Equal(Rgba32.White, px[0, 1]); - - Assert.Equal(Rgba32.White, px[1, 0]); - Assert.Equal(Rgba32.Black, px[1, 1]); - } - } - - [Fact] - public void LoadFromPixelData_Bytes() - { - var img = Image.LoadPixelData(new byte[] { - 0,0,0,255, // 0,0 - 255,255,255,255, // 0,1 - 255,255,255,255, // 1,0 - 0,0,0,255, // 1,1 - }, 2, 2); - - Assert.NotNull(img); - using (var px = img.Lock()) - { - Assert.Equal(Rgba32.Black, px[0, 0]); - Assert.Equal(Rgba32.White, px[0, 1]); - - Assert.Equal(Rgba32.White, px[1, 0]); - Assert.Equal(Rgba32.Black, px[1, 1]); - } - } - - - [Fact] - public void LoadsImageWithoutThrowingCrcException() - { - var image1Provider = TestImageProvider.File(TestImages.Png.VersioningImage1); - - using (Image img = image1Provider.GetImage()) - { - Assert.Equal(166036, img.Frames.RootFrame.GetPixelSpan().Length); - } - } - - public void Dispose() - { - // clean up the global object; - this.returnImage?.Dispose(); - } - } -} diff --git a/tests/ImageSharp.Tests/Image/ImageTests.Load_BasicCases.cs b/tests/ImageSharp.Tests/Image/ImageTests.Load_BasicCases.cs new file mode 100644 index 0000000000..e442b56543 --- /dev/null +++ b/tests/ImageSharp.Tests/Image/ImageTests.Load_BasicCases.cs @@ -0,0 +1,63 @@ +// Copyright (c) Six Labors and contributors. +// Licensed under the Apache License, Version 2.0. + +using System; +using SixLabors.ImageSharp.PixelFormats; +using Xunit; +// ReSharper disable InconsistentNaming + +namespace SixLabors.ImageSharp.Tests +{ + public partial class ImageTests + { + public class Load_BasicCases + { + [Fact] + public void ByteArray() + { + Assert.Throws(() => + { + Image.Load((byte[])null); + }); + + var file = TestFile.Create(TestImages.Bmp.Car); + using (var image = Image.Load(file.Bytes)) + { + Assert.Equal(600, image.Width); + Assert.Equal(450, image.Height); + } + } + + [Fact] + public void FileSystemPath() + { + var file = TestFile.Create(TestImages.Bmp.Car); + using (var image = Image.Load(file.FullPath)) + { + Assert.Equal(600, image.Width); + Assert.Equal(450, image.Height); + } + } + + [Fact] + public void FileSystemPath_FileNotFound() + { + System.IO.FileNotFoundException ex = Assert.Throws( + () => + { + Image.Load(Guid.NewGuid().ToString()); + }); + } + + [Fact] + public void FileSystemPath_NullPath() + { + ArgumentNullException ex = Assert.Throws( + () => + { + Image.Load((string)null); + }); + } + } + } +} \ No newline at end of file diff --git a/tests/ImageSharp.Tests/Image/ImageTests.Load_ComplexCases.cs b/tests/ImageSharp.Tests/Image/ImageTests.Load_ComplexCases.cs new file mode 100644 index 0000000000..957e5c40a1 --- /dev/null +++ b/tests/ImageSharp.Tests/Image/ImageTests.Load_ComplexCases.cs @@ -0,0 +1,338 @@ +// Copyright (c) Six Labors and contributors. +// Licensed under the Apache License, Version 2.0. + +using System; +using System.IO; + +using Moq; + +using SixLabors.ImageSharp.Advanced; +using SixLabors.ImageSharp.Formats; +using SixLabors.ImageSharp.IO; +using SixLabors.ImageSharp.PixelFormats; + +using Xunit; +// ReSharper disable InconsistentNaming + +namespace SixLabors.ImageSharp.Tests +{ + public partial class ImageTests + { + /// + /// Tests the class. + /// + public class Load_ComplexCases : IDisposable + { + private readonly Mock fileSystem; + private readonly Image returnImage; + private readonly Mock localDecoder; + private readonly string FilePath; + private readonly IImageFormatDetector localMimeTypeDetector; + private readonly Mock localImageFormatMock; + + public Configuration LocalConfiguration { get; private set; } + public byte[] Marker { get; private set; } + public MemoryStream DataStream { get; private set; } + public byte[] DecodedData { get; private set; } + + public Load_ComplexCases() + { + this.returnImage = new Image(1, 1); + + this.localImageFormatMock = new Mock(); + + this.localDecoder = new Mock(); + this.localMimeTypeDetector = new MockImageFormatDetector(this.localImageFormatMock.Object); + this.localDecoder.Setup(x => x.Decode(It.IsAny(), It.IsAny())) + + .Callback((c, s) => + { + using (var ms = new MemoryStream()) + { + s.CopyTo(ms); + this.DecodedData = ms.ToArray(); + } + }) + .Returns(this.returnImage); + + this.fileSystem = new Mock(); + + this.LocalConfiguration = new Configuration + { + FileSystem = this.fileSystem.Object + }; + this.LocalConfiguration.ImageFormatsManager.AddImageFormatDetector(this.localMimeTypeDetector); + this.LocalConfiguration.ImageFormatsManager.SetDecoder(this.localImageFormatMock.Object, this.localDecoder.Object); + + TestFormat.RegisterGlobalTestFormat(); + this.Marker = Guid.NewGuid().ToByteArray(); + this.DataStream = TestFormat.GlobalTestFormat.CreateStream(this.Marker); + + this.FilePath = Guid.NewGuid().ToString(); + this.fileSystem.Setup(x => x.OpenRead(this.FilePath)).Returns(this.DataStream); + + TestFileSystem.RegisterGlobalTestFormat(); + TestFileSystem.Global.AddFile(this.FilePath, this.DataStream); + } + + [Fact] + public void LoadFromStream() + { + var img = Image.Load(this.DataStream); + + Assert.NotNull(img); + + TestFormat.GlobalTestFormat.VerifyDecodeCall(this.Marker, Configuration.Default); + } + + [Fact] + public void LoadFromNoneSeekableStream() + { + var stream = new NoneSeekableStream(this.DataStream); + var img = Image.Load(stream); + + Assert.NotNull(img); + + TestFormat.GlobalTestFormat.VerifyDecodeCall(this.Marker, Configuration.Default); + } + + [Fact] + public void LoadFromStreamWithType() + { + var img = Image.Load(this.DataStream); + + Assert.NotNull(img); + Assert.Equal(TestFormat.GlobalTestFormat.Sample(), img); + + TestFormat.GlobalTestFormat.VerifyDecodeCall(this.Marker, Configuration.Default); + } + + + [Fact] + public void LoadFromStreamWithConfig() + { + Stream stream = new MemoryStream(); + var img = Image.Load(this.LocalConfiguration, stream); + + Assert.NotNull(img); + + this.localDecoder.Verify(x => x.Decode(this.LocalConfiguration, stream)); + } + + [Fact] + public void LoadFromStreamWithTypeAndConfig() + { + Stream stream = new MemoryStream(); + var img = Image.Load(this.LocalConfiguration, stream); + + Assert.NotNull(img); + Assert.Equal(this.returnImage, img); + + this.localDecoder.Verify(x => x.Decode(this.LocalConfiguration, stream)); + } + + + [Fact] + public void LoadFromStreamWithDecoder() + { + Stream stream = new MemoryStream(); + var img = Image.Load(stream, this.localDecoder.Object); + + Assert.NotNull(img); + this.localDecoder.Verify(x => x.Decode(Configuration.Default, stream)); + } + + [Fact] + public void LoadFromStreamWithTypeAndDecoder() + { + Stream stream = new MemoryStream(); + var img = Image.Load(stream, this.localDecoder.Object); + + Assert.NotNull(img); + Assert.Equal(this.returnImage, img); + this.localDecoder.Verify(x => x.Decode(Configuration.Default, stream)); + } + + [Fact] + public void LoadFromBytes() + { + var img = Image.Load(this.DataStream.ToArray()); + + Assert.NotNull(img); + + TestFormat.GlobalTestFormat.VerifyDecodeCall(this.Marker, Configuration.Default); + } + + [Fact] + public void LoadFromBytesWithType() + { + var img = Image.Load(this.DataStream.ToArray()); + + Assert.NotNull(img); + Assert.Equal(TestFormat.GlobalTestFormat.Sample(), img); + + TestFormat.GlobalTestFormat.VerifyDecodeCall(this.Marker, Configuration.Default); + + } + + [Fact] + public void LoadFromBytesWithConfig() + { + var img = Image.Load(this.LocalConfiguration, this.DataStream.ToArray()); + + Assert.NotNull(img); + + this.localDecoder.Verify(x => x.Decode(this.LocalConfiguration, It.IsAny())); + + Assert.Equal(this.DataStream.ToArray(), this.DecodedData); + } + + [Fact] + public void LoadFromBytesWithTypeAndConfig() + { + var img = Image.Load(this.LocalConfiguration, this.DataStream.ToArray()); + + Assert.NotNull(img); + Assert.Equal(this.returnImage, img); + + this.localDecoder.Verify(x => x.Decode(this.LocalConfiguration, It.IsAny())); + + Assert.Equal(this.DataStream.ToArray(), this.DecodedData); + } + + [Fact] + public void LoadFromBytesWithDecoder() + { + var img = Image.Load(this.DataStream.ToArray(), this.localDecoder.Object); + + Assert.NotNull(img); + this.localDecoder.Verify(x => x.Decode(Configuration.Default, It.IsAny())); + Assert.Equal(this.DataStream.ToArray(), this.DecodedData); + } + + [Fact] + public void LoadFromBytesWithTypeAndDecoder() + { + var img = Image.Load(this.DataStream.ToArray(), this.localDecoder.Object); + + Assert.NotNull(img); + Assert.Equal(this.returnImage, img); + this.localDecoder.Verify(x => x.Decode(Configuration.Default, It.IsAny())); + Assert.Equal(this.DataStream.ToArray(), this.DecodedData); + } + + [Fact] + public void LoadFromFile() + { + var img = Image.Load(this.DataStream); + + Assert.NotNull(img); + + TestFormat.GlobalTestFormat.VerifyDecodeCall(this.Marker, Configuration.Default); + } + + [Fact] + public void LoadFromFileWithType() + { + var img = Image.Load(this.DataStream); + + Assert.NotNull(img); + Assert.Equal(TestFormat.GlobalTestFormat.Sample(), img); + + TestFormat.GlobalTestFormat.VerifyDecodeCall(this.Marker, Configuration.Default); + } + + [Fact] + public void LoadFromFileWithConfig() + { + var img = Image.Load(this.LocalConfiguration, this.FilePath); + + Assert.NotNull(img); + + this.localDecoder.Verify(x => x.Decode(this.LocalConfiguration, this.DataStream)); + } + + [Fact] + public void LoadFromFileWithTypeAndConfig() + { + var img = Image.Load(this.LocalConfiguration, this.FilePath); + + Assert.NotNull(img); + Assert.Equal(this.returnImage, img); + + this.localDecoder.Verify(x => x.Decode(this.LocalConfiguration, this.DataStream)); + } + + [Fact] + public void LoadFromFileWithDecoder() + { + var img = Image.Load(this.FilePath, this.localDecoder.Object); + + Assert.NotNull(img); + this.localDecoder.Verify(x => x.Decode(Configuration.Default, this.DataStream)); + } + + [Fact] + public void LoadFromFileWithTypeAndDecoder() + { + var img = Image.Load(this.FilePath, this.localDecoder.Object); + + Assert.NotNull(img); + Assert.Equal(this.returnImage, img); + this.localDecoder.Verify(x => x.Decode(Configuration.Default, this.DataStream)); + } + + [Fact] + public void LoadFromPixelData_Pixels() + { + var img = Image.LoadPixelData(new Rgba32[] { + Rgba32.Black, Rgba32.White, + Rgba32.White, Rgba32.Black, + }, 2, 2); + + Assert.NotNull(img); + Assert.Equal(Rgba32.Black, img[0, 0]); + Assert.Equal(Rgba32.White, img[0, 1]); + + Assert.Equal(Rgba32.White, img[1, 0]); + Assert.Equal(Rgba32.Black, img[1, 1]); + } + + [Fact] + public void LoadFromPixelData_Bytes() + { + var img = Image.LoadPixelData(new byte[] { + 0,0,0,255, // 0,0 + 255,255,255,255, // 0,1 + 255,255,255,255, // 1,0 + 0,0,0,255, // 1,1 + }, 2, 2); + + Assert.NotNull(img); + Assert.Equal(Rgba32.Black, img[0, 0]); + Assert.Equal(Rgba32.White, img[0, 1]); + + Assert.Equal(Rgba32.White, img[1, 0]); + Assert.Equal(Rgba32.Black, img[1, 1]); + } + + + [Fact] + public void LoadsImageWithoutThrowingCrcException() + { + var image1Provider = TestImageProvider.File(TestImages.Png.VersioningImage1); + + using (Image img = image1Provider.GetImage()) + { + Assert.Equal(166036, img.Frames.RootFrame.GetPixelSpan().Length); + } + } + + public void Dispose() + { + // clean up the global object; + this.returnImage?.Dispose(); + } + } + } +} \ No newline at end of file diff --git a/tests/ImageSharp.Tests/Image/ImageTests.Save.cs b/tests/ImageSharp.Tests/Image/ImageTests.Save.cs new file mode 100644 index 0000000000..45399919a0 --- /dev/null +++ b/tests/ImageSharp.Tests/Image/ImageTests.Save.cs @@ -0,0 +1,70 @@ +// Copyright (c) Six Labors and contributors. +// Licensed under the Apache License, Version 2.0. + +// ReSharper disable InconsistentNaming + +using System; +using SixLabors.ImageSharp.Formats.Png; +using SixLabors.ImageSharp.PixelFormats; +using Xunit; + +namespace SixLabors.ImageSharp.Tests +{ + using SixLabors.ImageSharp.Formats; + + public partial class ImageTests + { + public class Save + { + [Fact] + public void DetecedEncoding() + { + string dir = TestEnvironment.CreateOutputDirectory(nameof(ImageTests)); + string file = System.IO.Path.Combine(dir, "DetecedEncoding.png"); + + using (var image = new Image(10, 10)) + { + image.Save(file); + } + + using (var img = Image.Load(file, out IImageFormat mime)) + { + Assert.Equal("image/png", mime.DefaultMimeType); + } + } + + [Fact] + public void WhenExtensionIsUnknown_Throws() + { + string dir = TestEnvironment.CreateOutputDirectory(nameof(ImageTests)); + string file = System.IO.Path.Combine(dir, "UnknownExtensionsEncoding_Throws.tmp"); + + NotSupportedException ex = Assert.Throws( + () => + { + using (var image = new Image(10, 10)) + { + image.Save(file); + } + }); + } + + [Fact] + public void SetEncoding() + { + string dir = TestEnvironment.CreateOutputDirectory(nameof(ImageTests)); + string file = System.IO.Path.Combine(dir, "SetEncoding.dat"); + + using (var image = new Image(10, 10)) + { + image.Save(file, new PngEncoder()); + } + + using (var img = Image.Load(file, out var mime)) + { + Assert.Equal("image/png", mime.DefaultMimeType); + } + } + } + } +} \ No newline at end of file diff --git a/tests/ImageSharp.Tests/Image/ImageTests.WrapMemory.cs b/tests/ImageSharp.Tests/Image/ImageTests.WrapMemory.cs new file mode 100644 index 0000000000..066be4a737 --- /dev/null +++ b/tests/ImageSharp.Tests/Image/ImageTests.WrapMemory.cs @@ -0,0 +1,24 @@ +// Copyright (c) Six Labors and contributors. +// Licensed under the Apache License, Version 2.0. + +using System; +using SixLabors.Memory; +using Xunit; + +// ReSharper disable InconsistentNaming +namespace SixLabors.ImageSharp.Tests +{ + public partial class ImageTests + { + public class WrapMemory + { + [Fact] + public void ConsumedBuffer_IsMemoryOwner_ReturnsFalse() + { + var memory = new Memory(new int[55]); + var buffer = new ConsumedBuffer(memory); + Assert.False(buffer.IsMemoryOwner); + } + } + } +} \ No newline at end of file diff --git a/tests/ImageSharp.Tests/Image/ImageTests.cs b/tests/ImageSharp.Tests/Image/ImageTests.cs index 8234df24ef..ed142ed974 100644 --- a/tests/ImageSharp.Tests/Image/ImageTests.cs +++ b/tests/ImageSharp.Tests/Image/ImageTests.cs @@ -1,19 +1,17 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -using System; using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Formats; -using SixLabors.ImageSharp.Formats.Png; using SixLabors.ImageSharp.PixelFormats; using Xunit; +// ReSharper disable InconsistentNaming namespace SixLabors.ImageSharp.Tests { /// /// Tests the class. /// - public class ImageTests + public partial class ImageTests { public class Constructor { @@ -64,101 +62,5 @@ public void Configuration_Width_Height_BackroundColor() } } } - - [Fact] - public void Load_ByteArray() - { - Assert.Throws(() => - { - Image.Load((byte[])null); - }); - - TestFile file = TestFile.Create(TestImages.Bmp.Car); - using (Image image = Image.Load(file.Bytes)) - { - Assert.Equal(600, image.Width); - Assert.Equal(450, image.Height); - } - } - - [Fact] - public void Load_FileSystemPath() - { - TestFile file = TestFile.Create(TestImages.Bmp.Car); - using (Image image = Image.Load(file.FullPath)) - { - Assert.Equal(600, image.Width); - Assert.Equal(450, image.Height); - } - } - - [Fact] - public void Load_FileSystemPath_FileNotFound() - { - System.IO.FileNotFoundException ex = Assert.Throws( - () => - { - Image.Load(Guid.NewGuid().ToString()); - }); - } - - [Fact] - public void Load_FileSystemPath_NullPath() - { - ArgumentNullException ex = Assert.Throws( - () => - { - Image.Load((string)null); - }); - } - - [Fact] - public void Save_DetecedEncoding() - { - string dir = TestEnvironment.CreateOutputDirectory(nameof(ImageTests)); - string file = System.IO.Path.Combine(dir, "Save_DetecedEncoding.png"); - - using (Image image = new Image(10, 10)) - { - image.Save(file); - } - - using (Image img = Image.Load(file, out var mime)) - { - Assert.Equal("image/png", mime.DefaultMimeType); - } - } - - [Fact] - public void Save_WhenExtensionIsUnknown_Throws() - { - string dir = TestEnvironment.CreateOutputDirectory(nameof(ImageTests)); - string file = System.IO.Path.Combine(dir, "Save_UnknownExtensionsEncoding_Throws.tmp"); - - NotSupportedException ex = Assert.Throws( - () => - { - using (Image image = new Image(10, 10)) - { - image.Save(file); - } - }); - } - - [Fact] - public void Save_SetEncoding() - { - string dir = TestEnvironment.CreateOutputDirectory(nameof(ImageTests)); - string file = System.IO.Path.Combine(dir, "Save_SetEncoding.dat"); - - using (Image image = new Image(10, 10)) - { - image.Save(file, new PngEncoder()); - } - using (Image img = Image.Load(file, out var mime)) - { - Assert.Equal("image/png", mime.DefaultMimeType); - } - } } } diff --git a/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs b/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs index bacdfb504d..c8e304b41a 100644 --- a/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs +++ b/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs @@ -12,7 +12,7 @@ namespace SixLabors.ImageSharp.Tests.Memory using System.Runtime.CompilerServices; using System.Runtime.InteropServices; - using SixLabors.ImageSharp.Memory; + using SixLabors.Memory; using Xunit; @@ -22,7 +22,7 @@ public class ArrayPoolMemoryManagerTests private const int PoolSelectorThresholdInBytes = MaxPooledBufferSizeInBytes / 2; - private MemoryManager MemoryManager { get; set; } = new ArrayPoolMemoryManager(MaxPooledBufferSizeInBytes, PoolSelectorThresholdInBytes); + private MemoryAllocator MemoryAllocator { get; set; } = new ArrayPoolMemoryAllocator(MaxPooledBufferSizeInBytes, PoolSelectorThresholdInBytes); /// /// Rent a buffer -> return it -> re-rent -> verify if it's span points to the previous location @@ -30,12 +30,12 @@ public class ArrayPoolMemoryManagerTests private bool CheckIsRentingPooledBuffer(int length) where T : struct { - IBuffer buffer = this.MemoryManager.Allocate(length); - ref T ptrToPrevPosition0 = ref buffer.DangerousGetPinnableReference(); + IBuffer buffer = this.MemoryAllocator.Allocate(length); + ref T ptrToPrevPosition0 = ref buffer.GetReference(); buffer.Dispose(); - buffer = this.MemoryManager.Allocate(length); - bool sameBuffers = Unsafe.AreSame(ref ptrToPrevPosition0, ref buffer.DangerousGetPinnableReference()); + buffer = this.MemoryAllocator.Allocate(length); + bool sameBuffers = Unsafe.AreSame(ref ptrToPrevPosition0, ref buffer.GetReference()); buffer.Dispose(); return sameBuffers; @@ -44,7 +44,7 @@ private bool CheckIsRentingPooledBuffer(int length) public class BufferTests : BufferTestSuite { public BufferTests() - : base(new ArrayPoolMemoryManager(MaxPooledBufferSizeInBytes, PoolSelectorThresholdInBytes)) + : base(new ArrayPoolMemoryAllocator(MaxPooledBufferSizeInBytes, PoolSelectorThresholdInBytes)) { } } @@ -54,7 +54,7 @@ public class Constructor [Fact] public void WhenBothParametersPassedByUser() { - var mgr = new ArrayPoolMemoryManager(1111, 666); + var mgr = new ArrayPoolMemoryAllocator(1111, 666); Assert.Equal(1111, mgr.MaxPoolSizeInBytes); Assert.Equal(666, mgr.PoolSelectorThresholdInBytes); } @@ -62,7 +62,7 @@ public void WhenBothParametersPassedByUser() [Fact] public void WhenPassedOnly_MaxPooledBufferSizeInBytes_SmallerThresholdValueIsAutoCalculated() { - var mgr = new ArrayPoolMemoryManager(5000); + var mgr = new ArrayPoolMemoryAllocator(5000); Assert.Equal(5000, mgr.MaxPoolSizeInBytes); Assert.True(mgr.PoolSelectorThresholdInBytes < mgr.MaxPoolSizeInBytes); } @@ -70,7 +70,7 @@ public void WhenPassedOnly_MaxPooledBufferSizeInBytes_SmallerThresholdValueIsAut [Fact] public void When_PoolSelectorThresholdInBytes_IsGreaterThan_MaxPooledBufferSizeInBytes_ExceptionIsThrown() { - Assert.ThrowsAny(() => { new ArrayPoolMemoryManager(100, 200); }); + Assert.ThrowsAny(() => { new ArrayPoolMemoryAllocator(100, 200); }); } } @@ -130,15 +130,15 @@ public unsafe void LaregeBuffersAreNotPooled_OfBigValueType() [InlineData(true)] public void CleaningRequests_AreControlledByAllocationParameter_Clean(bool clean) { - using (IBuffer firstAlloc = this.MemoryManager.Allocate(42)) + using (IBuffer firstAlloc = this.MemoryAllocator.Allocate(42)) { - firstAlloc.Span.Fill(666); + firstAlloc.GetSpan().Fill(666); } - using (IBuffer secondAlloc = this.MemoryManager.Allocate(42, clean)) + using (IBuffer secondAlloc = this.MemoryAllocator.Allocate(42, clean)) { int expected = clean ? 0 : 666; - Assert.Equal(expected, secondAlloc.Span[0]); + Assert.Equal(expected, secondAlloc.GetSpan()[0]); } } @@ -147,26 +147,26 @@ public void CleaningRequests_AreControlledByAllocationParameter_Clean(bool clean [InlineData(true)] public void ReleaseRetainedResources_ReplacesInnerArrayPool(bool keepBufferAlive) { - IBuffer buffer = this.MemoryManager.Allocate(32); - ref int ptrToPrev0 = ref MemoryMarshal.GetReference(buffer.Span); + IBuffer buffer = this.MemoryAllocator.Allocate(32); + ref int ptrToPrev0 = ref MemoryMarshal.GetReference(buffer.GetSpan()); if (!keepBufferAlive) { buffer.Dispose(); } - this.MemoryManager.ReleaseRetainedResources(); + this.MemoryAllocator.ReleaseRetainedResources(); - buffer = this.MemoryManager.Allocate(32); + buffer = this.MemoryAllocator.Allocate(32); - Assert.False(Unsafe.AreSame(ref ptrToPrev0, ref buffer.DangerousGetPinnableReference())); + Assert.False(Unsafe.AreSame(ref ptrToPrev0, ref buffer.GetReference())); } [Fact] public void ReleaseRetainedResources_DisposingPreviouslyAllocatedBuffer_IsAllowed() { - IBuffer buffer = this.MemoryManager.Allocate(32); - this.MemoryManager.ReleaseRetainedResources(); + IBuffer buffer = this.MemoryAllocator.Allocate(32); + this.MemoryAllocator.ReleaseRetainedResources(); buffer.Dispose(); } @@ -181,13 +181,13 @@ public void AllocationOverLargeArrayThreshold_UsesDifferentPool() int arrayLengthThreshold = PoolSelectorThresholdInBytes / sizeof(int); - IBuffer small = this.MemoryManager.Allocate(arrayLengthThreshold - 1); - ref int ptr2Small = ref small.DangerousGetPinnableReference(); + IBuffer small = this.MemoryAllocator.Allocate(arrayLengthThreshold - 1); + ref int ptr2Small = ref small.GetReference(); small.Dispose(); - IBuffer large = this.MemoryManager.Allocate(arrayLengthThreshold + 1); + IBuffer large = this.MemoryAllocator.Allocate(arrayLengthThreshold + 1); - Assert.False(Unsafe.AreSame(ref ptr2Small, ref large.DangerousGetPinnableReference())); + Assert.False(Unsafe.AreSame(ref ptr2Small, ref large.GetReference())); } [Fact] @@ -199,7 +199,7 @@ public void CreateWithAggressivePooling() return; } - this.MemoryManager = ArrayPoolMemoryManager.CreateWithAggressivePooling(); + this.MemoryAllocator = ArrayPoolMemoryAllocator.CreateWithAggressivePooling(); Assert.True(this.CheckIsRentingPooledBuffer(4096 * 4096)); } @@ -213,7 +213,7 @@ public void CreateDefault() return; } - this.MemoryManager = ArrayPoolMemoryManager.CreateDefault(); + this.MemoryAllocator = ArrayPoolMemoryAllocator.CreateDefault(); Assert.False(this.CheckIsRentingPooledBuffer(2 * 4096 * 4096)); Assert.True(this.CheckIsRentingPooledBuffer(2048 * 2048)); @@ -228,7 +228,7 @@ public void CreateWithModeratePooling() return; } - this.MemoryManager = ArrayPoolMemoryManager.CreateWithModeratePooling(); + this.MemoryAllocator = ArrayPoolMemoryAllocator.CreateWithModeratePooling(); Assert.False(this.CheckIsRentingPooledBuffer(2048 * 2048)); Assert.True(this.CheckIsRentingPooledBuffer(1024 * 16)); diff --git a/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs b/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs index d092df45a6..301a76f562 100644 --- a/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs +++ b/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs @@ -1,12 +1,15 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. +// ReSharper disable InconsistentNaming namespace SixLabors.ImageSharp.Tests.Memory { using System; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; - using SixLabors.ImageSharp.Memory; + + using SixLabors.ImageSharp.PixelFormats; + using SixLabors.Memory; using SixLabors.ImageSharp.Tests.Common; using SixLabors.Primitives; @@ -21,15 +24,15 @@ public static void SpanPointsTo(Span span, IBuffer buffer, int bufferOf where T : struct { ref T actual = ref MemoryMarshal.GetReference(span); - ref T expected = ref Unsafe.Add(ref buffer.DangerousGetPinnableReference(), bufferOffset); + ref T expected = ref Unsafe.Add(ref buffer.GetReference(), bufferOffset); Assert.True(Unsafe.AreSame(ref expected, ref actual), "span does not point to the expected position"); } } - private MemoryManager MemoryManager { get; } = new MockMemoryManager(); + private MemoryAllocator MemoryAllocator { get; } = new MockMemoryAllocator(); - private class MockMemoryManager : MemoryManager + private class MockMemoryAllocator : MemoryAllocator { internal override IBuffer Allocate(int length, bool clear) { @@ -58,7 +61,7 @@ internal override IManagedByteBuffer AllocateManagedByteBuffer(int length, bool [InlineData(1025, 17)] public void Construct(int width, int height) { - using (Buffer2D buffer = this.MemoryManager.Allocate2D(width, height)) + using (Buffer2D buffer = this.MemoryAllocator.Allocate2D(width, height)) { Assert.Equal(width, buffer.Width); Assert.Equal(height, buffer.Height); @@ -69,9 +72,9 @@ public void Construct(int width, int height) [Fact] public void CreateClean() { - using (Buffer2D buffer = this.MemoryManager.Allocate2D(42, 42, true)) + using (Buffer2D buffer = this.MemoryAllocator.Allocate2D(42, 42, true)) { - Span span = buffer.Span; + Span span = buffer.GetSpan(); for (int j = 0; j < span.Length; j++) { Assert.Equal(0, span[j]); @@ -85,7 +88,7 @@ public void CreateClean() [InlineData(17, 42, 41)] public void GetRowSpanY(int width, int height, int y) { - using (Buffer2D buffer = this.MemoryManager.Allocate2D(width, height)) + using (Buffer2D buffer = this.MemoryAllocator.Allocate2D(width, height)) { Span span = buffer.GetRowSpan(y); @@ -101,7 +104,7 @@ public void GetRowSpanY(int width, int height, int y) [InlineData(17, 42, 0, 41)] public void GetRowSpanXY(int width, int height, int x, int y) { - using (Buffer2D buffer = this.MemoryManager.Allocate2D(width, height)) + using (Buffer2D buffer = this.MemoryAllocator.Allocate2D(width, height)) { Span span = buffer.GetRowSpan(x, y); @@ -117,9 +120,9 @@ public void GetRowSpanXY(int width, int height, int x, int y) [InlineData(99, 88, 98, 87)] public void Indexer(int width, int height, int x, int y) { - using (Buffer2D buffer = this.MemoryManager.Allocate2D(width, height)) + using (Buffer2D buffer = this.MemoryAllocator.Allocate2D(width, height)) { - Span span = buffer.Buffer.Span; + Span span = buffer.Buffer.GetSpan(); ref TestStructs.Foo actual = ref buffer[x, y]; @@ -128,22 +131,92 @@ public void Indexer(int width, int height, int x, int y) Assert.True(Unsafe.AreSame(ref expected, ref actual)); } } - - [Fact] - public void SwapContents() + + public class SwapOrCopyContent { - using (Buffer2D a = this.MemoryManager.Allocate2D(10, 5)) - using (Buffer2D b = this.MemoryManager.Allocate2D(3, 7)) + private MemoryAllocator MemoryAllocator { get; } = new MockMemoryAllocator(); + + [Fact] + public void WhenBothBuffersAreMemoryOwners_ShouldSwap() + { + using (Buffer2D a = this.MemoryAllocator.Allocate2D(10, 5)) + using (Buffer2D b = this.MemoryAllocator.Allocate2D(3, 7)) + { + IBuffer aa = a.Buffer; + IBuffer bb = b.Buffer; + + Buffer2D.SwapOrCopyContent(a, b); + + Assert.Equal(bb, a.Buffer); + Assert.Equal(aa, b.Buffer); + + Assert.Equal(new Size(3, 7), a.Size()); + Assert.Equal(new Size(10, 5), b.Size()); + } + } + + [Fact] + public void WhenDestIsNotMemoryOwner_SameSize_ShouldCopy() + { + var data = new Rgba32[3 * 7]; + var color = new Rgba32(1, 2, 3, 4); + + var mmg = new TestMemoryManager(data); + var aBuff = new ConsumedBuffer(mmg.Memory); + + using (Buffer2D a = new Buffer2D(aBuff, 3, 7)) + { + IBuffer aa = a.Buffer; + + // Precondition: + Assert.Equal(aBuff, aa); + + using (Buffer2D b = this.MemoryAllocator.Allocate2D(3, 7)) + { + IBuffer bb = b.Buffer; + bb.GetSpan()[10] = color; + + // Act: + Buffer2D.SwapOrCopyContent(a, b); + + // Assert: + Assert.Equal(aBuff, a.Buffer); + Assert.Equal(bb, b.Buffer); + } + + // Assert: + Assert.Equal(color, a.Buffer.GetSpan()[10]); + } + } + + [Fact] + public void WhenDestIsNotMemoryOwner_DifferentSize_Throws() { - IBuffer aa = a.Buffer; - IBuffer bb = b.Buffer; + var data = new Rgba32[3 * 7]; + var color = new Rgba32(1, 2, 3, 4); + data[10] = color; - Buffer2D.SwapContents(a, b); + var mmg = new TestMemoryManager(data); + var aBuff = new ConsumedBuffer(mmg.Memory); - Assert.Equal(bb, a.Buffer); - Assert.Equal(new Size(3, 7), a.Size()); - Assert.Equal(new Size(10, 5), b.Size()); + using (Buffer2D a = new Buffer2D(aBuff, 3, 7)) + { + IBuffer aa = a.Buffer; + using (Buffer2D b = this.MemoryAllocator.Allocate2D(3, 8)) + { + IBuffer bb = b.Buffer; + + Assert.ThrowsAny( + () => + { + Buffer2D.SwapOrCopyContent(a, b); + }); + } + + Assert.Equal(color, a.Buffer.GetSpan()[10]); + } } + } } } \ No newline at end of file diff --git a/tests/ImageSharp.Tests/Memory/BufferAreaTests.cs b/tests/ImageSharp.Tests/Memory/BufferAreaTests.cs index db7367d972..bbf3505141 100644 --- a/tests/ImageSharp.Tests/Memory/BufferAreaTests.cs +++ b/tests/ImageSharp.Tests/Memory/BufferAreaTests.cs @@ -3,7 +3,7 @@ namespace SixLabors.ImageSharp.Tests.Memory { using System; - using SixLabors.ImageSharp.Memory; + using SixLabors.Memory; using SixLabors.Primitives; using Xunit; @@ -13,7 +13,7 @@ public class BufferAreaTests [Fact] public void Construct() { - using (var buffer = Configuration.Default.MemoryManager.Allocate2D(10, 20)) + using (var buffer = Configuration.Default.MemoryAllocator.Allocate2D(10, 20)) { var rectangle = new Rectangle(3,2, 5, 6); var area = new BufferArea(buffer, rectangle); @@ -25,7 +25,7 @@ public void Construct() private static Buffer2D CreateTestBuffer(int w, int h) { - var buffer = Configuration.Default.MemoryManager.Allocate2D(w, h); + var buffer = Configuration.Default.MemoryAllocator.Allocate2D(w, h); for (int y = 0; y < h; y++) { for (int x = 0; x < w; x++) @@ -117,7 +117,7 @@ public void Clear_FullArea() using (Buffer2D buffer = CreateTestBuffer(22, 13)) { buffer.GetArea().Clear(); - Span fullSpan = buffer.Span; + Span fullSpan = buffer.GetSpan(); Assert.True(fullSpan.SequenceEqual(new int[fullSpan.Length])); } } diff --git a/tests/ImageSharp.Tests/Memory/BufferTestSuite.cs b/tests/ImageSharp.Tests/Memory/BufferTestSuite.cs index eff1f197a0..6530850ecb 100644 --- a/tests/ImageSharp.Tests/Memory/BufferTestSuite.cs +++ b/tests/ImageSharp.Tests/Memory/BufferTestSuite.cs @@ -4,25 +4,25 @@ using System; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; using Xunit; // ReSharper disable InconsistentNaming namespace SixLabors.ImageSharp.Tests.Memory { - + using System.Buffers; /// - /// Inherit this class to test an implementation (provided by ). + /// Inherit this class to test an implementation (provided by ). /// public abstract class BufferTestSuite { - protected BufferTestSuite(MemoryManager memoryManager) + protected BufferTestSuite(MemoryAllocator memoryAllocator) { - this.MemoryManager = memoryManager; + this.MemoryAllocator = memoryAllocator; } - protected MemoryManager MemoryManager { get; } + protected MemoryAllocator MemoryAllocator { get; } public struct CustomStruct : IEquatable { @@ -64,6 +64,15 @@ public override int GetHashCode() public static readonly TheoryData LenthValues = new TheoryData { 0, 1, 7, 1023, 1024 }; + [Fact] + public void IsMemoryOwner() + { + using (IBuffer buffer = this.MemoryAllocator.Allocate(42)) + { + Assert.True(buffer.IsMemoryOwner); + } + } + [Theory] [MemberData(nameof(LenthValues))] public void HasCorrectLength_byte(int desiredLength) @@ -88,9 +97,9 @@ public void HasCorrectLength_CustomStruct(int desiredLength) private void TestHasCorrectLength(int desiredLength) where T : struct { - using (IBuffer buffer = this.MemoryManager.Allocate(desiredLength)) + using (IBuffer buffer = this.MemoryAllocator.Allocate(desiredLength)) { - Assert.Equal(desiredLength, buffer.Span.Length); + Assert.Equal(desiredLength, buffer.GetSpan().Length); } } @@ -121,7 +130,7 @@ private IBuffer Allocate(int desiredLength, bool clean, bool managedByteBu { if (managedByteBuffer) { - if (!(this.MemoryManager.AllocateManagedByteBuffer(desiredLength, clean) is IBuffer buffer)) + if (!(this.MemoryAllocator.AllocateManagedByteBuffer(desiredLength, clean) is IBuffer buffer)) { throw new InvalidOperationException("typeof(T) != typeof(byte)"); } @@ -129,7 +138,7 @@ private IBuffer Allocate(int desiredLength, bool clean, bool managedByteBu return buffer; } - return this.MemoryManager.Allocate(desiredLength, clean); + return this.MemoryAllocator.Allocate(desiredLength, clean); } private void TestCanAllocateCleanBuffer(int desiredLength, bool testManagedByteBuffer = false) @@ -141,7 +150,7 @@ private void TestCanAllocateCleanBuffer(int desiredLength, bool testManagedBy { using (IBuffer buffer = this.Allocate(desiredLength, true, testManagedByteBuffer)) { - Assert.True(buffer.Span.SequenceEqual(expected)); + Assert.True(buffer.GetSpan().SequenceEqual(expected)); } } } @@ -166,9 +175,9 @@ private void TestSpanPropertyIsAlwaysTheSame(int desiredLength, bool testMana { using (IBuffer buffer = this.Allocate(desiredLength, false, testManagedByteBuffer)) { - ref T a = ref MemoryMarshal.GetReference(buffer.Span); - ref T b = ref MemoryMarshal.GetReference(buffer.Span); - ref T c = ref MemoryMarshal.GetReference(buffer.Span); + ref T a = ref MemoryMarshal.GetReference(buffer.GetSpan()); + ref T b = ref MemoryMarshal.GetReference(buffer.GetSpan()); + ref T c = ref MemoryMarshal.GetReference(buffer.GetSpan()); Assert.True(Unsafe.AreSame(ref a, ref b)); Assert.True(Unsafe.AreSame(ref b, ref c)); @@ -199,14 +208,14 @@ private void TestWriteAndReadElements(int desiredLength, Func getExpe for (int i = 0; i < buffer.Length(); i++) { - Span span = buffer.Span; + Span span = buffer.GetSpan(); expectedVals[i] = getExpectedValue(i); span[i] = expectedVals[i]; } for (int i = 0; i < buffer.Length(); i++) { - Span span = buffer.Span; + Span span = buffer.GetSpan(); Assert.Equal(expectedVals[i], span[i]); } } @@ -244,21 +253,21 @@ private T TestIndexOutOfRangeShouldThrow(int desiredLength, bool testManagedB Assert.ThrowsAny( () => { - Span span = buffer.Span; + Span span = buffer.GetSpan(); dummy = span[desiredLength]; }); Assert.ThrowsAny( () => { - Span span = buffer.Span; + Span span = buffer.GetSpan(); dummy = span[desiredLength + 1]; }); Assert.ThrowsAny( () => { - Span span = buffer.Span; + Span span = buffer.GetSpan(); dummy = span[desiredLength + 42]; }); } @@ -273,13 +282,48 @@ private T TestIndexOutOfRangeShouldThrow(int desiredLength, bool testManagedB [InlineData(6666)] public void ManagedByteBuffer_ArrayIsCorrect(int desiredLength) { - using (IManagedByteBuffer buffer = this.MemoryManager.AllocateManagedByteBuffer(desiredLength)) + using (IManagedByteBuffer buffer = this.MemoryAllocator.AllocateManagedByteBuffer(desiredLength)) { ref byte array0 = ref buffer.Array[0]; - ref byte span0 = ref buffer.DangerousGetPinnableReference(); + ref byte span0 = ref buffer.GetReference(); Assert.True(Unsafe.AreSame(ref span0, ref array0)); - Assert.True(buffer.Array.Length >= buffer.Span.Length); + Assert.True(buffer.Array.Length >= buffer.GetSpan().Length); + } + } + + [Fact] + public void GetMemory_ReturnsValidMemory() + { + using (IBuffer buffer = this.MemoryAllocator.Allocate(42)) + { + Span span0 = buffer.GetSpan(); + span0[10].A = 30; + Memory memory = buffer.Memory; + + Assert.Equal(42, memory.Length); + Span span1 = memory.Span; + + Assert.Equal(42, span1.Length); + Assert.Equal(30, span1[10].A); + } + } + + [Fact] + public unsafe void GetMemory_ResultIsPinnable() + { + using (IBuffer buffer = this.MemoryAllocator.Allocate(42)) + { + Span span0 = buffer.GetSpan(); + span0[10] = 30; + + Memory memory = buffer.Memory; + + using (MemoryHandle h = memory.Pin()) + { + int* ptr = (int*) h.Pointer; + Assert.Equal(30, ptr[10]); + } } } } diff --git a/tests/ImageSharp.Tests/Memory/SimpleGcMemoryManagerTests.cs b/tests/ImageSharp.Tests/Memory/SimpleGcMemoryManagerTests.cs index 0d1c2beb8f..d04336690c 100644 --- a/tests/ImageSharp.Tests/Memory/SimpleGcMemoryManagerTests.cs +++ b/tests/ImageSharp.Tests/Memory/SimpleGcMemoryManagerTests.cs @@ -1,13 +1,13 @@ namespace SixLabors.ImageSharp.Tests.Memory { - using SixLabors.ImageSharp.Memory; + using SixLabors.Memory; public class SimpleGcMemoryManagerTests { public class BufferTests : BufferTestSuite { public BufferTests() - : base(new SimpleGcMemoryManager()) + : base(new SimpleGcMemoryAllocator()) { } } diff --git a/tests/ImageSharp.Tests/MetaData/Profiles/ICC/DataWriter/IccDataWriter.MatrixTests.cs b/tests/ImageSharp.Tests/MetaData/Profiles/ICC/DataWriter/IccDataWriter.MatrixTests.cs index f01a5ef96d..71dd18621c 100644 --- a/tests/ImageSharp.Tests/MetaData/Profiles/ICC/DataWriter/IccDataWriter.MatrixTests.cs +++ b/tests/ImageSharp.Tests/MetaData/Profiles/ICC/DataWriter/IccDataWriter.MatrixTests.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. using System.Numerics; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; using SixLabors.ImageSharp.MetaData.Profiles.Icc; using Xunit; diff --git a/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffFunctionsTests_TPixel.cs b/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffFunctionsTests_TPixel.cs index 10a34ec313..1273a453ea 100644 --- a/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffFunctionsTests_TPixel.cs +++ b/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffFunctionsTests_TPixel.cs @@ -12,7 +12,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelBlenders { - using SixLabors.ImageSharp.Memory; + using SixLabors.Memory; public class PorterDuffFunctionsTests_TPixel { @@ -27,7 +27,7 @@ private static Span AsSpan(T value) { new TestPixel(1,1,1,1), new TestPixel(0,0,0,.8f), .5f, new TestPixel(0.6f, 0.6f, 0.6f, 1) }, }; - private MemoryManager MemoryManager { get; } = Configuration.Default.MemoryManager; + private MemoryAllocator MemoryAllocator { get; } = Configuration.Default.MemoryAllocator; [Theory] [MemberData(nameof(NormalBlendFunctionData))] @@ -53,7 +53,7 @@ public void NormalBlendFunction_Blender_Bulk(TestPixel back, Tes where TPixel : struct, IPixel { Span dest = new Span(new TPixel[1]); - new DefaultPixelBlenders.Normal().Blend(this.MemoryManager, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount)); + new DefaultPixelBlenders.Normal().Blend(this.MemoryAllocator, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount)); VectorAssert.Equal(expected, dest[0], 2); } @@ -92,7 +92,7 @@ public void MultiplyFunction_Blender_Bulk(TestPixel back, TestPi where TPixel : struct, IPixel { Span dest = new Span(new TPixel[1]); - new DefaultPixelBlenders.Multiply().Blend(this.MemoryManager, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount)); + new DefaultPixelBlenders.Multiply().Blend(this.MemoryAllocator, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount)); VectorAssert.Equal(expected, dest[0], 2); } @@ -131,7 +131,7 @@ public void AddFunction_Blender_Bulk(TestPixel back, TestPixel { Span dest = new Span(new TPixel[1]); - new DefaultPixelBlenders.Add().Blend(this.MemoryManager, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount)); + new DefaultPixelBlenders.Add().Blend(this.MemoryAllocator, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount)); VectorAssert.Equal(expected, dest[0], 2); } @@ -170,7 +170,7 @@ public void SubstractFunction_Blender_Bulk(TestPixel back, TestP where TPixel : struct, IPixel { Span dest = new Span(new TPixel[1]); - new DefaultPixelBlenders.Subtract().Blend(this.MemoryManager, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount)); + new DefaultPixelBlenders.Subtract().Blend(this.MemoryAllocator, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount)); VectorAssert.Equal(expected, dest[0], 2); } @@ -209,7 +209,7 @@ public void ScreenFunction_Blender_Bulk(TestPixel back, TestPixe where TPixel : struct, IPixel { Span dest = new Span(new TPixel[1]); - new DefaultPixelBlenders.Screen().Blend(this.MemoryManager, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount)); + new DefaultPixelBlenders.Screen().Blend(this.MemoryAllocator, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount)); VectorAssert.Equal(expected, dest[0], 2); } @@ -248,7 +248,7 @@ public void DarkenFunction_Blender_Bulk(TestPixel back, TestPixe where TPixel : struct, IPixel { Span dest = new Span(new TPixel[1]); - new DefaultPixelBlenders.Darken().Blend(this.MemoryManager, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount)); + new DefaultPixelBlenders.Darken().Blend(this.MemoryAllocator, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount)); VectorAssert.Equal(expected, dest[0], 2); } @@ -287,7 +287,7 @@ public void LightenFunction_Blender_Bulk(TestPixel back, TestPix where TPixel : struct, IPixel { Span dest = new Span(new TPixel[1]); - new DefaultPixelBlenders.Lighten().Blend(this.MemoryManager, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount)); + new DefaultPixelBlenders.Lighten().Blend(this.MemoryAllocator, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount)); VectorAssert.Equal(expected, dest[0], 2); } @@ -326,7 +326,7 @@ public void OverlayFunction_Blender_Bulk(TestPixel back, TestPix where TPixel : struct, IPixel { Span dest = new Span(new TPixel[1]); - new DefaultPixelBlenders.Overlay().Blend(this.MemoryManager, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount)); + new DefaultPixelBlenders.Overlay().Blend(this.MemoryAllocator, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount)); VectorAssert.Equal(expected, dest[0], 2); } @@ -365,7 +365,7 @@ public void HardLightFunction_Blender_Bulk(TestPixel back, TestP where TPixel : struct, IPixel { Span dest = new Span(new TPixel[1]); - new DefaultPixelBlenders.HardLight().Blend(this.MemoryManager, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount)); + new DefaultPixelBlenders.HardLight().Blend(this.MemoryAllocator, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount)); VectorAssert.Equal(expected, dest[0], 2); } } diff --git a/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs b/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs index 4ae11301d5..caab05279d 100644 --- a/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs +++ b/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs @@ -4,7 +4,7 @@ using System; using System.Numerics; using System.Runtime.InteropServices; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; using SixLabors.ImageSharp.PixelFormats; using Xunit; using Xunit.Abstractions; @@ -43,7 +43,7 @@ public void ToVector4SimdAligned() TestOperation( source, expected, - (s, d) => ImageSharp.PixelFormats.Rgba32.PixelOperations.ToVector4SimdAligned(s, d.Span, 64) + (s, d) => ImageSharp.PixelFormats.Rgba32.PixelOperations.ToVector4SimdAligned(s, d.GetSpan(), 64) ); } @@ -56,14 +56,14 @@ public void Benchmark_ToVector4() int times = 200000; int count = 1024; - using (IBuffer source = Configuration.Default.MemoryManager.Allocate(count)) - using (IBuffer dest = Configuration.Default.MemoryManager.Allocate(count)) + using (IBuffer source = Configuration.Default.MemoryAllocator.Allocate(count)) + using (IBuffer dest = Configuration.Default.MemoryAllocator.Allocate(count)) { this.Measure( times, () => { - PixelOperations.Instance.ToVector4(source.Span, dest.Span, count); + PixelOperations.Instance.ToVector4(source.GetSpan(), dest.GetSpan(), count); }); } } @@ -133,7 +133,7 @@ public void PackFromVector4(int count) TestOperation( source, expected, - (s, d) => Operations.PackFromVector4(s, d.Span, count) + (s, d) => Operations.PackFromVector4(s, d.GetSpan(), count) ); } @@ -147,7 +147,7 @@ public void PackFromScaledVector4(int count) TestOperation( source, expected, - (s, d) => Operations.PackFromScaledVector4(s, d.Span, count) + (s, d) => Operations.PackFromScaledVector4(s, d.GetSpan(), count) ); } @@ -183,7 +183,7 @@ public void ToVector4(int count) TestOperation( source, expected, - (s, d) => Operations.ToVector4(s, d.Span, count) + (s, d) => Operations.ToVector4(s, d.GetSpan(), count) ); } @@ -197,7 +197,7 @@ public void ToScaledVector4(int count) TestOperation( source, expected, - (s, d) => Operations.ToScaledVector4(s, d.Span, count) + (s, d) => Operations.ToScaledVector4(s, d.GetSpan(), count) ); } @@ -218,7 +218,7 @@ public void PackFromXyzBytes(int count) TestOperation( source, expected, - (s, d) => Operations.PackFromRgb24Bytes(s, d.Span, count) + (s, d) => Operations.PackFromRgb24Bytes(s, d.GetSpan(), count) ); } @@ -242,7 +242,7 @@ public void ToXyzBytes(int count) TestOperation( source, expected, - (s, d) => Operations.ToRgb24Bytes(s, d.Span, count) + (s, d) => Operations.ToRgb24Bytes(s, d.GetSpan(), count) ); } @@ -263,7 +263,7 @@ public void PackFromXyzwBytes(int count) TestOperation( source, expected, - (s, d) => Operations.PackFromRgba32Bytes(s, d.Span, count) + (s, d) => Operations.PackFromRgba32Bytes(s, d.GetSpan(), count) ); } @@ -288,7 +288,7 @@ public void ToXyzwBytes(int count) TestOperation( source, expected, - (s, d) => Operations.ToRgba32Bytes(s, d.Span, count) + (s, d) => Operations.ToRgba32Bytes(s, d.GetSpan(), count) ); } @@ -309,7 +309,7 @@ public void PackFromZyxBytes(int count) TestOperation( source, expected, - (s, d) => Operations.PackFromBgr24Bytes(s, d.Span, count) + (s, d) => Operations.PackFromBgr24Bytes(s, d.GetSpan(), count) ); } @@ -333,7 +333,7 @@ public void ToZyxBytes(int count) TestOperation( source, expected, - (s, d) => Operations.ToBgr24Bytes(s, d.Span, count) + (s, d) => Operations.ToBgr24Bytes(s, d.GetSpan(), count) ); } @@ -354,7 +354,7 @@ public void PackFromZyxwBytes(int count) TestOperation( source, expected, - (s, d) => Operations.PackFromBgra32Bytes(s, d.Span, count) + (s, d) => Operations.PackFromBgra32Bytes(s, d.GetSpan(), count) ); } @@ -379,7 +379,7 @@ public void ToZyxwBytes(int count) TestOperation( source, expected, - (s, d) => Operations.ToBgra32Bytes(s, d.Span, count) + (s, d) => Operations.ToBgra32Bytes(s, d.GetSpan(), count) ); } @@ -400,7 +400,7 @@ public void PackFromWzyxBytes(int count) TestOperation( source, expected, - (s, d) => Operations.PackFromArgb32Bytes(s, d.Span, count) + (s, d) => Operations.PackFromArgb32Bytes(s, d.GetSpan(), count) ); } @@ -425,7 +425,7 @@ public void ToWzyxBytes(int count) TestOperation( source, expected, - (s, d) => Operations.ToArgb32Bytes(s, d.Span, count) + (s, d) => Operations.ToArgb32Bytes(s, d.GetSpan(), count) ); } @@ -441,7 +441,7 @@ public TestBuffers(TSource[] source, TDest[] expectedDest) { this.SourceBuffer = source; this.ExpectedDestBuffer = expectedDest; - this.ActualDestBuffer = Configuration.Default.MemoryManager.Allocate(expectedDest.Length); + this.ActualDestBuffer = Configuration.Default.MemoryAllocator.Allocate(expectedDest.Length); } public void Dispose() @@ -459,7 +459,7 @@ public void Verify() { Span expected = MemoryMarshal.Cast(this.ExpectedDestBuffer.AsSpan()); - Span actual = MemoryMarshal.Cast(this.ActualDestBuffer.Span); + Span actual = MemoryMarshal.Cast(this.ActualDestBuffer.GetSpan()); for (int i = 0; i < count; i++) { @@ -471,7 +471,7 @@ public void Verify() else { Span expected = this.ExpectedDestBuffer.AsSpan(); - Span actual = this.ActualDestBuffer.Span; + Span actual = this.ActualDestBuffer.GetSpan(); for (int i = 0; i < count; i++) { Assert.Equal(expected[i], actual[i]); diff --git a/tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs index e83d7009b9..6894f9b9bb 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs @@ -7,9 +7,12 @@ using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; using SixLabors.Primitives; using Xunit; +// ReSharper disable InconsistentNaming namespace SixLabors.ImageSharp.Tests.Processing.Processors.Convolution { + using SixLabors.ImageSharp.Advanced; + public class DetectEdgesTest : FileTestBase { private static readonly ImageComparer ValidatorComparer = ImageComparer.TolerantPercentage(0.001f); @@ -30,6 +33,21 @@ public class DetectEdgesTest : FileTestBase EdgeDetectionOperators.Sobel }; + [Theory] + [WithFileCollection(nameof(CommonTestImages), DefaultPixelType)] + public void DetectEdges_WorksOnWrappedMemoryImage(TestImageProvider provider) + where TPixel : struct, IPixel + { + provider.RunValidatingProcessorTestOnWrappedMemoryImage( + ctx => + { + Size size = ctx.GetCurrentSize(); + var bounds = new Rectangle(10, 10, size.Width / 2, size.Height / 2); + ctx.DetectEdges(bounds); + }, + useReferenceOutputFrom: nameof(this.DetectEdges_InBox)); + } + [Theory] [WithTestPatternImages(nameof(DetectEdgesFilters), 100, 100, DefaultPixelType)] [WithFileCollection(nameof(CommonTestImages), nameof(DetectEdgesFilters), DefaultPixelType)] diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/FlipTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/FlipTests.cs index 3f028259cb..0ac8a9459c 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/FlipTests.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/FlipTests.cs @@ -5,15 +5,14 @@ using SixLabors.ImageSharp.Processing; using Xunit; +// ReSharper disable InconsistentNaming namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms { using SixLabors.ImageSharp.Processing.Transforms; - public class FlipTests : FileTestBase + public class FlipTests { - public static readonly string[] FlipFiles = { TestImages.Bmp.F }; - public static readonly TheoryData FlipValues = new TheoryData { @@ -23,15 +22,28 @@ public static readonly TheoryData FlipValues }; [Theory] - [WithFileCollection(nameof(FlipFiles), nameof(FlipValues), DefaultPixelType)] - public void ImageShouldFlip(TestImageProvider provider, FlipMode flipType) + [WithTestPatternImages(nameof(FlipValues), 53, 37, PixelTypes.Rgba32)] + [WithTestPatternImages(nameof(FlipValues), 17, 32, PixelTypes.Rgba32)] + public void Flip(TestImageProvider provider, FlipMode flipMode) + where TPixel : struct, IPixel + { + provider.RunValidatingProcessorTest( + ctx => ctx.Flip(flipMode), + testOutputDetails: flipMode, + appendPixelTypeToFileName: false); + } + + [Theory] + [WithTestPatternImages(nameof(FlipValues), 53, 37, PixelTypes.Rgba32)] + [WithTestPatternImages(nameof(FlipValues), 17, 32, PixelTypes.Rgba32)] + public void Flip_WorksOnWrappedMemoryImage(TestImageProvider provider, FlipMode flipMode) where TPixel : struct, IPixel { - using (Image image = provider.GetImage()) - { - image.Mutate(x => x.Flip(flipType)); - image.DebugSave(provider, flipType); - } + provider.RunValidatingProcessorTestOnWrappedMemoryImage( + ctx => ctx.Flip(flipMode), + testOutputDetails: flipMode, + useReferenceOutputFrom: nameof(this.Flip), + appendPixelTypeToFileName: false); } } } \ No newline at end of file diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeProfilingBenchmarks.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeProfilingBenchmarks.cs index 1160e496c4..ab19c21eb2 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeProfilingBenchmarks.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeProfilingBenchmarks.cs @@ -46,7 +46,7 @@ public void PrintWeightsData() var size = new Size(500, 500); var proc = new ResizeProcessor(KnownResamplers.Bicubic, 200, 200, size); - WeightsBuffer weights = proc.PrecomputeWeights(Configuration.Default.MemoryManager, proc.Width, size.Width); + WeightsBuffer weights = proc.PrecomputeWeights(Configuration.Default.MemoryAllocator, proc.Width, size.Width); var bld = new StringBuilder(); diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs index 84da154db0..3fc22264d6 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs @@ -84,6 +84,28 @@ public void Resize_IsNotBoundToSinglePixelType(TestImageProvider } } + + [Theory] + [WithFileCollection(nameof(CommonTestImages), DefaultPixelType)] + public void Resize_ThrowsForWrappedMemoryImage(TestImageProvider provider) + where TPixel : struct, IPixel + { + using (Image image0 = provider.GetImage()) + { + var mmg = TestMemoryManager.CreateAsCopyOfPixelData(image0); + + using (var image1 = Image.WrapMemory(mmg.Memory, image0.Width, image0.Height)) + { + Assert.ThrowsAny( + () => + { + image1.Mutate(x => x.Resize(image0.Width / 2, image0.Height / 2, true)); + }); + } + } + } + + [Theory] [WithFile(TestImages.Png.Kaboom, DefaultPixelType)] public void Resize_DoesNotBleedAlphaPixels(TestImageProvider provider) diff --git a/tests/ImageSharp.Tests/TestDataIcc/IccTestDataMatrix.cs b/tests/ImageSharp.Tests/TestDataIcc/IccTestDataMatrix.cs index 02bda3a0bb..1fb745c38f 100644 --- a/tests/ImageSharp.Tests/TestDataIcc/IccTestDataMatrix.cs +++ b/tests/ImageSharp.Tests/TestDataIcc/IccTestDataMatrix.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. using System.Numerics; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; namespace SixLabors.ImageSharp.Tests { diff --git a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs index d04d2343f6..1dfb3ba469 100644 --- a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs +++ b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs @@ -5,7 +5,7 @@ using System.Drawing.Imaging; using SixLabors.ImageSharp.Advanced; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; using SixLabors.ImageSharp.PixelFormats; namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs @@ -33,9 +33,9 @@ internal static unsafe Image FromFromArgb32SystemDrawingBitmap(S var image = new Image(w, h); - using (IBuffer workBuffer = Configuration.Default.MemoryManager.Allocate(w)) + using (IBuffer workBuffer = Configuration.Default.MemoryAllocator.Allocate(w)) { - fixed (Bgra32* destPtr = &workBuffer.DangerousGetPinnableReference()) + fixed (Bgra32* destPtr = &workBuffer.GetReference()) { for (int y = 0; y < h; y++) { @@ -44,7 +44,7 @@ internal static unsafe Image FromFromArgb32SystemDrawingBitmap(S byte* sourcePtr = sourcePtrBase + data.Stride * y; Buffer.MemoryCopy(sourcePtr, destPtr, destRowByteCount, sourceRowByteCount); - PixelOperations.Instance.PackFromBgra32(workBuffer.Span, row, row.Length); + PixelOperations.Instance.PackFromBgra32(workBuffer.GetSpan(), row, row.Length); } } } @@ -76,9 +76,9 @@ internal static unsafe Image FromFromRgb24SystemDrawingBitmap(Sy var image = new Image(w, h); - using (IBuffer workBuffer = Configuration.Default.MemoryManager.Allocate(w)) + using (IBuffer workBuffer = Configuration.Default.MemoryAllocator.Allocate(w)) { - fixed (Bgr24* destPtr = &workBuffer.DangerousGetPinnableReference()) + fixed (Bgr24* destPtr = &workBuffer.GetReference()) { for (int y = 0; y < h; y++) { @@ -87,9 +87,9 @@ internal static unsafe Image FromFromRgb24SystemDrawingBitmap(Sy byte* sourcePtr = sourcePtrBase + data.Stride * y; Buffer.MemoryCopy(sourcePtr, destPtr, destRowByteCount, sourceRowByteCount); - PixelOperations.Instance.PackFromBgr24(workBuffer.Span, row, row.Length); + PixelOperations.Instance.PackFromBgr24(workBuffer.GetSpan(), row, row.Length); - // FromRgb24(workBuffer.Span, row); + // FromRgb24(workBuffer.GetSpan(), row); } } } @@ -111,15 +111,15 @@ internal static unsafe System.Drawing.Bitmap ToSystemDrawingBitmap(Image long destRowByteCount = data.Stride; long sourceRowByteCount = w * sizeof(Bgra32); - using (IBuffer workBuffer = image.GetConfiguration().MemoryManager.Allocate(w)) + using (IBuffer workBuffer = image.GetConfiguration().MemoryAllocator.Allocate(w)) { - fixed (Bgra32* sourcePtr = &workBuffer.DangerousGetPinnableReference()) + fixed (Bgra32* sourcePtr = &workBuffer.GetReference()) { for (int y = 0; y < h; y++) { Span row = image.Frames.RootFrame.GetPixelRowSpan(y); - PixelOperations.Instance.ToBgra32(row, workBuffer.Span, row.Length); + PixelOperations.Instance.ToBgra32(row, workBuffer.GetSpan(), row.Length); byte* destPtr = destPtrBase + data.Stride * y; Buffer.MemoryCopy(sourcePtr, destPtr, destRowByteCount, sourceRowByteCount); diff --git a/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs b/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs index b8c0489c82..e135c5d311 100644 --- a/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs +++ b/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs @@ -8,7 +8,7 @@ using SixLabors.ImageSharp.Advanced; using SixLabors.ImageSharp.Formats; -using SixLabors.ImageSharp.Memory; +using SixLabors.Memory; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; @@ -27,13 +27,13 @@ public static class TestImageExtensions public static void MakeOpaque(this IImageProcessingContext ctx) where TPixel : struct, IPixel { - MemoryManager memoryManager = ctx.MemoryManager; + MemoryAllocator memoryAllocator = ctx.MemoryAllocator; ctx.Apply(img => { - using (Buffer2D temp = memoryManager.Allocate2D(img.Width, img.Height)) + using (Buffer2D temp = memoryAllocator.Allocate2D(img.Width, img.Height)) { - Span tempSpan = temp.Span; + Span tempSpan = temp.GetSpan(); foreach (ImageFrame frame in img.Frames) { Span pixelSpan = frame.GetPixelSpan(); @@ -665,7 +665,7 @@ internal static Image ToGrayscaleImage(this Buffer2D buffer, floa Span pixels = image.Frames.RootFrame.GetPixelSpan(); - Span bufferSpan = buffer.Span; + Span bufferSpan = buffer.GetSpan(); for (int i = 0; i < bufferSpan.Length; i++) { diff --git a/tests/ImageSharp.Tests/TestUtilities/TestMemoryManager.cs b/tests/ImageSharp.Tests/TestUtilities/TestMemoryManager.cs new file mode 100644 index 0000000000..e7ecb2dda1 --- /dev/null +++ b/tests/ImageSharp.Tests/TestUtilities/TestMemoryManager.cs @@ -0,0 +1,50 @@ +using System; +using System.Buffers; + +namespace SixLabors.ImageSharp.Tests +{ + using SixLabors.ImageSharp.Advanced; + using SixLabors.ImageSharp.PixelFormats; + + class TestMemoryManager : MemoryManager + where T : struct, IPixel + { + public TestMemoryManager(T[] pixelArray) + { + this.PixelArray = pixelArray; + } + + public T[] PixelArray { get; } + + protected override void Dispose(bool disposing) + { + } + + public override Span GetSpan() + { + return this.PixelArray; + } + + public override MemoryHandle Pin(int elementIndex = 0) + { + throw new NotImplementedException(); + } + + public override void Unpin() + { + throw new NotImplementedException(); + } + + public static TestMemoryManager CreateAsCopyOfPixelData(Span pixelData) + { + var pixelArray = new T[pixelData.Length]; + pixelData.CopyTo(pixelArray); + return new TestMemoryManager(pixelArray); + } + + public static TestMemoryManager CreateAsCopyOfPixelData(Image image) + { + return CreateAsCopyOfPixelData(image.GetPixelSpan()); + } + } +} \ No newline at end of file diff --git a/tests/ImageSharp.Tests/TestUtilities/TestUtils.cs b/tests/ImageSharp.Tests/TestUtilities/TestUtils.cs index f71793ff24..ba7f6ad31d 100644 --- a/tests/ImageSharp.Tests/TestUtilities/TestUtils.cs +++ b/tests/ImageSharp.Tests/TestUtilities/TestUtils.cs @@ -14,6 +14,8 @@ namespace SixLabors.ImageSharp.Tests { + using SixLabors.ImageSharp.Advanced; + /// /// Various utility and extension methods. /// @@ -113,8 +115,6 @@ public static string ToCsv(this IEnumerable items, string separator = ",") /// public static PixelTypes GetPixelType(this Type colorStructClrType) => ClrTypes2PixelTypes[colorStructClrType]; - - public static IEnumerable> ExpandAllTypes(this PixelTypes pixelTypes) { if (pixelTypes == PixelTypes.Undefined) @@ -163,11 +163,15 @@ internal static TPixel GetPixelOfNamedColor(string colorName) /// The image processing method to test. (As a delegate) /// The value to append to the test output. /// The custom image comparer to use + /// + /// internal static void RunValidatingProcessorTest( this TestImageProvider provider, Action> process, object testOutputDetails = null, - ImageComparer comparer = null) + ImageComparer comparer = null, + bool appendPixelTypeToFileName = true, + bool appendSourceFileOrDescription = true) where TPixel : struct, IPixel { if (comparer == null) @@ -178,12 +182,69 @@ internal static void RunValidatingProcessorTest( using (Image image = provider.GetImage()) { image.Mutate(process); - image.DebugSave(provider, testOutputDetails); + + image.DebugSave( + provider, + testOutputDetails, + appendPixelTypeToFileName: appendPixelTypeToFileName, + appendSourceFileOrDescription: appendSourceFileOrDescription); // TODO: Investigate the cause of pixel inaccuracies under Linux if (TestEnvironment.IsWindows) { - image.CompareToReferenceOutput(comparer, provider, testOutputDetails); + image.CompareToReferenceOutput( + comparer, + provider, + testOutputDetails, + appendPixelTypeToFileName: appendPixelTypeToFileName, + appendSourceFileOrDescription: appendSourceFileOrDescription); + } + } + } + + public static void RunValidatingProcessorTestOnWrappedMemoryImage( + this TestImageProvider provider, + Action> process, + object testOutputDetails = null, + ImageComparer comparer = null, + string useReferenceOutputFrom = null, + bool appendPixelTypeToFileName = true, + bool appendSourceFileOrDescription = true) + where TPixel : struct, IPixel + { + if (comparer == null) + { + comparer = ImageComparer.TolerantPercentage(0.001f); + } + + using (Image image0 = provider.GetImage()) + { + var mmg = TestMemoryManager.CreateAsCopyOfPixelData(image0.GetPixelSpan()); + + using (var image1 = Image.WrapMemory(mmg.Memory, image0.Width, image0.Height)) + { + image1.Mutate(process); + image1.DebugSave( + provider, + testOutputDetails, + appendPixelTypeToFileName: appendPixelTypeToFileName, + appendSourceFileOrDescription: appendSourceFileOrDescription); + + // TODO: Investigate the cause of pixel inaccuracies under Linux + if (TestEnvironment.IsWindows) + { + if (useReferenceOutputFrom != null) + { + provider.Utility.TestName = useReferenceOutputFrom; + } + + image1.CompareToReferenceOutput( + comparer, + provider, + testOutputDetails, + appendPixelTypeToFileName: appendPixelTypeToFileName, + appendSourceFileOrDescription: appendSourceFileOrDescription); + } } } } diff --git a/tests/Images/External b/tests/Images/External index eb40b3c039..802ffbae9a 160000 --- a/tests/Images/External +++ b/tests/Images/External @@ -1 +1 @@ -Subproject commit eb40b3c039dd8c8ca448cb8073a59ca178901e9f +Subproject commit 802ffbae9af22d986226bc1c20d7d96aaf25d6b9