Merge pull request #1035 from SixLabors/af/expose-buffer-internals

Expose Buffer2D and ParallelHelper internals

src/ImageSharp.Drawing/Processing/Processors/Drawing/DrawImageProcessor{TPixelBg,TPixelFg}.cs

@@ -4,7 +4,7 @@
 using System;
 
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.ParallelUtils;
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 

src/ImageSharp.Drawing/Processing/Processors/Drawing/FillProcessor{TPixel}.cs

@@ -5,8 +5,8 @@ using System;
 using System.Buffers;
 
 using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
 using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 
@@ -45,7 +45,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Drawing
 
             int width = maxX - minX;
 
-            var workingRect = Rectangle.FromLTRB(minX, minY, maxX, maxY);
+            Rectangle workingRect = Rectangle.FromLTRB(minX, minY, maxX, maxY);
 
             IBrush brush = this.definition.Brush;
             GraphicsOptions options = this.definition.Options;
@@ -53,9 +53,10 @@ namespace SixLabors.ImageSharp.Processing.Processors.Drawing
             // If there's no reason for blending, then avoid it.
             if (this.IsSolidBrushWithoutBlending(out SolidBrush solidBrush))
             {
-                ParallelExecutionSettings parallelSettings = configuration.GetParallelSettings().MultiplyMinimumPixelsPerTask(4);
+                ParallelExecutionSettings parallelSettings = ParallelExecutionSettings.FromConfiguration(configuration)
+                    .MultiplyMinimumPixelsPerTask(4);
 
-                TPixel colorPixel = solidBrush.Color.ToPixel<TPixel>();
+                var colorPixel = solidBrush.Color.ToPixel<TPixel>();
 
                 ParallelHelper.IterateRows(
                     workingRect,

src/ImageSharp/Common/ParallelUtils/ParallelExecutionSettings.cs → src/ImageSharp/Advanced/ParallelUtils/ParallelExecutionSettings.cs

@@ -1,16 +1,17 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using System;
 using System.Threading.Tasks;
 
 using SixLabors.Memory;
 
-namespace SixLabors.ImageSharp.ParallelUtils
+namespace SixLabors.ImageSharp.Advanced.ParallelUtils
 {
     /// <summary>
     /// Defines execution settings for methods in <see cref="ParallelHelper"/>.
     /// </summary>
-    internal readonly struct ParallelExecutionSettings
+    public readonly struct ParallelExecutionSettings
     {
         /// <summary>
         /// Default value for <see cref="MinimumPixelsProcessedPerTask"/>.
@@ -20,11 +21,24 @@ namespace SixLabors.ImageSharp.ParallelUtils
         /// <summary>
         /// Initializes a new instance of the <see cref="ParallelExecutionSettings"/> struct.
         /// </summary>
+        /// <param name="maxDegreeOfParallelism">The value used for initializing <see cref="ParallelOptions.MaxDegreeOfParallelism"/> when using TPL.</param>
+        /// <param name="minimumPixelsProcessedPerTask">The value for <see cref="MinimumPixelsProcessedPerTask"/>.</param>
+        /// <param name="memoryAllocator">The <see cref="MemoryAllocator"/>.</param>
         public ParallelExecutionSettings(
             int maxDegreeOfParallelism,
             int minimumPixelsProcessedPerTask,
             MemoryAllocator memoryAllocator)
         {
+            // Shall be compatible with ParallelOptions.MaxDegreeOfParallelism:
+            // https://docs.microsoft.com/en-us/dotnet/api/system.threading.tasks.paralleloptions.maxdegreeofparallelism
+            if (maxDegreeOfParallelism == 0 || maxDegreeOfParallelism < -1)
+            {
+                throw new ArgumentOutOfRangeException(nameof(maxDegreeOfParallelism));
+            }
+
+            Guard.MustBeGreaterThan(minimumPixelsProcessedPerTask, 0, nameof(minimumPixelsProcessedPerTask));
+            Guard.NotNull(memoryAllocator, nameof(memoryAllocator));
+
             this.MaxDegreeOfParallelism = maxDegreeOfParallelism;
             this.MinimumPixelsProcessedPerTask = minimumPixelsProcessedPerTask;
             this.MemoryAllocator = memoryAllocator;
@@ -33,13 +47,15 @@ namespace SixLabors.ImageSharp.ParallelUtils
         /// <summary>
         /// Initializes a new instance of the <see cref="ParallelExecutionSettings"/> struct.
         /// </summary>
+        /// <param name="maxDegreeOfParallelism">The value used for initializing <see cref="ParallelOptions.MaxDegreeOfParallelism"/> when using TPL.</param>
+        /// <param name="memoryAllocator">The <see cref="MemoryAllocator"/>.</param>
         public ParallelExecutionSettings(int maxDegreeOfParallelism, MemoryAllocator memoryAllocator)
             : this(maxDegreeOfParallelism, DefaultMinimumPixelsProcessedPerTask, memoryAllocator)
         {
         }
 
         /// <summary>
-        /// Gets the MemoryAllocator
+        /// Gets the <see cref="MemoryAllocator"/>.
         /// </summary>
         public MemoryAllocator MemoryAllocator { get; }
 
@@ -60,12 +76,26 @@ namespace SixLabors.ImageSharp.ParallelUtils
         /// Creates a new instance of <see cref="ParallelExecutionSettings"/>
         /// having <see cref="MinimumPixelsProcessedPerTask"/> multiplied by <paramref name="multiplier"/>
         /// </summary>
+        /// <param name="multiplier">The value to multiply <see cref="MinimumPixelsProcessedPerTask"/> with.</param>
+        /// <returns>The modified <see cref="ParallelExecutionSettings"/>.</returns>
         public ParallelExecutionSettings MultiplyMinimumPixelsPerTask(int multiplier)
         {
+            Guard.MustBeGreaterThan(multiplier, 0, nameof(multiplier));
+
             return new ParallelExecutionSettings(
                 this.MaxDegreeOfParallelism,
                 this.MinimumPixelsProcessedPerTask * multiplier,
                 this.MemoryAllocator);
         }
+
+        /// <summary>
+        /// Get the default <see cref="SixLabors.ImageSharp.Advanced.ParallelUtils.ParallelExecutionSettings"/> for a <see cref="SixLabors.ImageSharp.Configuration"/>
+        /// </summary>
+        /// <param name="configuration">The <see cref="Configuration"/>.</param>
+        /// <returns>The <see cref="ParallelExecutionSettings"/>.</returns>
+        public static ParallelExecutionSettings FromConfiguration(Configuration configuration)
+        {
+            return new ParallelExecutionSettings(configuration.MaxDegreeOfParallelism, configuration.MemoryAllocator);
+        }
     }
-}
+}

src/ImageSharp/Common/ParallelUtils/ParallelHelper.cs → src/ImageSharp/Advanced/ParallelUtils/ParallelHelper.cs

@@ -10,29 +10,25 @@ using SixLabors.ImageSharp.Memory;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.ParallelUtils
+namespace SixLabors.ImageSharp.Advanced.ParallelUtils
 {
     /// <summary>
     /// Utility methods for batched processing of pixel row intervals.
-    /// Parallel execution is optimized for image processing.
+    /// Parallel execution is optimized for image processing based on values defined
-    /// Use this instead of direct <see cref="Parallel"/> calls!
+    /// <see cref="ParallelExecutionSettings"/> or <see cref="Configuration"/>.
+    /// Using this class is preferred over direct usage of <see cref="Parallel"/> utility methods.
     /// </summary>
-    internal static class ParallelHelper
+    public static class ParallelHelper
     {
-        /// <summary>
-        /// Get the default <see cref="ParallelExecutionSettings"/> for a <see cref="Configuration"/>
-        /// </summary>
-        public static ParallelExecutionSettings GetParallelSettings(this Configuration configuration)
-        {
-            return new ParallelExecutionSettings(configuration.MaxDegreeOfParallelism, configuration.MemoryAllocator);
-        }
-
         /// <summary>
         /// Iterate through the rows of a rectangle in optimized batches defined by <see cref="RowInterval"/>-s.
         /// </summary>
+        /// <param name="rectangle">The <see cref="Rectangle"/>.</param>
+        /// <param name="configuration">The <see cref="Configuration"/> to get the parallel settings from.</param>
+        /// <param name="body">The method body defining the iteration logic on a single <see cref="RowInterval"/>.</param>
         public static void IterateRows(Rectangle rectangle, Configuration configuration, Action<RowInterval> body)
         {
-            ParallelExecutionSettings parallelSettings = configuration.GetParallelSettings();
+            ParallelExecutionSettings parallelSettings = ParallelExecutionSettings.FromConfiguration(configuration);
 
             IterateRows(rectangle, parallelSettings, body);
         }
@@ -40,6 +36,9 @@ namespace SixLabors.ImageSharp.ParallelUtils
         /// <summary>
         /// Iterate through the rows of a rectangle in optimized batches defined by <see cref="RowInterval"/>-s.
         /// </summary>
+        /// <param name="rectangle">The <see cref="Rectangle"/>.</param>
+        /// <param name="parallelSettings">The <see cref="ParallelExecutionSettings"/>.</param>
+        /// <param name="body">The method body defining the iteration logic on a single <see cref="RowInterval"/>.</param>
         public static void IterateRows(
             Rectangle rectangle,
             in ParallelExecutionSettings parallelSettings,
@@ -47,7 +46,9 @@ namespace SixLabors.ImageSharp.ParallelUtils
         {
             ValidateRectangle(rectangle);
 
-            int maxSteps = DivideCeil(rectangle.Width * rectangle.Height, parallelSettings.MinimumPixelsProcessedPerTask);
+            int maxSteps = DivideCeil(
+                rectangle.Width * rectangle.Height,
+                parallelSettings.MinimumPixelsProcessedPerTask);
 
             int numOfSteps = Math.Min(parallelSettings.MaxDegreeOfParallelism, maxSteps);
 
@@ -81,7 +82,7 @@ namespace SixLabors.ImageSharp.ParallelUtils
         /// Iterate through the rows of a rectangle in optimized batches defined by <see cref="RowInterval"/>-s
         /// instantiating a temporary buffer for each <paramref name="body"/> invocation.
         /// </summary>
-        public static void IterateRowsWithTempBuffer<T>(
+        internal static void IterateRowsWithTempBuffer<T>(
             Rectangle rectangle,
             in ParallelExecutionSettings parallelSettings,
             Action<RowInterval, Memory<T>> body)
@@ -133,13 +134,13 @@ namespace SixLabors.ImageSharp.ParallelUtils
         /// Iterate through the rows of a rectangle in optimized batches defined by <see cref="RowInterval"/>-s
         /// instantiating a temporary buffer for each <paramref name="body"/> invocation.
         /// </summary>
-        public static void IterateRowsWithTempBuffer<T>(
+        internal static void IterateRowsWithTempBuffer<T>(
             Rectangle rectangle,
             Configuration configuration,
             Action<RowInterval, Memory<T>> body)
             where T : unmanaged
         {
-            IterateRowsWithTempBuffer(rectangle, configuration.GetParallelSettings(), body);
+            IterateRowsWithTempBuffer(rectangle, ParallelExecutionSettings.FromConfiguration(configuration), body);
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]

src/ImageSharp/Configuration.cs

@@ -63,7 +63,7 @@ namespace SixLabors.ImageSharp
             get => this.maxDegreeOfParallelism;
             set
             {
-                if (value <= 0)
+                if (value == 0 || value < -1)
                 {
                     throw new ArgumentOutOfRangeException(nameof(this.MaxDegreeOfParallelism));
                 }
@@ -161,4 +161,4 @@ namespace SixLabors.ImageSharp
                 new BmpConfigurationModule());
         }
     }
-}
+}

src/ImageSharp/ImageFrameCollection{TPixel}.cs

@@ -351,7 +351,7 @@ namespace SixLabors.ImageSharp
                 this.parent.GetConfiguration(),
                 source.Size(),
                 source.Metadata.DeepClone());
-            source.CopyPixelsTo(result.PixelBuffer.Span);
+            source.CopyPixelsTo(result.PixelBuffer.GetSpan());
             return result;
         }
     }

src/ImageSharp/ImageFrame{TPixel}.cs

@@ -6,9 +6,9 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.Metadata;
-using SixLabors.ImageSharp.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Memory;
 using SixLabors.Primitives;
@@ -218,10 +218,10 @@ namespace SixLabors.ImageSharp
             if (typeof(TPixel) == typeof(TDestinationPixel))
             {
                 Span<TPixel> dest1 = MemoryMarshal.Cast<TDestinationPixel, TPixel>(destination);
-                this.PixelBuffer.Span.CopyTo(dest1);
+                this.PixelBuffer.GetSpan().CopyTo(dest1);
             }
 
-            PixelOperations<TPixel>.Instance.To(this.Configuration, this.PixelBuffer.Span, destination);
+            PixelOperations<TPixel>.Instance.To(this.Configuration, this.PixelBuffer.GetSpan(), destination);
         }
 
         /// <inheritdoc/>

src/ImageSharp/Memory/Buffer2DExtensions.cs

@@ -13,13 +13,69 @@ namespace SixLabors.ImageSharp.Memory
     /// <summary>
     /// Defines extension methods for <see cref="Buffer2D{T}"/>.
     /// </summary>
-    internal static class Buffer2DExtensions
+    public static class Buffer2DExtensions
     {
+        /// <summary>
+        /// Gets a <see cref="Span{T}"/> to the backing buffer of <paramref name="buffer"/>.
+        /// </summary>
+        /// <param name="buffer">The <see cref="Buffer2D{T}"/>.</param>
+        /// <typeparam name="T">The value type.</typeparam>
+        /// <returns>The <see cref="Span{T}"/> referencing the memory area.</returns>
+        public static Span<T> GetSpan<T>(this Buffer2D<T> buffer)
+            where T : struct
+        {
+            Guard.NotNull(buffer, nameof(buffer));
+            return buffer.MemorySource.GetSpan();
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Memory{T}"/> holding the backing buffer of <paramref name="buffer"/>.
+        /// </summary>
+        /// <param name="buffer">The <see cref="Buffer2D{T}"/>.</param>
+        /// <typeparam name="T">The value type.</typeparam>
+        /// <returns>The <see cref="Memory{T}"/>.</returns>
+        public static Memory<T> GetMemory<T>(this Buffer2D<T> buffer)
+            where T : struct
+        {
+            Guard.NotNull(buffer, nameof(buffer));
+            return buffer.MemorySource.Memory;
+        }
+
+        /// <summary>
+        /// Gets a <see cref="Span{T}"/> to the row 'y' beginning from the pixel at the first pixel on that row.
+        /// </summary>
+        /// <param name="buffer">The buffer</param>
+        /// <param name="y">The y (row) coordinate</param>
+        /// <typeparam name="T">The element type</typeparam>
+        /// <returns>The <see cref="Span{T}"/></returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Span<T> GetRowSpan<T>(this Buffer2D<T> buffer, int y)
+            where T : struct
+        {
+            Guard.NotNull(buffer, nameof(buffer));
+            return buffer.GetSpan().Slice(y * buffer.Width, buffer.Width);
+        }
+
+        /// <summary>
+        /// Gets a <see cref="Memory{T}"/> to the row 'y' beginning from the pixel at the first pixel on that row.
+        /// </summary>
+        /// <param name="buffer">The buffer</param>
+        /// <param name="y">The y (row) coordinate</param>
+        /// <typeparam name="T">The element type</typeparam>
+        /// <returns>The <see cref="Span{T}"/></returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Memory<T> GetRowMemory<T>(this Buffer2D<T> buffer, int y)
+            where T : struct
+        {
+            Guard.NotNull(buffer, nameof(buffer));
+            return buffer.MemorySource.Memory.Slice(y * buffer.Width, buffer.Width);
+        }
+
         /// <summary>
         /// Copy <paramref name="columnCount"/> columns of <paramref name="buffer"/> inplace,
         /// from positions starting at <paramref name="sourceIndex"/> to positions at <paramref name="destIndex"/>.
         /// </summary>
-        public static unsafe void CopyColumns<T>(
+        internal static unsafe void CopyColumns<T>(
             this Buffer2D<T> buffer,
             int sourceIndex,
             int destIndex,
@@ -37,7 +93,7 @@ namespace SixLabors.ImageSharp.Memory
             int dOffset = destIndex * elementSize;
             long count = columnCount * elementSize;
 
-            Span<byte> span = MemoryMarshal.AsBytes(buffer.Memory.Span);
+            Span<byte> span = MemoryMarshal.AsBytes(buffer.GetMemory().Span);
 
             fixed (byte* ptr = span)
             {
@@ -60,7 +116,7 @@ namespace SixLabors.ImageSharp.Memory
         /// <typeparam name="T">The element type</typeparam>
         /// <param name="buffer">The <see cref="Buffer2D{T}"/></param>
         /// <returns>The <see cref="Rectangle"/></returns>
-        public static Rectangle FullRectangle<T>(this Buffer2D<T> buffer)
+        internal static Rectangle FullRectangle<T>(this Buffer2D<T> buffer)
             where T : struct
         {
             return new Rectangle(0, 0, buffer.Width, buffer.Height);
@@ -73,11 +129,11 @@ namespace SixLabors.ImageSharp.Memory
         /// <param name="buffer">The <see cref="Buffer2D{T}"/></param>
         /// <param name="rectangle">The rectangle subarea</param>
         /// <returns>The <see cref="BufferArea{T}"/></returns>
-        public static BufferArea<T> GetArea<T>(this Buffer2D<T> buffer, in Rectangle rectangle)
+        internal static BufferArea<T> GetArea<T>(this Buffer2D<T> buffer, in Rectangle rectangle)
             where T : struct =>
             new BufferArea<T>(buffer, rectangle);
 
-        public static BufferArea<T> GetArea<T>(this Buffer2D<T> buffer, int x, int y, int width, int height)
+        internal static BufferArea<T> GetArea<T>(this Buffer2D<T> buffer, int x, int y, int width, int height)
             where T : struct =>
             new BufferArea<T>(buffer, new Rectangle(x, y, width, height));
 
@@ -87,64 +143,17 @@ namespace SixLabors.ImageSharp.Memory
         /// <typeparam name="T">The element type</typeparam>
         /// <param name="buffer">The <see cref="Buffer2D{T}"/></param>
         /// <returns>The <see cref="BufferArea{T}"/></returns>
-        public static BufferArea<T> GetArea<T>(this Buffer2D<T> buffer)
+        internal static BufferArea<T> GetArea<T>(this Buffer2D<T> buffer)
             where T : struct =>
             new BufferArea<T>(buffer);
 
-        public static BufferArea<T> GetAreaBetweenRows<T>(this Buffer2D<T> buffer, int minY, int maxY)
-            where T : struct =>
-            new BufferArea<T>(buffer, new Rectangle(0, minY, buffer.Width, maxY - minY));
-
         /// <summary>
         /// Gets a span for all the pixels in <paramref name="buffer"/> defined by <paramref name="rows"/>
         /// </summary>
-        public static Span<T> GetMultiRowSpan<T>(this Buffer2D<T> buffer, in RowInterval rows)
+        internal static Span<T> GetMultiRowSpan<T>(this Buffer2D<T> buffer, in RowInterval rows)
             where T : struct
         {
-            return buffer.Span.Slice(rows.Min * buffer.Width, rows.Height * buffer.Width);
+            return buffer.GetSpan().Slice(rows.Min * buffer.Width, rows.Height * buffer.Width);
-        }
-
-        /// <summary>
-        /// Gets a <see cref="Memory{T}"/> to the row 'y' beginning from the pixel at the first pixel on that row.
-        /// </summary>
-        /// <param name="buffer">The buffer</param>
-        /// <param name="y">The y (row) coordinate</param>
-        /// <typeparam name="T">The element type</typeparam>
-        /// <returns>The <see cref="Span{T}"/></returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Memory<T> GetRowMemory<T>(this Buffer2D<T> buffer, int y)
-            where T : struct
-        {
-            return buffer.MemorySource.Memory.Slice(y * buffer.Width, buffer.Width);
-        }
-
-        /// <summary>
-        /// Gets a <see cref="Span{T}"/> to the row 'y' beginning from the pixel at 'x'.
-        /// </summary>
-        /// <param name="buffer">The buffer</param>
-        /// <param name="x">The x coordinate (position in the row)</param>
-        /// <param name="y">The y (row) coordinate</param>
-        /// <typeparam name="T">The element type</typeparam>
-        /// <returns>The <see cref="Span{T}"/></returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Span<T> GetRowSpan<T>(this Buffer2D<T> buffer, int x, int y)
-            where T : struct
-        {
-            return buffer.GetSpan().Slice((y * buffer.Width) + x, buffer.Width - x);
-        }
-
-        /// <summary>
-        /// Gets a <see cref="Span{T}"/> to the row 'y' beginning from the pixel at the first pixel on that row.
-        /// </summary>
-        /// <param name="buffer">The buffer</param>
-        /// <param name="y">The y (row) coordinate</param>
-        /// <typeparam name="T">The element type</typeparam>
-        /// <returns>The <see cref="Span{T}"/></returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Span<T> GetRowSpan<T>(this Buffer2D<T> buffer, int y)
-            where T : struct
-        {
-            return buffer.GetSpan().Slice(y * buffer.Width, buffer.Width);
         }
 
         /// <summary>
@@ -153,21 +162,12 @@ namespace SixLabors.ImageSharp.Memory
         /// <typeparam name="T">The element type</typeparam>
         /// <param name="buffer">The <see cref="Buffer2D{T}"/></param>
         /// <returns>The <see cref="Size{T}"/> of the buffer</returns>
-        public static Size Size<T>(this Buffer2D<T> buffer)
+        internal static Size Size<T>(this Buffer2D<T> buffer)
             where T : struct
         {
             return new Size(buffer.Width, buffer.Height);
         }
 
-        /// <summary>
-        /// Gets a <see cref="Span{T}"/> to the backing buffer of <paramref name="buffer"/>.
-        /// </summary>
-        internal static Span<T> GetSpan<T>(this Buffer2D<T> buffer)
-            where T : struct
-        {
-            return buffer.MemorySource.GetSpan();
-        }
-
         [Conditional("DEBUG")]
         private static void CheckColumnRegionsDoNotOverlap<T>(
             Buffer2D<T> buffer,

src/ImageSharp/Memory/Buffer2D{T}.cs

@@ -12,8 +12,12 @@ namespace SixLabors.ImageSharp.Memory
     /// Represents a buffer of value type objects
     /// interpreted as a 2D region of <see cref="Width"/> x <see cref="Height"/> elements.
     /// </summary>
+    /// <remarks>
+    /// Before RC1, this class might be target of API changes, use it on your own risk!
+    /// </remarks>
     /// <typeparam name="T">The value type.</typeparam>
-    internal sealed class Buffer2D<T> : IDisposable
+    // TODO: Consider moving this type to the SixLabors.Memory namespace (SixLabors.Core).
+    public sealed class Buffer2D<T> : IDisposable
         where T : struct
     {
         private MemorySource<T> memorySource;
@@ -24,7 +28,7 @@ namespace SixLabors.ImageSharp.Memory
         /// <param name="memorySource">The buffer to wrap</param>
         /// <param name="width">The number of elements in a row</param>
         /// <param name="height">The number of rows</param>
-        public Buffer2D(MemorySource<T> memorySource, int width, int height)
+        internal Buffer2D(MemorySource<T> memorySource, int width, int height)
         {
             this.memorySource = memorySource;
             this.Width = width;
@@ -44,11 +48,7 @@ namespace SixLabors.ImageSharp.Memory
         /// <summary>
         /// Gets the backing <see cref="MemorySource{T}"/>
         /// </summary>
-        public MemorySource<T> MemorySource => this.memorySource;
+        internal MemorySource<T> MemorySource => this.memorySource;
-
-        public Memory<T> Memory => this.MemorySource.Memory;
-
-        public Span<T> Span => this.Memory.Span;
 
         /// <summary>
         /// Gets a reference to the element at the specified position.
@@ -56,7 +56,7 @@ namespace SixLabors.ImageSharp.Memory
         /// <param name="x">The x coordinate (row)</param>
         /// <param name="y">The y coordinate (position at row)</param>
         /// <returns>A reference to the element.</returns>
-        public ref T this[int x, int y]
+        internal ref T this[int x, int y]
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get
@@ -64,7 +64,7 @@ namespace SixLabors.ImageSharp.Memory
                 DebugGuard.MustBeLessThan(x, this.Width, nameof(x));
                 DebugGuard.MustBeLessThan(y, this.Height, nameof(y));
 
-                Span<T> span = this.Span;
+                Span<T> span = this.GetSpan();
                 return ref span[(this.Width * y) + x];
             }
         }
@@ -81,7 +81,7 @@ namespace SixLabors.ImageSharp.Memory
             DebugGuard.MustBeGreaterThan(h, 0, nameof(h));
             DebugGuard.MustBeLessThanOrEqualTo(y + h, this.Height, nameof(h));
 
-            Memory<T> slice = this.Memory.Slice(y * this.Width, h * this.Width);
+            Memory<T> slice = this.GetMemory().Slice(y * this.Width, h * this.Width);
             var memory = new MemorySource<T>(slice);
             return new Buffer2D<T>(memory, this.Width, h);
         }
@@ -98,7 +98,7 @@ namespace SixLabors.ImageSharp.Memory
         /// 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!
         /// </summary>
-        public static void SwapOrCopyContent(Buffer2D<T> destination, Buffer2D<T> source)
+        internal static void SwapOrCopyContent(Buffer2D<T> destination, Buffer2D<T> source)
         {
             MemorySource<T>.SwapOrCopyContent(ref destination.memorySource, ref source.memorySource);
             SwapDimensionData(destination, source);

src/ImageSharp/Memory/RowInterval.cs

@@ -10,26 +10,32 @@ namespace SixLabors.ImageSharp.Memory
     /// <summary>
     /// Represents an interval of rows in a <see cref="Rectangle"/> and/or <see cref="Buffer2D{T}"/>
     /// </summary>
-    internal readonly struct RowInterval : IEquatable<RowInterval>
+    /// <remarks>
+    /// Before RC1, this class might be target of API changes, use it on your own risk!
+    /// </remarks>
+    // TODO: Consider moving this type to the SixLabors.Memory namespace (SixLabors.Core).
+    public readonly struct RowInterval : IEquatable<RowInterval>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RowInterval"/> struct.
         /// </summary>
+        /// <param name="min">The inclusive minimum row.</param>
+        /// <param name="max">The exclusive maximum row.</param>
         public RowInterval(int min, int max)
         {
-            DebugGuard.MustBeLessThan(min, max, nameof(min));
+            Guard.MustBeLessThan(min, max, nameof(min));
 
             this.Min = min;
             this.Max = max;
         }
 
         /// <summary>
-        /// Gets the INCLUSIVE minimum.
+        /// Gets the inclusive minimum row.
         /// </summary>
         public int Min { get; }
 
         /// <summary>
-        /// Gets the EXCLUSIVE maximum.
+        /// Gets the exclusive maximum row.
         /// </summary>
         public int Max { get; }
 
@@ -38,33 +44,48 @@ namespace SixLabors.ImageSharp.Memory
         /// </summary>
         public int Height => this.Max - this.Min;
 
+        /// <summary>
+        /// Returns a boolean indicating whether the given two <see cref="RowInterval"/>-s are equal.
+        /// </summary>
+        /// <param name="left">The first <see cref="RowInterval"/> to compare.</param>
+        /// <param name="right">The second <see cref="RowInterval"/> to compare.</param>
+        /// <returns>True if the given <see cref="RowInterval"/>-s are equal; False otherwise.</returns>
         public static bool operator ==(RowInterval left, RowInterval right)
         {
             return left.Equals(right);
         }
 
+        /// <summary>
+        /// Returns a boolean indicating whether the given two <see cref="RowInterval"/>-s are not equal.
+        /// </summary>
+        /// <param name="left">The first <see cref="RowInterval"/> to compare.</param>
+        /// <param name="right">The second <see cref="RowInterval"/> to compare.</param>
+        /// <returns>True if the given <see cref="RowInterval"/>-s are not equal; False otherwise.</returns>
         public static bool operator !=(RowInterval left, RowInterval right)
         {
             return !left.Equals(right);
         }
 
         /// <inheritdoc />
-        public override string ToString() => $"RowInterval [{this.Min}->{this.Max}]";
-
-        public RowInterval Slice(int start) => new RowInterval(this.Min + start, this.Max);
-
-        public RowInterval Slice(int start, int length) => new RowInterval(this.Min + start, this.Min + start + length);
-
         public bool Equals(RowInterval other)
         {
             return this.Min == other.Min && this.Max == other.Max;
         }
 
+        /// <inheritdoc />
         public override bool Equals(object obj)
         {
             return !ReferenceEquals(null, obj) && obj is RowInterval other && this.Equals(other);
         }
 
+        /// <inheritdoc />
         public override int GetHashCode() => HashCode.Combine(this.Min, this.Max);
+
+        /// <inheritdoc />
+        public override string ToString() => $"RowInterval [{this.Min}->{this.Max}]";
+
+        internal RowInterval Slice(int start) => new RowInterval(this.Min + start, this.Max);
+
+        internal RowInterval Slice(int start, int length) => new RowInterval(this.Min + start, this.Min + start + length);
     }
-}
+}

src/ImageSharp/Processing/Processors/Binarization/BinaryThresholdProcessor{TPixel}.cs

@@ -4,7 +4,7 @@
 using System;
 
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.ParallelUtils;
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 

src/ImageSharp/Processing/Processors/Convolution/BokehBlurProcessor{TPixel}.cs

@@ -8,8 +8,8 @@ using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
 using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
 using SixLabors.ImageSharp.Processing.Processors.Convolution.Parameters;

src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor{TPixel}.cs

@@ -5,8 +5,8 @@ using System;
 using System.Numerics;
 using System.Runtime.InteropServices;
 
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
 using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
 using SixLabors.Primitives;

src/ImageSharp/Processing/Processors/Convolution/Convolution2PassProcessor{TPixel}.cs

@@ -4,8 +4,9 @@
 using System;
 using System.Numerics;
 using System.Runtime.InteropServices;
+
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
 using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
 using SixLabors.Primitives;

src/ImageSharp/Processing/Processors/Convolution/ConvolutionProcessor{TPixel}.cs

@@ -4,8 +4,9 @@
 using System;
 using System.Numerics;
 using System.Runtime.InteropServices;
+
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
 using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
 using SixLabors.Primitives;

src/ImageSharp/Processing/Processors/Convolution/EdgeDetectorCompassProcessor{TPixel}.cs

@@ -6,8 +6,8 @@ using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
 using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
 using SixLabors.ImageSharp.Processing.Processors.Filters;

src/ImageSharp/Processing/Processors/Effects/OilPaintingProcessor{TPixel}.cs

@@ -5,8 +5,8 @@ using System;
 using System.Numerics;
 
 using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
 using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 

src/ImageSharp/Processing/Processors/Filters/FilterProcessor{TPixel}.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Numerics;
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.ParallelUtils;
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
 using SixLabors.Primitives;

src/ImageSharp/Processing/Processors/Normalization/GlobalHistogramEqualizationProcessor{TPixel}.cs

@@ -8,8 +8,8 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
 using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Memory;
 using SixLabors.Primitives;

src/ImageSharp/Processing/Processors/Overlays/BackgroundColorProcessor{TPixel}.cs

@@ -5,8 +5,8 @@ using System;
 using System.Buffers;
 
 using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
 using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 

src/ImageSharp/Processing/Processors/Overlays/GlowProcessor{TPixel}.cs

@@ -6,8 +6,8 @@ using System.Buffers;
 using System.Numerics;
 
 using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
 using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 

src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor{TPixel}.cs

@@ -6,8 +6,8 @@ using System.Buffers;
 using System.Numerics;
 
 using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
 using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 

src/ImageSharp/Processing/Processors/Transforms/AffineTransformProcessor{TPixel}.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Numerics;
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.ParallelUtils;
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 

src/ImageSharp/Processing/Processors/Transforms/CropProcessor{TPixel}.cs

@@ -3,7 +3,7 @@
 
 using System;
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.ParallelUtils;
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 
@@ -47,10 +47,8 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms
             Rectangle bounds = this.cropRectangle;
 
             // Copying is cheap, we should process more pixels per task:
-            ParallelExecutionSettings parallelSettings
+            ParallelExecutionSettings parallelSettings = ParallelExecutionSettings.FromConfiguration(this.Configuration)
-                = this.Configuration
+                .MultiplyMinimumPixelsPerTask(4);
-                      .GetParallelSettings()
-                      .MultiplyMinimumPixelsPerTask(4);
 
             ParallelHelper.IterateRows(
                 bounds,

src/ImageSharp/Processing/Processors/Transforms/FlipProcessor{TPixel}.cs

@@ -5,7 +5,7 @@ using System;
 using System.Buffers;
 
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.ParallelUtils;
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 

src/ImageSharp/Processing/Processors/Transforms/ProjectiveTransformProcessor{TPixel}.cs

@@ -5,7 +5,7 @@ using System;
 using System.Numerics;
 
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.ParallelUtils;
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 

src/ImageSharp/Processing/Processors/Transforms/Resize/ResizeKernelMap.cs

@@ -56,7 +56,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms
             this.DestinationLength = destinationLength;
             this.MaxDiameter = (radius * 2) + 1;
             this.data = memoryAllocator.Allocate2D<float>(this.MaxDiameter, bufferHeight, AllocationOptions.Clean);
-            this.pinHandle = this.data.Memory.Pin();
+            this.pinHandle = this.data.GetMemory().Pin();
             this.kernels = new ResizeKernel[destinationLength];
             this.tempValues = new double[this.MaxDiameter];
         }

src/ImageSharp/Processing/Processors/Transforms/Resize/ResizeProcessor{TPixel}.cs

@@ -4,8 +4,8 @@
 using System;
 
 using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
 using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Memory;
 using SixLabors.Primitives;

src/ImageSharp/Processing/Processors/Transforms/Resize/ResizeWorker.cs

@@ -115,6 +115,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms
         public void FillDestinationPixels(RowInterval rowInterval, Buffer2D<TPixel> destination)
         {
             Span<Vector4> tempColSpan = this.tempColumnBuffer.GetSpan();
+            Span<Vector4> transposedFirstPassBufferSpan = this.transposedFirstPassBuffer.GetSpan();
 
             for (int y = rowInterval.Min; y < rowInterval.Max; y++)
             {
@@ -129,8 +130,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms
                 ref Vector4 tempRowBase = ref MemoryMarshal.GetReference(tempColSpan);
 
                 int top = kernel.StartIndex - this.currentWindow.Min;
-
+                ref Vector4 fpBase = ref transposedFirstPassBufferSpan[top];
-                ref Vector4 fpBase = ref this.transposedFirstPassBuffer.Span[top];
 
                 for (int x = 0; x < this.destWidth; x++)
                 {
@@ -167,6 +167,8 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms
         private void CalculateFirstPassValues(RowInterval calculationInterval)
         {
             Span<Vector4> tempRowSpan = this.tempRowBuffer.GetSpan();
+            Span<Vector4> transposedFirstPassBufferSpan = this.transposedFirstPassBuffer.GetSpan();
+
             for (int y = calculationInterval.Min; y < calculationInterval.Max; y++)
             {
                 Span<TPixel> sourceRow = this.source.GetRowSpan(y);
@@ -177,17 +179,19 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms
                     tempRowSpan,
                     this.conversionModifiers);
 
-                // Span<Vector4> firstPassSpan = this.transposedFirstPassBuffer.Span.Slice(y - this.currentWindow.Min);
+                // optimization for:
-                ref Vector4 firstPassBaseRef = ref this.transposedFirstPassBuffer.Span[y - this.currentWindow.Min];
+                // Span<Vector4> firstPassSpan = transposedFirstPassBufferSpan.Slice(y - this.currentWindow.Min);
+                ref Vector4 firstPassBaseRef = ref transposedFirstPassBufferSpan[y - this.currentWindow.Min];
 
                 for (int x = this.targetWorkingRect.Left; x < this.targetWorkingRect.Right; x++)
                 {
                     ResizeKernel kernel = this.horizontalKernelMap.GetKernel(x - this.targetOrigin.X);
 
+                    // optimization for:
                     // firstPassSpan[x * this.workerHeight] = kernel.Convolve(tempRowSpan);
                     Unsafe.Add(ref firstPassBaseRef, x * this.workerHeight) = kernel.Convolve(tempRowSpan);
                 }
             }
         }
     }
-}
+}

src/ImageSharp/Processing/Processors/Transforms/RotateProcessor{TPixel}.cs

@@ -4,8 +4,8 @@
 using System;
 
 using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
 using SixLabors.ImageSharp.Metadata.Profiles.Exif;
-using SixLabors.ImageSharp.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 

tests/ImageSharp.Tests/ConfigurationTests.cs

@@ -61,12 +61,28 @@ namespace SixLabors.ImageSharp.Tests
         }
 
         [Theory]
-        [InlineData(0)]
+        [InlineData(-3, true)]
-        [InlineData(-42)]
+        [InlineData(-2, true)]
-        public void Set_MaxDegreeOfParallelism_ToNonPositiveValue_Throws(int value)
+        [InlineData(-1, false)]
+        [InlineData(0, true)]
+        [InlineData(1, false)]
+        [InlineData(5, false)]
+        public void MaxDegreeOfParallelism_CompatibleWith_ParallelOptions(int maxDegreeOfParallelism, bool throws)
         {
             var cfg = new Configuration();
-            Assert.Throws<ArgumentOutOfRangeException>(() => cfg.MaxDegreeOfParallelism = value);
+            if (throws)
+            {
+                Assert.Throws<ArgumentOutOfRangeException>(
+                    () =>
+                    {
+                        cfg.MaxDegreeOfParallelism = maxDegreeOfParallelism;
+                    });
+            }
+            else
+            {
+                cfg.MaxDegreeOfParallelism = maxDegreeOfParallelism;
+                Assert.Equal(maxDegreeOfParallelism, cfg.MaxDegreeOfParallelism);
+            }
         }
 
 
@@ -117,4 +133,4 @@ namespace SixLabors.ImageSharp.Tests
             Assert.True(config.WorkingBufferSizeHintInBytes  > 1024);
         }
     }
-}
+}

tests/ImageSharp.Tests/Helpers/ParallelExecutionSettingsTests.cs

@@ -0,0 +1,40 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
+using Xunit;
+
+namespace SixLabors.ImageSharp.Tests.Helpers
+{
+    public class ParallelExecutionSettingsTests
+    {
+        [Theory]
+        [InlineData(-3, true)]
+        [InlineData(-2, true)]
+        [InlineData(-1, false)]
+        [InlineData(0, true)]
+        [InlineData(1, false)]
+        [InlineData(5, false)]
+        public void Constructor_MaxDegreeOfParallelism_CompatibleWith_ParallelOptions(int maxDegreeOfParallelism, bool throws)
+        {
+            if (throws)
+            {
+                Assert.Throws<ArgumentOutOfRangeException>(
+                    () =>
+                    {
+                        _ = new ParallelExecutionSettings(
+                            maxDegreeOfParallelism,
+                            Configuration.Default.MemoryAllocator);
+                    });
+            }
+            else
+            {
+                var parallelSettings = new ParallelExecutionSettings(
+                    maxDegreeOfParallelism,
+                    Configuration.Default.MemoryAllocator);
+                Assert.Equal(maxDegreeOfParallelism, parallelSettings.MaxDegreeOfParallelism);
+            }
+        }
+    }
+}

tests/ImageSharp.Tests/Helpers/ParallelHelperTests.cs

@@ -7,8 +7,8 @@ using System.Linq;
 using System.Numerics;
 using System.Threading;
 
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
 using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Memory;
 using SixLabors.Primitives;
@@ -332,7 +332,7 @@ namespace SixLabors.ImageSharp.Tests.Helpers
                         });
 
                 // Assert:
-                TestImageExtensions.CompareBuffers(expected.Span, actual.Span);
+                TestImageExtensions.CompareBuffers(expected.GetSpan(), actual.GetSpan());
             }
         }
 

tests/ImageSharp.Tests/Helpers/RowIntervalTests.cs

@@ -25,7 +25,7 @@ namespace SixLabors.ImageSharp.Tests.Helpers
 
                 Span<int> span = buffer.GetMultiRowSpan(rows);
 
-                ref int expected0 = ref buffer.Span[min * width];
+                ref int expected0 = ref buffer.GetSpan()[min * width];
                 int expectedLength = (max - min) * width;
 
                 ref int actual0 = ref span[0];

tests/ImageSharp.Tests/Memory/Buffer2DTests.cs

@@ -42,7 +42,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
             {
                 Assert.Equal(width, buffer.Width);
                 Assert.Equal(height, buffer.Height);
-                Assert.Equal(width * height, buffer.Memory.Length);
+                Assert.Equal(width * height, buffer.GetMemory().Length);
             }
         }
 
@@ -75,22 +75,6 @@ namespace SixLabors.ImageSharp.Tests.Memory
             }
         }
 
-        [Theory]
-        [InlineData(7, 42, 0, 0)]
-        [InlineData(7, 42, 3, 10)]
-        [InlineData(17, 42, 0, 41)]
-        public void GetRowSpanXY(int width, int height, int x, int y)
-        {
-            using (Buffer2D<TestStructs.Foo> buffer = this.MemoryAllocator.Allocate2D<TestStructs.Foo>(width, height))
-            {
-                Span<TestStructs.Foo> span = buffer.GetRowSpan(x, y);
-
-                // Assert.Equal(width * y + x, span.Start);
-                Assert.Equal(width - x, span.Length);
-                Assert.SpanPointsTo(span, buffer.MemorySource.MemoryOwner, width * y + x);
-            }
-        }
-
         [Theory]
         [InlineData(42, 8, 0, 0)]
         [InlineData(400, 1000, 20, 10)]
@@ -140,7 +124,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
             var rnd = new Random(123);
             using (Buffer2D<float> b = this.MemoryAllocator.Allocate2D<float>(width, height))
             {
-                rnd.RandomFill(b.Span, 0, 1);
+                rnd.RandomFill(b.GetSpan(), 0, 1);
 
                 b.CopyColumns(startIndex, destIndex, columnCount);
 
@@ -162,7 +146,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
             var rnd = new Random(123);
             using (Buffer2D<float> b = this.MemoryAllocator.Allocate2D<float>(100, 100))
             {
-                rnd.RandomFill(b.Span, 0, 1);
+                rnd.RandomFill(b.GetSpan(), 0, 1);
 
                 b.CopyColumns(0, 50, 22);
                 b.CopyColumns(0, 50, 22);

tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs

@@ -7,9 +7,9 @@ using System.IO;
 using System.Numerics;
 
 using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
 using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Processing.Processors;