From 78f9ca50f211cb3c055eac57d46c16063309ac43 Mon Sep 17 00:00:00 2001
From: Jason Nelson <jason@carbonmade.com>
Date: Mon, 1 Apr 2019 09:37:51 -0700
Subject: [PATCH] Replace Endianness enum with isBigEndian

---
 src/ImageSharp/IO/Endianness.cs               | 21 ------------
 .../MetaData/Profiles/Exif/ExifReader.cs      | 32 ++++++++-----------
 2 files changed, 14 insertions(+), 39 deletions(-)
 delete mode 100644 src/ImageSharp/IO/Endianness.cs

diff --git a/src/ImageSharp/IO/Endianness.cs b/src/ImageSharp/IO/Endianness.cs
deleted file mode 100644
index 59b2ae77c1..0000000000
--- a/src/ImageSharp/IO/Endianness.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-namespace SixLabors.ImageSharp.IO
-{
-    /// <summary>
-    /// Endianness of a converter
-    /// </summary>
-    internal enum Endianness
-    {
-        /// <summary>
-        /// Little endian - least significant byte first
-        /// </summary>
-        LittleEndian,
-
-        /// <summary>
-        /// Big endian - most significant byte first
-        /// </summary>
-        BigEndian
-    }
-}
diff --git a/src/ImageSharp/MetaData/Profiles/Exif/ExifReader.cs b/src/ImageSharp/MetaData/Profiles/Exif/ExifReader.cs
index 8ec9eea275..cf95affb04 100644
--- a/src/ImageSharp/MetaData/Profiles/Exif/ExifReader.cs
+++ b/src/ImageSharp/MetaData/Profiles/Exif/ExifReader.cs
@@ -8,20 +8,19 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text;
-using SixLabors.ImageSharp.IO;
 using SixLabors.ImageSharp.Primitives;
 
 namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
 {
     /// <summary>
-    /// Reads and parses EXIF data from a byte array
+    /// Reads and parses EXIF data from a byte array.
     /// </summary>
     internal sealed class ExifReader
     {
         private List<ExifTag> invalidTags;
         private readonly byte[] exifData;
         private int position;
-        private Endianness endianness = Endianness.BigEndian;
+        private bool isBigEndian;
         private uint exifOffset;
         private uint gpsOffset;
 
@@ -38,12 +37,12 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
         public IReadOnlyList<ExifTag> InvalidTags => this.invalidTags ?? (IReadOnlyList<ExifTag>)Array.Empty<ExifTag>();
 
         /// <summary>
-        /// Gets the thumbnail length in the byte stream
+        /// Gets the thumbnail length in the byte stream.
         /// </summary>
         public uint ThumbnailLength { get; private set; }
 
         /// <summary>
-        /// Gets the thumbnail offset position in the byte stream
+        /// Gets the thumbnail offset position in the byte stream.
         /// </summary>
         public uint ThumbnailOffset { get; private set; }
 
@@ -74,10 +73,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
             var values = new List<ExifValue>();
 
             // II == 0x4949
-            if (this.ReadUInt16() == 0x4949)
-            {
-                this.endianness = Endianness.LittleEndian;
-            }
+            this.isBigEndian = !(this.ReadUInt16() == 0x4949);
 
             if (this.ReadUInt16() != 0x002A)
             {
@@ -382,7 +378,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
 
         [MethodImpl(InliningOptions.ShortMethod)]
         private TEnum ToEnum<TEnum>(int value, TEnum defaultValue)
-            where TEnum : struct
+            where TEnum : struct, Enum
         {
             if (EnumHelper<TEnum>.IsDefined(value))
             {
@@ -458,7 +454,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
                 return default;
             }
 
-            long intValue = this.endianness == Endianness.BigEndian
+            long intValue = this.isBigEndian
                 ? BinaryPrimitives.ReadInt64BigEndian(buffer)
                 : BinaryPrimitives.ReadInt64LittleEndian(buffer);
 
@@ -473,7 +469,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
                 return default;
             }
 
-            return this.endianness == Endianness.BigEndian
+            return this.isBigEndian
                 ? BinaryPrimitives.ReadUInt32BigEndian(buffer)
                 : BinaryPrimitives.ReadUInt32LittleEndian(buffer);
         }
@@ -485,7 +481,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
                 return default;
             }
 
-            return this.endianness == Endianness.BigEndian
+            return this.isBigEndian
                 ? BinaryPrimitives.ReadUInt16BigEndian(buffer)
                 : BinaryPrimitives.ReadUInt16LittleEndian(buffer);
         }
@@ -497,7 +493,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
                 return default;
             }
 
-            int intValue = this.endianness == Endianness.BigEndian
+            int intValue = this.isBigEndian
                 ? BinaryPrimitives.ReadInt32BigEndian(buffer)
                 : BinaryPrimitives.ReadInt32LittleEndian(buffer);
 
@@ -526,7 +522,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
                 return default;
             }
 
-            return this.endianness == Endianness.BigEndian
+            return this.isBigEndian
                 ? BinaryPrimitives.ReadInt32BigEndian(buffer)
                 : BinaryPrimitives.ReadInt32LittleEndian(buffer);
         }
@@ -551,13 +547,13 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
                 return default;
             }
 
-            return this.endianness == Endianness.BigEndian
+            return this.isBigEndian
                 ? BinaryPrimitives.ReadInt16BigEndian(buffer)
                 : BinaryPrimitives.ReadInt16LittleEndian(buffer);
         }
 
-        private class EnumHelper<TEnum>
-            where TEnum : struct
+        private sealed class EnumHelper<TEnum>
+            where TEnum : struct, Enum
         {
             private static readonly int[] Values = Enum.GetValues(typeof(TEnum)).Cast<TEnum>()
                 .Select(e => Convert.ToInt32(e)).OrderBy(e => e).ToArray();