From e302f35ff949d54f7a5b0cd2fc4b7973dd043148 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 27 Feb 2020 13:23:27 +0100
Subject: [PATCH] Refactored Convolution2DProcessor<TPixel>

---
 .../Convolution2DProcessor{TPixel}.cs         | 78 +++++++++----------
 1 file changed, 37 insertions(+), 41 deletions(-)

diff --git a/src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor{TPixel}.cs b/src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor{TPixel}.cs
index 219c81617..bd0c917dd 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor{TPixel}.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor{TPixel}.cs
@@ -65,9 +65,9 @@ namespace SixLabors.ImageSharp.Processing.Processors.Convolution
             source.CopyTo(targetPixels);
 
             var interest = Rectangle.Intersect(this.SourceRectangle, source.Bounds());
-            var operation = new RowIntervalOperation(interest, targetPixels, source.PixelBuffer, this.KernelY, this.KernelX, this.Configuration, this.PreserveAlpha);
+            var operation = new RowOperation(interest, targetPixels, source.PixelBuffer, this.KernelY, this.KernelX, this.Configuration, this.PreserveAlpha);
 
-            ParallelRowIterator.IterateRowIntervals<RowIntervalOperation, Vector4>(
+            ParallelRowIterator.IterateRows<RowOperation, Vector4>(
                 this.Configuration,
                 interest,
                 in operation);
@@ -78,7 +78,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Convolution
         /// <summary>
         /// A <see langword="struct"/> implementing the convolution logic for <see cref="Convolution2DProcessor{T}"/>.
         /// </summary>
-        private readonly struct RowIntervalOperation : IRowIntervalOperation<Vector4>
+        private readonly struct RowOperation : IRowOperation<Vector4>
         {
             private readonly Rectangle bounds;
             private readonly int maxY;
@@ -91,7 +91,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Convolution
             private readonly bool preserveAlpha;
 
             [MethodImpl(InliningOptions.ShortMethod)]
-            public RowIntervalOperation(
+            public RowOperation(
                 Rectangle bounds,
                 Buffer2D<TPixel> targetPixels,
                 Buffer2D<TPixel> sourcePixels,
@@ -113,52 +113,48 @@ namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 
             /// <inheritdoc/>
             [MethodImpl(InliningOptions.ShortMethod)]
-            public void Invoke(in RowInterval rows, Span<Vector4> span)
+            public void Invoke(int y, Span<Vector4> span)
             {
                 ref Vector4 spanRef = ref MemoryMarshal.GetReference(span);
+                Span<TPixel> targetRowSpan = this.targetPixels.GetRowSpan(y).Slice(this.bounds.X);
+                PixelOperations<TPixel>.Instance.ToVector4(this.configuration, targetRowSpan.Slice(0, span.Length), span);
 
-                for (int y = rows.Min; y < rows.Max; y++)
+                if (this.preserveAlpha)
                 {
-                    Span<TPixel> targetRowSpan = this.targetPixels.GetRowSpan(y).Slice(this.bounds.X);
-                    PixelOperations<TPixel>.Instance.ToVector4(this.configuration, targetRowSpan.Slice(0, span.Length), span);
-
-                    if (this.preserveAlpha)
+                    for (int x = 0; x < this.bounds.Width; x++)
                     {
-                        for (int x = 0; x < this.bounds.Width; x++)
-                        {
-                            DenseMatrixUtils.Convolve2D3(
-                                in this.kernelY,
-                                in this.kernelX,
-                                this.sourcePixels,
-                                ref spanRef,
-                                y,
-                                x,
-                                this.bounds.Y,
-                                this.maxY,
-                                this.bounds.X,
-                                this.maxX);
-                        }
+                        DenseMatrixUtils.Convolve2D3(
+                            in this.kernelY,
+                            in this.kernelX,
+                            this.sourcePixels,
+                            ref spanRef,
+                            y,
+                            x,
+                            this.bounds.Y,
+                            this.maxY,
+                            this.bounds.X,
+                            this.maxX);
                     }
-                    else
+                }
+                else
+                {
+                    for (int x = 0; x < this.bounds.Width; x++)
                     {
-                        for (int x = 0; x < this.bounds.Width; x++)
-                        {
-                            DenseMatrixUtils.Convolve2D4(
-                                in this.kernelY,
-                                in this.kernelX,
-                                this.sourcePixels,
-                                ref spanRef,
-                                y,
-                                x,
-                                this.bounds.Y,
-                                this.maxY,
-                                this.bounds.X,
-                                this.maxX);
-                        }
+                        DenseMatrixUtils.Convolve2D4(
+                            in this.kernelY,
+                            in this.kernelX,
+                            this.sourcePixels,
+                            ref spanRef,
+                            y,
+                            x,
+                            this.bounds.Y,
+                            this.maxY,
+                            this.bounds.X,
+                            this.maxX);
                     }
-
-                    PixelOperations<TPixel>.Instance.FromVector4Destructive(this.configuration, span, targetRowSpan);
                 }
+
+                PixelOperations<TPixel>.Instance.FromVector4Destructive(this.configuration, span, targetRowSpan);
             }
         }
     }