From dccdc1d1810509ce7a9b1be23467759d3004e7bf Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Fri, 16 Mar 2018 10:54:48 +1100 Subject: [PATCH] Rename types --- .../Processing/Dithering/DitherExtensions.cs | 2 +- .../{KnownDitherMatrices.cs => KnownDitherers.cs} | 2 +- .../{KnownMatrixFilters.cs => KnownFilterMatrices.cs} | 2 +- .../Filters/Processors/AchromatomalyProcessor.cs | 2 +- .../Filters/Processors/AchromatopsiaProcessor.cs | 2 +- .../Filters/Processors/BlackWhiteProcessor.cs | 2 +- .../Filters/Processors/BrightnessProcessor.cs | 2 +- .../Processing/Filters/Processors/ContrastProcessor.cs | 2 +- .../Filters/Processors/DeuteranomalyProcessor.cs | 2 +- .../Filters/Processors/DeuteranopiaProcessor.cs | 2 +- .../Filters/Processors/GrayscaleBt601Processor.cs | 2 +- .../Filters/Processors/GrayscaleBt709Processor.cs | 2 +- .../Processing/Filters/Processors/HueProcessor.cs | 2 +- .../Processing/Filters/Processors/InvertProcessor.cs | 2 +- .../Filters/Processors/KodachromeProcessor.cs | 2 +- .../Filters/Processors/LomographProcessor.cs | 2 +- .../Processing/Filters/Processors/OpacityProcessor.cs | 2 +- .../Processing/Filters/Processors/PolaroidProcessor.cs | 2 +- .../Filters/Processors/ProtanomalyProcessor.cs | 2 +- .../Filters/Processors/ProtanopiaProcessor.cs | 2 +- .../Processing/Filters/Processors/SaturateProcessor.cs | 2 +- .../Processing/Filters/Processors/SepiaProcessor.cs | 2 +- .../Filters/Processors/TritanomalyProcessor.cs | 2 +- .../Filters/Processors/TritanopiaProcessor.cs | 2 +- .../Processing/Binarization/BinaryDitherTest.cs | 2 +- .../Processing/Dithering/DitherTest.cs | 2 +- .../ImageSharp.Tests/Processing/Filters/FilterTest.cs | 4 ++-- .../Processors/Binarization/BinaryDitherTests.cs | 10 +++++----- .../Processing/Processors/Dithering/DitherTests.cs | 10 +++++----- .../Processing/Processors/Filters/FilterTest.cs | 6 +++--- 30 files changed, 41 insertions(+), 41 deletions(-) rename src/ImageSharp/Processing/Dithering/{KnownDitherMatrices.cs => KnownDitherers.cs} (96%) rename src/ImageSharp/Processing/Filters/{KnownMatrixFilters.cs => KnownFilterMatrices.cs} (99%) diff --git a/src/ImageSharp/Processing/Dithering/DitherExtensions.cs b/src/ImageSharp/Processing/Dithering/DitherExtensions.cs index 905813855..48dd87a3b 100644 --- a/src/ImageSharp/Processing/Dithering/DitherExtensions.cs +++ b/src/ImageSharp/Processing/Dithering/DitherExtensions.cs @@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.Processing.Dithering /// The . public static IImageProcessingContext Dither(this IImageProcessingContext source) where TPixel : struct, IPixel - => Dither(source, KnownDitherMatrices.BayerDither4x4); + => Dither(source, KnownDitherers.BayerDither4x4); /// /// Dithers the image reducing it to a web-safe palette using ordered dithering. diff --git a/src/ImageSharp/Processing/Dithering/KnownDitherMatrices.cs b/src/ImageSharp/Processing/Dithering/KnownDitherers.cs similarity index 96% rename from src/ImageSharp/Processing/Dithering/KnownDitherMatrices.cs rename to src/ImageSharp/Processing/Dithering/KnownDitherers.cs index 8e3258479..b268ae12c 100644 --- a/src/ImageSharp/Processing/Dithering/KnownDitherMatrices.cs +++ b/src/ImageSharp/Processing/Dithering/KnownDitherers.cs @@ -8,7 +8,7 @@ namespace SixLabors.ImageSharp.Processing.Dithering /// /// Contains reusable static instances of known ordered dither matrices /// - public class KnownDitherMatrices + public class KnownDitherers { /// /// Gets the order ditherer using the 2x2 Bayer dithering matrix diff --git a/src/ImageSharp/Processing/Filters/KnownMatrixFilters.cs b/src/ImageSharp/Processing/Filters/KnownFilterMatrices.cs similarity index 99% rename from src/ImageSharp/Processing/Filters/KnownMatrixFilters.cs rename to src/ImageSharp/Processing/Filters/KnownFilterMatrices.cs index 2b3c0a9a3..9da4aaa65 100644 --- a/src/ImageSharp/Processing/Filters/KnownMatrixFilters.cs +++ b/src/ImageSharp/Processing/Filters/KnownFilterMatrices.cs @@ -9,7 +9,7 @@ namespace SixLabors.ImageSharp.Processing.Filters /// /// A collection of known values for composing filters /// - public static class KnownMatrixFilters + public static class KnownFilterMatrices { /// /// Gets a filter recreating Achromatomaly (Color desensitivity) color blindness diff --git a/src/ImageSharp/Processing/Filters/Processors/AchromatomalyProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/AchromatomalyProcessor.cs index e1f11c094..e7238c68c 100644 --- a/src/ImageSharp/Processing/Filters/Processors/AchromatomalyProcessor.cs +++ b/src/ImageSharp/Processing/Filters/Processors/AchromatomalyProcessor.cs @@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors /// Initializes a new instance of the class. /// public AchromatomalyProcessor() - : base(KnownMatrixFilters.AchromatomalyFilter) + : base(KnownFilterMatrices.AchromatomalyFilter) { } } diff --git a/src/ImageSharp/Processing/Filters/Processors/AchromatopsiaProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/AchromatopsiaProcessor.cs index e9ff6177c..b581f8925 100644 --- a/src/ImageSharp/Processing/Filters/Processors/AchromatopsiaProcessor.cs +++ b/src/ImageSharp/Processing/Filters/Processors/AchromatopsiaProcessor.cs @@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors /// Initializes a new instance of the class. /// public AchromatopsiaProcessor() - : base(KnownMatrixFilters.AchromatopsiaFilter) + : base(KnownFilterMatrices.AchromatopsiaFilter) { } } diff --git a/src/ImageSharp/Processing/Filters/Processors/BlackWhiteProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/BlackWhiteProcessor.cs index 0b1f4dab5..428b9d4dd 100644 --- a/src/ImageSharp/Processing/Filters/Processors/BlackWhiteProcessor.cs +++ b/src/ImageSharp/Processing/Filters/Processors/BlackWhiteProcessor.cs @@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors /// Initializes a new instance of the class. /// public BlackWhiteProcessor() - : base(KnownMatrixFilters.BlackWhiteFilter) + : base(KnownFilterMatrices.BlackWhiteFilter) { } } diff --git a/src/ImageSharp/Processing/Filters/Processors/BrightnessProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/BrightnessProcessor.cs index d4a51ed04..e5c43bd8a 100644 --- a/src/ImageSharp/Processing/Filters/Processors/BrightnessProcessor.cs +++ b/src/ImageSharp/Processing/Filters/Processors/BrightnessProcessor.cs @@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors /// /// The proportion of the conversion. Must be greater than or equal to 0. public BrightnessProcessor(float amount) - : base(KnownMatrixFilters.CreateBrightnessFilter(amount)) + : base(KnownFilterMatrices.CreateBrightnessFilter(amount)) { this.Amount = amount; } diff --git a/src/ImageSharp/Processing/Filters/Processors/ContrastProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/ContrastProcessor.cs index 9c8e717f2..51f8ba6b1 100644 --- a/src/ImageSharp/Processing/Filters/Processors/ContrastProcessor.cs +++ b/src/ImageSharp/Processing/Filters/Processors/ContrastProcessor.cs @@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors /// /// The proportion of the conversion. Must be greater than or equal to 0. public ContrastProcessor(float amount) - : base(KnownMatrixFilters.CreateContrastFilter(amount)) + : base(KnownFilterMatrices.CreateContrastFilter(amount)) { this.Amount = amount; } diff --git a/src/ImageSharp/Processing/Filters/Processors/DeuteranomalyProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/DeuteranomalyProcessor.cs index afb5bbd53..d93068c8c 100644 --- a/src/ImageSharp/Processing/Filters/Processors/DeuteranomalyProcessor.cs +++ b/src/ImageSharp/Processing/Filters/Processors/DeuteranomalyProcessor.cs @@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors /// Initializes a new instance of the class. /// public DeuteranomalyProcessor() - : base(KnownMatrixFilters.DeuteranomalyFilter) + : base(KnownFilterMatrices.DeuteranomalyFilter) { } } diff --git a/src/ImageSharp/Processing/Filters/Processors/DeuteranopiaProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/DeuteranopiaProcessor.cs index 2cbfcf467..4b57a1fa4 100644 --- a/src/ImageSharp/Processing/Filters/Processors/DeuteranopiaProcessor.cs +++ b/src/ImageSharp/Processing/Filters/Processors/DeuteranopiaProcessor.cs @@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors /// Initializes a new instance of the class. /// public DeuteranopiaProcessor() - : base(KnownMatrixFilters.DeuteranopiaFilter) + : base(KnownFilterMatrices.DeuteranopiaFilter) { } } diff --git a/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt601Processor.cs b/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt601Processor.cs index 2fe4bf31b..b4ea8ac6b 100644 --- a/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt601Processor.cs +++ b/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt601Processor.cs @@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors /// /// The proportion of the conversion. Must be between 0 and 1. public GrayscaleBt601Processor(float amount) - : base(KnownMatrixFilters.CreateGrayscaleBt601Filter(amount)) + : base(KnownFilterMatrices.CreateGrayscaleBt601Filter(amount)) { this.Amount = amount; } diff --git a/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt709Processor.cs b/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt709Processor.cs index 5e2684998..480b134d3 100644 --- a/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt709Processor.cs +++ b/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt709Processor.cs @@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors /// /// The proportion of the conversion. Must be between 0 and 1. public GrayscaleBt709Processor(float amount) - : base(KnownMatrixFilters.CreateGrayscaleBt709Filter(amount)) + : base(KnownFilterMatrices.CreateGrayscaleBt709Filter(amount)) { this.Amount = amount; } diff --git a/src/ImageSharp/Processing/Filters/Processors/HueProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/HueProcessor.cs index 8bd7d3278..95ae98e78 100644 --- a/src/ImageSharp/Processing/Filters/Processors/HueProcessor.cs +++ b/src/ImageSharp/Processing/Filters/Processors/HueProcessor.cs @@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors /// /// The angle of rotation in degrees public HueProcessor(float degrees) - : base(KnownMatrixFilters.CreateHueFilter(degrees)) + : base(KnownFilterMatrices.CreateHueFilter(degrees)) { this.Degrees = degrees; } diff --git a/src/ImageSharp/Processing/Filters/Processors/InvertProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/InvertProcessor.cs index fc408912d..7b8ed2a03 100644 --- a/src/ImageSharp/Processing/Filters/Processors/InvertProcessor.cs +++ b/src/ImageSharp/Processing/Filters/Processors/InvertProcessor.cs @@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors /// /// The proportion of the conversion. Must be between 0 and 1. public InvertProcessor(float amount) - : base(KnownMatrixFilters.CreateInvertFilter(amount)) + : base(KnownFilterMatrices.CreateInvertFilter(amount)) { this.Amount = amount; } diff --git a/src/ImageSharp/Processing/Filters/Processors/KodachromeProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/KodachromeProcessor.cs index ea9b86d1b..cc3fa42f6 100644 --- a/src/ImageSharp/Processing/Filters/Processors/KodachromeProcessor.cs +++ b/src/ImageSharp/Processing/Filters/Processors/KodachromeProcessor.cs @@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors /// Initializes a new instance of the class. /// public KodachromeProcessor() - : base(KnownMatrixFilters.KodachromeFilter) + : base(KnownFilterMatrices.KodachromeFilter) { } } diff --git a/src/ImageSharp/Processing/Filters/Processors/LomographProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/LomographProcessor.cs index 7196bc2dd..d97bf57dd 100644 --- a/src/ImageSharp/Processing/Filters/Processors/LomographProcessor.cs +++ b/src/ImageSharp/Processing/Filters/Processors/LomographProcessor.cs @@ -20,7 +20,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors /// Initializes a new instance of the class. /// public LomographProcessor() - : base(KnownMatrixFilters.LomographFilter) + : base(KnownFilterMatrices.LomographFilter) { } diff --git a/src/ImageSharp/Processing/Filters/Processors/OpacityProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/OpacityProcessor.cs index 9e2e549b2..f50d27ae0 100644 --- a/src/ImageSharp/Processing/Filters/Processors/OpacityProcessor.cs +++ b/src/ImageSharp/Processing/Filters/Processors/OpacityProcessor.cs @@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors /// /// The proportion of the conversion. Must be between 0 and 1. public OpacityProcessor(float amount) - : base(KnownMatrixFilters.CreateOpacityFilter(amount)) + : base(KnownFilterMatrices.CreateOpacityFilter(amount)) { this.Amount = amount; } diff --git a/src/ImageSharp/Processing/Filters/Processors/PolaroidProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/PolaroidProcessor.cs index b9c555c9f..b6aa56223 100644 --- a/src/ImageSharp/Processing/Filters/Processors/PolaroidProcessor.cs +++ b/src/ImageSharp/Processing/Filters/Processors/PolaroidProcessor.cs @@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors /// Initializes a new instance of the class. /// public PolaroidProcessor() - : base(KnownMatrixFilters.PolaroidFilter) + : base(KnownFilterMatrices.PolaroidFilter) { } diff --git a/src/ImageSharp/Processing/Filters/Processors/ProtanomalyProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/ProtanomalyProcessor.cs index 24cdd75c2..88e2ee3c3 100644 --- a/src/ImageSharp/Processing/Filters/Processors/ProtanomalyProcessor.cs +++ b/src/ImageSharp/Processing/Filters/Processors/ProtanomalyProcessor.cs @@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors /// Initializes a new instance of the class. /// public ProtanomalyProcessor() - : base(KnownMatrixFilters.ProtanomalyFilter) + : base(KnownFilterMatrices.ProtanomalyFilter) { } } diff --git a/src/ImageSharp/Processing/Filters/Processors/ProtanopiaProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/ProtanopiaProcessor.cs index 441d08310..17020bbe2 100644 --- a/src/ImageSharp/Processing/Filters/Processors/ProtanopiaProcessor.cs +++ b/src/ImageSharp/Processing/Filters/Processors/ProtanopiaProcessor.cs @@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors /// Initializes a new instance of the class. /// public ProtanopiaProcessor() - : base(KnownMatrixFilters.ProtanopiaFilter) + : base(KnownFilterMatrices.ProtanopiaFilter) { } } diff --git a/src/ImageSharp/Processing/Filters/Processors/SaturateProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/SaturateProcessor.cs index 645052eab..d4b28a894 100644 --- a/src/ImageSharp/Processing/Filters/Processors/SaturateProcessor.cs +++ b/src/ImageSharp/Processing/Filters/Processors/SaturateProcessor.cs @@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors /// /// The proportion of the conversion. Must be greater than or equal to 0. public SaturateProcessor(float amount) - : base(KnownMatrixFilters.CreateSaturateFilter(amount)) + : base(KnownFilterMatrices.CreateSaturateFilter(amount)) { this.Amount = amount; } diff --git a/src/ImageSharp/Processing/Filters/Processors/SepiaProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/SepiaProcessor.cs index 641540f61..7295cee99 100644 --- a/src/ImageSharp/Processing/Filters/Processors/SepiaProcessor.cs +++ b/src/ImageSharp/Processing/Filters/Processors/SepiaProcessor.cs @@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors /// /// The proportion of the conversion. Must be between 0 and 1. public SepiaProcessor(float amount) - : base(KnownMatrixFilters.CreateSepiaFilter(amount)) + : base(KnownFilterMatrices.CreateSepiaFilter(amount)) { this.Amount = amount; } diff --git a/src/ImageSharp/Processing/Filters/Processors/TritanomalyProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/TritanomalyProcessor.cs index 2da3fd5fb..6991506e6 100644 --- a/src/ImageSharp/Processing/Filters/Processors/TritanomalyProcessor.cs +++ b/src/ImageSharp/Processing/Filters/Processors/TritanomalyProcessor.cs @@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors /// Initializes a new instance of the class. /// public TritanomalyProcessor() - : base(KnownMatrixFilters.TritanomalyFilter) + : base(KnownFilterMatrices.TritanomalyFilter) { } } diff --git a/src/ImageSharp/Processing/Filters/Processors/TritanopiaProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/TritanopiaProcessor.cs index a496f6f62..95c6cb542 100644 --- a/src/ImageSharp/Processing/Filters/Processors/TritanopiaProcessor.cs +++ b/src/ImageSharp/Processing/Filters/Processors/TritanopiaProcessor.cs @@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors /// Initializes a new instance of the class. /// public TritanopiaProcessor() - : base(KnownMatrixFilters.TritanopiaFilter) + : base(KnownFilterMatrices.TritanopiaFilter) { } } diff --git a/tests/ImageSharp.Tests/Processing/Binarization/BinaryDitherTest.cs b/tests/ImageSharp.Tests/Processing/Binarization/BinaryDitherTest.cs index d88491638..324225a06 100644 --- a/tests/ImageSharp.Tests/Processing/Binarization/BinaryDitherTest.cs +++ b/tests/ImageSharp.Tests/Processing/Binarization/BinaryDitherTest.cs @@ -20,7 +20,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Binarization public BinaryDitherTest() { - this.orderedDither = KnownDitherMatrices.BayerDither4x4; + this.orderedDither = KnownDitherers.BayerDither4x4; this.errorDiffuser = KnownDiffusers.FloydSteinberg; } diff --git a/tests/ImageSharp.Tests/Processing/Dithering/DitherTest.cs b/tests/ImageSharp.Tests/Processing/Dithering/DitherTest.cs index 1526644bb..a29fc28c9 100644 --- a/tests/ImageSharp.Tests/Processing/Dithering/DitherTest.cs +++ b/tests/ImageSharp.Tests/Processing/Dithering/DitherTest.cs @@ -25,7 +25,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Binarization public DitherTest() { - this.orderedDither = KnownDitherMatrices.BayerDither4x4; + this.orderedDither = KnownDitherers.BayerDither4x4; this.errorDiffuser = KnownDiffusers.FloydSteinberg; } diff --git a/tests/ImageSharp.Tests/Processing/Filters/FilterTest.cs b/tests/ImageSharp.Tests/Processing/Filters/FilterTest.cs index eb6d7c38c..cac1d7057 100644 --- a/tests/ImageSharp.Tests/Processing/Filters/FilterTest.cs +++ b/tests/ImageSharp.Tests/Processing/Filters/FilterTest.cs @@ -16,14 +16,14 @@ namespace SixLabors.ImageSharp.Tests.Processing.Filters [Fact] public void Filter_CorrectProcessor() { - this.operations.Filter(KnownMatrixFilters.AchromatomalyFilter * KnownMatrixFilters.CreateHueFilter(90F)); + this.operations.Filter(KnownFilterMatrices.AchromatomalyFilter * KnownFilterMatrices.CreateHueFilter(90F)); FilterProcessor p = this.Verify>(); } [Fact] public void Filter_rect_CorrectProcessor() { - this.operations.Filter(KnownMatrixFilters.AchromatomalyFilter * KnownMatrixFilters.CreateHueFilter(90F), this.rect); + this.operations.Filter(KnownFilterMatrices.AchromatomalyFilter * KnownFilterMatrices.CreateHueFilter(90F), this.rect); FilterProcessor p = this.Verify>(this.rect); } } diff --git a/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryDitherTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryDitherTests.cs index b75087bc4..f99fe0c2a 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryDitherTests.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryDitherTests.cs @@ -25,10 +25,10 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Binarization public static readonly TheoryData OrderedDitherers = new TheoryData { - { "Bayer8x8", KnownDitherMatrices.BayerDither8x8 }, - { "Bayer4x4", KnownDitherMatrices.BayerDither4x4 }, - { "Ordered3x3", KnownDitherMatrices.OrderedDither3x3 }, - { "Bayer2x2", KnownDitherMatrices.BayerDither2x2 } + { "Bayer8x8", KnownDitherers.BayerDither8x8 }, + { "Bayer4x4", KnownDitherers.BayerDither4x4 }, + { "Ordered3x3", KnownDitherers.OrderedDither3x3 }, + { "Bayer2x2", KnownDitherers.BayerDither2x2 } }; public static readonly TheoryData ErrorDiffusers = new TheoryData @@ -45,7 +45,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Binarization }; - private static IOrderedDither DefaultDitherer => KnownDitherMatrices.BayerDither4x4; + private static IOrderedDither DefaultDitherer => KnownDitherers.BayerDither4x4; private static IErrorDiffuser DefaultErrorDiffuser => KnownDiffusers.Atkinson; diff --git a/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs index 64e62fb2a..de2eff2ee 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs @@ -24,10 +24,10 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Binarization public static readonly TheoryData OrderedDitherers = new TheoryData { - { "Bayer8x8", KnownDitherMatrices.BayerDither8x8 }, - { "Bayer4x4", KnownDitherMatrices.BayerDither4x4 }, - { "Ordered3x3", KnownDitherMatrices.OrderedDither3x3 }, - { "Bayer2x2", KnownDitherMatrices.BayerDither2x2 } + { "Bayer8x8", KnownDitherers.BayerDither8x8 }, + { "Bayer4x4", KnownDitherers.BayerDither4x4 }, + { "Ordered3x3", KnownDitherers.OrderedDither3x3 }, + { "Bayer2x2", KnownDitherers.BayerDither2x2 } }; public static readonly TheoryData ErrorDiffusers = new TheoryData @@ -44,7 +44,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Binarization }; - private static IOrderedDither DefaultDitherer => KnownDitherMatrices.BayerDither4x4; + private static IOrderedDither DefaultDitherer => KnownDitherers.BayerDither4x4; private static IErrorDiffuser DefaultErrorDiffuser => KnownDiffusers.Atkinson; diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/FilterTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/FilterTest.cs index 226ebd673..190e117b3 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Filters/FilterTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/FilterTest.cs @@ -40,9 +40,9 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters private static Matrix4x4 CreateCombinedTestFilterMatrix() { - Matrix4x4 brightness = KnownMatrixFilters.CreateBrightnessFilter(0.9F); - Matrix4x4 hue = KnownMatrixFilters.CreateHueFilter(180F); - Matrix4x4 saturation = KnownMatrixFilters.CreateSaturateFilter(1.5F); + Matrix4x4 brightness = KnownFilterMatrices.CreateBrightnessFilter(0.9F); + Matrix4x4 hue = KnownFilterMatrices.CreateHueFilter(180F); + Matrix4x4 saturation = KnownFilterMatrices.CreateSaturateFilter(1.5F); Matrix4x4 m = brightness * hue * saturation; return m; }