diff --git a/README.md b/README.md index 28c377037..a1c9bca99 100644 --- a/README.md +++ b/README.md @@ -155,6 +155,7 @@ Core Team - [Dirk Lemstra](https://github.com/dlemstra) - [Anton Firsov](https://github.com/antonfirsov) - [Scott Williams](https://github.com/tocsoft) +- [Brian Popow](https://github.com/brianpopow) ### Backers diff --git a/src/ImageSharp/Processing/Extensions/BinaryDiffuseExtensions.cs b/src/ImageSharp/Processing/Extensions/Binarization/BinaryDiffuseExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/BinaryDiffuseExtensions.cs rename to src/ImageSharp/Processing/Extensions/Binarization/BinaryDiffuseExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/BinaryDitherExtensions.cs b/src/ImageSharp/Processing/Extensions/Binarization/BinaryDitherExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/BinaryDitherExtensions.cs rename to src/ImageSharp/Processing/Extensions/Binarization/BinaryDitherExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/BinaryThresholdExtensions.cs b/src/ImageSharp/Processing/Extensions/Binarization/BinaryThresholdExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/BinaryThresholdExtensions.cs rename to src/ImageSharp/Processing/Extensions/Binarization/BinaryThresholdExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/BokehBlurExtensions.cs b/src/ImageSharp/Processing/Extensions/Convolution/BokehBlurExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/BokehBlurExtensions.cs rename to src/ImageSharp/Processing/Extensions/Convolution/BokehBlurExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/BoxBlurExtensions.cs b/src/ImageSharp/Processing/Extensions/Convolution/BoxBlurExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/BoxBlurExtensions.cs rename to src/ImageSharp/Processing/Extensions/Convolution/BoxBlurExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/DetectEdgesExtensions.cs b/src/ImageSharp/Processing/Extensions/Convolution/DetectEdgesExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/DetectEdgesExtensions.cs rename to src/ImageSharp/Processing/Extensions/Convolution/DetectEdgesExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/GaussianBlurExtensions.cs b/src/ImageSharp/Processing/Extensions/Convolution/GaussianBlurExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/GaussianBlurExtensions.cs rename to src/ImageSharp/Processing/Extensions/Convolution/GaussianBlurExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/GaussianSharpenExtensions.cs b/src/ImageSharp/Processing/Extensions/Convolution/GaussianSharpenExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/GaussianSharpenExtensions.cs rename to src/ImageSharp/Processing/Extensions/Convolution/GaussianSharpenExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/DiffuseExtensions.cs b/src/ImageSharp/Processing/Extensions/Dithering/DiffuseExtensions.cs similarity index 99% rename from src/ImageSharp/Processing/Extensions/DiffuseExtensions.cs rename to src/ImageSharp/Processing/Extensions/Dithering/DiffuseExtensions.cs index b72111099..45eb932fe 100644 --- a/src/ImageSharp/Processing/Extensions/DiffuseExtensions.cs +++ b/src/ImageSharp/Processing/Extensions/Dithering/DiffuseExtensions.cs @@ -6,7 +6,7 @@ using System; using SixLabors.ImageSharp.Processing.Processors.Dithering; using SixLabors.Primitives; -namespace SixLabors.ImageSharp.Processing.Dithering +namespace SixLabors.ImageSharp.Processing { /// /// Defines extension methods to apply diffusion to an diff --git a/src/ImageSharp/Processing/Extensions/DitherExtensions.cs b/src/ImageSharp/Processing/Extensions/Dithering/DitherExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/DitherExtensions.cs rename to src/ImageSharp/Processing/Extensions/Dithering/DitherExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/OilPaintExtensions.cs b/src/ImageSharp/Processing/Extensions/Effects/OilPaintExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/OilPaintExtensions.cs rename to src/ImageSharp/Processing/Extensions/Effects/OilPaintExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/PixelateExtensions.cs b/src/ImageSharp/Processing/Extensions/Effects/PixelateExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/PixelateExtensions.cs rename to src/ImageSharp/Processing/Extensions/Effects/PixelateExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/BlackWhiteExtensions.cs b/src/ImageSharp/Processing/Extensions/Filters/BlackWhiteExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/BlackWhiteExtensions.cs rename to src/ImageSharp/Processing/Extensions/Filters/BlackWhiteExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/BrightnessExtensions.cs b/src/ImageSharp/Processing/Extensions/Filters/BrightnessExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/BrightnessExtensions.cs rename to src/ImageSharp/Processing/Extensions/Filters/BrightnessExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/ColorBlindnessExtensions.cs b/src/ImageSharp/Processing/Extensions/Filters/ColorBlindnessExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/ColorBlindnessExtensions.cs rename to src/ImageSharp/Processing/Extensions/Filters/ColorBlindnessExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/ContrastExtensions.cs b/src/ImageSharp/Processing/Extensions/Filters/ContrastExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/ContrastExtensions.cs rename to src/ImageSharp/Processing/Extensions/Filters/ContrastExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/FilterExtensions.cs b/src/ImageSharp/Processing/Extensions/Filters/FilterExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/FilterExtensions.cs rename to src/ImageSharp/Processing/Extensions/Filters/FilterExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/GrayscaleExtensions.cs b/src/ImageSharp/Processing/Extensions/Filters/GrayscaleExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/GrayscaleExtensions.cs rename to src/ImageSharp/Processing/Extensions/Filters/GrayscaleExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/HueExtensions.cs b/src/ImageSharp/Processing/Extensions/Filters/HueExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/HueExtensions.cs rename to src/ImageSharp/Processing/Extensions/Filters/HueExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/InvertExtensions.cs b/src/ImageSharp/Processing/Extensions/Filters/InvertExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/InvertExtensions.cs rename to src/ImageSharp/Processing/Extensions/Filters/InvertExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/KodachromeExtensions.cs b/src/ImageSharp/Processing/Extensions/Filters/KodachromeExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/KodachromeExtensions.cs rename to src/ImageSharp/Processing/Extensions/Filters/KodachromeExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/LightnessExtensions.cs b/src/ImageSharp/Processing/Extensions/Filters/LightnessExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/LightnessExtensions.cs rename to src/ImageSharp/Processing/Extensions/Filters/LightnessExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/LomographExtensions.cs b/src/ImageSharp/Processing/Extensions/Filters/LomographExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/LomographExtensions.cs rename to src/ImageSharp/Processing/Extensions/Filters/LomographExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/OpacityExtensions.cs b/src/ImageSharp/Processing/Extensions/Filters/OpacityExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/OpacityExtensions.cs rename to src/ImageSharp/Processing/Extensions/Filters/OpacityExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/PolaroidExtensions.cs b/src/ImageSharp/Processing/Extensions/Filters/PolaroidExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/PolaroidExtensions.cs rename to src/ImageSharp/Processing/Extensions/Filters/PolaroidExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/SaturateExtensions.cs b/src/ImageSharp/Processing/Extensions/Filters/SaturateExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/SaturateExtensions.cs rename to src/ImageSharp/Processing/Extensions/Filters/SaturateExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/SepiaExtensions.cs b/src/ImageSharp/Processing/Extensions/Filters/SepiaExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/SepiaExtensions.cs rename to src/ImageSharp/Processing/Extensions/Filters/SepiaExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/HistogramEqualizationExtensions.cs b/src/ImageSharp/Processing/Extensions/Normalization/HistogramEqualizationExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/HistogramEqualizationExtensions.cs rename to src/ImageSharp/Processing/Extensions/Normalization/HistogramEqualizationExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/BackgroundColorExtensions.cs b/src/ImageSharp/Processing/Extensions/Overlays/BackgroundColorExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/BackgroundColorExtensions.cs rename to src/ImageSharp/Processing/Extensions/Overlays/BackgroundColorExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/GlowExtensions.cs b/src/ImageSharp/Processing/Extensions/Overlays/GlowExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/GlowExtensions.cs rename to src/ImageSharp/Processing/Extensions/Overlays/GlowExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/VignetteExtensions.cs b/src/ImageSharp/Processing/Extensions/Overlays/VignetteExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/VignetteExtensions.cs rename to src/ImageSharp/Processing/Extensions/Overlays/VignetteExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/QuantizeExtensions.cs b/src/ImageSharp/Processing/Extensions/Quantization/QuantizeExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/QuantizeExtensions.cs rename to src/ImageSharp/Processing/Extensions/Quantization/QuantizeExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/AutoOrientExtensions.cs b/src/ImageSharp/Processing/Extensions/Transforms/AutoOrientExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/AutoOrientExtensions.cs rename to src/ImageSharp/Processing/Extensions/Transforms/AutoOrientExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/CropExtensions.cs b/src/ImageSharp/Processing/Extensions/Transforms/CropExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/CropExtensions.cs rename to src/ImageSharp/Processing/Extensions/Transforms/CropExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/EntropyCropExtensions.cs b/src/ImageSharp/Processing/Extensions/Transforms/EntropyCropExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/EntropyCropExtensions.cs rename to src/ImageSharp/Processing/Extensions/Transforms/EntropyCropExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/FlipExtensions.cs b/src/ImageSharp/Processing/Extensions/Transforms/FlipExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/FlipExtensions.cs rename to src/ImageSharp/Processing/Extensions/Transforms/FlipExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/PadExtensions.cs b/src/ImageSharp/Processing/Extensions/Transforms/PadExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/PadExtensions.cs rename to src/ImageSharp/Processing/Extensions/Transforms/PadExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/ResizeExtensions.cs b/src/ImageSharp/Processing/Extensions/Transforms/ResizeExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/ResizeExtensions.cs rename to src/ImageSharp/Processing/Extensions/Transforms/ResizeExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/RotateExtensions.cs b/src/ImageSharp/Processing/Extensions/Transforms/RotateExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/RotateExtensions.cs rename to src/ImageSharp/Processing/Extensions/Transforms/RotateExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/RotateFlipExtensions.cs b/src/ImageSharp/Processing/Extensions/Transforms/RotateFlipExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/RotateFlipExtensions.cs rename to src/ImageSharp/Processing/Extensions/Transforms/RotateFlipExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/SkewExtensions.cs b/src/ImageSharp/Processing/Extensions/Transforms/SkewExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/SkewExtensions.cs rename to src/ImageSharp/Processing/Extensions/Transforms/SkewExtensions.cs diff --git a/src/ImageSharp/Processing/Extensions/TransformExtensions.cs b/src/ImageSharp/Processing/Extensions/Transforms/TransformExtensions.cs similarity index 100% rename from src/ImageSharp/Processing/Extensions/TransformExtensions.cs rename to src/ImageSharp/Processing/Extensions/Transforms/TransformExtensions.cs diff --git a/tests/ImageSharp.Benchmarks/Samplers/Diffuse.cs b/tests/ImageSharp.Benchmarks/Samplers/Diffuse.cs index 6e67d11ef..c2b9cdc19 100644 --- a/tests/ImageSharp.Benchmarks/Samplers/Diffuse.cs +++ b/tests/ImageSharp.Benchmarks/Samplers/Diffuse.cs @@ -1,7 +1,6 @@ using BenchmarkDotNet.Attributes; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; -using SixLabors.ImageSharp.Processing.Dithering; using SixLabors.Primitives; namespace SixLabors.ImageSharp.Benchmarks.Samplers diff --git a/tests/ImageSharp.Tests/Processing/Dithering/DitherTest.cs b/tests/ImageSharp.Tests/Processing/Dithering/DitherTest.cs index c5d18cbb2..53a50468b 100644 --- a/tests/ImageSharp.Tests/Processing/Dithering/DitherTest.cs +++ b/tests/ImageSharp.Tests/Processing/Dithering/DitherTest.cs @@ -4,7 +4,6 @@ using System; using SixLabors.ImageSharp.Processing; -using SixLabors.ImageSharp.Processing.Dithering; using SixLabors.ImageSharp.Processing.Processors.Dithering; using Xunit; diff --git a/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs index 5417bc1f3..5d65a9e61 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs @@ -1,9 +1,8 @@ -// Copyright (c) Six Labors and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; -using SixLabors.ImageSharp.Processing.Dithering; using SixLabors.ImageSharp.Processing.Processors.Dithering; using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; @@ -149,4 +148,4 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Binarization appendPixelTypeToFileName: false); } } -} \ No newline at end of file +}