From 2995f596ef77a260ead68c506f91126f6ee8f733 Mon Sep 17 00:00:00 2001 From: Anton Firszov Date: Sat, 4 May 2019 14:34:11 +0200 Subject: [PATCH] *ProcessorImplementation ===> *Processor, add suppression of SA1413 to AssemblyInfo.cs --- .../Processing/Processors/Filters/FilterProcessor.cs | 2 +- ...sorImplementation.cs => FilterProcessor{TPixel}.cs} | 4 ++-- .../Processors/Filters/GrayscaleBt709Processor.cs | 2 +- .../Processors/Filters/LomographProcessor.cs | 2 +- ...Implementation.cs => LomographProcessor{TPixel}.cs} | 4 ++-- .../Processing/Processors/Filters/PolaroidProcessor.cs | 2 +- ...rImplementation.cs => PolaroidProcessor{TPixel}.cs} | 4 ++-- .../Processors/Transforms/Resize/ResizeProcessor.cs | 2 +- ...sorImplementation.cs => ResizeProcessor{TPixel}.cs} | 4 ++-- src/ImageSharp/Properties/AssemblyInfo.cs | 10 +++++++++- .../ImageSharp.Tests/Processing/Transforms/PadTest.cs | 2 +- 11 files changed, 23 insertions(+), 15 deletions(-) rename src/ImageSharp/Processing/Processors/Filters/{FilterProcessorImplementation.cs => FilterProcessor{TPixel}.cs} (92%) rename src/ImageSharp/Processing/Processors/Filters/{LomographProcessorImplementation.cs => LomographProcessor{TPixel}.cs} (83%) rename src/ImageSharp/Processing/Processors/Filters/{PolaroidProcessorImplementation.cs => PolaroidProcessor{TPixel}.cs} (86%) rename src/ImageSharp/Processing/Processors/Transforms/Resize/{ResizeProcessorImplementation.cs => ResizeProcessor{TPixel}.cs} (97%) diff --git a/src/ImageSharp/Processing/Processors/Filters/FilterProcessor.cs b/src/ImageSharp/Processing/Processors/Filters/FilterProcessor.cs index 886b4e096..b615b7bc6 100644 --- a/src/ImageSharp/Processing/Processors/Filters/FilterProcessor.cs +++ b/src/ImageSharp/Processing/Processors/Filters/FilterProcessor.cs @@ -26,7 +26,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Filters public virtual IImageProcessor CreatePixelSpecificProcessor() where TPixel : struct, IPixel { - return new FilterProcessorImplementation(this); + return new FilterProcessor(this); } } } \ No newline at end of file diff --git a/src/ImageSharp/Processing/Processors/Filters/FilterProcessorImplementation.cs b/src/ImageSharp/Processing/Processors/Filters/FilterProcessor{TPixel}.cs similarity index 92% rename from src/ImageSharp/Processing/Processors/Filters/FilterProcessorImplementation.cs rename to src/ImageSharp/Processing/Processors/Filters/FilterProcessor{TPixel}.cs index 8fea81564..ab60a4279 100644 --- a/src/ImageSharp/Processing/Processors/Filters/FilterProcessorImplementation.cs +++ b/src/ImageSharp/Processing/Processors/Filters/FilterProcessor{TPixel}.cs @@ -15,12 +15,12 @@ namespace SixLabors.ImageSharp.Processing.Processors.Filters /// Provides methods that accept a matrix to apply free-form filters to images. /// /// The pixel format. - internal class FilterProcessorImplementation : ImageProcessor + internal class FilterProcessor : ImageProcessor where TPixel : struct, IPixel { private readonly FilterProcessor definition; - public FilterProcessorImplementation(FilterProcessor definition) + public FilterProcessor(FilterProcessor definition) { this.definition = definition; } diff --git a/src/ImageSharp/Processing/Processors/Filters/GrayscaleBt709Processor.cs b/src/ImageSharp/Processing/Processors/Filters/GrayscaleBt709Processor.cs index 038a2885b..7bbd91556 100644 --- a/src/ImageSharp/Processing/Processors/Filters/GrayscaleBt709Processor.cs +++ b/src/ImageSharp/Processing/Processors/Filters/GrayscaleBt709Processor.cs @@ -30,7 +30,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Filters internal void ApplyToFrame(ImageFrame frame, Rectangle sourceRectangle, Configuration configuration) where TPixel : struct, IPixel { - var processorImpl = new FilterProcessorImplementation(new GrayscaleBt709Processor(1F)); + var processorImpl = new FilterProcessor(new GrayscaleBt709Processor(1F)); processorImpl.Apply(frame, sourceRectangle, configuration); } } diff --git a/src/ImageSharp/Processing/Processors/Filters/LomographProcessor.cs b/src/ImageSharp/Processing/Processors/Filters/LomographProcessor.cs index 345d829ac..b102f4daf 100644 --- a/src/ImageSharp/Processing/Processors/Filters/LomographProcessor.cs +++ b/src/ImageSharp/Processing/Processors/Filters/LomographProcessor.cs @@ -17,6 +17,6 @@ namespace SixLabors.ImageSharp.Processing.Processors.Filters } public override IImageProcessor CreatePixelSpecificProcessor() => - new LomographProcessorImplementation(this); + new LomographProcessor(this); } } \ No newline at end of file diff --git a/src/ImageSharp/Processing/Processors/Filters/LomographProcessorImplementation.cs b/src/ImageSharp/Processing/Processors/Filters/LomographProcessor{TPixel}.cs similarity index 83% rename from src/ImageSharp/Processing/Processors/Filters/LomographProcessorImplementation.cs rename to src/ImageSharp/Processing/Processors/Filters/LomographProcessor{TPixel}.cs index a922e7125..8ec4ec258 100644 --- a/src/ImageSharp/Processing/Processors/Filters/LomographProcessorImplementation.cs +++ b/src/ImageSharp/Processing/Processors/Filters/LomographProcessor{TPixel}.cs @@ -10,12 +10,12 @@ namespace SixLabors.ImageSharp.Processing.Processors.Filters /// /// Converts the colors of the image recreating an old Lomograph effect. /// - internal class LomographProcessorImplementation : FilterProcessorImplementation + internal class LomographProcessor : FilterProcessor where TPixel : struct, IPixel { private static readonly TPixel VeryDarkGreen = ColorBuilder.FromRGBA(0, 10, 0, 255); - public LomographProcessorImplementation(LomographProcessor definition) + public LomographProcessor(LomographProcessor definition) : base(definition) { } diff --git a/src/ImageSharp/Processing/Processors/Filters/PolaroidProcessor.cs b/src/ImageSharp/Processing/Processors/Filters/PolaroidProcessor.cs index 0b272c339..341c02acf 100644 --- a/src/ImageSharp/Processing/Processors/Filters/PolaroidProcessor.cs +++ b/src/ImageSharp/Processing/Processors/Filters/PolaroidProcessor.cs @@ -18,6 +18,6 @@ namespace SixLabors.ImageSharp.Processing.Processors.Filters /// public override IImageProcessor CreatePixelSpecificProcessor() => - new PolaroidProcessorImplementation(this); + new PolaroidProcessor(this); } } \ No newline at end of file diff --git a/src/ImageSharp/Processing/Processors/Filters/PolaroidProcessorImplementation.cs b/src/ImageSharp/Processing/Processors/Filters/PolaroidProcessor{TPixel}.cs similarity index 86% rename from src/ImageSharp/Processing/Processors/Filters/PolaroidProcessorImplementation.cs rename to src/ImageSharp/Processing/Processors/Filters/PolaroidProcessor{TPixel}.cs index ec3c5ed26..a73aa28de 100644 --- a/src/ImageSharp/Processing/Processors/Filters/PolaroidProcessorImplementation.cs +++ b/src/ImageSharp/Processing/Processors/Filters/PolaroidProcessor{TPixel}.cs @@ -10,13 +10,13 @@ namespace SixLabors.ImageSharp.Processing.Processors.Filters /// /// Converts the colors of the image recreating an old Polaroid effect. /// - internal class PolaroidProcessorImplementation : FilterProcessorImplementation + internal class PolaroidProcessor : FilterProcessor where TPixel : struct, IPixel { private static readonly TPixel VeryDarkOrange = ColorBuilder.FromRGB(102, 34, 0); private static readonly TPixel LightOrange = ColorBuilder.FromRGBA(255, 153, 102, 128); - public PolaroidProcessorImplementation(FilterProcessor definition) + public PolaroidProcessor(FilterProcessor definition) : base(definition) { } diff --git a/src/ImageSharp/Processing/Processors/Transforms/Resize/ResizeProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/Resize/ResizeProcessor.cs index 021451b5c..5710c4bd8 100644 --- a/src/ImageSharp/Processing/Processors/Transforms/Resize/ResizeProcessor.cs +++ b/src/ImageSharp/Processing/Processors/Transforms/Resize/ResizeProcessor.cs @@ -133,7 +133,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms public IImageProcessor CreatePixelSpecificProcessor() where TPixel : struct, IPixel { - return new ResizeProcessorImplementation(this); + return new ResizeProcessor(this); } } } \ No newline at end of file diff --git a/src/ImageSharp/Processing/Processors/Transforms/Resize/ResizeProcessorImplementation.cs b/src/ImageSharp/Processing/Processors/Transforms/Resize/ResizeProcessor{TPixel}.cs similarity index 97% rename from src/ImageSharp/Processing/Processors/Transforms/Resize/ResizeProcessorImplementation.cs rename to src/ImageSharp/Processing/Processors/Transforms/Resize/ResizeProcessor{TPixel}.cs index 36a054c54..cf99f28dd 100644 --- a/src/ImageSharp/Processing/Processors/Transforms/Resize/ResizeProcessorImplementation.cs +++ b/src/ImageSharp/Processing/Processors/Transforms/Resize/ResizeProcessor{TPixel}.cs @@ -25,7 +25,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms /// The original code has been adapted from . /// /// The pixel format. - internal class ResizeProcessorImplementation : TransformProcessorBase + internal class ResizeProcessor : TransformProcessorBase where TPixel : struct, IPixel { // The following fields are not immutable but are optionally created on demand. @@ -34,7 +34,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms private readonly ResizeProcessor parameterSource; - public ResizeProcessorImplementation(ResizeProcessor parameterSource) + public ResizeProcessor(ResizeProcessor parameterSource) { this.parameterSource = parameterSource; } diff --git a/src/ImageSharp/Properties/AssemblyInfo.cs b/src/ImageSharp/Properties/AssemblyInfo.cs index 7b8f933b0..f4459887f 100644 --- a/src/ImageSharp/Properties/AssemblyInfo.cs +++ b/src/ImageSharp/Properties/AssemblyInfo.cs @@ -1,6 +1,14 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. + using System.Runtime.CompilerServices; // Ensure the other projects can see the internal helpers -[assembly: InternalsVisibleTo("SixLabors.ImageSharp.Drawing")] \ No newline at end of file +[assembly: InternalsVisibleTo("SixLabors.ImageSharp.Drawing")] + +// Redundant suppressing of SA1413 for Rider. +[assembly: + System.Diagnostics.CodeAnalysis.SuppressMessage( + "StyleCop.CSharp.MaintainabilityRules", + "SA1413:UseTrailingCommasInMultiLineInitializers", + Justification = "Follows SixLabors.ruleset")] \ No newline at end of file diff --git a/tests/ImageSharp.Tests/Processing/Transforms/PadTest.cs b/tests/ImageSharp.Tests/Processing/Transforms/PadTest.cs index eca1a458b..82d768255 100644 --- a/tests/ImageSharp.Tests/Processing/Transforms/PadTest.cs +++ b/tests/ImageSharp.Tests/Processing/Transforms/PadTest.cs @@ -20,7 +20,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Transforms IResampler sampler = KnownResamplers.NearestNeighbor; this.operations.Pad(width, height); - ResizeProcessorImplementation resizeProcessor = this.Verify>(); + ResizeProcessor resizeProcessor = this.Verify>(); Assert.Equal(width, resizeProcessor.Width); Assert.Equal(height, resizeProcessor.Height);