Spanify IInputBytes

src/UglyToad.PdfPig.Core/IInputBytes.cs

@@ -47,8 +47,7 @@
         /// Fill the buffer with bytes starting from the current position.
         /// </summary>
         /// <param name="buffer">A buffer with a length corresponding to the number of bytes to read.</param>
-        /// <param name="length">Optional override for the number of bytes to read.</param>
         /// <returns>The number of bytes successfully read.</returns>
-        int Read(byte[] buffer, int? length = null);
+        int Read(Span<byte> buffer);
     }
 }

src/UglyToad.PdfPig.Core/MemoryInputBytes.cs

@@ -7,7 +7,7 @@
     /// <summary>
     /// Input bytes from a byte array.
     /// </summary>
-    public class MemoryInputBytes : IInputBytes
+    public sealed class MemoryInputBytes : IInputBytes
     {
         private readonly int upperBound;
         private readonly ReadOnlyMemory<byte> memory;
@@ -73,31 +73,15 @@
         }
 
         /// <inheritdoc />
-        public int Read(byte[] buffer, int? length = null)
+        public int Read(Span<byte> buffer)
         {
-            var bytesToRead = buffer.Length;
+            if (buffer.IsEmpty)
-            if (length.HasValue)
-            {
-                if (length.Value < 0)
-                {
-                    throw new ArgumentOutOfRangeException($"Cannot use a negative length: {length.Value}.");
-                }
-
-                if (length.Value > bytesToRead)
-                {
-                    throw new ArgumentOutOfRangeException($"Cannot read more bytes {length.Value} than there is space in the buffer {buffer.Length}.");
-                }
-
-                bytesToRead = length.Value;
-            }
-
-            if (bytesToRead == 0)
             {
                 return 0;
             }
 
             var viableLength = (memory.Length - currentOffset - 1);
-            var readLength = viableLength < bytesToRead ? viableLength : bytesToRead;
+            var readLength = viableLength < buffer.Length ? viableLength : buffer.Length;
             var startFrom = currentOffset + 1;
 
             memory.Span.Slice(startFrom, readLength).CopyTo(buffer);

src/UglyToad.PdfPig.Core/Polyfills/StreamExtensions.cs

@@ -6,19 +6,37 @@ using System.Buffers;
 
 internal static class StreamExtensions
 {
-    public static void Write(this Stream stream, ReadOnlySpan<byte> data)
+    public static void Write(this Stream stream, ReadOnlySpan<byte> buffer)
     {
-        var buffer = ArrayPool<byte>.Shared.Rent(data.Length);
+        var tempBuffer = ArrayPool<byte>.Shared.Rent(buffer.Length);
 
-        data.CopyTo(buffer);
+        buffer.CopyTo(tempBuffer);
 
         try
         {
-            stream.Write(buffer, 0, data.Length);
+            stream.Write(tempBuffer, 0, buffer.Length);
         }
         finally
         {
-            ArrayPool<byte>.Shared.Return(buffer);
+            ArrayPool<byte>.Shared.Return(tempBuffer);
+        }
+    }
+
+    public static int Read(this Stream stream, Span<byte> buffer)
+    {
+        var tempBuffer = ArrayPool<byte>.Shared.Rent(buffer.Length);
+
+        try
+        {
+            int read = stream.Read(tempBuffer, 0, buffer.Length);
+
+            tempBuffer.AsSpan(0, read).CopyTo(buffer);
+
+            return read;
+        }
+        finally
+        {
+            ArrayPool<byte>.Shared.Return(tempBuffer);
         }
     }
 }

src/UglyToad.PdfPig.Core/StreamInputBytes.cs

@@ -7,7 +7,7 @@
     /// <summary>
     /// Input bytes from a stream.
     /// </summary>
-    public class StreamInputBytes : IInputBytes
+    public sealed class StreamInputBytes : IInputBytes
     {
         private readonly Stream stream;
         private readonly bool shouldDispose;
@@ -106,30 +106,15 @@
         }
 
         /// <inheritdoc />
-        public int Read(byte[] buffer, int? length = null)
+        public int Read(Span<byte> buffer)
         {
-            var bytesToRead = buffer.Length;
+            if (buffer.IsEmpty)
-            if (length.HasValue)
-            {
-                if (length.Value < 0)
-                {
-                    throw new ArgumentOutOfRangeException($"Cannot use a negative length: {length.Value}.");
-                }
-
-                if (length.Value > bytesToRead)
-                {
-                    throw new ArgumentOutOfRangeException($"Cannot read more bytes {length.Value} than there is space in the buffer {buffer.Length}.");
-                }
-
-                bytesToRead = length.Value;
-            }
-
-            if (bytesToRead == 0)
             {
                 return 0;
             }
 
-            var read = stream.Read(buffer, 0, bytesToRead);
+            int read = stream.Read(buffer);
+
             if (read > 0)
             {
                 CurrentByte = buffer[read - 1];

src/UglyToad.PdfPig.Fonts/TrueType/TrueTypeDataBytes.cs

@@ -1,6 +1,7 @@
 namespace UglyToad.PdfPig.Fonts.TrueType
 {
     using System;
+    using System.Buffers.Binary;
     using System.Text;
     using Core;
 
@@ -9,7 +10,6 @@
     /// </summary>
     public class TrueTypeDataBytes
     {
-        private readonly byte[] internalBuffer = new byte[16];
         private readonly IInputBytes inputBytes;
 
         /// <summary>
@@ -50,9 +50,11 @@
         /// </summary>
         public short ReadSignedShort()
         {
-            ReadBuffered(internalBuffer, 2);
+            Span<byte> buffer = stackalloc byte[2];
 
-            return unchecked((short)((internalBuffer[0] << 8) + (internalBuffer[1] << 0)));
+            ReadBuffered(buffer);
+
+            return unchecked((short)((buffer[0] << 8) + (buffer[1] << 0)));
         }
 
         /// <summary>
@@ -60,9 +62,11 @@
         /// </summary>
         public ushort ReadUnsignedShort()
         {
-            ReadBuffered(internalBuffer, 2);
+            Span<byte> buffer = stackalloc byte[2];
 
-            return (ushort)((internalBuffer[0] << 8) + (internalBuffer[1] << 0));
+            ReadBuffered(buffer);
+
+            return (ushort)((buffer[0] << 8) + (buffer[1] << 0));
         }
 
         /// <summary>
@@ -70,9 +74,11 @@
         /// </summary>
         public byte ReadByte()
         {
-            ReadBuffered(internalBuffer, 1);
+            Span<byte> buffer = stackalloc byte[1];
 
-            return internalBuffer[0];
+            ReadBuffered(buffer);
+
+            return buffer[0];
         }
 
         /// <summary>
@@ -99,8 +105,11 @@
                 return false;
             }
 
-            byte[] data = new byte[bytesToRead];
+            Span<byte> data = bytesToRead <= 64
-            if (ReadBuffered(data, bytesToRead))
+                ? stackalloc byte[bytesToRead]
+                : new byte[bytesToRead];
+
+            if (ReadBuffered(data))
             {
                 result = encoding.GetString(data);
                 return true;
@@ -114,9 +123,11 @@
         /// </summary>
         public uint ReadUnsignedInt()
         {
-            ReadBuffered(internalBuffer, 4);
+            Span<byte> buffer = stackalloc byte[4];
 
-            return (uint)(((long)internalBuffer[0] << 24) + ((long)internalBuffer[1] << 16) + (internalBuffer[2] << 8) + (internalBuffer[3] << 0));
+            ReadBuffered(buffer);
+            
+            return BinaryPrimitives.ReadUInt32BigEndian(buffer);
         }
 
         /// <summary>
@@ -124,9 +135,11 @@
         /// </summary>
         public int ReadSignedInt()
         {
-            ReadBuffered(internalBuffer, 4);
+            Span<byte> buffer = stackalloc byte[4];
 
-            return (internalBuffer[0] << 24) + (internalBuffer[1] << 16) + (internalBuffer[2] << 8) + (internalBuffer[3] << 0);
+            ReadBuffered(buffer);
+
+            return BinaryPrimitives.ReadInt32BigEndian(buffer);
         }
 
         /// <summary>
@@ -175,9 +188,11 @@
         /// </summary>
         public int ReadSignedByte()
         {
-            ReadBuffered(internalBuffer, 1);
+            Span<byte> buffer = stackalloc byte[1];
 
-            var signedByte = internalBuffer[0];
+            ReadBuffered(buffer);
+
+            var signedByte = buffer[0];
 
             return signedByte < 127 ? signedByte : signedByte - 256;
         }
@@ -204,7 +219,7 @@
         {
             var result = new byte[length];
 
-            ReadBuffered(result, length);
+            ReadBuffered(result);
 
             return result;
         }
@@ -244,15 +259,9 @@
             return $"@: {Position} of {inputBytes.Length} bytes.";
         }
 
-        private bool ReadBuffered(byte[] buffer, int length)
+        private bool ReadBuffered(Span<byte> buffer)
         {
-            var read = inputBytes.Read(buffer, length);
+            return inputBytes.Read(buffer) == buffer.Length;
-            if (read < length)
-            {
-                return false;
-            }
-
-            return true;
         }
     }
-}
+}

src/UglyToad.PdfPig/Parser/FileStructure/CrossReferenceParser.cs

@@ -312,7 +312,7 @@
 
             bytes.Seek(lastOffset);
 
-            var buffer = new byte[5];
+            Span<byte> buffer = stackalloc byte[5];
 
             while (bytes.Read(buffer) == buffer.Length)
             {
@@ -347,10 +347,9 @@
 
                 bytes.Seek(lastOffset);
             }
+
             bytes.Read(buffer);
 
-
-
             return false;
         }
     }

src/UglyToad.PdfPig/Parser/FileStructure/FileHeaderParser.cs

@@ -103,13 +103,13 @@
 
             // Slide a window of bufferLength bytes across the file allowing for the fact the version could get split by
             // the window (so always ensure an overlap of versionLength bytes between the end of the previous and start of the next buffer).
-            var buffer = new byte[bufferLength];
+            Span<byte> buffer = stackalloc byte[bufferLength];
 
             var currentOffset = startPosition;
             int readLength;
             do
             {
-                readLength = inputBytes.Read(buffer, bufferLength);
+                readLength = inputBytes.Read(buffer);
 
                 var content = OtherEncodings.BytesAsLatin1String(buffer);