Merge pull request #2200 from teo-tsirpanis/patch-1

Refactor `EnumUtils` and make it AOT-friendly.
SixLabors · Aug 10, 2022 · 4a0a5cf · 4a0a5cf
2 parents d33b364 + 1cc618a
commit 4a0a5cf
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/ImageSharp/Common/Helpers/EnumUtils.cs b/src/ImageSharp/Common/Helpers/EnumUtils.cs
@@ -19,15 +19,14 @@ internal static class EnumUtils
         /// <param name="defaultValue">The default value to return.</param>
         /// <returns>The <typeparamref name="TEnum"/>.</returns>
         public static TEnum Parse<TEnum>(int value, TEnum defaultValue)
-            where TEnum : Enum
+            where TEnum : struct, Enum
         {
-            foreach (TEnum enumValue in Enum.GetValues(typeof(TEnum)))
+            DebugGuard.IsTrue(Unsafe.SizeOf<TEnum>() == sizeof(int), "Only int-sized enums are supported.");
+
+            TEnum valueEnum = Unsafe.As<int, TEnum>(ref value);
+            if (Enum.IsDefined(valueEnum))
             {
-                TEnum current = enumValue;
-                if (value == Unsafe.As<TEnum, int>(ref current))
-                {
-                    return enumValue;
-                }
+                return valueEnum;
             }
 
             return defaultValue;
@@ -41,8 +40,10 @@ public static TEnum Parse<TEnum>(int value, TEnum defaultValue)
         /// <param name="flag">The flag.</param>
         /// <returns>The <see cref="bool"/>.</returns>
         public static bool HasFlag<TEnum>(TEnum value, TEnum flag)
-          where TEnum : Enum
+          where TEnum : struct, Enum
         {
+            DebugGuard.IsTrue(Unsafe.SizeOf<TEnum>() == sizeof(int), "Only int-sized enums are supported.");
+
             uint flagValue = Unsafe.As<TEnum, uint>(ref flag);
             return (Unsafe.As<TEnum, uint>(ref value) & flagValue) == flagValue;
         }