Skip to content

Commit 49b8d47

Browse files
authored
Merge pull request #412 from drewnoakes/collapse-asspan-slice
Collapse .AsSpan().Slice(...) calls into .AsSpan(...)
2 parents aa74bff + cddd240 commit 49b8d47

6 files changed

+6
-6
lines changed

MetadataExtractor/Formats/Gif/GifReader.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ private static byte[] GatherBytes(SequentialReader reader, byte firstLength)
369369

370370
while (length > 0)
371371
{
372-
reader.GetBytes(buffer.AsSpan().Slice(0, length));
372+
reader.GetBytes(buffer.AsSpan(0, length));
373373

374374
stream.Write(buffer, 0, length);
375375

MetadataExtractor/IO/BufferReader.Indexed.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ public readonly string GetString(int index, int bytesRequested, Encoding encodin
195195
{
196196
byte[] bytes = ArrayPool<byte>.Shared.Rent(bytesRequested);
197197

198-
Span<byte> span = bytes.AsSpan().Slice(0, bytesRequested);
198+
Span<byte> span = bytes.AsSpan(0, bytesRequested);
199199

200200
GetBytes(index, span);
201201

MetadataExtractor/IO/ByteArrayReader.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public override void GetBytes(int index, Span<byte> bytes)
3737
{
3838
ValidateIndex(index, bytes.Length);
3939

40-
_buffer.AsSpan().Slice(index + _baseOffset, bytes.Length).CopyTo(bytes);
40+
_buffer.AsSpan(index + _baseOffset, bytes.Length).CopyTo(bytes);
4141
}
4242

4343
protected override void ValidateIndex(int index, int bytesRequested)

MetadataExtractor/IO/IndexedCapturingReader.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public override void GetBytes(int index, Span<byte> bytes)
165165
GetPosition(fromIndex, out int fromChunkIndex, out int fromInnerIndex);
166166
var length = Math.Min(remaining, _chunkLength - fromInnerIndex);
167167
var chunk = _chunks[fromChunkIndex];
168-
chunk.AsSpan().Slice(fromInnerIndex, length).CopyTo(bytes.Slice(toIndex, length));
168+
chunk.AsSpan(fromInnerIndex, length).CopyTo(bytes.Slice(toIndex, length));
169169
remaining -= length;
170170
fromIndex += length;
171171
toIndex += length;

MetadataExtractor/IO/IndexedReader.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ public string GetString(int index, int bytesRequested, Encoding encoding)
337337
{
338338
byte[] bytes = ArrayPool<byte>.Shared.Rent(bytesRequested);
339339

340-
Span<byte> span = bytes.AsSpan().Slice(0, bytesRequested);
340+
Span<byte> span = bytes.AsSpan(0, bytesRequested);
341341

342342
GetBytes(index, span);
343343

MetadataExtractor/IO/SequentialReader.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ public string GetString(int bytesRequested, Encoding encoding)
238238
{
239239
byte[] bytes = ArrayPool<byte>.Shared.Rent(bytesRequested);
240240

241-
Span<byte> span = bytes.AsSpan().Slice(0, bytesRequested);
241+
Span<byte> span = bytes.AsSpan(0, bytesRequested);
242242

243243
GetBytes(span);
244244

0 commit comments

Comments
 (0)