Merge pull request #1115 from ionite34/backport/main/pr-1108

[dev to main] backport: Fix build error for .net 9/10 macOS hybrid shenanigans (1108)

Author: mohnjiles

StabilityMatrix.Avalonia/Helpers/PngDataHelper.cs

@@ -42,7 +42,7 @@ InferenceProjectDocument projectDocument
         while (position < inputImage.Length)
         {
             var chunkLength = BitConverter.ToInt32(
-                inputImage[position..(position + 4)].Reverse().ToArray(),
+                inputImage[position..(position + 4)].AsEnumerable().Reverse().ToArray(),
                 0
             );
             var chunkType = Encoding.ASCII.GetString(inputImage[(position + 4)..(position + 8)]);
@@ -53,8 +53,10 @@ InferenceProjectDocument projectDocument
                 {
                     var imageWidthBytes = inputImage[(position + 8)..(position + 12)];
                     var imageHeightBytes = inputImage[(position + 12)..(position + 16)];
-                    var imageWidth = BitConverter.ToInt32(imageWidthBytes.Reverse().ToArray());
-                    var imageHeight = BitConverter.ToInt32(imageHeightBytes.Reverse().ToArray());
+                    var imageWidth = BitConverter.ToInt32(imageWidthBytes.AsEnumerable().Reverse().ToArray());
+                    var imageHeight = BitConverter.ToInt32(
+                        imageHeightBytes.AsEnumerable().Reverse().ToArray()
+                    );
 
                     generationParameters.Width = imageWidth;
                     generationParameters.Height = imageHeight;
@@ -102,7 +104,7 @@ public static byte[] RemoveMetadata(byte[] inputImage)
         while (position < inputImage.Length)
         {
             var chunkLength = BitConverter.ToInt32(
-                inputImage[position..(position + 4)].Reverse().ToArray(),
+                inputImage[position..(position + 4)].AsEnumerable().Reverse().ToArray(),
                 0
             );
             var chunkType = Encoding.ASCII.GetString(inputImage[(position + 4)..(position + 8)]);
@@ -124,9 +126,13 @@ private static byte[] BuildTextChunk(string key, string value)
     {
         var textData = $"{key}\0{value}";
         var dataBytes = Encoding.UTF8.GetBytes(textData);
-        var textDataLength = BitConverter.GetBytes(dataBytes.Length).Reverse();
+        var textDataLength = BitConverter.GetBytes(dataBytes.Length).AsEnumerable().Reverse().ToArray();
         var textDataBytes = Text.Concat(dataBytes).ToArray();
-        var crc = BitConverter.GetBytes(Crc32Algorithm.Compute(textDataBytes)).Reverse();
+        var crc = BitConverter
+            .GetBytes(Crc32Algorithm.Compute(textDataBytes))
+            .AsEnumerable()
+            .Reverse()
+            .ToArray();
 
         return textDataLength.Concat(textDataBytes).Concat(crc).ToArray();
     }

StabilityMatrix.Core/Helper/ImageMetadata.cs

@@ -2,6 +2,7 @@
 using System.Text;
 using System.Text.Json;
 using ExifLibrary;
+using KGySoft.CoreLibraries;
 using MetadataExtractor;
 using MetadataExtractor.Formats.Exif;
 using MetadataExtractor.Formats.Png;
@@ -52,8 +53,8 @@ public static System.Drawing.Size GetImageSize(byte[] inputImage)
     {
         var imageWidthBytes = inputImage[0x10..0x14];
         var imageHeightBytes = inputImage[0x14..0x18];
-        var imageWidth = BitConverter.ToInt32(imageWidthBytes.Reverse().ToArray());
-        var imageHeight = BitConverter.ToInt32(imageHeightBytes.Reverse().ToArray());
+        var imageWidth = BitConverter.ToInt32(imageWidthBytes.AsEnumerable().Reverse().ToArray());
+        var imageHeight = BitConverter.ToInt32(imageHeightBytes.AsEnumerable().Reverse().ToArray());
 
         return new System.Drawing.Size(imageWidth, imageHeight);
     }
@@ -66,8 +67,8 @@ public static System.Drawing.Size GetImageSize(BinaryReader reader)
         var imageWidthBytes = reader.ReadBytes(4);
         var imageHeightBytes = reader.ReadBytes(4);
 
-        var imageWidth = BitConverter.ToInt32(imageWidthBytes.Reverse().ToArray());
-        var imageHeight = BitConverter.ToInt32(imageHeightBytes.Reverse().ToArray());
+        var imageWidth = BitConverter.ToInt32(imageWidthBytes.AsEnumerable().Reverse().ToArray());
+        var imageHeight = BitConverter.ToInt32(imageHeightBytes.AsEnumerable().Reverse().ToArray());
 
         reader.BaseStream.Position = oldPosition;
 
@@ -169,7 +170,7 @@ public static string ReadTextChunk(BinaryReader byteStream, string key)
 
         while (byteStream.BaseStream.Position < byteStream.BaseStream.Length - 4)
         {
-            var chunkSize = BitConverter.ToInt32(byteStream.ReadBytes(4).Reverse().ToArray());
+            var chunkSize = BitConverter.ToInt32(byteStream.ReadBytes(4).AsEnumerable().Reverse().ToArray());
             var chunkType = Encoding.UTF8.GetString(byteStream.ReadBytes(4));
 
             if (chunkType == Encoding.UTF8.GetString(Idat))
@@ -220,7 +221,7 @@ public static string ReadTextChunk(BinaryReader byteStream, string key)
         while (byteStream.BaseStream.Position < byteStream.BaseStream.Length - 4)
         {
             var chunkSizeBytes = byteStream.ReadBytes(4);
-            var chunkSize = BitConverter.ToInt32(chunkSizeBytes.Reverse().ToArray());
+            var chunkSize = BitConverter.ToInt32(chunkSizeBytes.AsEnumerable().Reverse().ToArray());
             var chunkTypeBytes = byteStream.ReadBytes(4);
             var chunkType = Encoding.UTF8.GetString(chunkTypeBytes);