Merge branch 'master' into cq3

src/ImageSharp.Drawing/Primitives/ShapePath.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using SixLabors.ImageSharp.Processing.Drawing.Pens;
+using SixLabors.ImageSharp.Processing;
 using SixLabors.Shapes;
 
 namespace SixLabors.ImageSharp.Primitives

src/ImageSharp.Drawing/Processing/Drawing/Brushes/BrushApplicator.cs → src/ImageSharp.Drawing/Processing/BrushApplicator.cs

@@ -6,7 +6,7 @@ using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Memory;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// primitive that converts a point in to a color for discovering the fill color based on an implementation

src/ImageSharp.Drawing/Processing/Drawing/Brushes/Brushes.cs → src/ImageSharp.Drawing/Processing/Brushes.cs

@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// A collection of methods for creating generic brushes.

src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/ColorStop{TPixel}.cs → src/ImageSharp.Drawing/Processing/ColorStop{TPixel}.cs

@@ -1,8 +1,11 @@
-using System.Diagnostics;
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System.Diagnostics;
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes.GradientBrushes
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// A struct that defines a single color stop.

src/ImageSharp.Drawing/Processing/Drawing/DrawBezierExtensions.cs → src/ImageSharp.Drawing/Processing/DrawBezierExtensions.cs

@@ -2,12 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Drawing.Pens;
 using SixLabors.Primitives;
 using SixLabors.Shapes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the drawing of Bezier paths to the <see cref="Image{TPixel}"/> type.

src/ImageSharp.Drawing/Processing/Drawing/DrawImageExtensions.cs → src/ImageSharp.Drawing/Processing/DrawImageExtensions.cs

@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Drawing;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the drawing of images to the <see cref="Image{TPixel}"/> type.

src/ImageSharp.Drawing/Processing/Drawing/DrawLineExtensions.cs → src/ImageSharp.Drawing/Processing/DrawLineExtensions.cs

@@ -2,12 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Drawing.Pens;
 using SixLabors.Primitives;
 using SixLabors.Shapes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the drawing of lines to the <see cref="Image{TPixel}"/> type.

src/ImageSharp.Drawing/Processing/Drawing/DrawPathCollectionExtensions.cs → src/ImageSharp.Drawing/Processing/DrawPathCollectionExtensions.cs

@@ -2,11 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Drawing.Pens;
 using SixLabors.Shapes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the drawing of collections of polygon outlines to the <see cref="Image{TPixel}"/> type.

src/ImageSharp.Drawing/Processing/Drawing/DrawPathExtensions.cs → src/ImageSharp.Drawing/Processing/DrawPathExtensions.cs

@@ -3,11 +3,9 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Drawing.Pens;
 using SixLabors.Shapes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the drawing of polygon outlines to the <see cref="Image{TPixel}"/> type.

src/ImageSharp.Drawing/Processing/Drawing/DrawPolygonExtensions.cs → src/ImageSharp.Drawing/Processing/DrawPolygonExtensions.cs

@@ -2,12 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Drawing.Pens;
 using SixLabors.Primitives;
 using SixLabors.Shapes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the drawing of closed linear polygons to the <see cref="Image{TPixel}"/> type.

src/ImageSharp.Drawing/Processing/Drawing/DrawRectangleExtensions.cs → src/ImageSharp.Drawing/Processing/DrawRectangleExtensions.cs

@@ -2,12 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Drawing.Pens;
 using SixLabors.Primitives;
 using SixLabors.Shapes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the drawing of rectangles to the <see cref="Image{TPixel}"/> type.

src/ImageSharp.Drawing/Processing/Text/DrawTextExtensions.cs → src/ImageSharp.Drawing/Processing/DrawTextExtensions.cs

@@ -3,17 +3,15 @@
 
 using SixLabors.Fonts;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Drawing.Pens;
-using SixLabors.ImageSharp.Processing.Text.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Text;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Text
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the drawing of text to the <see cref="Image{TPixel}"/> type.
     /// </summary>
-    public static partial class DrawTextExtensions
+    public static class DrawTextExtensions
     {
         /// <summary>
         /// Draws the text onto the the image filled via the brush.

src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/EllipticGradientBrush{TPixel}.cs → src/ImageSharp.Drawing/Processing/EllipticGradientBrush{TPixel}.cs

@@ -1,9 +1,12 @@
-using System;
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes.GradientBrushes
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Gradient Brush with elliptic shape.

src/ImageSharp.Drawing/Processing/Drawing/FillPathBuilderExtensions.cs → src/ImageSharp.Drawing/Processing/FillPathBuilderExtensions.cs

@@ -3,10 +3,9 @@
 
 using System;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
 using SixLabors.Shapes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the filling of polygons with various brushes to the <see cref="Image{TPixel}"/> type.

src/ImageSharp.Drawing/Processing/Drawing/FillPathCollectionExtensions.cs → src/ImageSharp.Drawing/Processing/FillPathCollectionExtensions.cs

@@ -2,10 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
 using SixLabors.Shapes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the filling of collections of polygon outlines to the <see cref="Image{TPixel}"/> type.

src/ImageSharp.Drawing/Processing/Drawing/FillPathExtensions.cs → src/ImageSharp.Drawing/Processing/FillPathExtensions.cs

@@ -3,10 +3,9 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
 using SixLabors.Shapes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the filling of polygon outlines to the <see cref="Image{TPixel}"/> type.

src/ImageSharp.Drawing/Processing/Drawing/FillPolygonExtensions.cs → src/ImageSharp.Drawing/Processing/FillPolygonExtensions.cs

@@ -2,11 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
 using SixLabors.Primitives;
 using SixLabors.Shapes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the filling of closed linear polygons to the <see cref="Image{TPixel}"/> type.

src/ImageSharp.Drawing/Processing/Drawing/FillRectangleExtensions.cs → src/ImageSharp.Drawing/Processing/FillRectangleExtensions.cs

@@ -2,11 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
 using SixLabors.Primitives;
 using SixLabors.Shapes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the filling of rectangles to the <see cref="Image{TPixel}"/> type.

src/ImageSharp.Drawing/Processing/Drawing/FillRegionExtensions.cs → src/ImageSharp.Drawing/Processing/FillRegionExtensions.cs

@@ -3,10 +3,9 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Drawing.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Drawing;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the filling of regions with various brushes to the <see cref="Image{TPixel}"/> type.

src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/GradientBrushBase{TPixel}.cs → src/ImageSharp.Drawing/Processing/GradientBrushBase{TPixel}.cs

@@ -1,11 +1,14 @@
-using System;
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
 using System.Numerics;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.PixelFormats.PixelBlenders;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes.GradientBrushes
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Base class for Gradient brushes

src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/GradientRepetitionMode.cs → src/ImageSharp.Drawing/Processing/GradientRepetitionMode.cs

@@ -1,4 +1,7 @@
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes.GradientBrushes
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Modes to repeat a gradient.

src/ImageSharp.Drawing/Processing/Drawing/Brushes/IBrush.cs → src/ImageSharp.Drawing/Processing/IBrush.cs

@@ -4,7 +4,7 @@
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Brush represents a logical configuration of a brush which can be used to source pixel colors

src/ImageSharp.Drawing/Processing/Drawing/Pens/IPen.cs → src/ImageSharp.Drawing/Processing/IPen.cs

@@ -3,9 +3,8 @@
 
 using System;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Pens
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Interface representing a Pen

src/ImageSharp.Drawing/Processing/Drawing/Brushes/ImageBrush{TPixel}.cs → src/ImageSharp.Drawing/Processing/ImageBrush{TPixel}.cs

@@ -7,7 +7,7 @@ using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Provides an implementation of an image brush for painting images within areas.

src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/LinearGradientBrush{TPixel}.cs → src/ImageSharp.Drawing/Processing/LinearGradientBrush{TPixel}.cs

@@ -1,9 +1,12 @@
-using System;
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes.GradientBrushes
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Provides an implementation of a brush for painting linear gradients within areas.

src/ImageSharp.Drawing/Processing/Drawing/Brushes/PatternBrush{TPixel}.cs → src/ImageSharp.Drawing/Processing/PatternBrush{TPixel}.cs

@@ -9,7 +9,7 @@ using SixLabors.ImageSharp.Primitives;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Provides an implementation of a pattern brush for painting patterns.

src/ImageSharp.Drawing/Processing/Drawing/Pens/Pens.cs → src/ImageSharp.Drawing/Processing/Pens.cs

@@ -2,9 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Pens
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Contains a collection of common Pen styles

src/ImageSharp.Drawing/Processing/Drawing/Pens/Pen{TPixel}.cs → src/ImageSharp.Drawing/Processing/Pen{TPixel}.cs

@@ -3,9 +3,8 @@
 
 using System;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Pens
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Provides a pen that can apply a pattern to a line with a set brush and thickness
@@ -25,7 +24,7 @@ namespace SixLabors.ImageSharp.Processing.Drawing.Pens
         private readonly float[] pattern;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Drawing.Pens.Pen{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="Pen{TPixel}"/> class.
         /// </summary>
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
@@ -36,7 +35,7 @@ namespace SixLabors.ImageSharp.Processing.Drawing.Pens
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Drawing.Pens.Pen{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="Pen{TPixel}"/> class.
         /// </summary>
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
@@ -49,7 +48,7 @@ namespace SixLabors.ImageSharp.Processing.Drawing.Pens
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Drawing.Pens.Pen{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="Pen{TPixel}"/> class.
         /// </summary>
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
@@ -59,7 +58,7 @@ namespace SixLabors.ImageSharp.Processing.Drawing.Pens
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Drawing.Pens.Pen{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="Pen{TPixel}"/> class.
         /// </summary>
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>

src/ImageSharp.Drawing/Processing/Drawing/Processors/DrawImageProcessor.cs → src/ImageSharp.Drawing/Processing/Processors/Drawing/DrawImageProcessor.cs

@@ -5,11 +5,10 @@ using System;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Drawing
 {
     /// <summary>
     /// Combines two images together by blending the pixels.

src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs → src/ImageSharp.Drawing/Processing/Processors/Drawing/FillProcessor.cs

@@ -5,12 +5,11 @@ using System;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Processors;
+using SixLabors.ImageSharp.Processing;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Drawing
 {
     /// <summary>
     /// Using the brush as a source of pixels colors blends the brush color with source.

src/ImageSharp.Drawing/Processing/Drawing/Processors/FillRegionProcessor.cs → src/ImageSharp.Drawing/Processing/Processors/Drawing/FillRegionProcessor.cs

@@ -4,13 +4,11 @@
 using System;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.ImageSharp.Utils;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Drawing
 {
     /// <summary>
     /// Using a brush and a shape fills shape with contents of brush the

src/ImageSharp.Drawing/Processing/Text/Processors/DrawTextProcessor.cs → src/ImageSharp.Drawing/Processing/Processors/Text/DrawTextProcessor.cs

@@ -6,15 +6,12 @@ using System.Collections.Generic;
 using SixLabors.Fonts;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Drawing.Pens;
-using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.ImageSharp.Utils;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 using SixLabors.Shapes;
 
-namespace SixLabors.ImageSharp.Processing.Text.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Text
 {
     /// <summary>
     /// Using the brush as a source of pixels colors blends the brush color with source.

src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/RadialGradientBrush{TPixel}.cs → src/ImageSharp.Drawing/Processing/RadialGradientBrush{TPixel}.cs

@@ -1,9 +1,12 @@
-using System;
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes.GradientBrushes
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// A Circular Gradient Brush, defined by center point and radius.

src/ImageSharp.Drawing/Processing/Drawing/Brushes/RecolorBrush{TPixel}.cs → src/ImageSharp.Drawing/Processing/RecolorBrush{TPixel}.cs

@@ -8,14 +8,14 @@ using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Provides an implementation of a brush that can recolor an image
     /// </summary>
     /// <typeparam name="TPixel">The pixel format.</typeparam>
     public class RecolorBrush<TPixel> : IBrush<TPixel>
-    where TPixel : struct, IPixel<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RecolorBrush{TPixel}" /> class.

src/ImageSharp.Drawing/Processing/Drawing/Brushes/SolidBrush{TPixel}.cs → src/ImageSharp.Drawing/Processing/SolidBrush{TPixel}.cs

@@ -7,7 +7,7 @@ using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Provides an implementation of a solid brush for painting solid color areas.

src/ImageSharp.Drawing/Processing/Text/TextGraphicsOptions.cs → src/ImageSharp.Drawing/Processing/TextGraphicsOptions.cs

@@ -4,7 +4,7 @@
 using SixLabors.Fonts;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Text
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Options for influencing the drawing functions.

src/ImageSharp/Formats/Gif/GifEncoder.cs

@@ -5,7 +5,7 @@ using System.IO;
 using System.Text;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Quantization;
+using SixLabors.ImageSharp.Processing.Processors.Quantization;
 
 namespace SixLabors.ImageSharp.Formats.Gif
 {

src/ImageSharp/Formats/Gif/GifEncoderCore.cs

@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Quantization;
+using SixLabors.ImageSharp.Processing.Processors.Quantization;
 using SixLabors.Memory;
 
 namespace SixLabors.ImageSharp.Formats.Gif

src/ImageSharp/Formats/Gif/IGifEncoderOptions.cs

@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.Text;
-using SixLabors.ImageSharp.Processing.Quantization;
+using SixLabors.ImageSharp.Processing.Processors.Quantization;
 
 namespace SixLabors.ImageSharp.Formats.Gif
 {

src/ImageSharp/Formats/Png/IPngEncoderOptions.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using SixLabors.ImageSharp.Processing.Quantization;
+using SixLabors.ImageSharp.Processing.Processors.Quantization;
 
 namespace SixLabors.ImageSharp.Formats.Png
 {

src/ImageSharp/Formats/Png/PngEncoder.cs

@@ -4,7 +4,7 @@
 using System.IO;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Quantization;
+using SixLabors.ImageSharp.Processing.Processors.Quantization;
 
 namespace SixLabors.ImageSharp.Formats.Png
 {

src/ImageSharp/Formats/Png/PngEncoderCore.cs

@@ -9,7 +9,7 @@ using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Formats.Png.Filters;
 using SixLabors.ImageSharp.Formats.Png.Zlib;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Quantization;
+using SixLabors.ImageSharp.Processing.Processors.Quantization;
 using SixLabors.Memory;
 
 namespace SixLabors.ImageSharp.Formats.Png

src/ImageSharp/Processing/Transforms/AnchorPositionMode.cs → src/ImageSharp/Processing/AnchorPositionMode.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Enumerated anchor positions to apply to resized images.

src/ImageSharp/Processing/Transforms/AutoOrientExtensions.cs → src/ImageSharp/Processing/AutoOrientExtensions.cs

@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of auto-orientation operations to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Overlays/BackgroundColorExtensions.cs → src/ImageSharp/Processing/BackgroundColorExtensions.cs

@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Overlays.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Overlays;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Overlays
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of a background color to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Binarization/BinaryDiffuseExtensions.cs → src/ImageSharp/Processing/BinaryDiffuseExtensions.cs

@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Binarization.Processors;
-using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
+using SixLabors.ImageSharp.Processing.Processors.Binarization;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Binarization
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds binary diffusion extensions to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Binarization/BinaryDitherExtensions.cs → src/ImageSharp/Processing/BinaryDitherExtensions.cs

@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Binarization.Processors;
-using SixLabors.ImageSharp.Processing.Dithering.Ordered;
+using SixLabors.ImageSharp.Processing.Processors.Binarization;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Binarization
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds binary dithering extensions to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Binarization/BinaryThresholdExtensions.cs → src/ImageSharp/Processing/BinaryThresholdExtensions.cs

@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Binarization.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Binarization;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Binarization
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds binary thresholding extensions to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Filters/BlackWhiteExtensions.cs → src/ImageSharp/Processing/BlackWhiteExtensions.cs

@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of black and white toning to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Convolution/BoxBlurExtensions.cs → src/ImageSharp/Processing/BoxBlurExtensions.cs

@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Convolution.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Convolution;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds box blurring extensions to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Filters/BrightnessExtensions.cs → src/ImageSharp/Processing/BrightnessExtensions.cs

@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the alteration of the brightness component to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Filters/ColorBlindnessExtensions.cs → src/ImageSharp/Processing/ColorBlindnessExtensions.cs

@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
 using SixLabors.ImageSharp.Processing.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that simulate the effects of various color blindness disorders to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Filters/ColorBlindnessMode.cs → src/ImageSharp/Processing/ColorBlindnessMode.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Enumerates the various types of defined color blindness filters.

src/ImageSharp/Processing/Filters/ContrastExtensions.cs → src/ImageSharp/Processing/ContrastExtensions.cs

@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the alteration of the contrast component to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Transforms/CropExtensions.cs → src/ImageSharp/Processing/CropExtensions.cs

@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of cropping operations to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Convolution/DetectEdgesExtensions.cs → src/ImageSharp/Processing/DetectEdgesExtensions.cs

@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Convolution.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Convolution;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds edge detection extensions to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Dithering/DiffuseExtensions.cs → src/ImageSharp/Processing/DiffuseExtensions.cs

@@ -2,8 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
-using SixLabors.ImageSharp.Processing.Dithering.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 using SixLabors.Primitives;
 
 namespace SixLabors.ImageSharp.Processing.Dithering

src/ImageSharp/Processing/Dithering/DitherExtensions.cs → src/ImageSharp/Processing/DitherExtensions.cs

@@ -2,11 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Dithering.Ordered;
-using SixLabors.ImageSharp.Processing.Dithering.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Dithering
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds dithering extensions to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Convolution/EdgeDetectionOperators.cs → src/ImageSharp/Processing/EdgeDetectionOperators.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Convolution
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Enumerates the various types of defined edge detection filters.

src/ImageSharp/Processing/Transforms/EntropyCropExtensions.cs → src/ImageSharp/Processing/EntropyCropExtensions.cs

@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of entropy cropping operations to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Filters/FilterExtensions.cs → src/ImageSharp/Processing/FilterExtensions.cs

@@ -3,10 +3,10 @@
 
 using System.Numerics;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of composable filters to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Transforms/FlipExtensions.cs → src/ImageSharp/Processing/FlipExtensions.cs

@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of flipping operations to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Transforms/FlipMode.cs → src/ImageSharp/Processing/FlipMode.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Provides enumeration over how a image should be flipped.

src/ImageSharp/Processing/Convolution/GaussianBlurExtensions.cs → src/ImageSharp/Processing/GaussianBlurExtensions.cs

@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Convolution.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Convolution;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds Gaussian blurring extensions to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Convolution/GaussianSharpenExtensions.cs → src/ImageSharp/Processing/GaussianSharpenExtensions.cs

@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Convolution.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Convolution;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds Gaussian sharpening extensions to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Overlays/GlowExtensions.cs → src/ImageSharp/Processing/GlowExtensions.cs

@@ -3,10 +3,10 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Overlays.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Overlays;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Overlays
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of a radial glow to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Filters/GrayscaleExtensions.cs → src/ImageSharp/Processing/GrayscaleExtensions.cs

@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
 using SixLabors.ImageSharp.Processing.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of grayscale toning to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Filters/GrayscaleMode.cs → src/ImageSharp/Processing/GrayscaleMode.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Enumerates the various types of defined grayscale filters.

src/ImageSharp/Processing/Filters/HueExtensions.cs → src/ImageSharp/Processing/HueExtensions.cs

@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the alteration of the hue component to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Filters/InvertExtensions.cs → src/ImageSharp/Processing/InvertExtensions.cs

@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the inversion of colors to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Dithering/KnownDiffusers.cs → src/ImageSharp/Processing/KnownDiffusers.cs

@@ -1,9 +1,9 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 
-namespace SixLabors.ImageSharp.Processing.Dithering
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Contains reusable static instances of known error diffusion algorithms

src/ImageSharp/Processing/Dithering/KnownDitherers.cs → src/ImageSharp/Processing/KnownDitherers.cs

@@ -1,14 +1,14 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using SixLabors.ImageSharp.Processing.Dithering.Ordered;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 
-namespace SixLabors.ImageSharp.Processing.Dithering
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Contains reusable static instances of known ordered dither matrices
     /// </summary>
-    public class KnownDitherers
+    public static class KnownDitherers
     {
         /// <summary>
         /// Gets the order ditherer using the 2x2 Bayer dithering matrix

src/ImageSharp/Processing/Filters/KnownFilterMatrices.cs → src/ImageSharp/Processing/KnownFilterMatrices.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Numerics;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// A collection of known <see cref="Matrix4x4"/> values for composing filters
@@ -314,7 +314,7 @@ namespace SixLabors.ImageSharp.Processing.Filters
         public static Matrix4x4 CreateHueFilter(float degrees)
         {
             // Wrap the angle round at 360.
-            degrees = degrees % 360;
+            degrees %= 360;
 
             // Make sure it's not negative.
             while (degrees < 0)

src/ImageSharp/Processing/Quantization/KnownQuantizers.cs → src/ImageSharp/Processing/KnownQuantizers.cs

@@ -1,7 +1,9 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Quantization
+using SixLabors.ImageSharp.Processing.Processors.Quantization;
+
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Contains reusable static instances of known quantizing algorithms

src/ImageSharp/Processing/Transforms/KnownResamplers.cs → src/ImageSharp/Processing/KnownResamplers.cs

@@ -1,9 +1,9 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using SixLabors.ImageSharp.Processing.Transforms.Resamplers;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Contains reusable static instances of known resampling algorithms

src/ImageSharp/Processing/Filters/KodachromeExtensions.cs → src/ImageSharp/Processing/KodachromeExtensions.cs

@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the recreation of an old Kodachrome camera effect to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Filters/LomographExtensions.cs → src/ImageSharp/Processing/LomographExtensions.cs

@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the recreation of an old Lomograph camera effect to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Effects/OilPaintExtensions.cs → src/ImageSharp/Processing/OilPaintExtensions.cs

@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Effects.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Effects;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Effects
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds oil painting effect extensions to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Filters/OpacityExtensions.cs → src/ImageSharp/Processing/OpacityExtensions.cs

@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the alteration of the opacity component to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Transforms/OrientationMode.cs → src/ImageSharp/Processing/OrientationMode.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Enumerates the available orientation values supplied by EXIF metadata.

src/ImageSharp/Processing/Transforms/PadExtensions.cs → src/ImageSharp/Processing/PadExtensions.cs

@@ -4,7 +4,7 @@
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of padding operations to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Effects/PixelateExtensions.cs → src/ImageSharp/Processing/PixelateExtensions.cs

@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Effects.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Effects;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Effects
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds pixelation effect extensions to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Filters/PolaroidExtensions.cs → src/ImageSharp/Processing/PolaroidExtensions.cs

@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the recreation of an old Polaroid camera effect to the <see cref="Image{TPixel}"/> type.

src/ImageSharp/Processing/Binarization/Processors/BinaryErrorDiffusionProcessor.cs → src/ImageSharp/Processing/Processors/Binarization/BinaryErrorDiffusionProcessor.cs

@@ -4,11 +4,10 @@
 using System;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
-using SixLabors.ImageSharp.Processing.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Binarization.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Binarization
 {
     /// <summary>
     /// Performs binary threshold filtering against an image using error diffusion.

src/ImageSharp/Processing/Binarization/Processors/BinaryOrderedDitherProcessor.cs → src/ImageSharp/Processing/Processors/Binarization/BinaryOrderedDitherProcessor.cs

@@ -4,11 +4,10 @@
 using System;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Dithering.Ordered;
-using SixLabors.ImageSharp.Processing.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Binarization.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Binarization
 {
     /// <summary>
     /// Performs binary threshold filtering against an image using ordered dithering.

src/ImageSharp/Processing/Binarization/Processors/BinaryThresholdProcessor.cs → src/ImageSharp/Processing/Processors/Binarization/BinaryThresholdProcessor.cs

@@ -8,7 +8,7 @@ using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Binarization.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Binarization
 {
     /// <summary>
     /// Performs simple binary threshold filtering against an image.

src/ImageSharp/Processing/Convolution/Processors/BoxBlurProcessor.cs → src/ImageSharp/Processing/Processors/Convolution/BoxBlurProcessor.cs

@@ -3,10 +3,9 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Applies box blur processing to the image.

src/ImageSharp/Processing/Convolution/Processors/Convolution2DProcessor.cs → src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor.cs

@@ -7,11 +7,10 @@ using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Defines a processor that uses two one-dimensional matrices to perform convolution against an image.

src/ImageSharp/Processing/Convolution/Processors/Convolution2PassProcessor.cs → src/ImageSharp/Processing/Processors/Convolution/Convolution2PassProcessor.cs

@@ -10,7 +10,7 @@ using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Defines a processor that uses two one-dimensional matrices to perform two-pass convolution against an image.

src/ImageSharp/Processing/Convolution/Processors/ConvolutionProcessor.cs → src/ImageSharp/Processing/Processors/Convolution/ConvolutionProcessor.cs

@@ -11,7 +11,7 @@ using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Defines a processor that uses a 2 dimensional matrix to perform convolution against an image.

src/ImageSharp/Processing/Convolution/Processors/EdgeDetector2DProcessor.cs → src/ImageSharp/Processing/Processors/Convolution/EdgeDetector2DProcessor.cs

@@ -3,11 +3,10 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
-using SixLabors.ImageSharp.Processing.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Defines a processor that detects edges within an image using two one-dimensional matrices.

src/ImageSharp/Processing/Convolution/Processors/EdgeDetectorCompassProcessor.cs → src/ImageSharp/Processing/Processors/Convolution/EdgeDetectorCompassProcessor.cs

@@ -8,12 +8,11 @@ using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
-using SixLabors.ImageSharp.Processing.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Defines a processor that detects edges within an image using a eight two dimensional matrices.

src/ImageSharp/Processing/Convolution/Processors/EdgeDetectorProcessor.cs → src/ImageSharp/Processing/Processors/Convolution/EdgeDetectorProcessor.cs

@@ -3,11 +3,10 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
-using SixLabors.ImageSharp.Processing.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Defines a processor that detects edges within an image using a single two dimensional matrix.

src/ImageSharp/Processing/Convolution/Processors/GaussianBlurProcessor.cs → src/ImageSharp/Processing/Processors/Convolution/GaussianBlurProcessor.cs

@@ -7,7 +7,7 @@ using SixLabors.ImageSharp.Primitives;
 using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Applies Gaussian blur processing to the image.

src/ImageSharp/Processing/Convolution/Processors/GaussianSharpenProcessor.cs → src/ImageSharp/Processing/Processors/Convolution/GaussianSharpenProcessor.cs

@@ -4,10 +4,9 @@
 using System;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Applies Gaussian sharpening processing to the image.
@@ -160,14 +159,14 @@ namespace SixLabors.ImageSharp.Processing.Convolution.Processors
             {
                 for (int i = 0; i < size; i++)
                 {
-                    kernel[0, i] = kernel[0, i] / sum;
+                    kernel[0, i] /= sum;
                 }
             }
             else
             {
                 for (int i = 0; i < size; i++)
                 {
-                    kernel[i, 0] = kernel[i, 0] / sum;
+                    kernel[i, 0] /= sum;
                 }
             }
 

src/ImageSharp/Processing/Convolution/Processors/IEdgeDetectorProcessor.cs → src/ImageSharp/Processing/Processors/Convolution/IEdgeDetectorProcessor.cs

@@ -4,7 +4,7 @@
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing.Processors;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Provides properties and methods allowing the detection of edges within an image.

src/ImageSharp/Processing/Convolution/Processors/KayyaliKernels.cs → src/ImageSharp/Processing/Processors/Convolution/KayyaliKernels.cs

@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Contains the kernels used for Kayyali edge detection

src/ImageSharp/Processing/Convolution/Processors/KayyaliProcessor.cs → src/ImageSharp/Processing/Processors/Convolution/KayyaliProcessor.cs

@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Applies edge detection processing to the image using the Kayyali operator filter. <see href="http://edgedetection.webs.com/"/>

src/ImageSharp/Processing/Convolution/Processors/KirschProcessor.cs → src/ImageSharp/Processing/Processors/Convolution/KirschProcessor.cs

@@ -4,7 +4,7 @@
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Applies edge detection processing to the image using the Kirsch operator filter. <see href="http://en.wikipedia.org/wiki/Kirsch_operator"/>

src/ImageSharp/Processing/Convolution/Processors/KirshKernels.cs → src/ImageSharp/Processing/Processors/Convolution/KirshKernels.cs

@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Contains the eight matrices used for Kirsh edge detection