From c267876a0edb2aa2c25e73ec93e3bfce199cbf85 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Sat, 22 Sep 2018 23:07:24 +0200
Subject: [PATCH] better FlipProcessor implementation

---
 .../ParallelExecutionSettings.cs              |  2 +-
 .../Processors/Transforms/FlipProcessor.cs    | 67 ++++++-------------
 2 files changed, 23 insertions(+), 46 deletions(-)

diff --git a/src/ImageSharp/Common/ParallelUtils/ParallelExecutionSettings.cs b/src/ImageSharp/Common/ParallelUtils/ParallelExecutionSettings.cs
index 516c1446d..9b2ae89d0 100644
--- a/src/ImageSharp/Common/ParallelUtils/ParallelExecutionSettings.cs
+++ b/src/ImageSharp/Common/ParallelUtils/ParallelExecutionSettings.cs
@@ -15,7 +15,7 @@ namespace SixLabors.ImageSharp.ParallelUtils
         /// <summary>
         /// Default value for <see cref="MinimumPixelsProcessedPerTask"/>.
         /// </summary>
-        public const int DefaultMinimumPixelsProcessedPerTask = 2048;
+        public const int DefaultMinimumPixelsProcessedPerTask = 4096;
 
         public ParallelExecutionSettings(
             int maxDegreeOfParallelism,
diff --git a/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs
index 442873676..c6f5e9d7b 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs
@@ -2,9 +2,11 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Memory;
+using SixLabors.ImageSharp.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Memory;
 using SixLabors.Primitives;
@@ -55,30 +57,20 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms
         private void FlipX(ImageFrame<TPixel> source, Configuration configuration)
         {
             int height = source.Height;
-            int halfHeight = (int)Math.Ceiling(source.Height * .5F);
 
-          
-            using (Buffer2D<TPixel> targetPixels = configuration.MemoryAllocator.Allocate2D<TPixel>(source.Size()))
+            using (IMemoryOwner<TPixel> tempBuffer = configuration.MemoryAllocator.Allocate<TPixel>(source.Width))
             {
+                Span<TPixel> temp = tempBuffer.Memory.Span;
 
-
-                ParallelFor.WithConfiguration(
-                    0,
-                    halfHeight,
-                    configuration,
-                    y =>
-                        {
-                            int newY = height - y - 1;
-                            Span<TPixel> sourceRow = source.GetPixelRowSpan(y);
-                            Span<TPixel> altSourceRow = source.GetPixelRowSpan(newY);
-                            Span<TPixel> targetRow = targetPixels.GetRowSpan(y);
-                            Span<TPixel> altTargetRow = targetPixels.GetRowSpan(newY);
-
-                            sourceRow.CopyTo(altTargetRow);
-                            altSourceRow.CopyTo(targetRow);
-                        });
-
-                Buffer2D<TPixel>.SwapOrCopyContent(source.PixelBuffer, targetPixels);
+                for (int yTop = 0; yTop < height / 2; yTop++)
+                {
+                    int yBottom = height - yTop - 1;
+                    Span<TPixel> topRow = source.GetPixelRowSpan(yBottom);
+                    Span<TPixel> bottomRow = source.GetPixelRowSpan(yTop);
+                    topRow.CopyTo(temp);
+                    bottomRow.CopyTo(topRow);
+                    temp.CopyTo(bottomRow);
+                }
             }
         }
 
@@ -89,31 +81,16 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms
         /// <param name="configuration">The configuration.</param>
         private void FlipY(ImageFrame<TPixel> source, Configuration configuration)
         {
-            int width = source.Width;
-            int height = source.Height;
-            int halfWidth = (int)Math.Ceiling(width * .5F);
-
-            using (Buffer2D<TPixel> targetPixels = configuration.MemoryAllocator.Allocate2D<TPixel>(source.Size()))
-            {
-                ParallelFor.WithConfiguration(
-                    0,
-                    height,
-                    configuration,
-                    y =>
+            ParallelHelper.IterateRows(
+                source.Bounds(),
+                configuration,
+                rows =>
+                    {
+                        for (int y = rows.Min; y < rows.Max; y++)
                         {
-                            Span<TPixel> sourceRow = source.GetPixelRowSpan(y);
-                            Span<TPixel> targetRow = targetPixels.GetRowSpan(y);
-
-                            for (int x = 0; x < halfWidth; x++)
-                            {
-                                int newX = width - x - 1;
-                                targetRow[x] = sourceRow[newX];
-                                targetRow[newX] = sourceRow[x];
-                            }
-                        });
-
-                Buffer2D<TPixel>.SwapOrCopyContent(source.PixelBuffer, targetPixels);
-            }
+                            source.GetPixelRowSpan(y).Reverse();
+                        }
+                    });
         }
     }
 }
\ No newline at end of file