diff --git a/src/ImageProcessorCore/Filters/Binarization/Threshold.cs b/src/ImageProcessorCore/Filters/Binarization/Threshold.cs index e348817a35..250cdc1407 100644 --- a/src/ImageProcessorCore/Filters/Binarization/Threshold.cs +++ b/src/ImageProcessorCore/Filters/Binarization/Threshold.cs @@ -45,7 +45,7 @@ namespace ImageProcessorCore.Filters public Color LowerColor => Color.Black; /// - protected override void OnApply(ImageBase source, ImageBase target, Rectangle targetRectangle, Rectangle sourceRectangle) + protected override void OnApply(ImageBase target, ImageBase source, Rectangle targetRectangle, Rectangle sourceRectangle) { new GreyscaleBt709().Apply(source, source, sourceRectangle); } diff --git a/src/ImageProcessorCore/Filters/ColorMatrix/Hue.cs b/src/ImageProcessorCore/Filters/ColorMatrix/Hue.cs index 4d1945ecf7..8d79a204aa 100644 --- a/src/ImageProcessorCore/Filters/ColorMatrix/Hue.cs +++ b/src/ImageProcessorCore/Filters/ColorMatrix/Hue.cs @@ -40,7 +40,7 @@ public override bool Compand => false; /// - protected override void OnApply(ImageBase source, ImageBase target, Rectangle targetRectangle, Rectangle sourceRectangle) + protected override void OnApply(ImageBase target, ImageBase source, Rectangle targetRectangle, Rectangle sourceRectangle) { float radians = (float)ImageMaths.DegreesToRadians(this.Angle); double cosradians = Math.Cos(radians); diff --git a/src/ImageProcessorCore/Filters/ColorMatrix/Saturation.cs b/src/ImageProcessorCore/Filters/ColorMatrix/Saturation.cs index f5e6f1b3cd..113afcb0c2 100644 --- a/src/ImageProcessorCore/Filters/ColorMatrix/Saturation.cs +++ b/src/ImageProcessorCore/Filters/ColorMatrix/Saturation.cs @@ -40,7 +40,7 @@ namespace ImageProcessorCore.Filters public override Matrix4x4 Matrix => this.matrix; /// - protected override void OnApply(ImageBase source, ImageBase target, Rectangle targetRectangle, Rectangle sourceRectangle) + protected override void OnApply(ImageBase target, ImageBase source, Rectangle targetRectangle, Rectangle sourceRectangle) { float saturationFactor = this.saturation / 100f; diff --git a/src/ImageProcessorCore/Filters/Convolution/BoxBlur.cs b/src/ImageProcessorCore/Filters/Convolution/BoxBlur.cs index f104140bd4..5da2d2be67 100644 --- a/src/ImageProcessorCore/Filters/Convolution/BoxBlur.cs +++ b/src/ImageProcessorCore/Filters/Convolution/BoxBlur.cs @@ -46,7 +46,7 @@ namespace ImageProcessorCore.Filters public override int Parallelism => 1; /// - protected override void OnApply(ImageBase source, ImageBase target, Rectangle targetRectangle, Rectangle sourceRectangle) + protected override void OnApply(ImageBase target, ImageBase source, Rectangle targetRectangle, Rectangle sourceRectangle) { if (this.kernelY == null) { diff --git a/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/EdgeDetector2DFilter.cs b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/EdgeDetector2DFilter.cs index 2b6391c76d..c37e6f23c9 100644 --- a/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/EdgeDetector2DFilter.cs +++ b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/EdgeDetector2DFilter.cs @@ -15,7 +15,7 @@ namespace ImageProcessorCore.Filters public bool Greyscale { get; set; } /// - protected override void OnApply(ImageBase source, ImageBase target, Rectangle targetRectangle, Rectangle sourceRectangle) + protected override void OnApply(ImageBase target, ImageBase source, Rectangle targetRectangle, Rectangle sourceRectangle) { if (this.Greyscale) { diff --git a/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/EdgeDetectorFilter.cs b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/EdgeDetectorFilter.cs index 614ed5ab86..3795bb78c8 100644 --- a/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/EdgeDetectorFilter.cs +++ b/src/ImageProcessorCore/Filters/Convolution/EdgeDetection/EdgeDetectorFilter.cs @@ -15,7 +15,7 @@ namespace ImageProcessorCore.Filters public bool Greyscale { get; set; } /// - protected override void OnApply(ImageBase source, ImageBase target, Rectangle targetRectangle, Rectangle sourceRectangle) + protected override void OnApply(ImageBase target, ImageBase source, Rectangle targetRectangle, Rectangle sourceRectangle) { if (this.Greyscale) { diff --git a/src/ImageProcessorCore/Filters/Convolution/GuassianBlur.cs b/src/ImageProcessorCore/Filters/Convolution/GuassianBlur.cs index aa0ef4f3c6..ed4cb6d4fb 100644 --- a/src/ImageProcessorCore/Filters/Convolution/GuassianBlur.cs +++ b/src/ImageProcessorCore/Filters/Convolution/GuassianBlur.cs @@ -80,7 +80,7 @@ namespace ImageProcessorCore.Filters public override int Parallelism => 1; /// - protected override void OnApply(ImageBase source, ImageBase target, Rectangle targetRectangle, Rectangle sourceRectangle) + protected override void OnApply(ImageBase target, ImageBase source, Rectangle targetRectangle, Rectangle sourceRectangle) { if (this.kernelY == null) { diff --git a/src/ImageProcessorCore/Filters/Convolution/GuassianSharpen.cs b/src/ImageProcessorCore/Filters/Convolution/GuassianSharpen.cs index 44b0f9d40d..7e64383cfe 100644 --- a/src/ImageProcessorCore/Filters/Convolution/GuassianSharpen.cs +++ b/src/ImageProcessorCore/Filters/Convolution/GuassianSharpen.cs @@ -82,7 +82,7 @@ namespace ImageProcessorCore.Filters public override int Parallelism => 1; /// - protected override void OnApply(ImageBase source, ImageBase target, Rectangle targetRectangle, Rectangle sourceRectangle) + protected override void OnApply(ImageBase target, ImageBase source, Rectangle targetRectangle, Rectangle sourceRectangle) { if (this.kernelY == null) { diff --git a/src/ImageProcessorCore/ParallelImageProcessor.cs b/src/ImageProcessorCore/ParallelImageProcessor.cs index 8ec38d1258..fd47b2357f 100644 --- a/src/ImageProcessorCore/ParallelImageProcessor.cs +++ b/src/ImageProcessorCore/ParallelImageProcessor.cs @@ -37,7 +37,7 @@ namespace ImageProcessorCore { try { - this.OnApply(source, target, target.Bounds, sourceRectangle); + this.OnApply(target, source, target.Bounds, sourceRectangle); this.numRowsProcessed = 0; this.totalRows = sourceRectangle.Height; @@ -71,7 +71,7 @@ namespace ImageProcessorCore this.Apply(target, source, target.Bounds, sourceRectangle, sourceRectangle.Y, sourceRectangle.Bottom); } - this.AfterApply(source, target, target.Bounds, sourceRectangle); + this.AfterApply(target, source, target.Bounds, sourceRectangle); } catch (Exception ex) { @@ -98,7 +98,7 @@ namespace ImageProcessorCore targetRectangle = target.Bounds; } - this.OnApply(source, target, targetRectangle, sourceRectangle); + this.OnApply(target, source, targetRectangle, sourceRectangle); this.numRowsProcessed = 0; this.totalRows = targetRectangle.Bottom; @@ -129,7 +129,7 @@ namespace ImageProcessorCore this.Apply(target, source, targetRectangle, sourceRectangle, targetRectangle.Y, targetRectangle.Bottom); } - this.AfterApply(source, target, target.Bounds, sourceRectangle); + this.AfterApply(target, source, target.Bounds, sourceRectangle); } catch (Exception ex) { @@ -140,8 +140,8 @@ namespace ImageProcessorCore /// /// This method is called before the process is applied to prepare the processor. /// - /// The source image. Cannot be null. /// Target image to apply the process to. + /// The source image. Cannot be null. /// /// The structure that specifies the location and size of the drawn image. /// The image is scaled to fit the rectangle. @@ -149,7 +149,7 @@ namespace ImageProcessorCore /// /// The structure that specifies the portion of the image object to draw. /// - protected virtual void OnApply(ImageBase source, ImageBase target, Rectangle targetRectangle, Rectangle sourceRectangle) + protected virtual void OnApply(ImageBase target, ImageBase source, Rectangle targetRectangle, Rectangle sourceRectangle) { } @@ -177,8 +177,8 @@ namespace ImageProcessorCore /// /// This method is called after the process is applied to prepare the processor. /// - /// The source image. Cannot be null. /// Target image to apply the process to. + /// The source image. Cannot be null. /// /// The structure that specifies the location and size of the drawn image. /// The image is scaled to fit the rectangle. @@ -186,7 +186,7 @@ namespace ImageProcessorCore /// /// The structure that specifies the portion of the image object to draw. /// - protected virtual void AfterApply(ImageBase source, ImageBase target, Rectangle targetRectangle, Rectangle sourceRectangle) + protected virtual void AfterApply(ImageBase target, ImageBase source, Rectangle targetRectangle, Rectangle sourceRectangle) { } diff --git a/src/ImageProcessorCore/Samplers/Options/ResizeOptions.cs b/src/ImageProcessorCore/Samplers/Options/ResizeOptions.cs index 8a5716f6b9..82db8ed860 100644 --- a/src/ImageProcessorCore/Samplers/Options/ResizeOptions.cs +++ b/src/ImageProcessorCore/Samplers/Options/ResizeOptions.cs @@ -5,7 +5,6 @@ namespace ImageProcessorCore { - using Processors using System.Collections.Generic; using System.Linq; diff --git a/src/ImageProcessorCore/Samplers/Processors/EntropyCrop.cs b/src/ImageProcessorCore/Samplers/Processors/EntropyCrop.cs index 763433d9c4..ef9bd5b23e 100644 --- a/src/ImageProcessorCore/Samplers/Processors/EntropyCrop.cs +++ b/src/ImageProcessorCore/Samplers/Processors/EntropyCrop.cs @@ -40,7 +40,7 @@ namespace ImageProcessorCore.Processors public float Value { get; } /// - protected override void OnApply(ImageBase source, ImageBase target, Rectangle targetRectangle, Rectangle sourceRectangle) + protected override void OnApply(ImageBase target, ImageBase source, Rectangle targetRectangle, Rectangle sourceRectangle) { using (ImageBase temp = new Image(source.Width, source.Height)) { diff --git a/src/ImageProcessorCore/Samplers/Processors/Resize.cs b/src/ImageProcessorCore/Samplers/Processors/Resize.cs index e8bd9bbab9..3ca754ee6f 100644 --- a/src/ImageProcessorCore/Samplers/Processors/Resize.cs +++ b/src/ImageProcessorCore/Samplers/Processors/Resize.cs @@ -32,7 +32,7 @@ namespace ImageProcessorCore.Processors public override int Parallelism { get; set; } = 1; /// - protected override void OnApply(ImageBase source, ImageBase target, Rectangle targetRectangle, Rectangle sourceRectangle) + protected override void OnApply(ImageBase target, ImageBase source, Rectangle targetRectangle, Rectangle sourceRectangle) { if (!(this.Sampler is NearestNeighborResampler)) { diff --git a/src/ImageProcessorCore/Samplers/Processors/Rotate.cs b/src/ImageProcessorCore/Samplers/Processors/Rotate.cs index e98117a176..2d46dee06a 100644 --- a/src/ImageProcessorCore/Samplers/Processors/Rotate.cs +++ b/src/ImageProcessorCore/Samplers/Processors/Rotate.cs @@ -63,7 +63,7 @@ namespace ImageProcessorCore.Processors public bool Expand { get; set; } /// - protected override void OnApply(ImageBase source, ImageBase target, Rectangle targetRectangle, Rectangle sourceRectangle) + protected override void OnApply(ImageBase target, ImageBase source, Rectangle targetRectangle, Rectangle sourceRectangle) { // If we are expanding we need to pad the bounds of the source rectangle. // We can use the resizer in nearest neighbor mode to do this fairly quickly. diff --git a/src/ImageProcessorCore/Samplers/Processors/Skew.cs b/src/ImageProcessorCore/Samplers/Processors/Skew.cs index fd457ece47..89f050630f 100644 --- a/src/ImageProcessorCore/Samplers/Processors/Skew.cs +++ b/src/ImageProcessorCore/Samplers/Processors/Skew.cs @@ -94,7 +94,7 @@ namespace ImageProcessorCore.Processors public bool Expand { get; set; } /// - protected override void OnApply(ImageBase source, ImageBase target, Rectangle targetRectangle, Rectangle sourceRectangle) + protected override void OnApply(ImageBase target, ImageBase source, Rectangle targetRectangle, Rectangle sourceRectangle) { // If we are expanding we need to pad the bounds of the source rectangle. // We can use the resizer in nearest neighbor mode to do this fairly quickly. diff --git a/tests/ImageProcessorCore.Benchmarks/Samplers/Crop.cs b/tests/ImageProcessorCore.Benchmarks/Samplers/Crop.cs index 85bc4190a2..3c0cab4cab 100644 --- a/tests/ImageProcessorCore.Benchmarks/Samplers/Crop.cs +++ b/tests/ImageProcessorCore.Benchmarks/Samplers/Crop.cs @@ -5,7 +5,7 @@ using BenchmarkDotNet.Attributes; - using ImageProcessorCore.Samplers; + using ImageProcessorCore.Processors; using CoreImage = ImageProcessorCore.Image; using CoreSize = ImageProcessorCore.Size; diff --git a/tests/ImageProcessorCore.Benchmarks/Samplers/Resize.cs b/tests/ImageProcessorCore.Benchmarks/Samplers/Resize.cs index 15f1b91be3..97415f2fac 100644 --- a/tests/ImageProcessorCore.Benchmarks/Samplers/Resize.cs +++ b/tests/ImageProcessorCore.Benchmarks/Samplers/Resize.cs @@ -5,7 +5,7 @@ using BenchmarkDotNet.Attributes; - using ImageProcessorCore.Samplers; + using ImageProcessorCore.Processors; using CoreImage = ImageProcessorCore.Image; using CoreSize = ImageProcessorCore.Size; diff --git a/tests/ImageProcessorCore.Tests/Processors/Samplers/SamplerTests.cs b/tests/ImageProcessorCore.Tests/Processors/Samplers/SamplerTests.cs index 247c2bd526..33b006ebf8 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Samplers/SamplerTests.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Samplers/SamplerTests.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using System.IO; - using ImageProcessorCore.Samplers; + using ImageProcessorCore.Processors; using Xunit; using Filters;