From a67cb01a5f5c396286c0f40216760ef30b2ec0d6 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Sat, 16 Oct 2021 13:31:32 +0200
Subject: [PATCH] fix build after merge

---
 src/ImageSharp/ImageFrame{TPixel}.cs                  |  2 --
 src/ImageSharp/Memory/Buffer2D{T}.cs                  | 11 -----------
 .../LoadResizeSaveParallelMemoryStress.cs             |  1 -
 .../TestUtilities/ImageProviders/TestImageProvider.cs |  3 ---
 4 files changed, 17 deletions(-)

diff --git a/src/ImageSharp/ImageFrame{TPixel}.cs b/src/ImageSharp/ImageFrame{TPixel}.cs
index 0174b249b..b29608f62 100644
--- a/src/ImageSharp/ImageFrame{TPixel}.cs
+++ b/src/ImageSharp/ImageFrame{TPixel}.cs
@@ -12,8 +12,6 @@ using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp
 {
-
-
     /// <summary>
     /// Represents a pixel-specific image frame containing all pixel data and <see cref="ImageFrameMetadata"/>.
     /// In case of animated formats like gif, it contains the single frame in a animation.
diff --git a/src/ImageSharp/Memory/Buffer2D{T}.cs b/src/ImageSharp/Memory/Buffer2D{T}.cs
index 09ce14900..c85a1cdb5 100644
--- a/src/ImageSharp/Memory/Buffer2D{T}.cs
+++ b/src/ImageSharp/Memory/Buffer2D{T}.cs
@@ -109,17 +109,6 @@ namespace SixLabors.ImageSharp.Memory
             DebugGuard.MustBeLessThan(y, this.Height, nameof(y));
 
             int stride = this.Width + padding;
-            if (this.cachedMemory.Length > 0)
-            {
-                paddedSpan = this.cachedMemory.Span.Slice(y * this.Width);
-                if (paddedSpan.Length < stride)
-                {
-                    return false;
-                }
-
-                paddedSpan = paddedSpan.Slice(0, stride);
-                return true;
-            }
 
             Memory<T> memory = this.FastMemoryGroup.GetRemainingSliceOfBuffer(y * (long)this.Width);
 
diff --git a/tests/ImageSharp.Tests.ProfilingSandbox/LoadResizeSaveParallelMemoryStress.cs b/tests/ImageSharp.Tests.ProfilingSandbox/LoadResizeSaveParallelMemoryStress.cs
index b862fd5c0..873845393 100644
--- a/tests/ImageSharp.Tests.ProfilingSandbox/LoadResizeSaveParallelMemoryStress.cs
+++ b/tests/ImageSharp.Tests.ProfilingSandbox/LoadResizeSaveParallelMemoryStress.cs
@@ -133,7 +133,6 @@ namespace SixLabors.ImageSharp.Tests.ProfilingSandbox
                     lrs.SystemDrawingBenchmarkParallel();
                     break;
                 case ConsoleKey.D2:
-                        Console.WriteLine($"Images: {lrs.benchmarks.Images.Length}");
                     lrs.ImageSharpBenchmarkParallel();
                     break;
                 case ConsoleKey.D3:
diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestImageProvider.cs b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestImageProvider.cs
index a4d48488d..a30cdb4c5 100644
--- a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestImageProvider.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestImageProvider.cs
@@ -27,9 +27,6 @@ namespace SixLabors.ImageSharp.Tests
             this.Configuration.MemoryAllocator = Configuration.Default.MemoryAllocator;
         }
 
-            return configuration;
-        }
-
         public PixelTypes PixelType { get; private set; } = typeof(TPixel).GetPixelType();
 
         public virtual string SourceFileOrDescription => string.Empty;