diff --git a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs index 0c77fc482f..953a6fcb23 100644 --- a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs +++ b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs @@ -446,17 +446,6 @@ namespace SixLabors.ImageSharp.Formats.Bmp PixelOperations.Instance.PackFromBgr24Bytes(row.Span, pixelSpan, width); } } - - //using (var row = new PixelArea(width, ComponentOrder.Zyx, padding)) - //{ - // for (int y = 0; y < height; y++) - // { - // row.Read(this.currentStream); - - // int newY = Invert(y, height, inverted); - // pixels.CopyFrom(row, newY); - // } - //} } /// @@ -471,14 +460,15 @@ namespace SixLabors.ImageSharp.Formats.Bmp where TPixel : struct, IPixel { int padding = CalculatePadding(width, 4); - using (var row = new PixelArea(width, ComponentOrder.Zyxw, padding)) + + using (IManagedByteBuffer row = this.memoryManager.AllocatePaddedPixelRowBuffer(width, 4, padding)) { for (int y = 0; y < height; y++) { - row.Read(this.currentStream); - + this.currentStream.Read(row); int newY = Invert(y, height, inverted); - pixels.CopyFrom(row, newY); + Span pixelSpan = pixels.GetRowSpan(newY); + PixelOperations.Instance.PackFromBgra32Bytes(row.Span, pixelSpan, width); } } } diff --git a/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs b/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs index 26d16cea32..5b85e9cb9e 100644 --- a/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs +++ b/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs @@ -151,6 +151,11 @@ namespace SixLabors.ImageSharp.Formats.Bmp } } + private IManagedByteBuffer AllocateRow(int width, int bytesPerPixel) + { + return this.memoryManager.AllocatePaddedPixelRowBuffer(width, bytesPerPixel, this.padding); + } + /// /// Writes the 32bit color palette to the stream. /// @@ -160,12 +165,13 @@ namespace SixLabors.ImageSharp.Formats.Bmp private void Write32Bit(EndianBinaryWriter writer, PixelAccessor pixels) where TPixel : struct, IPixel { - using (PixelArea row = new PixelArea(pixels.Width, ComponentOrder.Zyxw, this.padding)) + using (IManagedByteBuffer row = this.AllocateRow(pixels.Width, 4)) { for (int y = pixels.Height - 1; y >= 0; y--) { - pixels.CopyTo(row, y); - writer.Write(row.Bytes, 0, row.Length); + Span pixelSpan = pixels.GetRowSpan(y); + PixelOperations.Instance.ToBgra32Bytes(pixelSpan, row.Span, pixelSpan.Length); + writer.Write(row.Array, 0, row.Length()); } } } @@ -179,8 +185,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp private void Write24Bit(EndianBinaryWriter writer, PixelAccessor pixels) where TPixel : struct, IPixel { - using (IManagedByteBuffer row = - this.memoryManager.AllocatePaddedPixelRowBuffer(pixels.Width, 3, this.padding)) + using (IManagedByteBuffer row = this.AllocateRow(pixels.Width, 3)) { for (int y = pixels.Height - 1; y >= 0; y--) { @@ -189,15 +194,6 @@ namespace SixLabors.ImageSharp.Formats.Bmp writer.Write(row.Array, 0, row.Length()); } } - - //using (PixelArea row = new PixelArea(pixels.Width, ComponentOrder.Zyx, this.padding)) - //{ - // for (int y = pixels.Height - 1; y >= 0; y--) - // { - // pixels.CopyTo(row, y); - // writer.Write(row.Bytes, 0, row.Length); - // } - //} } } } diff --git a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs index da92665be5..8fd7f04d28 100644 --- a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs +++ b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs @@ -542,28 +542,31 @@ namespace SixLabors.ImageSharp.Formats.Gif return; } - // Optimization for when the size of the frame is the same as the image size. - if (this.restoreArea.Value.Width == imageWidth && - this.restoreArea.Value.Height == imageHeight) - { - using (PixelAccessor pixelAccessor = frame.Lock()) - { - pixelAccessor.Reset(); - } - } - else - { - using (var emptyRow = new PixelArea(this.restoreArea.Value.Width, ComponentOrder.Xyzw)) - { - using (PixelAccessor pixelAccessor = frame.Lock()) - { - for (int y = this.restoreArea.Value.Top; y < this.restoreArea.Value.Top + this.restoreArea.Value.Height; y++) - { - pixelAccessor.CopyFrom(emptyRow, y, this.restoreArea.Value.Left); - } - } - } - } + BufferArea pixelArea = frame.PixelBuffer.GetArea(this.restoreArea.Value); + pixelArea.Clear(); + + //if (this.restoreArea.Value.Width == imageWidth && + // this.restoreArea.Value.Height == imageHeight) + //{ + // using (PixelAccessor pixelAccessor = frame.Lock()) + // { + // pixelAccessor.Reset(); + // } + //} + //else + //{ + + // using (var emptyRow = new PixelArea(this.restoreArea.Value.Width, ComponentOrder.Xyzw)) + // { + // using (PixelAccessor pixelAccessor = frame.Lock()) + // { + // for (int y = this.restoreArea.Value.Top; y < this.restoreArea.Value.Top + this.restoreArea.Value.Height; y++) + // { + // pixelAccessor.CopyFrom(emptyRow, y, this.restoreArea.Value.Left); + // } + // } + // } + //} this.restoreArea = null; } diff --git a/src/ImageSharp/Image/ImageFrame{TPixel}.cs b/src/ImageSharp/Image/ImageFrame{TPixel}.cs index 5170522de3..163c7a3b08 100644 --- a/src/ImageSharp/Image/ImageFrame{TPixel}.cs +++ b/src/ImageSharp/Image/ImageFrame{TPixel}.cs @@ -21,11 +21,6 @@ namespace SixLabors.ImageSharp public sealed class ImageFrame : IPixelSource, IDisposable where TPixel : struct, IPixel { - /// - /// The image pixels. Not private as Buffer2D requires an array in its constructor. - /// - private Buffer2D pixelBuffer; - private bool isDisposed; /// @@ -54,7 +49,7 @@ namespace SixLabors.ImageSharp Guard.NotNull(metaData, nameof(metaData)); this.MemoryManager = memoryManager; - this.pixelBuffer = memoryManager.AllocateClean2D(width, height); + this.PixelBuffer = memoryManager.AllocateClean2D(width, height); this.MetaData = metaData; } @@ -77,8 +72,8 @@ namespace SixLabors.ImageSharp internal ImageFrame(MemoryManager memoryManager, ImageFrame source) { this.MemoryManager = memoryManager; - this.pixelBuffer = memoryManager.Allocate2D(source.pixelBuffer.Width, source.pixelBuffer.Height); - source.pixelBuffer.Span.CopyTo(this.pixelBuffer.Span); + this.PixelBuffer = memoryManager.Allocate2D(source.PixelBuffer.Width, source.PixelBuffer.Height); + source.PixelBuffer.Span.CopyTo(this.PixelBuffer.Span); this.MetaData = source.MetaData.Clone(); } @@ -87,18 +82,23 @@ namespace SixLabors.ImageSharp /// public MemoryManager MemoryManager { get; } + /// + /// Gets the image pixels. Not private as Buffer2D requires an array in its constructor. + /// + internal Buffer2D PixelBuffer { get; private set; } + /// - Buffer2D IPixelSource.PixelBuffer => this.pixelBuffer; + Buffer2D IPixelSource.PixelBuffer => this.PixelBuffer; /// /// Gets the width. /// - public int Width => this.pixelBuffer.Width; + public int Width => this.PixelBuffer.Width; /// /// Gets the height. /// - public int Height => this.pixelBuffer.Height; + public int Height => this.PixelBuffer.Height; /// /// Gets the meta data of the frame. @@ -116,13 +116,13 @@ namespace SixLabors.ImageSharp [MethodImpl(MethodImplOptions.AggressiveInlining)] get { - return this.pixelBuffer[x, y]; + return this.PixelBuffer[x, y]; } [MethodImpl(MethodImplOptions.AggressiveInlining)] set { - this.pixelBuffer[x, y] = value; + this.PixelBuffer[x, y] = value; } } @@ -135,7 +135,7 @@ namespace SixLabors.ImageSharp [MethodImpl(MethodImplOptions.AggressiveInlining)] internal ref TPixel GetPixelReference(int x, int y) { - return ref this.pixelBuffer[x, y]; + return ref this.PixelBuffer[x, y]; } /// @@ -168,8 +168,8 @@ namespace SixLabors.ImageSharp 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; + Buffer2D newPixels = pixelSource.SwapBufferOwnership(this.PixelBuffer); + this.PixelBuffer = newPixels; } /// @@ -180,9 +180,9 @@ namespace SixLabors.ImageSharp { Guard.NotNull(pixelSource, nameof(pixelSource)); - Buffer2D temp = this.pixelBuffer; - this.pixelBuffer = pixelSource.pixelBuffer; - pixelSource.pixelBuffer = temp; + Buffer2D temp = this.PixelBuffer; + this.PixelBuffer = pixelSource.PixelBuffer; + pixelSource.PixelBuffer = temp; } /// @@ -195,8 +195,8 @@ namespace SixLabors.ImageSharp return; } - this.pixelBuffer?.Dispose(); - this.pixelBuffer = null; + this.PixelBuffer?.Dispose(); + this.PixelBuffer = null; // Note disposing is done. this.isDisposed = true; diff --git a/src/ImageSharp/Image/PixelAccessor{TPixel}.cs b/src/ImageSharp/Image/PixelAccessor{TPixel}.cs index 3a894fb9ad..f1c8531cc4 100644 --- a/src/ImageSharp/Image/PixelAccessor{TPixel}.cs +++ b/src/ImageSharp/Image/PixelAccessor{TPixel}.cs @@ -158,65 +158,6 @@ namespace SixLabors.ImageSharp this.PixelBuffer.Buffer.Clear(); } - /// - /// Copy an area of pixels to the image. - /// - /// The area. - /// The target row index. - /// The target column index. - /// - /// Thrown when an unsupported component order value is passed. - /// - internal void CopyFrom(PixelArea area, int targetY, int targetX = 0) - { - this.CheckCoordinates(area, targetX, targetY); - - this.CopyFrom(area, targetX, targetY, area.Width, area.Height); - } - - /// - /// Copy pixels from the image to an area of pixels. - /// - /// The area. - /// The source row index. - /// The source column index. - /// - /// Thrown when an unsupported component order value is passed. - /// - internal void CopyTo(PixelArea area, int sourceY, int sourceX = 0) - { - this.CheckCoordinates(area, sourceX, sourceY); - - this.CopyTo(area, sourceX, sourceY, area.Width, area.Height); - } - - /// - /// Copy pixels from the image to an area of pixels. This method will make sure that the pixels - /// that are copied are within the bounds of the image. - /// - /// The area. - /// The source row index. - /// The source column index. - /// - /// Thrown when an unsupported component order value is passed. - /// - internal void SafeCopyTo(PixelArea area, int sourceY, int sourceX = 0) - { - int width = Math.Min(area.Width, this.Width - sourceX); - if (width < 1) - { - return; - } - - int height = Math.Min(area.Height, this.Height - sourceY); - if (height < 1) - { - return; - } - - this.CopyTo(area, sourceX, sourceY, width, height); - } - /// /// Sets the pixel buffer in an unsafe manner. This should not be used unless you know what its doing!!! /// @@ -239,161 +180,6 @@ namespace SixLabors.ImageSharp SpanHelper.Copy(this.PixelBuffer.Span, target.PixelBuffer.Span); } - /// - /// Copies from an area in format. - /// - /// The area. - /// The target column index. - /// The target row index. - /// The width. - /// The height. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private void CopyFromZyx(PixelArea area, int targetX, int targetY, int width, int height) - { - for (int y = 0; y < height; y++) - { - Span source = area.GetRowSpan(y); - Span destination = this.GetRowSpan(targetX, targetY + y); - - Operations.PackFromBgr24Bytes(source, destination, width); - } - } - - /// - /// Copies from an area in format. - /// - /// The area. - /// The target column index. - /// The target row index. - /// The width. - /// The height. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private void CopyFromZyxw(PixelArea area, int targetX, int targetY, int width, int height) - { - for (int y = 0; y < height; y++) - { - Span source = area.GetRowSpan(y); - Span destination = this.GetRowSpan(targetX, targetY + y); - - Operations.PackFromBgra32Bytes(source, destination, width); - } - } - - /// - /// Copies from an area in format. - /// - /// The area. - /// The target column index. - /// The target row index. - /// The width. - /// The height. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private void CopyFromXyz(PixelArea area, int targetX, int targetY, int width, int height) - { - for (int y = 0; y < height; y++) - { - Span source = area.GetRowSpan(y); - Span destination = this.GetRowSpan(targetX, targetY + y); - - Operations.PackFromRgb24Bytes(source, destination, width); - } - } - - /// - /// Copies from an area in format. - /// - /// The area. - /// The target column index. - /// The target row index. - /// The width. - /// The height. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private void CopyFromXyzw(PixelArea area, int targetX, int targetY, int width, int height) - { - for (int y = 0; y < height; y++) - { - Span source = area.GetRowSpan(y); - Span destination = this.GetRowSpan(targetX, targetY + y); - Operations.PackFromRgba32Bytes(source, destination, width); - } - } - - /// - /// Copies to an area in format. - /// - /// The row. - /// The source column index. - /// The source row index. - /// The width. - /// The height. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private void CopyToZyx(PixelArea area, int sourceX, int sourceY, int width, int height) - { - for (int y = 0; y < height; y++) - { - Span source = this.GetRowSpan(sourceX, sourceY + y); - Span destination = area.GetRowSpan(y); - Operations.ToBgr24Bytes(source, destination, width); - } - } - - /// - /// Copies to an area in format. - /// - /// The row. - /// The source column index. - /// The source row index. - /// The width. - /// The height. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private void CopyToZyxw(PixelArea area, int sourceX, int sourceY, int width, int height) - { - for (int y = 0; y < height; y++) - { - Span source = this.GetRowSpan(sourceX, sourceY + y); - Span destination = area.GetRowSpan(y); - Operations.ToBgra32Bytes(source, destination, width); - } - } - - /// - /// Copies to an area in format. - /// - /// The row. - /// The source column index. - /// The source row index. - /// The width. - /// The height. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private void CopyToXyz(PixelArea area, int sourceX, int sourceY, int width, int height) - { - for (int y = 0; y < height; y++) - { - Span source = this.GetRowSpan(sourceX, sourceY + y); - Span destination = area.GetRowSpan(y); - Operations.ToRgb24Bytes(source, destination, width); - } - } - - /// - /// Copies to an area in format. - /// - /// The row. - /// The source column index. - /// The source row index. - /// The width. - /// The height. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private void CopyToXyzw(PixelArea area, int sourceX, int sourceY, int width, int height) - { - for (int y = 0; y < height; y++) - { - Span source = this.GetRowSpan(sourceX, sourceY + y); - Span destination = area.GetRowSpan(y); - Operations.ToRgba32Bytes(source, destination, width); - } - } - /// /// Sets the pixel buffer in an unsafe manor this should not be used unless you know what its doing!!! /// @@ -410,95 +196,6 @@ namespace SixLabors.ImageSharp this.RowStride = this.Width * this.PixelSize; } - /// - /// Copy an area of pixels to the image. - /// - /// The area. - /// The target column index. - /// The target row index. - /// The width of the area to copy. - /// The height of the area to copy. - /// - /// Thrown when an unsupported component order value is passed. - /// - private void CopyFrom(PixelArea area, int targetX, int targetY, int width, int height) - { - switch (area.ComponentOrder) - { - case ComponentOrder.Zyx: - this.CopyFromZyx(area, targetX, targetY, width, height); - break; - case ComponentOrder.Zyxw: - this.CopyFromZyxw(area, targetX, targetY, width, height); - break; - case ComponentOrder.Xyz: - this.CopyFromXyz(area, targetX, targetY, width, height); - break; - case ComponentOrder.Xyzw: - this.CopyFromXyzw(area, targetX, targetY, width, height); - break; - default: - throw new NotSupportedException(); - } - } - - /// - /// Copy pixels from the image to an area of pixels. - /// - /// The area. - /// The source column index. - /// The source row index. - /// The width of the area to copy. - /// The height of the area to copy. - /// - /// Thrown when an unsupported component order value is passed. - /// - private void CopyTo(PixelArea area, int sourceX, int sourceY, int width, int height) - { - switch (area.ComponentOrder) - { - case ComponentOrder.Zyx: - this.CopyToZyx(area, sourceX, sourceY, width, height); - break; - case ComponentOrder.Zyxw: - this.CopyToZyxw(area, sourceX, sourceY, width, height); - break; - case ComponentOrder.Xyz: - this.CopyToXyz(area, sourceX, sourceY, width, height); - break; - case ComponentOrder.Xyzw: - this.CopyToXyzw(area, sourceX, sourceY, width, height); - break; - default: - throw new NotSupportedException(); - } - } - - /// - /// Checks that the given area and offset are within the bounds of the image. - /// - /// The area. - /// The x-coordinate of the pixel. Must be greater than zero and less than the width of the image. - /// The y-coordinate of the pixel. Must be greater than zero and less than the height of the image. - /// - /// Thrown if the dimensions are not within the bounds of the image. - /// - [Conditional("DEBUG")] - private void CheckCoordinates(PixelArea area, int x, int y) - { - int width = Math.Min(area.Width, this.Width - x); - if (width < 1) - { - throw new ArgumentOutOfRangeException(nameof(width), width, "Invalid area size specified."); - } - - int height = Math.Min(area.Height, this.Height - y); - if (height < 1) - { - throw new ArgumentOutOfRangeException(nameof(height), height, "Invalid area size specified."); - } - } - /// /// Checks the coordinates to ensure they are within bounds. /// diff --git a/src/ImageSharp/Image/PixelArea{TPixel}.cs b/src/ImageSharp/Image/PixelArea{TPixel}.cs deleted file mode 100644 index 7648017222..0000000000 --- a/src/ImageSharp/Image/PixelArea{TPixel}.cs +++ /dev/null @@ -1,212 +0,0 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the Apache License, Version 2.0. - -using System; -using System.Diagnostics; -using System.IO; -using SixLabors.ImageSharp.Memory; -using SixLabors.ImageSharp.PixelFormats; - -namespace SixLabors.ImageSharp -{ - /// - /// Represents an area of generic pixels. - /// - /// The pixel format. - internal sealed class PixelArea : IDisposable - where TPixel : struct, IPixel - { - /// - /// A value indicating whether this instance of the given entity has been disposed. - /// - /// if this instance has been disposed; otherwise, . - /// - /// If the entity is disposed, it must not be disposed a second time. The isDisposed field is set the first time the entity - /// is disposed. If the isDisposed field is true, then the Dispose() method will not dispose again. This help not to prolong the entity's - /// life in the Garbage Collector. - /// - private bool isDisposed; - - /// - /// The underlying buffer containing the raw pixel data. - /// - private readonly IManagedByteBuffer byteBuffer; - - /// - /// Initializes a new instance of the class. - /// - /// The width. - /// The component order. - public PixelArea(int width, ComponentOrder componentOrder) - : this(width, 1, componentOrder, 0) - { - } - - /// - /// Initializes a new instance of the class. - /// - /// The width. - /// The component order. - /// The number of bytes to pad each row. - public PixelArea(int width, ComponentOrder componentOrder, int padding) - : this(width, 1, componentOrder, padding) - { - } - - /// - /// Initializes a new instance of the class. - /// - /// The width. - /// The height. - /// The component order. - public PixelArea(int width, int height, ComponentOrder componentOrder) - : this(width, height, componentOrder, 0) - { - } - - /// - /// Initializes a new instance of the class. - /// - /// The width. - /// The height. - /// The component order. - /// The number of bytes to pad each row. - public PixelArea(int width, int height, ComponentOrder componentOrder, int padding) - { - this.Width = width; - this.Height = height; - this.ComponentOrder = componentOrder; - this.RowStride = (width * GetComponentCount(componentOrder)) + padding; - this.Length = this.RowStride * height; - - this.byteBuffer = Configuration.Default.MemoryManager.AllocateCleanManagedByteBuffer(this.Length); - } - - /// - /// Gets the data in bytes. - /// - public byte[] Bytes => this.byteBuffer.Array; - - /// - /// Gets the length of the buffer. - /// - public int Length { get; } - - /// - /// Gets the component order. - /// - public ComponentOrder ComponentOrder { get; } - - /// - /// Gets the height. - /// - public int Height { get; } - - /// - /// Gets the width of one row in the number of bytes. - /// - public int RowStride { get; } - - /// - /// Gets the width. - /// - public int Width { get; } - - /// - /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. - /// - public void Dispose() - { - if (this.isDisposed) - { - return; - } - - this.byteBuffer.Dispose(); - this.isDisposed = true; - } - - /// - /// Reads the stream to the area. - /// - /// The stream. - public void Read(Stream stream) - { - stream.Read(this.Bytes, 0, this.Length); - } - - /// - /// Writes the area to the stream. - /// - /// The stream. - public void Write(Stream stream) - { - stream.Write(this.Bytes, 0, this.Length); - } - - /// - /// Resets the bytes of the array to it's initial value. - /// - public void Reset() - { - this.byteBuffer.Clear(); - } - - /// - /// Gets a to the row y. - /// - /// The y coordinate - /// The - internal Span GetRowSpan(int y) - { - return this.byteBuffer.Slice(y * this.RowStride); - } - - /// - /// Gets component count for the given order. - /// - /// The component order. - /// - /// The . - /// - /// - /// Thrown if an invalid order is given. - /// - private static int GetComponentCount(ComponentOrder componentOrder) - { - switch (componentOrder) - { - case ComponentOrder.Zyx: - case ComponentOrder.Xyz: - return 3; - case ComponentOrder.Zyxw: - case ComponentOrder.Xyzw: - return 4; - } - - throw new NotSupportedException(); - } - - /// - /// Checks that the length of the byte array to ensure that it matches the given width and height. - /// - /// The width. - /// The height. - /// The byte array. - /// The component order. - /// - /// Thrown if the byte array is th incorrect length. - /// - [Conditional("DEBUG")] - private void CheckBytesLength(int width, int height, byte[] bytes, ComponentOrder componentOrder) - { - int requiredLength = (width * GetComponentCount(componentOrder)) * height; - if (bytes.Length != requiredLength) - { - throw new ArgumentOutOfRangeException( - nameof(bytes), - $"Invalid byte array length. Length {bytes.Length}; Should be {requiredLength}."); - } - } - } -} \ No newline at end of file diff --git a/src/ImageSharp/Memory/BufferArea{T}.cs b/src/ImageSharp/Memory/BufferArea{T}.cs index b5ed3566fa..850cc4c164 100644 --- a/src/ImageSharp/Memory/BufferArea{T}.cs +++ b/src/ImageSharp/Memory/BufferArea{T}.cs @@ -45,11 +45,26 @@ namespace SixLabors.ImageSharp.Memory /// public Size Size => this.Rectangle.Size; + /// + /// Gets the width + /// + public int Width => this.Rectangle.Width; + + /// + /// Gets the height + /// + public int Height => this.Rectangle.Height; + /// /// Gets the pixel stride which is equal to the width of . /// public int Stride => this.DestinationBuffer.Width; + /// + /// Gets a value indicating whether the area refers to the entire + /// + public bool IsFullBufferArea => this.Size == this.DestinationBuffer.Size(); + /// /// Gets or sets a value at the given index. /// @@ -126,5 +141,21 @@ namespace SixLabors.ImageSharp.Memory { return (y + this.Rectangle.Y) * this.DestinationBuffer.Width; } + + 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(); + return; + } + + for (int y = 0; y < this.Rectangle.Height; y++) + { + Span row = this.GetRowSpan(y); + row.Clear(); + } + } } } \ No newline at end of file diff --git a/tests/ImageSharp.Tests/Image/PixelAccessorTests.cs b/tests/ImageSharp.Tests/Image/PixelAccessorTests.cs deleted file mode 100644 index 1ab3f2ce9f..0000000000 --- a/tests/ImageSharp.Tests/Image/PixelAccessorTests.cs +++ /dev/null @@ -1,246 +0,0 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the Apache License, Version 2.0. - -using System; -using System.Numerics; -using SixLabors.ImageSharp.PixelFormats; -using SixLabors.Primitives; -using Xunit; - -namespace SixLabors.ImageSharp.Tests -{ - /// - /// Tests the class. - /// - public class PixelAccessorTests - { - public static Image CreateTestImage() - where TPixel : struct, IPixel - { - var image = new Image(10, 10); - using (PixelAccessor pixels = image.Lock()) - { - for (int i = 0; i < 10; i++) - { - for (int j = 0; j < 10; j++) - { - var v = new Vector4(i, j, 0, 1); - v /= 10; - - var color = default(TPixel); - color.PackFromVector4(v); - - pixels[i, j] = color; - } - } - } - return image; - } - - [Theory] - [WithMemberFactory(nameof(CreateTestImage), PixelTypes.All, ComponentOrder.Xyz)] - [WithMemberFactory(nameof(CreateTestImage), PixelTypes.All, ComponentOrder.Zyx)] - [WithMemberFactory(nameof(CreateTestImage), PixelTypes.All, ComponentOrder.Xyzw)] - [WithMemberFactory(nameof(CreateTestImage), PixelTypes.All, ComponentOrder.Zyxw)] - internal void CopyTo_Then_CopyFrom_OnFullImageRect(TestImageProvider provider, ComponentOrder order) - where TPixel : struct, IPixel - { - using (Image src = provider.GetImage()) - { - using (Image dest = new Image(src.Width, src.Height)) - { - using (PixelArea area = new PixelArea(src.Width, src.Height, order)) - { - using (PixelAccessor srcPixels = src.Lock()) - { - srcPixels.CopyTo(area, 0, 0); - } - - using (PixelAccessor destPixels = dest.Lock()) - { - destPixels.CopyFrom(area, 0, 0); - } - } - - Assert.True(src.IsEquivalentTo(dest, false)); - } - } - } - - [Theory] - [WithBlankImages(16, 16, PixelTypes.All, ComponentOrder.Xyz)] - [WithBlankImages(16, 16, PixelTypes.All, ComponentOrder.Zyx)] - [WithBlankImages(16, 16, PixelTypes.All, ComponentOrder.Xyzw)] - [WithBlankImages(16, 16, PixelTypes.All, ComponentOrder.Zyxw)] - internal void CopyToThenCopyFromWithOffset(TestImageProvider provider, ComponentOrder order) - where TPixel : struct, IPixel - { - using (Image destImage = new Image(8, 8)) - { - using (Image srcImage = provider.GetImage()) - { - srcImage.Mutate(x => x.Fill(NamedColors.Red, new Rectangle(4, 4, 8, 8))); - using (PixelAccessor srcPixels = srcImage.Lock()) - { - using (PixelArea area = new PixelArea(8, 8, order)) - { - srcPixels.CopyTo(area, 4, 4); - - using (PixelAccessor destPixels = destImage.Lock()) - { - destPixels.CopyFrom(area, 0, 0); - } - } - } - } - - provider.Utility.SourceFileOrDescription = order.ToString(); - provider.Utility.SaveTestOutputFile(destImage, "bmp"); - - using (Image expectedImage = new Image(8, 8)) - { - expectedImage.Mutate(x => x.Fill(NamedColors.Red)); - Assert.True(destImage.IsEquivalentTo(expectedImage)); - } - } - } - - - [Fact] - public void CopyFromZYX() - { - using (Image image = new Image(1, 1)) - { - CopyFromZYXImpl(image); - } - } - - [Fact] - public void CopyFromZYXW() - { - using (Image image = new Image(1, 1)) - { - CopyFromZYXWImpl(image); - } - } - - [Fact] - public void CopyToZYX() - { - using (Image image = new Image(1, 1)) - { - CopyToZYXImpl(image); - } - } - - [Fact] - public void CopyToZYXW() - { - using (Image image = new Image(1, 1)) - { - CopyToZYXWImpl(image); - } - } - - private static void CopyFromZYXImpl(Image image) - where TPixel : struct, IPixel - { - using (PixelAccessor pixels = image.Lock()) - { - byte red = 1; - byte green = 2; - byte blue = 3; - byte alpha = 255; - - using (PixelArea row = new PixelArea(1, ComponentOrder.Zyx)) - { - row.Bytes[0] = blue; - row.Bytes[1] = green; - row.Bytes[2] = red; - - pixels.CopyFrom(row, 0); - - Rgba32 color = (Rgba32)(object)pixels[0, 0]; - Assert.Equal(red, color.R); - Assert.Equal(green, color.G); - Assert.Equal(blue, color.B); - Assert.Equal(alpha, color.A); - } - } - } - - private static void CopyFromZYXWImpl(Image image) - where TPixel : struct, IPixel - { - using (PixelAccessor pixels = image.Lock()) - { - byte red = 1; - byte green = 2; - byte blue = 3; - byte alpha = 4; - - using (PixelArea row = new PixelArea(1, ComponentOrder.Zyxw)) - { - row.Bytes[0] = blue; - row.Bytes[1] = green; - row.Bytes[2] = red; - row.Bytes[3] = alpha; - - pixels.CopyFrom(row, 0); - - Rgba32 color = (Rgba32)(object)pixels[0, 0]; - Assert.Equal(red, color.R); - Assert.Equal(green, color.G); - Assert.Equal(blue, color.B); - Assert.Equal(alpha, color.A); - } - } - } - - private static void CopyToZYXImpl(Image image) - where TPixel : struct, IPixel - { - using (PixelAccessor pixels = image.Lock()) - { - byte red = 1; - byte green = 2; - byte blue = 3; - - using (PixelArea row = new PixelArea(1, ComponentOrder.Zyx)) - { - pixels[0, 0] = (TPixel)(object)new Rgba32(red, green, blue); - - pixels.CopyTo(row, 0); - - Assert.Equal(blue, row.Bytes[0]); - Assert.Equal(green, row.Bytes[1]); - Assert.Equal(red, row.Bytes[2]); - } - } - } - - private static void CopyToZYXWImpl(Image image) - where TPixel : struct, IPixel - { - using (PixelAccessor pixels = image.Lock()) - { - byte red = 1; - byte green = 2; - byte blue = 3; - byte alpha = 4; - - using (PixelArea row = new PixelArea(1, ComponentOrder.Zyxw)) - { - pixels[0, 0] = (TPixel)(object)new Rgba32(red, green, blue, alpha); - - pixels.CopyTo(row, 0); - - Assert.Equal(blue, row.Bytes[0]); - Assert.Equal(green, row.Bytes[1]); - Assert.Equal(red, row.Bytes[2]); - Assert.Equal(alpha, row.Bytes[3]); - } - } - } - } -} diff --git a/tests/ImageSharp.Tests/Memory/BufferAreaTests.cs b/tests/ImageSharp.Tests/Memory/BufferAreaTests.cs index 2ca409dc15..e96aa2e375 100644 --- a/tests/ImageSharp.Tests/Memory/BufferAreaTests.cs +++ b/tests/ImageSharp.Tests/Memory/BufferAreaTests.cs @@ -110,5 +110,38 @@ namespace SixLabors.ImageSharp.Tests.Memory Assert.Equal(expected, r); } } + + [Fact] + public void Clear_FullArea() + { + using (Buffer2D buffer = CreateTestBuffer(22, 13)) + { + buffer.GetArea().Clear(); + Span fullSpan = buffer.Span; + Assert.True(fullSpan.SequenceEqual(new int[fullSpan.Length])); + } + } + + [Fact] + public void Clear_SubArea() + { + using (Buffer2D buffer = CreateTestBuffer(20, 30)) + { + BufferArea area = buffer.GetArea(5, 5, 10, 10); + area.Clear(); + + Assert.NotEqual(0, buffer[4, 4]); + Assert.NotEqual(0, buffer[15, 15]); + + Assert.Equal(0, buffer[5, 5]); + Assert.Equal(0, buffer[14, 14]); + + for (int y = area.Rectangle.Y; y < area.Rectangle.Bottom; y++) + { + Span span = buffer.GetRowSpan(y).Slice(area.Rectangle.X, area.Width); + Assert.True(span.SequenceEqual(new int[area.Width])); + } + } + } } } \ No newline at end of file