Merge pull request SixLabors#1035 from SixLabors/af/expose-buffer-internals

Expose Buffer2D and ParallelHelper internals

Author: JimBobSquarePants

src/ImageSharp.Drawing/Processing/Processors/Drawing/DrawImageProcessor{TPixelBg,TPixelFg}.cs

@@ -4,7 +4,7 @@
 using System;
 
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.ParallelUtils;
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 

src/ImageSharp.Drawing/Processing/Processors/Drawing/FillProcessor{TPixel}.cs

@@ -5,8 +5,8 @@
 using System.Buffers;
 
 using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Advanced.ParallelUtils;
 using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.ParallelUtils;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 
@@ -45,17 +45,18 @@ protected override void OnFrameApply(ImageFrame<TPixel> source)
 
             int width = maxX - minX;
 
-            var workingRect = Rectangle.FromLTRB(minX, minY, maxX, maxY);
+            Rectangle workingRect = Rectangle.FromLTRB(minX, minY, maxX, maxY);
 
             IBrush brush = this.definition.Brush;
             GraphicsOptions options = this.definition.Options;
 
             // If there's no reason for blending, then avoid it.
             if (this.IsSolidBrushWithoutBlending(out SolidBrush solidBrush))
             {
-                ParallelExecutionSettings parallelSettings = configuration.GetParallelSettings().MultiplyMinimumPixelsPerTask(4);
+                ParallelExecutionSettings parallelSettings = ParallelExecutionSettings.FromConfiguration(configuration)
+                    .MultiplyMinimumPixelsPerTask(4);
 
-                TPixel colorPixel = solidBrush.Color.ToPixel<TPixel>();
+                var colorPixel = solidBrush.Color.ToPixel<TPixel>();
 
                 ParallelHelper.IterateRows(
                     workingRect,

tests/ImageSharp.Tests/ConfigurationTests.cs

@@ -61,12 +61,28 @@ public void TestDefaultConfigurationMaxDegreeOfParallelism()
         }
 
         [Theory]
-        [InlineData(0)]
-        [InlineData(-42)]
-        public void Set_MaxDegreeOfParallelism_ToNonPositiveValue_Throws(int value)
+        [InlineData(-3, true)]
+        [InlineData(-2, true)]
+        [InlineData(-1, false)]
+        [InlineData(0, true)]
+        [InlineData(1, false)]
+        [InlineData(5, false)]
+        public void MaxDegreeOfParallelism_CompatibleWith_ParallelOptions(int maxDegreeOfParallelism, bool throws)
         {
             var cfg = new Configuration();
-            Assert.Throws<ArgumentOutOfRangeException>(() => cfg.MaxDegreeOfParallelism = value);
+            if (throws)
+            {
+                Assert.Throws<ArgumentOutOfRangeException>(
+                    () =>
+                    {
+                        cfg.MaxDegreeOfParallelism = maxDegreeOfParallelism;
+                    });
+            }
+            else
+            {
+                cfg.MaxDegreeOfParallelism = maxDegreeOfParallelism;
+                Assert.Equal(maxDegreeOfParallelism, cfg.MaxDegreeOfParallelism);
+            }
         }
 
 
@@ -117,4 +133,4 @@ public void WorkingBufferSizeHint_DefaultIsCorrect()
             Assert.True(config.WorkingBufferSizeHintInBytes  > 1024);
         }
     }
-}
+}