Merge pull request #410 from drewnoakes/use-spans-in-dotnet-8

Use spans in readers in .NET 8
drewnoakes · Feb 18, 2024 · 3fdeeb0 · 3fdeeb0
2 parents 4505428 + 990e635
commit 3fdeeb0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/MetadataExtractor/IO/IndexedSeekingReader.cs b/MetadataExtractor/IO/IndexedSeekingReader.cs
@@ -41,7 +41,7 @@ public IndexedSeekingReader(Stream stream, int baseOffset = 0, bool isMotorolaBy
 
         public override long Length { get; }
 
-#if !NETSTANDARD2_1
+#if !NETSTANDARD2_1 && !NET8_0_OR_GREATER
         private readonly byte[] _buffer = new byte[2048];
 #endif
 
@@ -59,7 +59,7 @@ public override void GetBytes(int index, Span<byte> bytes)
             while (totalBytesRead != bytes.Length)
             {
                 var target = bytes.Slice(totalBytesRead);
-#if NETSTANDARD2_1
+#if NETSTANDARD2_1 || NET8_0_OR_GREATER
                 var bytesRead = _stream.Read(target);
 #else
                 var len = Math.Min(bytes.Length - totalBytesRead, _buffer.Length);
@@ -75,7 +75,6 @@ public override void GetBytes(int index, Span<byte> bytes)
 
                 Debug.Assert(totalBytesRead <= bytes.Length);
             }
-
         }
 
         private void Seek(int index)

diff --git a/MetadataExtractor/IO/SequentialStreamReader.cs b/MetadataExtractor/IO/SequentialStreamReader.cs
@@ -51,7 +51,7 @@ public override void GetBytes(byte[] buffer, int offset, int count)
             }
         }
 
-#if !NETSTANDARD2_1
+#if !NETSTANDARD2_1 && !NET8_0_OR_GREATER
         private readonly byte[] _buffer = new byte[2048];
 #endif
 
@@ -62,7 +62,7 @@ public override void GetBytes(Span<byte> bytes)
             while (totalBytesRead != bytes.Length)
             {
                 var target = bytes.Slice(totalBytesRead);
-#if NETSTANDARD2_1
+#if NETSTANDARD2_1 || NET8_0_OR_GREATER
                 var bytesRead = _stream.Read(target);
 #else
                 var len = Math.Min(bytes.Length - totalBytesRead, _buffer.Length);