From 16aee11d458ccc624c212a416ed55e208356719b Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Sat, 30 Jul 2016 22:00:20 +1000 Subject: [PATCH] Use processor specific parallel options. Former-commit-id: 2acf4fe804efd492297eab966fb5202502ea5455 Former-commit-id: 8fa7b831fa1b096316c10b12c1003a116541051b Former-commit-id: b5970581a06e6a7af28b806f2625517a153591cb --- .../Filters/Processors/AlphaProcessor.cs | 2 +- .../Filters/Processors/BackgroundColorProcessor.cs | 2 +- .../Binarization/BinaryThresholdProcessor.cs | 2 +- .../Filters/Processors/BlendProcessor.cs | 1 + .../Filters/Processors/BrightnessProcessor.cs | 2 +- .../Processors/ColorMatrix/ColorMatrixFilter.cs | 2 +- .../Filters/Processors/ContrastProcessor.cs | 2 +- .../Processors/Convolution/Convolution2DFilter.cs | 2 +- .../Processors/Convolution/Convolution2PassFilter.cs | 2 +- .../Processors/Convolution/ConvolutionFilter.cs | 2 +- .../Filters/Processors/GlowProcessor.cs | 2 +- .../Filters/Processors/InvertProcessor.cs | 2 +- .../Filters/Processors/PixelateProcessor.cs | 1 + .../Filters/Processors/VignetteProcessor.cs | 2 +- .../Samplers/Processors/CropProcessor.cs | 1 + .../Samplers/Processors/EntropyCropProcessor.cs | 1 + .../Samplers/Processors/RotateFlipProcessor.cs | 10 +++++----- .../Samplers/Processors/RotateProcessor.cs | 1 + .../Samplers/Processors/SkewProcessor.cs | 1 + 19 files changed, 23 insertions(+), 17 deletions(-) diff --git a/src/ImageProcessorCore/Filters/Processors/AlphaProcessor.cs b/src/ImageProcessorCore/Filters/Processors/AlphaProcessor.cs index b2a2520c3b..bf5da0551d 100644 --- a/src/ImageProcessorCore/Filters/Processors/AlphaProcessor.cs +++ b/src/ImageProcessorCore/Filters/Processors/AlphaProcessor.cs @@ -51,7 +51,7 @@ namespace ImageProcessorCore.Processors Parallel.For( startY, endY, - Bootstrapper.Instance.ParallelOptions, + this.ParallelOptions, y => { if (y >= sourceY && y < sourceBottom) diff --git a/src/ImageProcessorCore/Filters/Processors/BackgroundColorProcessor.cs b/src/ImageProcessorCore/Filters/Processors/BackgroundColorProcessor.cs index cc59d2d4fc..03ff6b40b6 100644 --- a/src/ImageProcessorCore/Filters/Processors/BackgroundColorProcessor.cs +++ b/src/ImageProcessorCore/Filters/Processors/BackgroundColorProcessor.cs @@ -50,7 +50,7 @@ namespace ImageProcessorCore.Processors Parallel.For( startY, endY, - Bootstrapper.Instance.ParallelOptions, + this.ParallelOptions, y => { if (y >= sourceY && y < sourceBottom) diff --git a/src/ImageProcessorCore/Filters/Processors/Binarization/BinaryThresholdProcessor.cs b/src/ImageProcessorCore/Filters/Processors/Binarization/BinaryThresholdProcessor.cs index ffe5c4452a..28d7ffd2c5 100644 --- a/src/ImageProcessorCore/Filters/Processors/Binarization/BinaryThresholdProcessor.cs +++ b/src/ImageProcessorCore/Filters/Processors/Binarization/BinaryThresholdProcessor.cs @@ -81,7 +81,7 @@ namespace ImageProcessorCore.Processors Parallel.For( startY, endY, - Bootstrapper.Instance.ParallelOptions, + this.ParallelOptions, y => { if (y >= sourceY && y < sourceBottom) diff --git a/src/ImageProcessorCore/Filters/Processors/BlendProcessor.cs b/src/ImageProcessorCore/Filters/Processors/BlendProcessor.cs index 56c754729a..724d7c7485 100644 --- a/src/ImageProcessorCore/Filters/Processors/BlendProcessor.cs +++ b/src/ImageProcessorCore/Filters/Processors/BlendProcessor.cs @@ -59,6 +59,7 @@ namespace ImageProcessorCore.Processors Parallel.For( startY, endY, + this.ParallelOptions, y => { if (y >= sourceY && y < sourceBottom) diff --git a/src/ImageProcessorCore/Filters/Processors/BrightnessProcessor.cs b/src/ImageProcessorCore/Filters/Processors/BrightnessProcessor.cs index bedbd6b71d..4d0bd1b56c 100644 --- a/src/ImageProcessorCore/Filters/Processors/BrightnessProcessor.cs +++ b/src/ImageProcessorCore/Filters/Processors/BrightnessProcessor.cs @@ -50,7 +50,7 @@ namespace ImageProcessorCore.Processors Parallel.For( startY, endY, - Bootstrapper.Instance.ParallelOptions, + this.ParallelOptions, y => { if (y >= sourceY && y < sourceBottom) diff --git a/src/ImageProcessorCore/Filters/Processors/ColorMatrix/ColorMatrixFilter.cs b/src/ImageProcessorCore/Filters/Processors/ColorMatrix/ColorMatrixFilter.cs index dddb1b2b34..f77cf654ab 100644 --- a/src/ImageProcessorCore/Filters/Processors/ColorMatrix/ColorMatrixFilter.cs +++ b/src/ImageProcessorCore/Filters/Processors/ColorMatrix/ColorMatrixFilter.cs @@ -37,7 +37,7 @@ namespace ImageProcessorCore.Processors Parallel.For( startY, endY, - Bootstrapper.Instance.ParallelOptions, + this.ParallelOptions, y => { for (int x = startX; x < endX; x++) diff --git a/src/ImageProcessorCore/Filters/Processors/ContrastProcessor.cs b/src/ImageProcessorCore/Filters/Processors/ContrastProcessor.cs index 1415027209..25e446d145 100644 --- a/src/ImageProcessorCore/Filters/Processors/ContrastProcessor.cs +++ b/src/ImageProcessorCore/Filters/Processors/ContrastProcessor.cs @@ -52,7 +52,7 @@ namespace ImageProcessorCore.Processors Parallel.For( startY, endY, - Bootstrapper.Instance.ParallelOptions, + this.ParallelOptions, y => { if (y >= sourceY && y < sourceBottom) diff --git a/src/ImageProcessorCore/Filters/Processors/Convolution/Convolution2DFilter.cs b/src/ImageProcessorCore/Filters/Processors/Convolution/Convolution2DFilter.cs index 1113d0640a..ef024bcfb7 100644 --- a/src/ImageProcessorCore/Filters/Processors/Convolution/Convolution2DFilter.cs +++ b/src/ImageProcessorCore/Filters/Processors/Convolution/Convolution2DFilter.cs @@ -53,7 +53,7 @@ namespace ImageProcessorCore.Processors Parallel.For( startY, endY, - Bootstrapper.Instance.ParallelOptions, + this.ParallelOptions, y => { if (y >= sourceY && y < sourceBottom) diff --git a/src/ImageProcessorCore/Filters/Processors/Convolution/Convolution2PassFilter.cs b/src/ImageProcessorCore/Filters/Processors/Convolution/Convolution2PassFilter.cs index 6e1fb78419..09a591ec11 100644 --- a/src/ImageProcessorCore/Filters/Processors/Convolution/Convolution2PassFilter.cs +++ b/src/ImageProcessorCore/Filters/Processors/Convolution/Convolution2PassFilter.cs @@ -69,7 +69,7 @@ namespace ImageProcessorCore.Processors Parallel.For( startY, endY, - Bootstrapper.Instance.ParallelOptions, + this.ParallelOptions, y => { for (int x = startX; x < endX; x++) diff --git a/src/ImageProcessorCore/Filters/Processors/Convolution/ConvolutionFilter.cs b/src/ImageProcessorCore/Filters/Processors/Convolution/ConvolutionFilter.cs index eb0c454b44..45279550db 100644 --- a/src/ImageProcessorCore/Filters/Processors/Convolution/ConvolutionFilter.cs +++ b/src/ImageProcessorCore/Filters/Processors/Convolution/ConvolutionFilter.cs @@ -40,7 +40,7 @@ namespace ImageProcessorCore.Processors Parallel.For( startY, endY, - Bootstrapper.Instance.ParallelOptions, + this.ParallelOptions, y => { if (y >= sourceY && y < sourceBottom) diff --git a/src/ImageProcessorCore/Filters/Processors/GlowProcessor.cs b/src/ImageProcessorCore/Filters/Processors/GlowProcessor.cs index 6215393810..afe8b1b290 100644 --- a/src/ImageProcessorCore/Filters/Processors/GlowProcessor.cs +++ b/src/ImageProcessorCore/Filters/Processors/GlowProcessor.cs @@ -58,7 +58,7 @@ namespace ImageProcessorCore.Processors Parallel.For( startY, endY, - Bootstrapper.Instance.ParallelOptions, + this.ParallelOptions, y => { for (int x = startX; x < endX; x++) diff --git a/src/ImageProcessorCore/Filters/Processors/InvertProcessor.cs b/src/ImageProcessorCore/Filters/Processors/InvertProcessor.cs index 3d8465fa4c..221dc97ffd 100644 --- a/src/ImageProcessorCore/Filters/Processors/InvertProcessor.cs +++ b/src/ImageProcessorCore/Filters/Processors/InvertProcessor.cs @@ -30,7 +30,7 @@ namespace ImageProcessorCore.Processors Parallel.For( startY, endY, - Bootstrapper.Instance.ParallelOptions, + this.ParallelOptions, y => { if (y >= sourceY && y < sourceBottom) diff --git a/src/ImageProcessorCore/Filters/Processors/PixelateProcessor.cs b/src/ImageProcessorCore/Filters/Processors/PixelateProcessor.cs index 816ce2f42b..e1e833f35b 100644 --- a/src/ImageProcessorCore/Filters/Processors/PixelateProcessor.cs +++ b/src/ImageProcessorCore/Filters/Processors/PixelateProcessor.cs @@ -53,6 +53,7 @@ namespace ImageProcessorCore.Processors { Parallel.ForEach( range, + this.ParallelOptions, y => { if (y >= sourceY && y < sourceBottom) diff --git a/src/ImageProcessorCore/Filters/Processors/VignetteProcessor.cs b/src/ImageProcessorCore/Filters/Processors/VignetteProcessor.cs index 7e7f02317e..905849a2e1 100644 --- a/src/ImageProcessorCore/Filters/Processors/VignetteProcessor.cs +++ b/src/ImageProcessorCore/Filters/Processors/VignetteProcessor.cs @@ -58,7 +58,7 @@ namespace ImageProcessorCore.Processors Parallel.For( startY, endY, - Bootstrapper.Instance.ParallelOptions, + this.ParallelOptions, y => { for (int x = startX; x < endX; x++) diff --git a/src/ImageProcessorCore/Samplers/Processors/CropProcessor.cs b/src/ImageProcessorCore/Samplers/Processors/CropProcessor.cs index 0990711122..dfd3c7f507 100644 --- a/src/ImageProcessorCore/Samplers/Processors/CropProcessor.cs +++ b/src/ImageProcessorCore/Samplers/Processors/CropProcessor.cs @@ -28,6 +28,7 @@ namespace ImageProcessorCore.Processors Parallel.For( startY, endY, + this.ParallelOptions, y => { for (int x = startX; x < endX; x++) diff --git a/src/ImageProcessorCore/Samplers/Processors/EntropyCropProcessor.cs b/src/ImageProcessorCore/Samplers/Processors/EntropyCropProcessor.cs index 6cd7726c92..f6630df93b 100644 --- a/src/ImageProcessorCore/Samplers/Processors/EntropyCropProcessor.cs +++ b/src/ImageProcessorCore/Samplers/Processors/EntropyCropProcessor.cs @@ -78,6 +78,7 @@ namespace ImageProcessorCore.Processors Parallel.For( startY, endY, + this.ParallelOptions, y => { if (y >= targetY && y < targetBottom) diff --git a/src/ImageProcessorCore/Samplers/Processors/RotateFlipProcessor.cs b/src/ImageProcessorCore/Samplers/Processors/RotateFlipProcessor.cs index 7a6259f79b..f1233a553e 100644 --- a/src/ImageProcessorCore/Samplers/Processors/RotateFlipProcessor.cs +++ b/src/ImageProcessorCore/Samplers/Processors/RotateFlipProcessor.cs @@ -88,7 +88,7 @@ namespace ImageProcessorCore.Processors Parallel.For( 0, height, - Bootstrapper.Instance.ParallelOptions, + this.ParallelOptions, y => { for (int x = 0; x < width; x++) @@ -125,7 +125,7 @@ namespace ImageProcessorCore.Processors Parallel.For( 0, height, - Bootstrapper.Instance.ParallelOptions, + this.ParallelOptions, y => { for (int x = 0; x < width; x++) @@ -159,7 +159,7 @@ namespace ImageProcessorCore.Processors Parallel.For( 0, height, - Bootstrapper.Instance.ParallelOptions, + this.ParallelOptions, y => { for (int x = 0; x < width; x++) @@ -196,7 +196,7 @@ namespace ImageProcessorCore.Processors Parallel.For( 0, halfHeight, - Bootstrapper.Instance.ParallelOptions, + this.ParallelOptions, y => { for (int x = 0; x < width; x++) @@ -232,7 +232,7 @@ namespace ImageProcessorCore.Processors Parallel.For( 0, height, - Bootstrapper.Instance.ParallelOptions, + this.ParallelOptions, y => { for (int x = 0; x < halfWidth; x++) diff --git a/src/ImageProcessorCore/Samplers/Processors/RotateProcessor.cs b/src/ImageProcessorCore/Samplers/Processors/RotateProcessor.cs index 71ae1aad2f..be36dca3d0 100644 --- a/src/ImageProcessorCore/Samplers/Processors/RotateProcessor.cs +++ b/src/ImageProcessorCore/Samplers/Processors/RotateProcessor.cs @@ -51,6 +51,7 @@ namespace ImageProcessorCore.Processors Parallel.For( 0, target.Height, + this.ParallelOptions, y => { for (int x = 0; x < target.Width; x++) diff --git a/src/ImageProcessorCore/Samplers/Processors/SkewProcessor.cs b/src/ImageProcessorCore/Samplers/Processors/SkewProcessor.cs index a595d3ee69..5177f825c1 100644 --- a/src/ImageProcessorCore/Samplers/Processors/SkewProcessor.cs +++ b/src/ImageProcessorCore/Samplers/Processors/SkewProcessor.cs @@ -56,6 +56,7 @@ namespace ImageProcessorCore.Processors Parallel.For( 0, target.Height, + this.ParallelOptions, y => { for (int x = 0; x < target.Width; x++)