From e55a63ac64cc3d7df14768f80c67c64c2a925549 Mon Sep 17 00:00:00 2001
From: Ildar Khayrutdinov <ildarkhairutdin@gmail.com>
Date: Sat, 18 Sep 2021 20:28:29 +0300
Subject: [PATCH] Revert some changes

---
 src/ImageSharp/Metadata/Profiles/Exif/ExifReader.cs    |  4 ++--
 .../Metadata/Profiles/Exif/Values/ExifNumberArray.cs   | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/ImageSharp/Metadata/Profiles/Exif/ExifReader.cs b/src/ImageSharp/Metadata/Profiles/Exif/ExifReader.cs
index eb15f9a492..2aa2fa27d9 100644
--- a/src/ImageSharp/Metadata/Profiles/Exif/ExifReader.cs
+++ b/src/ImageSharp/Metadata/Profiles/Exif/ExifReader.cs
@@ -394,7 +394,7 @@ namespace SixLabors.ImageSharp.Metadata.Profiles.Exif
             }
             else
             {
-                object value = this.ConvertValue(dataType, offsetBuffer.Slice(0, (int)size), numberOfComponents > 1 || exifValue.IsArray);
+                object value = this.ConvertValue(dataType, offsetBuffer.Slice(0, (int)size), numberOfComponents > 1);
                 this.Add(values, exifValue, value);
             }
         }
@@ -477,7 +477,7 @@ namespace SixLabors.ImageSharp.Metadata.Profiles.Exif
             }
             else
             {
-                object value = this.ConvertValue(dataType, offsetBuffer.Slice(0, (int)size), numberOfComponents > 1 || exifValue.IsArray);
+                object value = this.ConvertValue(dataType, offsetBuffer.Slice(0, (int)size), numberOfComponents > 1);
                 this.Add(values, exifValue, value);
             }
         }
diff --git a/src/ImageSharp/Metadata/Profiles/Exif/Values/ExifNumberArray.cs b/src/ImageSharp/Metadata/Profiles/Exif/Values/ExifNumberArray.cs
index 9e9e0e7378..2d3a93aed3 100644
--- a/src/ImageSharp/Metadata/Profiles/Exif/Values/ExifNumberArray.cs
+++ b/src/ImageSharp/Metadata/Profiles/Exif/Values/ExifNumberArray.cs
@@ -49,18 +49,18 @@ namespace SixLabors.ImageSharp.Metadata.Profiles.Exif
                     return this.SetSingle(val);
                 case uint val:
                     return this.SetSingle(val);
-                case ushort val:
-                    return this.SetSingle(val);
                 case short val:
                     return this.SetSingle(val);
-                case uint[] array:
-                    return this.SetArray(array);
+                case ushort val:
+                    return this.SetSingle(val);
                 case int[] array:
                     return this.SetArray(array);
-                case ushort[] array:
+                case uint[] array:
                     return this.SetArray(array);
                 case short[] array:
                     return this.SetArray(array);
+                case ushort[] array:
+                    return this.SetArray(array);
             }
 
             return false;