fix merge

src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Numerics;
+using SixLabors.ImageSharp.Advanced.Unsafe;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
@@ -149,7 +150,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder
                 var values = new JpegColorConverter.ComponentValues(buffers, y);
                 this.colorConverter.ConvertToRGBA(values, this.rgbaBuffer);
 
-                Span<TPixel> destRow = destination.GetRowSpan(yy);
+                Span<TPixel> destRow = destination.GetPixelRowSpan(yy);
 
                 PixelOperations<TPixel>.Instance.PackFromVector4(this.rgbaBuffer, destRow, destination.Width);
             }

tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs

@@ -14,7 +14,7 @@ using SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs;
 namespace SixLabors.ImageSharp.Tests
 {
     using System.Numerics;
-
+    using SixLabors.ImageSharp.Advanced.Unsafe;
     using SixLabors.ImageSharp.Memory;
 
     public static class TestImageExtensions
@@ -196,7 +196,7 @@ namespace SixLabors.ImageSharp.Tests
         {
             var image = new Image<Rgba32>(buffer.Width, buffer.Height);
 
-            Span<Rgba32> pixels = image.Pixels;
+            Span<Rgba32> pixels = image.GetPixelSpan();
 
             for (int i = 0; i < buffer.Length; i++)
             {