From 4da33609f844c47a286a3b495ddab1c9cc10e2b5 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Sun, 23 Sep 2018 01:35:40 +0200
Subject: [PATCH] ParallelHelper -> FillProcessor

---
 .../Processors/Drawing/FillProcessor.cs       | 39 ++++++++++++-------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/ImageSharp.Drawing/Processing/Processors/Drawing/FillProcessor.cs b/src/ImageSharp.Drawing/Processing/Processors/Drawing/FillProcessor.cs
index 4f2be309b0..ed6c869511 100644
--- a/src/ImageSharp.Drawing/Processing/Processors/Drawing/FillProcessor.cs
+++ b/src/ImageSharp.Drawing/Processing/Processors/Drawing/FillProcessor.cs
@@ -6,6 +6,7 @@ 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;
@@ -52,17 +53,23 @@ namespace SixLabors.ImageSharp.Processing.Processors.Drawing
 
             int width = maxX - minX;
 
+            var workingRect = Rectangle.FromLTRB(minX, minY, maxX, maxY);
+
             // If there's no reason for blending, then avoid it.
             if (this.IsSolidBrushWithoutBlending(out SolidBrush<TPixel> solidBrush))
             {
-                ParallelFor.WithConfiguration(
-                    minY,
-                    maxY,
-                    configuration,
-                    y =>
-                    {
-                        source.GetPixelRowSpan(y).Slice(minX, width).Fill(solidBrush.Color);
-                    });
+                ParallelExecutionSettings parallelSettings = configuration.GetParallelSettings().MultiplyMinimumPixelsPerTask(4);
+
+                ParallelHelper.IterateRows(
+                    workingRect,
+                    parallelSettings,
+                    rows =>
+                        {
+                            for (int y = rows.Min; y < rows.Max; y++)
+                            {
+                                source.GetPixelRowSpan(y).Slice(minX, width).Fill(solidBrush.Color);
+                            }
+                        });
             }
             else
             {
@@ -85,16 +92,18 @@ namespace SixLabors.ImageSharp.Processing.Processors.Drawing
                 {
                     amount.GetSpan().Fill(1f);
 
-                    ParallelFor.WithConfiguration(
-                        minY,
-                        maxY,
+                    ParallelHelper.IterateRows(
+                        workingRect,
                         configuration,
-                        y =>
+                        rows =>
                             {
-                                int offsetY = y - startY;
-                                int offsetX = minX - startX;
+                                for (int y = rows.Min; y < rows.Max; y++)
+                                {
+                                    int offsetY = y - startY;
+                                    int offsetX = minX - startX;
 
-                                applicator.Apply(amount.GetSpan(), offsetX, offsetY);
+                                    applicator.Apply(amount.GetSpan(), offsetX, offsetY);
+                                }
                             });
                 }
             }