From 296e412f3fe0ff9adc364d6139d45bb3f4d375f7 Mon Sep 17 00:00:00 2001
From: Ynse Hoornenborg <github@ynse.nl>
Date: Fri, 10 Dec 2021 16:57:05 +0100
Subject: [PATCH] Fixes after rebasing to latest master

---
 .gitattributes                                  |  8 ++------
 tests/ImageSharp.Tests/Image/ImageCloneTests.cs | 17 +++++++++--------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 355b64dce..70ced6903 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -87,6 +87,7 @@
 *.eot               binary
 *.exe               binary
 *.otf               binary
+*.pbm               binary
 *.pdf               binary
 *.ppt               binary
 *.pptx              binary
@@ -94,6 +95,7 @@
 *.snk               binary
 *.ttc               binary
 *.ttf               binary
+*.wbmp              binary
 *.woff              binary
 *.woff2             binary
 *.xls               binary
@@ -124,9 +126,3 @@
 *.dds               filter=lfs diff=lfs merge=lfs -text
 *.ktx               filter=lfs diff=lfs merge=lfs -text
 *.ktx2              filter=lfs diff=lfs merge=lfs -text
-*.pam               filter=lfs diff=lfs merge=lfs -text
-*.pbm               filter=lfs diff=lfs merge=lfs -text
-*.pgm               filter=lfs diff=lfs merge=lfs -text
-*.ppm               filter=lfs diff=lfs merge=lfs -text
-*.pnm               filter=lfs diff=lfs merge=lfs -text
-*.wbmp              filter=lfs diff=lfs merge=lfs -text
diff --git a/tests/ImageSharp.Tests/Image/ImageCloneTests.cs b/tests/ImageSharp.Tests/Image/ImageCloneTests.cs
index c1012e2df..9d978ee52 100644
--- a/tests/ImageSharp.Tests/Image/ImageCloneTests.cs
+++ b/tests/ImageSharp.Tests/Image/ImageCloneTests.cs
@@ -60,15 +60,17 @@ namespace SixLabors.ImageSharp.Tests
         [WithTestPatternImages(9, 9, PixelTypes.Rgba32)]
         public void CloneAs_ToAbgr32(TestImageProvider<Rgba32> provider)
         {
-            using (Image<Rgba32> image = provider.GetImage())
-            using (Image<Abgr32> clone = image.CloneAs<Abgr32>())
+            using Image<Rgba32> image = provider.GetImage();
+            using Image<Abgr32> clone = image.CloneAs<Abgr32>();
+
+            image.ProcessPixelRows(clone, static (imageAccessor, cloneAccessor) =>
             {
-                for (int y = 0; y < image.Height; y++)
+                for (int y = 0; y < imageAccessor.Height; y++)
                 {
-                    Span<Rgba32> row = image.GetPixelRowSpan(y);
-                    Span<Abgr32> rowClone = clone.GetPixelRowSpan(y);
+                    Span<Rgba32> row = imageAccessor.GetRowSpan(y);
+                    Span<Abgr32> rowClone = cloneAccessor.GetRowSpan(y);
 
-                    for (int x = 0; x < image.Width; x++)
+                    for (int x = 0; x < cloneAccessor.Width; x++)
                     {
                         Rgba32 expected = row[x];
                         Abgr32 actual = rowClone[x];
@@ -76,10 +78,9 @@ namespace SixLabors.ImageSharp.Tests
                         Assert.Equal(expected.R, actual.R);
                         Assert.Equal(expected.G, actual.G);
                         Assert.Equal(expected.B, actual.B);
-                        Assert.Equal(expected.A, actual.A);
                     }
                 }
-            }
+            });
         }
 
         [Theory]