@ -4,7 +4,6 @@
using System ; using System ;
using System.Buffers ; using System.Buffers ;
using System.IO ; using System.IO ;
using SixLabors.ImageSharp.Memory ; using SixLabors.ImageSharp.Memory ;
using SixLabors.Memory ; using SixLabors.Memory ;
@ -15,7 +14,6 @@ namespace SixLabors.ImageSharp
/// </summary>
/// </summary>
internal static class StreamExtensions internal static class StreamExtensions
{ {
#if NETCOREAPP2_1
/// <summary>
/// <summary>
/// Writes data from a stream into the provided buffer.
/// Writes data from a stream into the provided buffer.
/// </summary>
/// </summary>
@ -24,23 +22,18 @@ namespace SixLabors.ImageSharp
/// <param name="offset">The offset within the buffer to begin writing.</param>
/// <param name="offset">The offset within the buffer to begin writing.</param>
/// <param name="count">The number of bytes to write to the stream.</param>
/// <param name="count">The number of bytes to write to the stream.</param>
public static void Write ( this Stream stream , Span < byte > buffer , int offset , int count ) public static void Write ( this Stream stream , Span < byte > buffer , int offset , int count )
{ = > stream . Write ( buffer . Slice ( offset , count ) ) ;
stream . Write ( buffer . Slice ( offset , count ) ) ;
}
/// <summary>
/// <summary>
/// Reads data from a stream into the provided buffer.
/// Reads data from a stream into the provided buffer.
/// </summary>
/// </summary>
/// <param name="stream">The stream.</param>
/// <param name="stream">The stream.</param>
/// <param name="buffer">The buffer.. </param>
/// <param name="buffer">The buffer.</param>
/// <param name="offset">The offset within the buffer where the bytes are read into.</param>
/// <param name="offset">The offset within the buffer where the bytes are read into.</param>
/// <param name="count">The number of bytes, if available, to read.</param>
/// <param name="count">The number of bytes, if available, to read.</param>
/// <returns>The actual number of bytes read.</returns>
/// <returns>The actual number of bytes read.</returns>
public static int Read ( this Stream stream , Span < byte > buffer , int offset , int count ) public static int Read ( this Stream stream , Span < byte > buffer , int offset , int count )
{ = > stream . Read ( buffer . Slice ( offset , count ) ) ;
return stream . Read ( buffer . Slice ( offset , count ) ) ;
}
#endif
/// <summary>
/// <summary>
/// Skips the number of bytes in the given stream.
/// Skips the number of bytes in the given stream.
@ -75,17 +68,39 @@ namespace SixLabors.ImageSharp
} }
public static void Read ( this Stream stream , IManagedByteBuffer buffer ) public static void Read ( this Stream stream , IManagedByteBuffer buffer )
{ = > stream . Read ( buffer . Array , 0 , buffer . Length ( ) ) ;
stream . Read ( buffer . Array , 0 , buffer . Length ( ) ) ;
}
public static void Write ( this Stream stream , IManagedByteBuffer buffer ) public static void Write ( this Stream stream , IManagedByteBuffer buffer )
= > stream . Write ( buffer . Array , 0 , buffer . Length ( ) ) ;
#if !SUPPORTS_SPAN_STREAM
// This is a port of the CoreFX implementation and is MIT Licensed:
// https://github.com/dotnet/corefx/blob/17300169760c61a90cab8d913636c1058a30a8c1/src/Common/src/CoreLib/System/IO/Stream.cs#L742
public static int Read ( this Stream stream , Span < byte > buffer )
{ {
stream . Write ( buffer . Array , 0 , buffer . Length ( ) ) ; // This uses ArrayPool<byte>.Shared, rather than taking a MemoryAllocator,
// in order to match the signature of the framework method that exists in
// .NET Core.
byte [ ] sharedBuffer = ArrayPool < byte > . Shared . Rent ( buffer . Length ) ;
try
{
int numRead = stream . Read ( sharedBuffer , 0 , buffer . Length ) ;
if ( ( uint ) numRead > ( uint ) buffer . Length )
{
throw new IOException ( "Stream was too long." ) ;
}
new Span < byte > ( sharedBuffer , 0 , numRead ) . CopyTo ( buffer ) ;
return numRead ;
}
finally
{
ArrayPool < byte > . Shared . Return ( sharedBuffer ) ;
}
} }
#if NET472 || NETSTANDARD1_3 || NETSTANDARD2_0
// This is a port of the CoreFX implementation and is MIT Licensed:
// This is a port of the CoreFX implementation and is MIT Licensed: https://github.com/dotnet/coreclr/blob/c4dca1072d15bdda64c754ad1ea474b1580fa554/src/System.Private.CoreLib/shared/System/IO/Stream.cs#L770
// https://github.com/dotnet/corefx/blob/17300169760c61a90cab8d913636c1058a30a8c1/src/Common/src/CoreLib/System/IO/Stream.cs#L775
public static void Write ( this Stream stream , ReadOnlySpan < byte > buffer ) public static void Write ( this Stream stream , ReadOnlySpan < byte > buffer )
{ {
// This uses ArrayPool<byte>.Shared, rather than taking a MemoryAllocator,
// This uses ArrayPool<byte>.Shared, rather than taking a MemoryAllocator,
James Jackson-South
6 years ago