Merge remote-tracking branch 'origin/master' into simplified-IPixel

Conflicts:
	src/ImageSharp.Formats.Bmp/BmpDecoder.cs
	src/ImageSharp.Formats.Bmp/BmpEncoder.cs
	src/ImageSharp.Formats.Gif/GifDecoder.cs
	src/ImageSharp.Formats.Gif/GifEncoder.cs
	src/ImageSharp.Formats.Jpeg/JpegDecoder.cs
	src/ImageSharp.Formats.Png/PngEncoder.cs

src/ImageSharp.Formats.Bmp/BmpDecoder.cs

@@ -27,8 +27,8 @@ namespace ImageSharp.Formats
     {
         /// <inheritdoc/>
         public void Decode<TColor>(Image<TColor> image, Stream stream)
-        where TColor : struct, IPixel<TColor>
+            where TColor : struct, IPixel<TColor>
-                {
+        {
             Guard.NotNull(image, "image");
             Guard.NotNull(stream, "stream");
 

src/ImageSharp.Formats.Bmp/BmpEncoder.cs

@@ -22,7 +22,7 @@ namespace ImageSharp.Formats
         /// <inheritdoc/>
         public void Encode<TColor>(Image<TColor> image, Stream stream)
             where TColor : struct, IPixel<TColor>
-                    {
+        {
             BmpEncoderCore encoder = new BmpEncoderCore();
             encoder.Encode(image, stream, this.BitsPerPixel);
         }

src/ImageSharp.Formats.Gif/GifDecoder.cs

@@ -16,7 +16,7 @@ namespace ImageSharp.Formats
         /// <inheritdoc/>
         public void Decode<TColor>(Image<TColor> image, Stream stream)
             where TColor : struct, IPixel<TColor>
-                    {
+        {
             new GifDecoderCore<TColor>().Decode(image, stream);
         }
     }

src/ImageSharp.Formats.Gif/GifEncoder.cs

@@ -33,8 +33,8 @@ namespace ImageSharp.Formats
 
         /// <inheritdoc/>
         public void Encode<TColor>(Image<TColor> image, Stream stream)
-        where TColor : struct, IPixel<TColor>
+            where TColor : struct, IPixel<TColor>
-                {
+        {
             GifEncoderCore encoder = new GifEncoderCore
             {
                 Quality = this.Quality,

src/ImageSharp.Formats.Jpeg/JpegDecoder.cs

@@ -16,7 +16,7 @@ namespace ImageSharp.Formats
         /// <inheritdoc/>
         public void Decode<TColor>(Image<TColor> image, Stream stream)
             where TColor : struct, IPixel<TColor>
-                    {
+        {
             Guard.NotNull(image, "image");
             Guard.NotNull(stream, "stream");
 

src/ImageSharp.Formats.Png/PngEncoder.cs

@@ -58,7 +58,7 @@ namespace ImageSharp.Formats
         /// <inheritdoc/>
         public void Encode<TColor>(Image<TColor> image, Stream stream)
             where TColor : struct, IPixel<TColor>
-                    {
+        {
             PngEncoderCore encoder = new PngEncoderCore
             {
                 CompressionLevel = this.CompressionLevel,