Skip to content

Commit ada96d1

Browse files
Merge branch 'js/canvas-api' of https://github.com/SixLabors/ImageSharp.Drawing into js/canvas-api
2 parents 6b2632f + f5cf5c0 commit ada96d1

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

src/ImageSharp.Drawing/Processing/Backends/DefaultDrawingBackend.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,10 @@ private static void ExecuteScene<TPixel>(
8787
}
8888

8989
int requestedParallelism = configuration.MaxDegreeOfParallelism;
90-
int partitionCount = ParallelExecutionHelper.GetPartitionCount(requestedParallelism, scene.RowCount);
91-
9290
_ = Parallel.For(
9391
fromInclusive: 0,
9492
toExclusive: scene.RowCount,
95-
parallelOptions: ParallelExecutionHelper.CreateParallelOptions(requestedParallelism, partitionCount),
93+
parallelOptions: ParallelExecutionHelper.CreateParallelOptions(requestedParallelism, scene.RowCount),
9694
localInit: () => new WorkerState<TPixel>(configuration.MemoryAllocator, destinationFrame.Width, scene.MaxLayerDepth + 1),
9795
body: (rowIndex, _, state) =>
9896
{

src/ImageSharp.Drawing/Processing/Backends/ParallelExecutionHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public static int GetPartitionCount(int maxDegreeOfParallelism, int workItemCoun
4848
/// <param name="partitionCount">The computed number of useful partitions for the operation.</param>
4949
/// <returns>The <see cref="ParallelOptions"/> instance for the operation.</returns>
5050
public static ParallelOptions CreateParallelOptions(int maxDegreeOfParallelism, int partitionCount)
51-
=> new() { MaxDegreeOfParallelism = maxDegreeOfParallelism == -1 ? -1 : Math.Min(maxDegreeOfParallelism, partitionCount) };
51+
=> new() { MaxDegreeOfParallelism = Math.Min(maxDegreeOfParallelism, partitionCount) };
5252

5353
/// <summary>
5454
/// Computes the internal partition-planning cap for the configured parallelism setting.

0 commit comments

Comments
 (0)