From 1e5fac8ff90eacd37271458aeeda41cc59a75003 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Wed, 28 Oct 2015 14:25:16 +1100
Subject: [PATCH] Update to NET 4.6 etc

Former-commit-id: 13504b6bd87f681d061848d19c5f3cb607e96dc6
Former-commit-id: eff308eb2d06484cbe38ef3a808f29584233ac6e
Former-commit-id: fc96b270e55c0ed1d7dd47e2769402c348bf298e
---
 src/ImageProcessor/Colors/Bgra.cs             |  2 +-
 src/ImageProcessor/Colors/Cmyk.cs             |  2 +-
 src/ImageProcessor/Colors/Hsv.cs              |  2 +-
 src/ImageProcessor/Colors/YCbCr.cs            |  2 +-
 .../Common/Exceptions/ImageFormatException.cs |  2 +-
 .../Common/Extensions/ByteExtensions.cs       |  2 +-
 .../Common/Extensions/ComparableExtensions.cs |  2 +-
 src/ImageProcessor/Common/Helpers/Guard.cs    |  2 +-
 .../Common/Helpers/ImageMaths.cs              |  2 +-
 .../Common/Helpers/PixelOperations.cs         |  6 ++--
 src/ImageProcessor/Filters/Alpha.cs           |  2 +-
 .../Filters/ColorMatrix/BlackWhite.cs         |  2 +-
 .../Filters/ColorMatrix/ColorMatrix.cs        |  2 +-
 .../Filters/ColorMatrix/ColorMatrixFilter.cs  |  2 +-
 .../Filters/ColorMatrix/GreyscaleBt601.cs     |  2 +-
 .../Filters/ColorMatrix/GreyscaleBt709.cs     |  2 +-
 .../Filters/ColorMatrix/Lomograph.cs          |  2 +-
 .../Filters/ColorMatrix/Polaroid.cs           |  2 +-
 .../Filters/ColorMatrix/Sepia.cs              |  2 +-
 src/ImageProcessor/Filters/Contrast.cs        |  2 +-
 .../Filters/ImageFilterExtensions.cs          |  2 +-
 src/ImageProcessor/Filters/Invert.cs          | 36 +++++++++++++++++++
 .../Formats/Bmp/BmpCompression.cs             |  2 +-
 src/ImageProcessor/Formats/Bmp/BmpDecoder.cs  |  2 +-
 .../Formats/Bmp/BmpDecoderCore.cs             |  2 +-
 src/ImageProcessor/Formats/Bmp/BmpEncoder.cs  |  2 +-
 .../Formats/Bmp/BmpFileHeader.cs              |  2 +-
 src/ImageProcessor/Formats/Bmp/BmpFormat.cs   |  2 +-
 .../Formats/Bmp/BmpInfoHeader.cs              |  2 +-
 src/ImageProcessor/Formats/Gif/BitEncoder.cs  |  2 +-
 .../Formats/Gif/DisposalMethod.cs             |  2 +-
 .../Formats/Gif/GifConstants.cs               |  2 +-
 src/ImageProcessor/Formats/Gif/GifDecoder.cs  |  2 +-
 .../Formats/Gif/GifDecoderCore.cs             |  2 +-
 src/ImageProcessor/Formats/Gif/GifEncoder.cs  |  2 +-
 src/ImageProcessor/Formats/Gif/GifFormat.cs   |  2 +-
 src/ImageProcessor/Formats/Gif/LzwDecoder.cs  |  8 ++---
 src/ImageProcessor/Formats/Gif/LzwEncoder.cs  |  2 +-
 .../Formats/Gif/Quantizer/IQuantizer.cs       |  2 +-
 .../Formats/Gif/Quantizer/OctreeQuantizer.cs  |  2 +-
 .../Formats/Gif/Quantizer/QuantizedImage.cs   |  2 +-
 .../Formats/Gif/Quantizer/Quantizer.cs        |  2 +-
 .../Sections/GifGraphicsControlExtension.cs   |  2 +-
 .../Gif/Sections/GifImageDescriptor.cs        |  2 +-
 .../Sections/GifLogicalScreenDescriptor.cs    |  2 +-
 src/ImageProcessor/Formats/IImageDecoder.cs   |  2 +-
 src/ImageProcessor/Formats/IImageEncoder.cs   |  2 +-
 src/ImageProcessor/Formats/IImageFormat.cs    |  2 +-
 src/ImageProcessor/Formats/Jpg/JpegDecoder.cs |  2 +-
 src/ImageProcessor/Formats/Jpg/JpegEncoder.cs |  2 +-
 src/ImageProcessor/Formats/Jpg/JpegFormat.cs  |  2 +-
 .../Formats/Jpg/LibJpeg/BitStream.cs          |  2 +-
 .../Jpg/LibJpeg/DecompressorToJpegImage.cs    |  2 +-
 .../Jpg/LibJpeg/IDecompressDestination.cs     |  2 +-
 .../Formats/Png/GrayscaleReader.cs            |  2 +-
 .../Formats/Png/IColorReader.cs               |  2 +-
 .../Formats/Png/PaletteIndexReader.cs         |  2 +-
 src/ImageProcessor/Formats/Png/PngChunk.cs    |  2 +-
 .../Formats/Png/PngChunkTypes.cs              |  2 +-
 .../Formats/Png/PngColorTypeInformation.cs    |  2 +-
 src/ImageProcessor/Formats/Png/PngDecoder.cs  |  2 +-
 .../Formats/Png/PngDecoderCore.cs             |  2 +-
 src/ImageProcessor/Formats/Png/PngEncoder.cs  |  2 +-
 src/ImageProcessor/Formats/Png/PngFormat.cs   |  2 +-
 src/ImageProcessor/Formats/Png/PngHeader.cs   |  2 +-
 .../Formats/Png/TrueColorReader.cs            |  2 +-
 .../Formats/Png/Zlib/Adler32.cs               |  2 +-
 src/ImageProcessor/Formats/Png/Zlib/Crc32.cs  |  2 +-
 .../Formats/Png/Zlib/DeflateStrategy.cs       |  2 +-
 .../Formats/Png/Zlib/Deflater.cs              |  2 +-
 .../Formats/Png/Zlib/DeflaterConstants.cs     |  2 +-
 .../Formats/Png/Zlib/DeflaterEngine.cs        |  2 +-
 .../Formats/Png/Zlib/DeflaterOutputStream.cs  |  2 +-
 .../Formats/Png/Zlib/DeflaterPending.cs       |  2 +-
 .../Formats/Png/Zlib/GeneralBitFlags.cs       |  2 +-
 .../Formats/Png/Zlib/IChecksum.cs             |  2 +-
 src/ImageProcessor/IImage.cs                  |  2 +-
 src/ImageProcessor/IImageBase.cs              |  2 +-
 src/ImageProcessor/IImageProcessor.cs         |  2 +-
 src/ImageProcessor/Image.cs                   |  2 +-
 src/ImageProcessor/ImageBase.cs               |  2 +-
 src/ImageProcessor/ImageExtensions.cs         |  2 +-
 src/ImageProcessor/ImageFrame.cs              |  2 +-
 src/ImageProcessor/ImageProcessor.csproj      | 24 ++++---------
 src/ImageProcessor/ImageProperty.cs           |  2 +-
 src/ImageProcessor/Numerics/Point.cs          |  2 +-
 src/ImageProcessor/Numerics/Rectangle.cs      |  2 +-
 src/ImageProcessor/Numerics/Size.cs           |  2 +-
 src/ImageProcessor/ParallelImageProcessor.cs  |  2 +-
 src/ImageProcessor/Properties/AssemblyInfo.cs |  2 +-
 .../Samplers/ImageSampleExtensions.cs         |  2 +-
 .../Samplers/Resamplers/BicubicResampler.cs   |  2 +-
 .../Samplers/Resamplers/BoxResampler.cs       |  2 +-
 .../Resamplers/CatmullRomResampler.cs         |  2 +-
 .../Samplers/Resamplers/HermiteResampler.cs   |  2 +-
 .../Samplers/Resamplers/Lanczos3Resampler.cs  |  2 +-
 .../Samplers/Resamplers/Lanczos5Resampler.cs  |  2 +-
 .../Samplers/Resamplers/Lanczos8Resampler.cs  |  2 +-
 .../Resamplers/MitchellNetravaliResampler.cs  |  2 +-
 .../Samplers/Resamplers/RobidouxResampler.cs  |  2 +-
 .../Resamplers/RobidouxSharpResampler.cs      |  2 +-
 .../Resamplers/RobidouxSoftResampler.cs       |  2 +-
 .../Samplers/Resamplers/SplineResampler.cs    |  2 +-
 .../Samplers/Resamplers/TriangleResampler.cs  |  2 +-
 .../Samplers/Resamplers/WelchResampler.cs     |  2 +-
 src/ImageProcessor/Samplers/Resize.cs         |  2 +-
 src/ImageProcessor/packages.config            |  4 ---
 src/ImageProcessor/project.json               | 17 +++++++++
 .../project.lock.json.REMOVED.git-id          |  1 +
 .../Processors/Filters/FilterTests.cs         | 18 +++++-----
 110 files changed, 178 insertions(+), 140 deletions(-)
 create mode 100644 src/ImageProcessor/Filters/Invert.cs
 delete mode 100644 src/ImageProcessor/packages.config
 create mode 100644 src/ImageProcessor/project.json
 create mode 100644 src/ImageProcessor/project.lock.json.REMOVED.git-id

diff --git a/src/ImageProcessor/Colors/Bgra.cs b/src/ImageProcessor/Colors/Bgra.cs
index eb9bc7e26..052a036e4 100644
--- a/src/ImageProcessor/Colors/Bgra.cs
+++ b/src/ImageProcessor/Colors/Bgra.cs
@@ -1,5 +1,5 @@
 // <copyright file="Bgra.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Colors/Cmyk.cs b/src/ImageProcessor/Colors/Cmyk.cs
index 42fd96ba0..a11fffdd5 100644
--- a/src/ImageProcessor/Colors/Cmyk.cs
+++ b/src/ImageProcessor/Colors/Cmyk.cs
@@ -1,5 +1,5 @@
 // <copyright file="Cmyk.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Colors/Hsv.cs b/src/ImageProcessor/Colors/Hsv.cs
index 94248d969..2e184b7e1 100644
--- a/src/ImageProcessor/Colors/Hsv.cs
+++ b/src/ImageProcessor/Colors/Hsv.cs
@@ -1,5 +1,5 @@
 // <copyright file="Hsv.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Colors/YCbCr.cs b/src/ImageProcessor/Colors/YCbCr.cs
index e16400ec2..c99fe55fb 100644
--- a/src/ImageProcessor/Colors/YCbCr.cs
+++ b/src/ImageProcessor/Colors/YCbCr.cs
@@ -1,5 +1,5 @@
 // <copyright file="YCbCr.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Common/Exceptions/ImageFormatException.cs b/src/ImageProcessor/Common/Exceptions/ImageFormatException.cs
index 90e9c3367..bcc477192 100644
--- a/src/ImageProcessor/Common/Exceptions/ImageFormatException.cs
+++ b/src/ImageProcessor/Common/Exceptions/ImageFormatException.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="ImageFormatException.cs" company="James South">
-//   Copyright © James South and contributors.
+//   Copyright (c) James South and contributors.
 //   Licensed under the Apache License, Version 2.0.
 // </copyright>
 // <summary>
diff --git a/src/ImageProcessor/Common/Extensions/ByteExtensions.cs b/src/ImageProcessor/Common/Extensions/ByteExtensions.cs
index d11132801..7e9cbb67a 100644
--- a/src/ImageProcessor/Common/Extensions/ByteExtensions.cs
+++ b/src/ImageProcessor/Common/Extensions/ByteExtensions.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="ByteExtensions.cs" company="James South">
-//   Copyright © James South and contributors.
+//   Copyright (c) James South and contributors.
 //   Licensed under the Apache License, Version 2.0.
 // </copyright>
 // <summary>
diff --git a/src/ImageProcessor/Common/Extensions/ComparableExtensions.cs b/src/ImageProcessor/Common/Extensions/ComparableExtensions.cs
index 8b73b327f..e13890898 100644
--- a/src/ImageProcessor/Common/Extensions/ComparableExtensions.cs
+++ b/src/ImageProcessor/Common/Extensions/ComparableExtensions.cs
@@ -1,5 +1,5 @@
 // <copyright file="ComparableExtensions.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Common/Helpers/Guard.cs b/src/ImageProcessor/Common/Helpers/Guard.cs
index 81e10700f..bdde8149b 100644
--- a/src/ImageProcessor/Common/Helpers/Guard.cs
+++ b/src/ImageProcessor/Common/Helpers/Guard.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="Guard.cs" company="James South">
-//   Copyright © James South and contributors.
+//   Copyright (c) James South and contributors.
 //   Licensed under the Apache License, Version 2.0.
 // </copyright>
 // <summary>
diff --git a/src/ImageProcessor/Common/Helpers/ImageMaths.cs b/src/ImageProcessor/Common/Helpers/ImageMaths.cs
index e0362992a..71f7d9670 100644
--- a/src/ImageProcessor/Common/Helpers/ImageMaths.cs
+++ b/src/ImageProcessor/Common/Helpers/ImageMaths.cs
@@ -1,5 +1,5 @@
 // <copyright file="ImageMaths.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Common/Helpers/PixelOperations.cs b/src/ImageProcessor/Common/Helpers/PixelOperations.cs
index 6352025d5..9767268bf 100644
--- a/src/ImageProcessor/Common/Helpers/PixelOperations.cs
+++ b/src/ImageProcessor/Common/Helpers/PixelOperations.cs
@@ -1,5 +1,5 @@
 // <copyright file="PixelOperations.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
@@ -105,7 +105,7 @@ namespace ImageProcessor
         /// <returns>
         /// The <see cref="float"/>.
         /// </returns>
-        private static float SrgbToLinear(float signal)
+        internal static float SrgbToLinear(float signal)
         {
             float a = 0.055f;
 
@@ -126,7 +126,7 @@ namespace ImageProcessor
         /// <returns>
         /// The <see cref="float"/>.
         /// </returns>
-        private static float LinearToSrgb(float signal)
+        internal static float LinearToSrgb(float signal)
         {
             float a = 0.055f;
 
diff --git a/src/ImageProcessor/Filters/Alpha.cs b/src/ImageProcessor/Filters/Alpha.cs
index 672e5263a..93c335550 100644
--- a/src/ImageProcessor/Filters/Alpha.cs
+++ b/src/ImageProcessor/Filters/Alpha.cs
@@ -1,5 +1,5 @@
 // <copyright file="Alpha.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Filters/ColorMatrix/BlackWhite.cs b/src/ImageProcessor/Filters/ColorMatrix/BlackWhite.cs
index 8f63fbaea..153e84de6 100644
--- a/src/ImageProcessor/Filters/ColorMatrix/BlackWhite.cs
+++ b/src/ImageProcessor/Filters/ColorMatrix/BlackWhite.cs
@@ -1,5 +1,5 @@
 // <copyright file="BlackWhite.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Filters/ColorMatrix/ColorMatrix.cs b/src/ImageProcessor/Filters/ColorMatrix/ColorMatrix.cs
index 564befd88..6885acc07 100644
--- a/src/ImageProcessor/Filters/ColorMatrix/ColorMatrix.cs
+++ b/src/ImageProcessor/Filters/ColorMatrix/ColorMatrix.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="ColorMatrix.cs" company="James South">
-//   Copyright © James South and contributors.
+//   Copyright (c) James South and contributors.
 //   Licensed under the Apache License, Version 2.0.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/src/ImageProcessor/Filters/ColorMatrix/ColorMatrixFilter.cs b/src/ImageProcessor/Filters/ColorMatrix/ColorMatrixFilter.cs
index 9442ea558..3f7eb7591 100644
--- a/src/ImageProcessor/Filters/ColorMatrix/ColorMatrixFilter.cs
+++ b/src/ImageProcessor/Filters/ColorMatrix/ColorMatrixFilter.cs
@@ -1,5 +1,5 @@
 // <copyright file="ColorMatrixFilter.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Filters/ColorMatrix/GreyscaleBt601.cs b/src/ImageProcessor/Filters/ColorMatrix/GreyscaleBt601.cs
index 749d7adc4..90b1a9d8f 100644
--- a/src/ImageProcessor/Filters/ColorMatrix/GreyscaleBt601.cs
+++ b/src/ImageProcessor/Filters/ColorMatrix/GreyscaleBt601.cs
@@ -1,5 +1,5 @@
 // <copyright file="GreyscaleBt601.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Filters/ColorMatrix/GreyscaleBt709.cs b/src/ImageProcessor/Filters/ColorMatrix/GreyscaleBt709.cs
index 4dc074ffd..b975d33d7 100644
--- a/src/ImageProcessor/Filters/ColorMatrix/GreyscaleBt709.cs
+++ b/src/ImageProcessor/Filters/ColorMatrix/GreyscaleBt709.cs
@@ -1,5 +1,5 @@
 // <copyright file="GreyscaleBt709.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Filters/ColorMatrix/Lomograph.cs b/src/ImageProcessor/Filters/ColorMatrix/Lomograph.cs
index 31e4c5d32..f0d4c139a 100644
--- a/src/ImageProcessor/Filters/ColorMatrix/Lomograph.cs
+++ b/src/ImageProcessor/Filters/ColorMatrix/Lomograph.cs
@@ -1,5 +1,5 @@
 // <copyright file="Lomograph.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Filters/ColorMatrix/Polaroid.cs b/src/ImageProcessor/Filters/ColorMatrix/Polaroid.cs
index b86173a59..2b6b9289d 100644
--- a/src/ImageProcessor/Filters/ColorMatrix/Polaroid.cs
+++ b/src/ImageProcessor/Filters/ColorMatrix/Polaroid.cs
@@ -1,5 +1,5 @@
 // <copyright file="Polaroid.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Filters/ColorMatrix/Sepia.cs b/src/ImageProcessor/Filters/ColorMatrix/Sepia.cs
index 7d622ad53..1b014a533 100644
--- a/src/ImageProcessor/Filters/ColorMatrix/Sepia.cs
+++ b/src/ImageProcessor/Filters/ColorMatrix/Sepia.cs
@@ -1,5 +1,5 @@
 // <copyright file="Sepia.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Filters/Contrast.cs b/src/ImageProcessor/Filters/Contrast.cs
index d08bcfcc2..556b3828f 100644
--- a/src/ImageProcessor/Filters/Contrast.cs
+++ b/src/ImageProcessor/Filters/Contrast.cs
@@ -1,5 +1,5 @@
 // <copyright file="Contrast.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Filters/ImageFilterExtensions.cs b/src/ImageProcessor/Filters/ImageFilterExtensions.cs
index 4aa511e36..6ee04a53c 100644
--- a/src/ImageProcessor/Filters/ImageFilterExtensions.cs
+++ b/src/ImageProcessor/Filters/ImageFilterExtensions.cs
@@ -1,5 +1,5 @@
 // <copyright file="ImageFilterExtensions.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Filters/Invert.cs b/src/ImageProcessor/Filters/Invert.cs
new file mode 100644
index 000000000..d24979a2d
--- /dev/null
+++ b/src/ImageProcessor/Filters/Invert.cs
@@ -0,0 +1,36 @@
+// <copyright file="Invert.cs" company="James South">
+// Copyright (c) James South and contributors.
+// Licensed under the Apache License, Version 2.0.
+// </copyright>
+
+namespace ImageProcessor.Filters
+{
+    /// <summary>
+    /// An <see cref="IImageProcessor"/> to invert the colors of an <see cref="Image"/>.
+    /// </summary>
+    public class Invert : ParallelImageProcessor
+    {
+        /// <inheritdoc/>
+        protected override void Apply(ImageBase target, ImageBase source, Rectangle targetRectangle, Rectangle sourceRectangle, int startY, int endY)
+        {
+            int sourceY = sourceRectangle.Y;
+            int sourceBottom = sourceRectangle.Bottom;
+            int startX = sourceRectangle.X;
+            int endX = sourceRectangle.Right;
+
+            for (int y = startY; y < endY; y++)
+            {
+                if (y >= sourceY && y < sourceBottom)
+                {
+                    for (int x = startX; x < endX; x++)
+                    {
+                        // TODO: This doesn't work for gamma test images.
+                        Bgra color = source[x, y];
+                        Bgra targetColor = new Bgra((255 - color.B).ToByte(), (255 - color.G).ToByte(), (255 - color.R).ToByte(), color.A);
+                        target[x, y] = targetColor;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/ImageProcessor/Formats/Bmp/BmpCompression.cs b/src/ImageProcessor/Formats/Bmp/BmpCompression.cs
index 2db5e7534..a56ee62b8 100644
--- a/src/ImageProcessor/Formats/Bmp/BmpCompression.cs
+++ b/src/ImageProcessor/Formats/Bmp/BmpCompression.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="BmpCompression.cs" company="James South">
-//   Copyright © James South and contributors.
+//   Copyright (c) James South and contributors.
 //   Licensed under the Apache License, Version 2.0.
 // </copyright>
 // <summary>
diff --git a/src/ImageProcessor/Formats/Bmp/BmpDecoder.cs b/src/ImageProcessor/Formats/Bmp/BmpDecoder.cs
index 038324fba..cc1b6b464 100644
--- a/src/ImageProcessor/Formats/Bmp/BmpDecoder.cs
+++ b/src/ImageProcessor/Formats/Bmp/BmpDecoder.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="BmpDecoder.cs" company="James South">
-//   Copyright © James South and contributors.
+//   Copyright (c) James South and contributors.
 //   Licensed under the Apache License, Version 2.0.
 // </copyright>
 // <summary>
diff --git a/src/ImageProcessor/Formats/Bmp/BmpDecoderCore.cs b/src/ImageProcessor/Formats/Bmp/BmpDecoderCore.cs
index 14f1a12dc..1fb911bdd 100644
--- a/src/ImageProcessor/Formats/Bmp/BmpDecoderCore.cs
+++ b/src/ImageProcessor/Formats/Bmp/BmpDecoderCore.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="BmpDecoderCore.cs" company="James South">
-//   Copyright © James South and contributors.
+//   Copyright (c) James South and contributors.
 //   Licensed under the Apache License, Version 2.0.
 // </copyright>
 // <summary>
diff --git a/src/ImageProcessor/Formats/Bmp/BmpEncoder.cs b/src/ImageProcessor/Formats/Bmp/BmpEncoder.cs
index 6a6f3f4f2..ed833bf62 100644
--- a/src/ImageProcessor/Formats/Bmp/BmpEncoder.cs
+++ b/src/ImageProcessor/Formats/Bmp/BmpEncoder.cs
@@ -1,5 +1,5 @@
 // <copyright file="BmpEncoder.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Bmp/BmpFileHeader.cs b/src/ImageProcessor/Formats/Bmp/BmpFileHeader.cs
index f6a525da2..fcba8deda 100644
--- a/src/ImageProcessor/Formats/Bmp/BmpFileHeader.cs
+++ b/src/ImageProcessor/Formats/Bmp/BmpFileHeader.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="BmpFileHeader.cs" company="James South">
-//   Copyright © James South and contributors.
+//   Copyright (c) James South and contributors.
 //   Licensed under the Apache License, Version 2.0.
 // </copyright>
 // <summary>
diff --git a/src/ImageProcessor/Formats/Bmp/BmpFormat.cs b/src/ImageProcessor/Formats/Bmp/BmpFormat.cs
index cd882469a..90ff4bff1 100644
--- a/src/ImageProcessor/Formats/Bmp/BmpFormat.cs
+++ b/src/ImageProcessor/Formats/Bmp/BmpFormat.cs
@@ -1,5 +1,5 @@
 // <copyright file="BmpFormat.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Bmp/BmpInfoHeader.cs b/src/ImageProcessor/Formats/Bmp/BmpInfoHeader.cs
index 22886bf9b..74b5756fb 100644
--- a/src/ImageProcessor/Formats/Bmp/BmpInfoHeader.cs
+++ b/src/ImageProcessor/Formats/Bmp/BmpInfoHeader.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="BmpInfoHeader.cs" company="James South">
-//   Copyright © James South and contributors.
+//   Copyright (c) James South and contributors.
 //   Licensed under the Apache License, Version 2.0.
 // </copyright>
 // <summary>
diff --git a/src/ImageProcessor/Formats/Gif/BitEncoder.cs b/src/ImageProcessor/Formats/Gif/BitEncoder.cs
index faf37108a..ae0455807 100644
--- a/src/ImageProcessor/Formats/Gif/BitEncoder.cs
+++ b/src/ImageProcessor/Formats/Gif/BitEncoder.cs
@@ -1,5 +1,5 @@
 // <copyright file="BitEncoder.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Gif/DisposalMethod.cs b/src/ImageProcessor/Formats/Gif/DisposalMethod.cs
index 055435f93..3f7d73726 100644
--- a/src/ImageProcessor/Formats/Gif/DisposalMethod.cs
+++ b/src/ImageProcessor/Formats/Gif/DisposalMethod.cs
@@ -1,5 +1,5 @@
 // <copyright file="DisposalMethod.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Gif/GifConstants.cs b/src/ImageProcessor/Formats/Gif/GifConstants.cs
index bae71dd2b..cfcb7defb 100644
--- a/src/ImageProcessor/Formats/Gif/GifConstants.cs
+++ b/src/ImageProcessor/Formats/Gif/GifConstants.cs
@@ -1,5 +1,5 @@
 // <copyright file="GifConstants.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Gif/GifDecoder.cs b/src/ImageProcessor/Formats/Gif/GifDecoder.cs
index 9757137d2..cdc247269 100644
--- a/src/ImageProcessor/Formats/Gif/GifDecoder.cs
+++ b/src/ImageProcessor/Formats/Gif/GifDecoder.cs
@@ -1,5 +1,5 @@
 // <copyright file="GifDecoder.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Gif/GifDecoderCore.cs b/src/ImageProcessor/Formats/Gif/GifDecoderCore.cs
index 41d9a3773..ae91b3d03 100644
--- a/src/ImageProcessor/Formats/Gif/GifDecoderCore.cs
+++ b/src/ImageProcessor/Formats/Gif/GifDecoderCore.cs
@@ -1,5 +1,5 @@
 // <copyright file="GifDecoderCore.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Gif/GifEncoder.cs b/src/ImageProcessor/Formats/Gif/GifEncoder.cs
index 0a2318f45..cf8dc73d0 100644
--- a/src/ImageProcessor/Formats/Gif/GifEncoder.cs
+++ b/src/ImageProcessor/Formats/Gif/GifEncoder.cs
@@ -1,5 +1,5 @@
 // <copyright file="GifEncoder.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Gif/GifFormat.cs b/src/ImageProcessor/Formats/Gif/GifFormat.cs
index ccc3d5c99..bd7030de2 100644
--- a/src/ImageProcessor/Formats/Gif/GifFormat.cs
+++ b/src/ImageProcessor/Formats/Gif/GifFormat.cs
@@ -1,5 +1,5 @@
 // <copyright file="GifFormat.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Gif/LzwDecoder.cs b/src/ImageProcessor/Formats/Gif/LzwDecoder.cs
index 347b0e847..d757ae77a 100644
--- a/src/ImageProcessor/Formats/Gif/LzwDecoder.cs
+++ b/src/ImageProcessor/Formats/Gif/LzwDecoder.cs
@@ -1,5 +1,5 @@
 // <copyright file="LzwDecoder.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
@@ -81,7 +81,7 @@ namespace ImageProcessor.Formats
             int[] pixelStatck = new int[MaxStackSize + 1]; // ÓÃÓÚÁÙʱ±£´æÊý¾ÝÁ÷
 
             int top = 0;
-            int count = 0; // ÔÚÏÂÃæµÄÑ­»·ÖУ¬Ã¿´Î»á»ñÈ¡Ò»¶¨Á¿µÄ±àÂëµÄ×Ö½ÚÊý×飬¶ø´¦ÀíÕâЩÊý×éµÄʱºòÐèÒª1¸ö¸ö×Ö½ÚÀ´´¦Àí£¬count¾ÍÊDZíʾ»¹Òª´¦ÀíµÄ×Ö½ÚÊýÄ¿
+            int count = 0; // ÔÚÏÂÃæµÄÑ­»·ÖУ¬Ã¿´Î»á»ñÈ¡Ò»¶¨Á¿µÄ±àÂëµÄ×Ö½ÚÊý×飬¶ø´¦ÀíÕâÐ(c)Êý×éµÄʱºòÐèÒª1¸ö¸ö×Ö½ÚÀ´´¦Àí£¬count¾ÍÊDZíʾ»¹Òª´¦ÀíµÄ×Ö½ÚÊýÄ¿
             int bi = 0; // count±íʾ»¹Ê£¶àÉÙ×Ö½ÚÐèÒª´¦Àí£¬¶øbiÔò±íʾ±¾´ÎÒѾ­´¦ÀíµÄ¸öÊý
             int xyz = 0; // i´ú±íµ±Ç°´¦ÀíµÃµ½ÏñËØÊý
 
@@ -134,10 +134,10 @@ namespace ImageProcessor.Formats
                         continue;
                     }
 
-                    // Èç¹ûÒѾ­ÓÐ×ã¹»µÄbitÊý¿É¹©´¦Àí£¬ÏÂÃæ¾ÍÊÇ´¦Àí¹ý³Ì
+                    // Èç¹ûÒѾ­ÓÐ×ã¹»µÄbitÊý¿É¹(c)´¦Àí£¬ÏÂÃæ¾ÍÊÇ´¦Àí¹ý³Ì
                     // »ñÈ¡±àÂë
                     code = data & codeMask; // »ñÈ¡dataÊý¾ÝµÄ±àÂëλ´óСbitµÄÊý¾Ý
-                    data >>= codeSize; // ½«±àÂëÊý¾Ý½ØÈ¡ºó£¬Ô­À´µÄÊý¾Ý¾Íʣϼ¸¸öbitÁË£¬´Ëʱ½«ÕâЩbitÓÒÒÆ£¬ÎªÏ´Î×÷×¼±¸
+                    data >>= codeSize; // ½«±àÂëÊý¾Ý½ØÈ¡ºó£¬Ô­À´µÄÊý¾Ý¾Íʣϼ¸¸öbitÁË£¬´Ëʱ½«ÕâÐ(c)bitÓÒÒÆ£¬ÎªÏ´Î×÷×¼±¸
                     bits -= codeSize; // ͬʱÐèÒª½«µ±Ç°Êý¾ÝµÄbitÊý¼õÈ¥±àÂë볤£¬ÒòΪÒѾ­µÃµ½ÁË´¦Àí¡£
 
                     // ÏÂÃæ¸ù¾Ý»ñÈ¡µÄcodeÖµÀ´½øÐд¦Àí
diff --git a/src/ImageProcessor/Formats/Gif/LzwEncoder.cs b/src/ImageProcessor/Formats/Gif/LzwEncoder.cs
index f68d07f8f..a6dca8c7a 100644
--- a/src/ImageProcessor/Formats/Gif/LzwEncoder.cs
+++ b/src/ImageProcessor/Formats/Gif/LzwEncoder.cs
@@ -1,5 +1,5 @@
 // <copyright file="LzwEncoder.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Gif/Quantizer/IQuantizer.cs b/src/ImageProcessor/Formats/Gif/Quantizer/IQuantizer.cs
index 26f4f8bf4..9e82f2f45 100644
--- a/src/ImageProcessor/Formats/Gif/Quantizer/IQuantizer.cs
+++ b/src/ImageProcessor/Formats/Gif/Quantizer/IQuantizer.cs
@@ -1,5 +1,5 @@
 // <copyright file="IQuantizer.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Gif/Quantizer/OctreeQuantizer.cs b/src/ImageProcessor/Formats/Gif/Quantizer/OctreeQuantizer.cs
index e4cf98a37..7358d015a 100644
--- a/src/ImageProcessor/Formats/Gif/Quantizer/OctreeQuantizer.cs
+++ b/src/ImageProcessor/Formats/Gif/Quantizer/OctreeQuantizer.cs
@@ -1,5 +1,5 @@
 // <copyright file="OctreeQuantizer.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Gif/Quantizer/QuantizedImage.cs b/src/ImageProcessor/Formats/Gif/Quantizer/QuantizedImage.cs
index e2ed9273d..76c273fe8 100644
--- a/src/ImageProcessor/Formats/Gif/Quantizer/QuantizedImage.cs
+++ b/src/ImageProcessor/Formats/Gif/Quantizer/QuantizedImage.cs
@@ -1,5 +1,5 @@
 // <copyright file="QuantizedImage.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Gif/Quantizer/Quantizer.cs b/src/ImageProcessor/Formats/Gif/Quantizer/Quantizer.cs
index 99ce8643e..dda33d479 100644
--- a/src/ImageProcessor/Formats/Gif/Quantizer/Quantizer.cs
+++ b/src/ImageProcessor/Formats/Gif/Quantizer/Quantizer.cs
@@ -1,5 +1,5 @@
 // <copyright file="Quantizer.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Gif/Sections/GifGraphicsControlExtension.cs b/src/ImageProcessor/Formats/Gif/Sections/GifGraphicsControlExtension.cs
index 006d8e291..c5fed645e 100644
--- a/src/ImageProcessor/Formats/Gif/Sections/GifGraphicsControlExtension.cs
+++ b/src/ImageProcessor/Formats/Gif/Sections/GifGraphicsControlExtension.cs
@@ -1,5 +1,5 @@
 // <copyright file="GifGraphicsControlExtension.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Gif/Sections/GifImageDescriptor.cs b/src/ImageProcessor/Formats/Gif/Sections/GifImageDescriptor.cs
index 199424893..db0ec582e 100644
--- a/src/ImageProcessor/Formats/Gif/Sections/GifImageDescriptor.cs
+++ b/src/ImageProcessor/Formats/Gif/Sections/GifImageDescriptor.cs
@@ -1,5 +1,5 @@
 // <copyright file="GifImageDescriptor.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Gif/Sections/GifLogicalScreenDescriptor.cs b/src/ImageProcessor/Formats/Gif/Sections/GifLogicalScreenDescriptor.cs
index 003b439c7..6cee48fca 100644
--- a/src/ImageProcessor/Formats/Gif/Sections/GifLogicalScreenDescriptor.cs
+++ b/src/ImageProcessor/Formats/Gif/Sections/GifLogicalScreenDescriptor.cs
@@ -1,5 +1,5 @@
 // <copyright file="GifLogicalScreenDescriptor.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/IImageDecoder.cs b/src/ImageProcessor/Formats/IImageDecoder.cs
index 4796f6cab..434b2ea6d 100644
--- a/src/ImageProcessor/Formats/IImageDecoder.cs
+++ b/src/ImageProcessor/Formats/IImageDecoder.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="IImageDecoder.cs" company="James South">
-//   Copyright © James South and contributors.
+//   Copyright (c) James South and contributors.
 //   Licensed under the Apache License, Version 2.0.
 // </copyright>
 // <summary>
diff --git a/src/ImageProcessor/Formats/IImageEncoder.cs b/src/ImageProcessor/Formats/IImageEncoder.cs
index 5414af88d..cbf0aa198 100644
--- a/src/ImageProcessor/Formats/IImageEncoder.cs
+++ b/src/ImageProcessor/Formats/IImageEncoder.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="IImageEncoder.cs" company="James South">
-//   Copyright © James South and contributors.
+//   Copyright (c) James South and contributors.
 //   Licensed under the Apache License, Version 2.0.
 // </copyright>
 // <summary>
diff --git a/src/ImageProcessor/Formats/IImageFormat.cs b/src/ImageProcessor/Formats/IImageFormat.cs
index 8e0efc711..31687db3f 100644
--- a/src/ImageProcessor/Formats/IImageFormat.cs
+++ b/src/ImageProcessor/Formats/IImageFormat.cs
@@ -1,5 +1,5 @@
 // <copyright file="IImageFormat.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Jpg/JpegDecoder.cs b/src/ImageProcessor/Formats/Jpg/JpegDecoder.cs
index f1aeb814c..766923f7e 100644
--- a/src/ImageProcessor/Formats/Jpg/JpegDecoder.cs
+++ b/src/ImageProcessor/Formats/Jpg/JpegDecoder.cs
@@ -1,5 +1,5 @@
 // <copyright file="JpegDecoder.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Jpg/JpegEncoder.cs b/src/ImageProcessor/Formats/Jpg/JpegEncoder.cs
index 575cfb6c9..35d6e286e 100644
--- a/src/ImageProcessor/Formats/Jpg/JpegEncoder.cs
+++ b/src/ImageProcessor/Formats/Jpg/JpegEncoder.cs
@@ -1,5 +1,5 @@
 // <copyright file="JpegEncoder.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Jpg/JpegFormat.cs b/src/ImageProcessor/Formats/Jpg/JpegFormat.cs
index 390916221..bc77390c3 100644
--- a/src/ImageProcessor/Formats/Jpg/JpegFormat.cs
+++ b/src/ImageProcessor/Formats/Jpg/JpegFormat.cs
@@ -1,5 +1,5 @@
 // <copyright file="JpegFormat.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/BitStream.cs b/src/ImageProcessor/Formats/Jpg/LibJpeg/BitStream.cs
index 4faa346e9..c054559d9 100644
--- a/src/ImageProcessor/Formats/Jpg/LibJpeg/BitStream.cs
+++ b/src/ImageProcessor/Formats/Jpg/LibJpeg/BitStream.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="BitStream.cs" company="James South">
-//   Copyright © James South and contributors.
+//   Copyright (c) James South and contributors.
 //   Licensed under the Apache License, Version 2.0.
 // </copyright>
 // <summary>
diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/DecompressorToJpegImage.cs b/src/ImageProcessor/Formats/Jpg/LibJpeg/DecompressorToJpegImage.cs
index 79ab054db..796b3a56d 100644
--- a/src/ImageProcessor/Formats/Jpg/LibJpeg/DecompressorToJpegImage.cs
+++ b/src/ImageProcessor/Formats/Jpg/LibJpeg/DecompressorToJpegImage.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="DecompressorToJpegImage.cs" company="James South">
-//   Copyright © James South and contributors.
+//   Copyright (c) James South and contributors.
 //   Licensed under the Apache License, Version 2.0.
 // </copyright>
 // <summary>
diff --git a/src/ImageProcessor/Formats/Jpg/LibJpeg/IDecompressDestination.cs b/src/ImageProcessor/Formats/Jpg/LibJpeg/IDecompressDestination.cs
index 1e6cd859b..2aa6cff40 100644
--- a/src/ImageProcessor/Formats/Jpg/LibJpeg/IDecompressDestination.cs
+++ b/src/ImageProcessor/Formats/Jpg/LibJpeg/IDecompressDestination.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="IDecompressDestination.cs" company="James South">
-//   Copyright © James South and contributors.
+//   Copyright (c) James South and contributors.
 //   Licensed under the Apache License, Version 2.0.
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
diff --git a/src/ImageProcessor/Formats/Png/GrayscaleReader.cs b/src/ImageProcessor/Formats/Png/GrayscaleReader.cs
index 8c96a3cf1..552776a67 100644
--- a/src/ImageProcessor/Formats/Png/GrayscaleReader.cs
+++ b/src/ImageProcessor/Formats/Png/GrayscaleReader.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="GrayscaleReader.cs" company="James South">
-//   Copyright © James South and contributors.
+//   Copyright (c) James South and contributors.
 //   Licensed under the Apache License, Version 2.0.
 // </copyright>
 // <summary>
diff --git a/src/ImageProcessor/Formats/Png/IColorReader.cs b/src/ImageProcessor/Formats/Png/IColorReader.cs
index b2a7e4460..40c14d6ec 100644
--- a/src/ImageProcessor/Formats/Png/IColorReader.cs
+++ b/src/ImageProcessor/Formats/Png/IColorReader.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="IColorReader.cs" company="James South">
-//   Copyright © James South and contributors.
+//   Copyright (c) James South and contributors.
 //   Licensed under the Apache License, Version 2.0.
 // </copyright>
 // <summary>
diff --git a/src/ImageProcessor/Formats/Png/PaletteIndexReader.cs b/src/ImageProcessor/Formats/Png/PaletteIndexReader.cs
index f6795f8fd..a44d34c29 100644
--- a/src/ImageProcessor/Formats/Png/PaletteIndexReader.cs
+++ b/src/ImageProcessor/Formats/Png/PaletteIndexReader.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="PaletteIndexReader.cs" company="James South">
-//   Copyright © James South and contributors.
+//   Copyright (c) James South and contributors.
 //   Licensed under the Apache License, Version 2.0.
 // </copyright>
 // <summary>
diff --git a/src/ImageProcessor/Formats/Png/PngChunk.cs b/src/ImageProcessor/Formats/Png/PngChunk.cs
index 554ccbca2..f2590f93e 100644
--- a/src/ImageProcessor/Formats/Png/PngChunk.cs
+++ b/src/ImageProcessor/Formats/Png/PngChunk.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="PngChunk.cs" company="James South">
-//   Copyright © James South and contributors.
+//   Copyright (c) James South and contributors.
 //   Licensed under the Apache License, Version 2.0.
 // </copyright>
 // <summary>
diff --git a/src/ImageProcessor/Formats/Png/PngChunkTypes.cs b/src/ImageProcessor/Formats/Png/PngChunkTypes.cs
index cc908e48e..dd7e379f7 100644
--- a/src/ImageProcessor/Formats/Png/PngChunkTypes.cs
+++ b/src/ImageProcessor/Formats/Png/PngChunkTypes.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="PngChunkTypes.cs" company="James South">
-//   Copyright © James South and contributors.
+//   Copyright (c) James South and contributors.
 //   Licensed under the Apache License, Version 2.0.
 // </copyright>
 // <summary>
diff --git a/src/ImageProcessor/Formats/Png/PngColorTypeInformation.cs b/src/ImageProcessor/Formats/Png/PngColorTypeInformation.cs
index 15b3fb7ff..14043678a 100644
--- a/src/ImageProcessor/Formats/Png/PngColorTypeInformation.cs
+++ b/src/ImageProcessor/Formats/Png/PngColorTypeInformation.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="PngColorTypeInformation.cs" company="James South">
-//   Copyright © James South and contributors.
+//   Copyright (c) James South and contributors.
 //   Licensed under the Apache License, Version 2.0.
 // </copyright>
 // <summary>
diff --git a/src/ImageProcessor/Formats/Png/PngDecoder.cs b/src/ImageProcessor/Formats/Png/PngDecoder.cs
index 7c97b6e24..c8f1797bc 100644
--- a/src/ImageProcessor/Formats/Png/PngDecoder.cs
+++ b/src/ImageProcessor/Formats/Png/PngDecoder.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="PngDecoder.cs" company="James South">
-//   Copyright © James South and contributors.
+//   Copyright (c) James South and contributors.
 //   Licensed under the Apache License, Version 2.0.
 // </copyright>
 // <summary>
diff --git a/src/ImageProcessor/Formats/Png/PngDecoderCore.cs b/src/ImageProcessor/Formats/Png/PngDecoderCore.cs
index d0bdc8698..9f837a6bf 100644
--- a/src/ImageProcessor/Formats/Png/PngDecoderCore.cs
+++ b/src/ImageProcessor/Formats/Png/PngDecoderCore.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="PngDecoderCore.cs" company="James South">
-//   Copyright © James South and contributors.
+//   Copyright (c) James South and contributors.
 //   Licensed under the Apache License, Version 2.0.
 // </copyright>
 // <summary>
diff --git a/src/ImageProcessor/Formats/Png/PngEncoder.cs b/src/ImageProcessor/Formats/Png/PngEncoder.cs
index c747d934e..14a312220 100644
--- a/src/ImageProcessor/Formats/Png/PngEncoder.cs
+++ b/src/ImageProcessor/Formats/Png/PngEncoder.cs
@@ -1,5 +1,5 @@
 // <copyright file="PngEncoder.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Png/PngFormat.cs b/src/ImageProcessor/Formats/Png/PngFormat.cs
index 9e2bcfee2..a53680d99 100644
--- a/src/ImageProcessor/Formats/Png/PngFormat.cs
+++ b/src/ImageProcessor/Formats/Png/PngFormat.cs
@@ -1,5 +1,5 @@
 // <copyright file="PngFormat.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Png/PngHeader.cs b/src/ImageProcessor/Formats/Png/PngHeader.cs
index 4c2ac2d56..7d02b8c27 100644
--- a/src/ImageProcessor/Formats/Png/PngHeader.cs
+++ b/src/ImageProcessor/Formats/Png/PngHeader.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="PngHeader.cs" company="James South">
-//   Copyright © James South and contributors.
+//   Copyright (c) James South and contributors.
 //   Licensed under the Apache License, Version 2.0.
 // </copyright>
 // <summary>
diff --git a/src/ImageProcessor/Formats/Png/TrueColorReader.cs b/src/ImageProcessor/Formats/Png/TrueColorReader.cs
index ebae1c8ca..c60e68306 100644
--- a/src/ImageProcessor/Formats/Png/TrueColorReader.cs
+++ b/src/ImageProcessor/Formats/Png/TrueColorReader.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="TrueColorReader.cs" company="James South">
-//   Copyright © James South and contributors.
+//   Copyright (c) James South and contributors.
 //   Licensed under the Apache License, Version 2.0.
 // </copyright>
 // <summary>
diff --git a/src/ImageProcessor/Formats/Png/Zlib/Adler32.cs b/src/ImageProcessor/Formats/Png/Zlib/Adler32.cs
index 7ed887c25..ff5aec61f 100644
--- a/src/ImageProcessor/Formats/Png/Zlib/Adler32.cs
+++ b/src/ImageProcessor/Formats/Png/Zlib/Adler32.cs
@@ -1,5 +1,5 @@
 // <copyright file="Adler32.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Png/Zlib/Crc32.cs b/src/ImageProcessor/Formats/Png/Zlib/Crc32.cs
index f069b0fbf..3cf5916cf 100644
--- a/src/ImageProcessor/Formats/Png/Zlib/Crc32.cs
+++ b/src/ImageProcessor/Formats/Png/Zlib/Crc32.cs
@@ -1,5 +1,5 @@
 // <copyright file="Crc32.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Png/Zlib/DeflateStrategy.cs b/src/ImageProcessor/Formats/Png/Zlib/DeflateStrategy.cs
index 479fe99a8..64489abbf 100644
--- a/src/ImageProcessor/Formats/Png/Zlib/DeflateStrategy.cs
+++ b/src/ImageProcessor/Formats/Png/Zlib/DeflateStrategy.cs
@@ -1,5 +1,5 @@
 // <copyright file="DeflateStrategy.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Png/Zlib/Deflater.cs b/src/ImageProcessor/Formats/Png/Zlib/Deflater.cs
index d1a35483d..79c153082 100644
--- a/src/ImageProcessor/Formats/Png/Zlib/Deflater.cs
+++ b/src/ImageProcessor/Formats/Png/Zlib/Deflater.cs
@@ -1,5 +1,5 @@
 // <copyright file="Deflater.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Png/Zlib/DeflaterConstants.cs b/src/ImageProcessor/Formats/Png/Zlib/DeflaterConstants.cs
index 0a65ae481..5565ffb58 100644
--- a/src/ImageProcessor/Formats/Png/Zlib/DeflaterConstants.cs
+++ b/src/ImageProcessor/Formats/Png/Zlib/DeflaterConstants.cs
@@ -1,5 +1,5 @@
 // <copyright file="DeflaterConstants.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Png/Zlib/DeflaterEngine.cs b/src/ImageProcessor/Formats/Png/Zlib/DeflaterEngine.cs
index 434c4727a..6294919dd 100644
--- a/src/ImageProcessor/Formats/Png/Zlib/DeflaterEngine.cs
+++ b/src/ImageProcessor/Formats/Png/Zlib/DeflaterEngine.cs
@@ -1,5 +1,5 @@
 // <copyright file="DeflaterEngine.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Png/Zlib/DeflaterOutputStream.cs b/src/ImageProcessor/Formats/Png/Zlib/DeflaterOutputStream.cs
index aa05aed70..7fd65e5d4 100644
--- a/src/ImageProcessor/Formats/Png/Zlib/DeflaterOutputStream.cs
+++ b/src/ImageProcessor/Formats/Png/Zlib/DeflaterOutputStream.cs
@@ -1,5 +1,5 @@
 // <copyright file="DeflaterOutputStream.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Png/Zlib/DeflaterPending.cs b/src/ImageProcessor/Formats/Png/Zlib/DeflaterPending.cs
index 79679a092..d8bce8a3a 100644
--- a/src/ImageProcessor/Formats/Png/Zlib/DeflaterPending.cs
+++ b/src/ImageProcessor/Formats/Png/Zlib/DeflaterPending.cs
@@ -1,5 +1,5 @@
 // <copyright file="DeflaterPending.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Png/Zlib/GeneralBitFlags.cs b/src/ImageProcessor/Formats/Png/Zlib/GeneralBitFlags.cs
index 9cf75c920..d6b975d3d 100644
--- a/src/ImageProcessor/Formats/Png/Zlib/GeneralBitFlags.cs
+++ b/src/ImageProcessor/Formats/Png/Zlib/GeneralBitFlags.cs
@@ -1,5 +1,5 @@
 // <copyright file="GeneralBitFlags.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Formats/Png/Zlib/IChecksum.cs b/src/ImageProcessor/Formats/Png/Zlib/IChecksum.cs
index 5da32dd32..d5e593e1a 100644
--- a/src/ImageProcessor/Formats/Png/Zlib/IChecksum.cs
+++ b/src/ImageProcessor/Formats/Png/Zlib/IChecksum.cs
@@ -1,5 +1,5 @@
 // <copyright file="IChecksum.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/IImage.cs b/src/ImageProcessor/IImage.cs
index 58f3380bd..1c1f4591a 100644
--- a/src/ImageProcessor/IImage.cs
+++ b/src/ImageProcessor/IImage.cs
@@ -1,5 +1,5 @@
 // <copyright file="IImage.cs" company="James South">
-// Copyright � James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/IImageBase.cs b/src/ImageProcessor/IImageBase.cs
index 94912c887..62fc821b3 100644
--- a/src/ImageProcessor/IImageBase.cs
+++ b/src/ImageProcessor/IImageBase.cs
@@ -1,5 +1,5 @@
 // <copyright file="IImageBase.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/IImageProcessor.cs b/src/ImageProcessor/IImageProcessor.cs
index 696348989..c8c30de48 100644
--- a/src/ImageProcessor/IImageProcessor.cs
+++ b/src/ImageProcessor/IImageProcessor.cs
@@ -1,5 +1,5 @@
 // <copyright file="IImageProcessor.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Image.cs b/src/ImageProcessor/Image.cs
index d141568ee..dd7c58e07 100644
--- a/src/ImageProcessor/Image.cs
+++ b/src/ImageProcessor/Image.cs
@@ -1,5 +1,5 @@
 // <copyright file="Image.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/ImageBase.cs b/src/ImageProcessor/ImageBase.cs
index bd91fc5e1..405cd888f 100644
--- a/src/ImageProcessor/ImageBase.cs
+++ b/src/ImageProcessor/ImageBase.cs
@@ -1,5 +1,5 @@
 // <copyright file="ImageBase.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/ImageExtensions.cs b/src/ImageProcessor/ImageExtensions.cs
index d66d80eb7..2b341d766 100644
--- a/src/ImageProcessor/ImageExtensions.cs
+++ b/src/ImageProcessor/ImageExtensions.cs
@@ -1,5 +1,5 @@
 // <copyright file="ImageFilterExtensions.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/ImageFrame.cs b/src/ImageProcessor/ImageFrame.cs
index 84166507a..d799ff490 100644
--- a/src/ImageProcessor/ImageFrame.cs
+++ b/src/ImageProcessor/ImageFrame.cs
@@ -1,5 +1,5 @@
 // <copyright file="ImageFrame.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/ImageProcessor.csproj b/src/ImageProcessor/ImageProcessor.csproj
index 2fe51042e..694ea1f8f 100644
--- a/src/ImageProcessor/ImageProcessor.csproj
+++ b/src/ImageProcessor/ImageProcessor.csproj
@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{8047C4AC-7097-4DE4-B00D-6D55EBCF1D36}</ProjectGuid>
@@ -13,8 +13,9 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>
@@ -39,16 +40,11 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .NET Framework is automatically included -->
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta015\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta015\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta015\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="Colors\Cmyk.cs" />
     <Compile Include="Common\Helpers\ImageMaths.cs" />
     <Compile Include="Common\Helpers\PixelOperations.cs" />
+    <Compile Include="Filters\Invert.cs" />
     <Compile Include="Filters\Alpha.cs" />
     <Compile Include="Filters\ColorMatrix\ColorMatrix.cs" />
     <Compile Include="Filters\ColorMatrix\ColorMatrixFilter.cs" />
@@ -58,7 +54,6 @@
     <Compile Include="Filters\ColorMatrix\Polaroid.cs" />
     <Compile Include="Filters\ColorMatrix\Lomograph.cs" />
     <Compile Include="Filters\ColorMatrix\Sepia.cs" />
-    <Compile Include="Filters\ColorMatrix\Invert.cs" />
     <Compile Include="Filters\Contrast.cs" />
     <Compile Include="Filters\ImageFilterExtensions.cs" />
     <Compile Include="Formats\Png\Zlib\Adler32.cs" />
@@ -239,7 +234,7 @@
     <None Include="Formats\Gif\README.md" />
     <None Include="Formats\Jpg\README.md" />
     <None Include="Formats\Png\Zlib\README.md" />
-    <None Include="packages.config" />
+    <None Include="project.json" />
     <None Include="stylecop.json" />
   </ItemGroup>
   <ItemGroup>
@@ -248,13 +243,6 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets" Condition="Exists('..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\StyleCop.Analyzers.1.0.0-beta015\build\StyleCop.Analyzers.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/ImageProcessor/ImageProperty.cs b/src/ImageProcessor/ImageProperty.cs
index 108a810cb..9104cf0fa 100644
--- a/src/ImageProcessor/ImageProperty.cs
+++ b/src/ImageProcessor/ImageProperty.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="ImageProperty.cs" company="James South">
-//   Copyright © James South and contributors.
+//   Copyright (c) James South and contributors.
 //   Licensed under the Apache License, Version 2.0.
 // </copyright>
 // <summary>
diff --git a/src/ImageProcessor/Numerics/Point.cs b/src/ImageProcessor/Numerics/Point.cs
index 57bd0b46f..3ba60c18f 100644
--- a/src/ImageProcessor/Numerics/Point.cs
+++ b/src/ImageProcessor/Numerics/Point.cs
@@ -1,5 +1,5 @@
 // <copyright file="Point.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Numerics/Rectangle.cs b/src/ImageProcessor/Numerics/Rectangle.cs
index ef7df4c76..6fe8a6388 100644
--- a/src/ImageProcessor/Numerics/Rectangle.cs
+++ b/src/ImageProcessor/Numerics/Rectangle.cs
@@ -1,5 +1,5 @@
 // <copyright file="Rectangle.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Numerics/Size.cs b/src/ImageProcessor/Numerics/Size.cs
index 709984152..f9838bc6c 100644
--- a/src/ImageProcessor/Numerics/Size.cs
+++ b/src/ImageProcessor/Numerics/Size.cs
@@ -1,5 +1,5 @@
 // <copyright file="Size.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/ParallelImageProcessor.cs b/src/ImageProcessor/ParallelImageProcessor.cs
index 8d7ba13dc..d84b3cdaf 100644
--- a/src/ImageProcessor/ParallelImageProcessor.cs
+++ b/src/ImageProcessor/ParallelImageProcessor.cs
@@ -1,5 +1,5 @@
 // <copyright file="ParallelImageProcessor.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Properties/AssemblyInfo.cs b/src/ImageProcessor/Properties/AssemblyInfo.cs
index fbdbb3a81..ff4e72fd1 100644
--- a/src/ImageProcessor/Properties/AssemblyInfo.cs
+++ b/src/ImageProcessor/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("ImageProcessor")]
-[assembly: AssemblyCopyright("Copyright © James South and contributors.")]
+[assembly: AssemblyCopyright("Copyright (c) James South and contributors.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: NeutralResourcesLanguage("en")]
diff --git a/src/ImageProcessor/Samplers/ImageSampleExtensions.cs b/src/ImageProcessor/Samplers/ImageSampleExtensions.cs
index a31355e6a..b560e4779 100644
--- a/src/ImageProcessor/Samplers/ImageSampleExtensions.cs
+++ b/src/ImageProcessor/Samplers/ImageSampleExtensions.cs
@@ -1,5 +1,5 @@
 // <copyright file="ImageSampleExtensions.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Samplers/Resamplers/BicubicResampler.cs b/src/ImageProcessor/Samplers/Resamplers/BicubicResampler.cs
index 20c4643cb..27a6d6742 100644
--- a/src/ImageProcessor/Samplers/Resamplers/BicubicResampler.cs
+++ b/src/ImageProcessor/Samplers/Resamplers/BicubicResampler.cs
@@ -1,5 +1,5 @@
 // <copyright file="BicubicResampler.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Samplers/Resamplers/BoxResampler.cs b/src/ImageProcessor/Samplers/Resamplers/BoxResampler.cs
index 7983261da..49e407934 100644
--- a/src/ImageProcessor/Samplers/Resamplers/BoxResampler.cs
+++ b/src/ImageProcessor/Samplers/Resamplers/BoxResampler.cs
@@ -1,5 +1,5 @@
 // <copyright file="BoxResampler.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Samplers/Resamplers/CatmullRomResampler.cs b/src/ImageProcessor/Samplers/Resamplers/CatmullRomResampler.cs
index 816cf0607..4bfcbef9a 100644
--- a/src/ImageProcessor/Samplers/Resamplers/CatmullRomResampler.cs
+++ b/src/ImageProcessor/Samplers/Resamplers/CatmullRomResampler.cs
@@ -1,5 +1,5 @@
 // <copyright file="CatmullRomResampler.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Samplers/Resamplers/HermiteResampler.cs b/src/ImageProcessor/Samplers/Resamplers/HermiteResampler.cs
index 666c3372d..1134ebcc7 100644
--- a/src/ImageProcessor/Samplers/Resamplers/HermiteResampler.cs
+++ b/src/ImageProcessor/Samplers/Resamplers/HermiteResampler.cs
@@ -1,5 +1,5 @@
 // <copyright file="HermiteResampler.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Samplers/Resamplers/Lanczos3Resampler.cs b/src/ImageProcessor/Samplers/Resamplers/Lanczos3Resampler.cs
index 3a154303d..f871a9b55 100644
--- a/src/ImageProcessor/Samplers/Resamplers/Lanczos3Resampler.cs
+++ b/src/ImageProcessor/Samplers/Resamplers/Lanczos3Resampler.cs
@@ -1,5 +1,5 @@
 // <copyright file="Lanczos3Resampler.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Samplers/Resamplers/Lanczos5Resampler.cs b/src/ImageProcessor/Samplers/Resamplers/Lanczos5Resampler.cs
index ef219874b..43b22a61d 100644
--- a/src/ImageProcessor/Samplers/Resamplers/Lanczos5Resampler.cs
+++ b/src/ImageProcessor/Samplers/Resamplers/Lanczos5Resampler.cs
@@ -1,5 +1,5 @@
 // <copyright file="Lanczos5Resampler.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Samplers/Resamplers/Lanczos8Resampler.cs b/src/ImageProcessor/Samplers/Resamplers/Lanczos8Resampler.cs
index ac9065db4..4493824b5 100644
--- a/src/ImageProcessor/Samplers/Resamplers/Lanczos8Resampler.cs
+++ b/src/ImageProcessor/Samplers/Resamplers/Lanczos8Resampler.cs
@@ -1,5 +1,5 @@
 // <copyright file="Lanczos3Resampler.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Samplers/Resamplers/MitchellNetravaliResampler.cs b/src/ImageProcessor/Samplers/Resamplers/MitchellNetravaliResampler.cs
index acf5c51d6..69e034eea 100644
--- a/src/ImageProcessor/Samplers/Resamplers/MitchellNetravaliResampler.cs
+++ b/src/ImageProcessor/Samplers/Resamplers/MitchellNetravaliResampler.cs
@@ -1,5 +1,5 @@
 // <copyright file="MitchellResampler.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Samplers/Resamplers/RobidouxResampler.cs b/src/ImageProcessor/Samplers/Resamplers/RobidouxResampler.cs
index dcfea2870..d72c20ee1 100644
--- a/src/ImageProcessor/Samplers/Resamplers/RobidouxResampler.cs
+++ b/src/ImageProcessor/Samplers/Resamplers/RobidouxResampler.cs
@@ -1,5 +1,5 @@
 // <copyright file="RobidouxResampler.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Samplers/Resamplers/RobidouxSharpResampler.cs b/src/ImageProcessor/Samplers/Resamplers/RobidouxSharpResampler.cs
index dfb8d9bfd..ac8566d5e 100644
--- a/src/ImageProcessor/Samplers/Resamplers/RobidouxSharpResampler.cs
+++ b/src/ImageProcessor/Samplers/Resamplers/RobidouxSharpResampler.cs
@@ -1,5 +1,5 @@
 // <copyright file="RobidouxSharpResampler.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Samplers/Resamplers/RobidouxSoftResampler.cs b/src/ImageProcessor/Samplers/Resamplers/RobidouxSoftResampler.cs
index a6bbfada8..de0e536ba 100644
--- a/src/ImageProcessor/Samplers/Resamplers/RobidouxSoftResampler.cs
+++ b/src/ImageProcessor/Samplers/Resamplers/RobidouxSoftResampler.cs
@@ -1,5 +1,5 @@
 // <copyright file="RobidouxSoftResampler.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Samplers/Resamplers/SplineResampler.cs b/src/ImageProcessor/Samplers/Resamplers/SplineResampler.cs
index f3ed32ef0..1449ab01c 100644
--- a/src/ImageProcessor/Samplers/Resamplers/SplineResampler.cs
+++ b/src/ImageProcessor/Samplers/Resamplers/SplineResampler.cs
@@ -1,5 +1,5 @@
 // <copyright file="SplineResampler.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Samplers/Resamplers/TriangleResampler.cs b/src/ImageProcessor/Samplers/Resamplers/TriangleResampler.cs
index 66ff6a1ae..779b5180e 100644
--- a/src/ImageProcessor/Samplers/Resamplers/TriangleResampler.cs
+++ b/src/ImageProcessor/Samplers/Resamplers/TriangleResampler.cs
@@ -1,5 +1,5 @@
 // <copyright file="TriangleResampler.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Samplers/Resamplers/WelchResampler.cs b/src/ImageProcessor/Samplers/Resamplers/WelchResampler.cs
index db395ba85..d55a1415b 100644
--- a/src/ImageProcessor/Samplers/Resamplers/WelchResampler.cs
+++ b/src/ImageProcessor/Samplers/Resamplers/WelchResampler.cs
@@ -1,5 +1,5 @@
 // <copyright file="WelchResampler.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/Samplers/Resize.cs b/src/ImageProcessor/Samplers/Resize.cs
index 7e7e80557..015f6d2d7 100644
--- a/src/ImageProcessor/Samplers/Resize.cs
+++ b/src/ImageProcessor/Samplers/Resize.cs
@@ -1,5 +1,5 @@
 // <copyright file="Resize.cs" company="James South">
-// Copyright © James South and contributors.
+// Copyright (c) James South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
diff --git a/src/ImageProcessor/packages.config b/src/ImageProcessor/packages.config
deleted file mode 100644
index f8d3d631b..000000000
--- a/src/ImageProcessor/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="StyleCop.Analyzers" version="1.0.0-beta015" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
-</packages>
\ No newline at end of file
diff --git a/src/ImageProcessor/project.json b/src/ImageProcessor/project.json
new file mode 100644
index 000000000..6288fcc23
--- /dev/null
+++ b/src/ImageProcessor/project.json
@@ -0,0 +1,17 @@
+{
+  "supports": {
+    "net46.app": {},
+    "uwp.10.0.app": {},
+    "dnxcore50.app": {}
+  },
+  "dependencies": {
+    "Microsoft.NETCore": "5.0.0",
+    "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
+    "StyleCop.Analyzers": "1.0.0-beta015"
+  },
+  "frameworks": {
+    "dotnet": {
+      "imports": "portable-net452+win81"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/ImageProcessor/project.lock.json.REMOVED.git-id b/src/ImageProcessor/project.lock.json.REMOVED.git-id
new file mode 100644
index 000000000..24339fed2
--- /dev/null
+++ b/src/ImageProcessor/project.lock.json.REMOVED.git-id
@@ -0,0 +1 @@
+3f05708641eb3ed085d4689aae4a960eb067fd16
\ No newline at end of file
diff --git a/tests/ImageProcessor.Tests/Processors/Filters/FilterTests.cs b/tests/ImageProcessor.Tests/Processors/Filters/FilterTests.cs
index c5c5c0d75..a109d02a7 100644
--- a/tests/ImageProcessor.Tests/Processors/Filters/FilterTests.cs
+++ b/tests/ImageProcessor.Tests/Processors/Filters/FilterTests.cs
@@ -12,16 +12,16 @@ namespace ImageProcessor.Tests
     {
         public static readonly TheoryData<string, IImageProcessor> Filters = new TheoryData<string, IImageProcessor>
         {
-            { "Contrast-50", new Contrast(50) },
-            { "Contrast--50", new Contrast(-50) },
-            { "Alpha--50", new Alpha(50) },
+            //{ "Contrast-50", new Contrast(50) },
+            //{ "Contrast--50", new Contrast(-50) },
+            //{ "Alpha--50", new Alpha(50) },
             { "Invert", new Invert() },
-            { "Sepia", new Sepia() },
-            { "BlackWhite", new BlackWhite() },
-            { "Lomograph", new Lomograph() },
-            { "Polaroid", new Polaroid() },
-            { "GreyscaleBt709", new GreyscaleBt709() },
-            { "GreyscaleBt601", new GreyscaleBt601() },
+            //{ "Sepia", new Sepia() },
+            //{ "BlackWhite", new BlackWhite() },
+            //{ "Lomograph", new Lomograph() },
+            //{ "Polaroid", new Polaroid() },
+            //{ "GreyscaleBt709", new GreyscaleBt709() },
+            //{ "GreyscaleBt601", new GreyscaleBt601() },
         };
 
         [Theory]