From 473a7f40ab0daf27bd2da323660e5cff107e76a5 Mon Sep 17 00:00:00 2001
From: Jason Nelson <jason@carbonmade.com>
Date: Mon, 15 Oct 2018 09:25:11 -0700
Subject: [PATCH] Use ASCII Encoding when known to be ASCII

---
 src/ImageSharp/Formats/Gif/GifConstants.cs                | 4 ++--
 .../Formats/Jpeg/Components/Decoder/ProfileResolver.cs    | 8 ++++----
 src/ImageSharp/Formats/Png/PngDecoderCore.cs              | 2 +-
 tests/ImageSharp.Tests/Formats/Png/PngChunkTypeTests.cs   | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/ImageSharp/Formats/Gif/GifConstants.cs b/src/ImageSharp/Formats/Gif/GifConstants.cs
index f8942cc3b..288c3dfa1 100644
--- a/src/ImageSharp/Formats/Gif/GifConstants.cs
+++ b/src/ImageSharp/Formats/Gif/GifConstants.cs
@@ -24,7 +24,7 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// <summary>
         /// The ASCII encoded bytes used to identify the GIF file.
         /// </summary>
-        internal static readonly byte[] MagicNumber = Encoding.UTF8.GetBytes(FileType + FileVersion);
+        internal static readonly byte[] MagicNumber = Encoding.ASCII.GetBytes(FileType + FileVersion);
 
         /// <summary>
         /// The extension block introducer <value>!</value>.
@@ -54,7 +54,7 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// <summary>
         /// The ASCII encoded application identification bytes.
         /// </summary>
-        internal static readonly byte[] NetscapeApplicationIdentificationBytes = Encoding.UTF8.GetBytes(NetscapeApplicationIdentification);
+        internal static readonly byte[] NetscapeApplicationIdentificationBytes = Encoding.ASCII.GetBytes(NetscapeApplicationIdentification);
 
         /// <summary>
         /// The Netscape looping application sub block size.
diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ProfileResolver.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ProfileResolver.cs
index a6d5faaea..3e7108b15 100644
--- a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ProfileResolver.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ProfileResolver.cs
@@ -14,22 +14,22 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
         /// <summary>
         /// Describes the EXIF specific markers
         /// </summary>
-        public static readonly byte[] JFifMarker = Encoding.UTF8.GetBytes("JFIF\0");
+        public static readonly byte[] JFifMarker = Encoding.ASCII.GetBytes("JFIF\0");
 
         /// <summary>
         /// Describes the EXIF specific markers
         /// </summary>
-        public static readonly byte[] IccMarker = Encoding.UTF8.GetBytes("ICC_PROFILE\0");
+        public static readonly byte[] IccMarker = Encoding.ASCII.GetBytes("ICC_PROFILE\0");
 
         /// <summary>
         /// Describes the ICC specific markers
         /// </summary>
-        public static readonly byte[] ExifMarker = Encoding.UTF8.GetBytes("Exif\0\0");
+        public static readonly byte[] ExifMarker = Encoding.ASCII.GetBytes("Exif\0\0");
 
         /// <summary>
         /// Describes Adobe specific markers <see href="http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/JPEG.html#Adobe"/>
         /// </summary>
-        public static readonly byte[] AdobeMarker = Encoding.UTF8.GetBytes("Adobe");
+        public static readonly byte[] AdobeMarker = Encoding.ASCII.GetBytes("Adobe");
 
         /// <summary>
         /// Returns a value indicating whether the passed bytes are a match to the profile identifier
diff --git a/src/ImageSharp/Formats/Png/PngDecoderCore.cs b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
index 8401f4e98..d66ac6c0d 100644
--- a/src/ImageSharp/Formats/Png/PngDecoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
@@ -1005,7 +1005,7 @@ namespace SixLabors.ImageSharp.Formats.Png
 
             if (this.crc.Value != chunk.Crc)
             {
-                string chunkTypeName = Encoding.UTF8.GetString(chunkType);
+                string chunkTypeName = Encoding.ASCII.GetString(chunkType);
 
                 throw new ImageFormatException($"CRC Error. PNG {chunkTypeName} chunk is corrupt!");
             }
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngChunkTypeTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngChunkTypeTests.cs
index 35652dd6b..e4cd06ab1 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngChunkTypeTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngChunkTypeTests.cs
@@ -24,7 +24,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
 
         private static PngChunkType GetType(string text)
         {
-            return (PngChunkType)BinaryPrimitives.ReadInt32BigEndian(Encoding.UTF8.GetBytes(text));
+            return (PngChunkType)BinaryPrimitives.ReadInt32BigEndian(Encoding.ASCII.GetBytes(text));
         }
     }
 }
\ No newline at end of file