Merge branch 'main' into js/proper-segment-integrity-handling

Author: JimBobSquarePants

src/ImageSharp/Advanced/ParallelExecutionSettings.cs

@@ -20,7 +20,7 @@ public readonly struct ParallelExecutionSettings
     /// </summary>
     /// <param name="maxDegreeOfParallelism">
     /// The value used for initializing <see cref="ParallelOptions.MaxDegreeOfParallelism"/> when using TPL.
-    /// Set to <c>-1</c> to leave the degree of parallelism unbounded.
+    /// If set to <c>-1</c>, there is no limit on the number of concurrently running operations.
     /// </param>
     /// <param name="minimumPixelsProcessedPerTask">The value for <see cref="MinimumPixelsProcessedPerTask"/>.</param>
     /// <param name="memoryAllocator">The <see cref="MemoryAllocator"/>.</param>
@@ -31,7 +31,7 @@ public ParallelExecutionSettings(
     {
         // Shall be compatible with ParallelOptions.MaxDegreeOfParallelism:
         // https://docs.microsoft.com/en-us/dotnet/api/system.threading.tasks.paralleloptions.maxdegreeofparallelism
-        if (maxDegreeOfParallelism == 0 || maxDegreeOfParallelism < -1)
+        if (maxDegreeOfParallelism is 0 or < -1)
         {
             throw new ArgumentOutOfRangeException(nameof(maxDegreeOfParallelism));
         }
@@ -49,7 +49,7 @@ public ParallelExecutionSettings(
     /// </summary>
     /// <param name="maxDegreeOfParallelism">
     /// The value used for initializing <see cref="ParallelOptions.MaxDegreeOfParallelism"/> when using TPL.
-    /// Set to <c>-1</c> to leave the degree of parallelism unbounded.
+    /// If set to <c>-1</c>, there is no limit on the number of concurrently running operations.
     /// </param>
     /// <param name="memoryAllocator">The <see cref="MemoryAllocator"/>.</param>
     public ParallelExecutionSettings(int maxDegreeOfParallelism, MemoryAllocator memoryAllocator)
@@ -64,7 +64,7 @@ public ParallelExecutionSettings(int maxDegreeOfParallelism, MemoryAllocator mem
 
     /// <summary>
     /// Gets the value used for initializing <see cref="ParallelOptions.MaxDegreeOfParallelism"/> when using TPL.
-    /// A value of <c>-1</c> leaves the degree of parallelism unbounded.
+    /// A value of <c>-1</c> means there is no limit on the number of concurrently running operations.
     /// </summary>
     public int MaxDegreeOfParallelism { get; }
 
@@ -93,12 +93,10 @@ public ParallelExecutionSettings MultiplyMinimumPixelsPerTask(int multiplier)
     }
 
     /// <summary>
-    /// Get the default <see cref="SixLabors.ImageSharp.Advanced.ParallelExecutionSettings"/> for a <see cref="SixLabors.ImageSharp.Configuration"/>
+    /// Get the default <see cref="ParallelExecutionSettings"/> for a <see cref="Configuration"/>
     /// </summary>
     /// <param name="configuration">The <see cref="Configuration"/>.</param>
     /// <returns>The <see cref="ParallelExecutionSettings"/>.</returns>
     public static ParallelExecutionSettings FromConfiguration(Configuration configuration)
-    {
-        return new ParallelExecutionSettings(configuration.MaxDegreeOfParallelism, configuration.MemoryAllocator);
-    }
+        => new(configuration.MaxDegreeOfParallelism, configuration.MemoryAllocator);
 }

src/ImageSharp/Advanced/ParallelRowIterator.cs

@@ -44,7 +44,6 @@ public static void IterateRows<T>(
         where T : struct, IRowOperation
     {
         ValidateRectangle(rectangle);
-        ValidateSettings(parallelSettings);
 
         int top = rectangle.Top;
         int bottom = rectangle.Bottom;
@@ -109,7 +108,6 @@ public static void IterateRows<T, TBuffer>(
         where TBuffer : unmanaged
     {
         ValidateRectangle(rectangle);
-        ValidateSettings(parallelSettings);
 
         int top = rectangle.Top;
         int bottom = rectangle.Bottom;
@@ -174,7 +172,6 @@ public static void IterateRowIntervals<T>(
         where T : struct, IRowIntervalOperation
     {
         ValidateRectangle(rectangle);
-        ValidateSettings(parallelSettings);
 
         int top = rectangle.Top;
         int bottom = rectangle.Bottom;
@@ -236,7 +233,6 @@ public static void IterateRowIntervals<T, TBuffer>(
         where TBuffer : unmanaged
     {
         ValidateRectangle(rectangle);
-        ValidateSettings(parallelSettings);
 
         int top = rectangle.Top;
         int bottom = rectangle.Bottom;
@@ -315,35 +311,4 @@ private static void ValidateRectangle(Rectangle rectangle)
             0,
             $"{nameof(rectangle)}.{nameof(rectangle.Height)}");
     }
-
-    /// <summary>
-    /// Validates the supplied <see cref="ParallelExecutionSettings"/>.
-    /// </summary>
-    /// <param name="parallelSettings">The execution settings.</param>
-    /// <exception cref="ArgumentOutOfRangeException">
-    /// Thrown when <see cref="ParallelExecutionSettings.MaxDegreeOfParallelism"/> or
-    /// <see cref="ParallelExecutionSettings.MinimumPixelsProcessedPerTask"/> is invalid.
-    /// </exception>
-    /// <exception cref="ArgumentNullException">
-    /// Thrown when <see cref="ParallelExecutionSettings.MemoryAllocator"/> is null.
-    /// This also guards the public <see cref="ParallelExecutionSettings"/> default value, which bypasses constructor validation.
-    /// </exception>
-    private static void ValidateSettings(in ParallelExecutionSettings parallelSettings)
-    {
-        // ParallelExecutionSettings is a public struct, so callers can pass default and bypass constructor validation.
-        if (parallelSettings.MaxDegreeOfParallelism is 0 or < -1)
-        {
-            throw new ArgumentOutOfRangeException(
-                $"{nameof(parallelSettings)}.{nameof(ParallelExecutionSettings.MaxDegreeOfParallelism)}");
-        }
-
-        Guard.MustBeGreaterThan(
-            parallelSettings.MinimumPixelsProcessedPerTask,
-            0,
-            $"{nameof(parallelSettings)}.{nameof(ParallelExecutionSettings.MinimumPixelsProcessedPerTask)}");
-
-        Guard.NotNull(
-            parallelSettings.MemoryAllocator,
-            $"{nameof(parallelSettings)}.{nameof(ParallelExecutionSettings.MemoryAllocator)}");
-    }
 }

src/ImageSharp/Configuration.cs

@@ -65,8 +65,9 @@ public Configuration(params IImageFormatConfigurationModule[] configurationModul
     /// <summary>
     /// Gets or sets the maximum number of concurrent tasks enabled in ImageSharp algorithms
     /// configured with this <see cref="Configuration"/> instance.
-    /// Set to <c>-1</c> to leave the degree of parallelism unbounded.
-    /// Initialized with <see cref="Environment.ProcessorCount"/> by default.
+    /// A positive value limits the number of concurrent operations to the set value.
+    /// If set to <c>-1</c>, there is no limit on the number of concurrently running operations.
+    /// Defaults to <see cref="Environment.ProcessorCount"/>.
     /// </summary>
     public int MaxDegreeOfParallelism
     {