Merge pull request #1212 from SixLabors/js/fix-1211

Swap buffers when encoding PNG with Filtered Adam7 Palette mode

src/ImageSharp/Formats/Png/PngEncoderCore.cs

@@ -1081,6 +1081,10 @@ namespace SixLabors.ImageSharp.Formats.Png
                         // encode data
                         IManagedByteBuffer r = this.EncodeAdam7IndexedPixelRow(destSpan);
                         deflateStream.Write(r.Array, 0, resultLength);
+
+                        IManagedByteBuffer temp = this.currentScanline;
+                        this.currentScanline = this.previousScanline;
+                        this.previousScanline = temp;
                     }
                 }
             }

tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs

@@ -199,17 +199,20 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
                 return;
             }
 
-            foreach (PngInterlaceMode interlaceMode in InterlaceMode)
+            foreach (var filterMethod in PngFilterMethods)
             {
-                TestPngEncoderCore(
+                foreach (PngInterlaceMode interlaceMode in InterlaceMode)
-                provider,
+                {
-                pngColorType,
+                    TestPngEncoderCore(
-                PngFilterMethod.Adaptive,
+                    provider,
-                pngBitDepth,
+                    pngColorType,
-                interlaceMode,
+                    (PngFilterMethod)filterMethod[0],
-                appendPngColorType: true,
+                    pngBitDepth,
-                appendPixelType: true,
+                    interlaceMode,
-                appendPngBitDepth: true);
+                    appendPngColorType: true,
+                    appendPixelType: true,
+                    appendPngBitDepth: true);
+                }
             }
         }
 
@@ -232,18 +235,21 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
         public void WorksWithAllBitDepthsAndExcludeAllFilter<TPixel>(TestImageProvider<TPixel> provider, PngColorType pngColorType, PngBitDepth pngBitDepth)
           where TPixel : unmanaged, IPixel<TPixel>
         {
-            foreach (PngInterlaceMode interlaceMode in InterlaceMode)
+            foreach (var filterMethod in PngFilterMethods)
             {
-                TestPngEncoderCore(
+                foreach (PngInterlaceMode interlaceMode in InterlaceMode)
-                provider,
+                {
-                pngColorType,
+                    TestPngEncoderCore(
-                PngFilterMethod.Adaptive,
+                    provider,
-                pngBitDepth,
+                    pngColorType,
-                interlaceMode,
+                    (PngFilterMethod)filterMethod[0],
-                appendPngColorType: true,
+                    pngBitDepth,
-                appendPixelType: true,
+                    interlaceMode,
-                appendPngBitDepth: true,
+                    appendPngColorType: true,
-                optimizeMethod: PngChunkFilter.ExcludeAll);
+                    appendPixelType: true,
+                    appendPngBitDepth: true,
+                    optimizeMethod: PngChunkFilter.ExcludeAll);
+                }
             }
         }