tsai
/
ImageSharp
mirror of https://github.com/SixLabors/ImageSharp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Update AllocatePaddedPixelRowBuffer

pull/1676/head
James Jackson-South 5 years ago
parent
cfba8c97f0
commit
82fd63bb95
6 changed files with 246 additions and 256 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/ImageSharp/Common/Extensions/StreamExtensions.cs
  2. 38
      src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
  3. 29
      src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs
  4. 49
      src/ImageSharp/Formats/Tga/TgaDecoderCore.cs
  5. 44
      src/ImageSharp/Formats/Tga/TgaEncoderCore.cs
  6. 8
      src/ImageSharp/Memory/MemoryAllocatorExtensions.cs

6
src/ImageSharp/Common/Extensions/StreamExtensions.cs
View File

@ -72,12 +72,6 @@ namespace SixLabors.ImageSharp
} }
} }
public static void Read(this Stream stream, IManagedByteBuffer buffer)
=> stream.Read(buffer.Array, 0, buffer.Length());
public static void Write(this Stream stream, IManagedByteBuffer buffer)
=> stream.Write(buffer.Array, 0, buffer.Length());
#if !SUPPORTS_SPAN_STREAM #if !SUPPORTS_SPAN_STREAM
// 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/corefx/blob/17300169760c61a90cab8d913636c1058a30a8c1/src/Common/src/CoreLib/System/IO/Stream.cs#L742 // https://github.com/dotnet/corefx/blob/17300169760c61a90cab8d913636c1058a30a8c1/src/Common/src/CoreLib/System/IO/Stream.cs#L742

38
src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
View File

@ -928,22 +928,21 @@ namespace SixLabors.ImageSharp.Formats.Bmp
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
int padding = CalculatePadding(width, 3); int padding = CalculatePadding(width, 3);
using IMemoryOwner<byte> row = this.memoryAllocator.AllocatePaddedPixelRowBuffer(width, 3, padding);
Span<byte> rowSpan = row.GetSpan();
using (IManagedByteBuffer row = this.memoryAllocator.AllocatePaddedPixelRowBuffer(width, 3, padding))
{
for (int y = 0; y < height; y++) for (int y = 0; y < height; y++)
{ {
this.stream.Read(row); this.stream.Read(rowSpan);
int newY = Invert(y, height, inverted); int newY = Invert(y, height, inverted);
Span<TPixel> pixelSpan = pixels.GetRowSpan(newY); Span<TPixel> pixelSpan = pixels.GetRowSpan(newY);
PixelOperations<TPixel>.Instance.FromBgr24Bytes( PixelOperations<TPixel>.Instance.FromBgr24Bytes(
this.Configuration, this.Configuration,
row.GetSpan(), rowSpan,
pixelSpan, pixelSpan,
width); width);
} }
} }
}
/// <summary> /// <summary>
/// Reads the 32 bit color palette from the stream. /// Reads the 32 bit color palette from the stream.
@ -957,22 +956,21 @@ namespace SixLabors.ImageSharp.Formats.Bmp
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
int padding = CalculatePadding(width, 4); int padding = CalculatePadding(width, 4);
using IMemoryOwner<byte> row = this.memoryAllocator.AllocatePaddedPixelRowBuffer(width, 4, padding);
Span<byte> rowSpan = row.GetSpan();
using (IManagedByteBuffer row = this.memoryAllocator.AllocatePaddedPixelRowBuffer(width, 4, padding))
{
for (int y = 0; y < height; y++) for (int y = 0; y < height; y++)
{ {
this.stream.Read(row); this.stream.Read(rowSpan);
int newY = Invert(y, height, inverted); int newY = Invert(y, height, inverted);
Span<TPixel> pixelSpan = pixels.GetRowSpan(newY); Span<TPixel> pixelSpan = pixels.GetRowSpan(newY);
PixelOperations<TPixel>.Instance.FromBgra32Bytes( PixelOperations<TPixel>.Instance.FromBgra32Bytes(
this.Configuration, this.Configuration,
row.GetSpan(), rowSpan,
pixelSpan, pixelSpan,
width); width);
} }
} }
}
/// <summary> /// <summary>
/// Reads the 32 bit color palette from the stream, checking the alpha component of each pixel. /// Reads the 32 bit color palette from the stream, checking the alpha component of each pixel.
@ -987,10 +985,9 @@ namespace SixLabors.ImageSharp.Formats.Bmp
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
int padding = CalculatePadding(width, 4); int padding = CalculatePadding(width, 4);
using IMemoryOwner<byte> row = this.memoryAllocator.AllocatePaddedPixelRowBuffer(width, 4, padding);
using (IManagedByteBuffer row = this.memoryAllocator.AllocatePaddedPixelRowBuffer(width, 4, padding)) using IMemoryOwner<Bgra32> bgraRow = this.memoryAllocator.Allocate<Bgra32>(width);
using (IMemoryOwner<Bgra32> bgraRow = this.memoryAllocator.Allocate<Bgra32>(width)) Span<byte> rowSpan = row.GetSpan();
{
Span<Bgra32> bgraRowSpan = bgraRow.GetSpan(); Span<Bgra32> bgraRowSpan = bgraRow.GetSpan();
long currentPosition = this.stream.Position; long currentPosition = this.stream.Position;
bool hasAlpha = false; bool hasAlpha = false;
@ -1000,11 +997,11 @@ namespace SixLabors.ImageSharp.Formats.Bmp
// actually a BGRA image, and change tactics accordingly. // actually a BGRA image, and change tactics accordingly.
for (int y = 0; y < height; y++) for (int y = 0; y < height; y++)
{ {
this.stream.Read(row); this.stream.Read(rowSpan);
PixelOperations<Bgra32>.Instance.FromBgra32Bytes( PixelOperations<Bgra32>.Instance.FromBgra32Bytes(
this.Configuration, this.Configuration,
row.GetSpan(), rowSpan,
bgraRowSpan, bgraRowSpan,
width); width);
@ -1033,14 +1030,14 @@ namespace SixLabors.ImageSharp.Formats.Bmp
{ {
for (int y = 0; y < height; y++) for (int y = 0; y < height; y++)
{ {
this.stream.Read(row); this.stream.Read(rowSpan);
int newY = Invert(y, height, inverted); int newY = Invert(y, height, inverted);
Span<TPixel> pixelSpan = pixels.GetRowSpan(newY); Span<TPixel> pixelSpan = pixels.GetRowSpan(newY);
PixelOperations<TPixel>.Instance.FromBgra32Bytes( PixelOperations<TPixel>.Instance.FromBgra32Bytes(
this.Configuration, this.Configuration,
row.GetSpan(), rowSpan,
pixelSpan, pixelSpan,
width); width);
} }
@ -1051,10 +1048,10 @@ namespace SixLabors.ImageSharp.Formats.Bmp
// Slow path. We need to set each alpha component value to fully opaque. // Slow path. We need to set each alpha component value to fully opaque.
for (int y = 0; y < height; y++) for (int y = 0; y < height; y++)
{ {
this.stream.Read(row); this.stream.Read(rowSpan);
PixelOperations<Bgra32>.Instance.FromBgra32Bytes( PixelOperations<Bgra32>.Instance.FromBgra32Bytes(
this.Configuration, this.Configuration,
row.GetSpan(), rowSpan,
bgraRowSpan, bgraRowSpan,
width); width);
@ -1070,7 +1067,6 @@ namespace SixLabors.ImageSharp.Formats.Bmp
} }
} }
} }
}
/// <summary> /// <summary>
/// Decode an 32 Bit Bitmap containing a bitmask for each color channel. /// Decode an 32 Bit Bitmap containing a bitmask for each color channel.

29
src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs
View File

@ -257,7 +257,8 @@ namespace SixLabors.ImageSharp.Formats.Bmp
} }
} }
private IManagedByteBuffer AllocateRow(int width, int bytesPerPixel) => this.memoryAllocator.AllocatePaddedPixelRowBuffer(width, bytesPerPixel, this.padding); private IMemoryOwner<byte> AllocateRow(int width, int bytesPerPixel)
=> this.memoryAllocator.AllocatePaddedPixelRowBuffer(width, bytesPerPixel, this.padding);
/// <summary> /// <summary>
/// Writes the 32bit color palette to the stream. /// Writes the 32bit color palette to the stream.
@ -268,18 +269,18 @@ namespace SixLabors.ImageSharp.Formats.Bmp
private void Write32Bit<TPixel>(Stream stream, Buffer2D<TPixel> pixels) private void Write32Bit<TPixel>(Stream stream, Buffer2D<TPixel> pixels)
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
using (IManagedByteBuffer row = this.AllocateRow(pixels.Width, 4)) using IMemoryOwner<byte> row = this.AllocateRow(pixels.Width, 4);
{ Span<byte> rowSpan = row.GetSpan();
for (int y = pixels.Height - 1; y >= 0; y--) for (int y = pixels.Height - 1; y >= 0; y--)
{ {
Span<TPixel> pixelSpan = pixels.GetRowSpan(y); Span<TPixel> pixelSpan = pixels.GetRowSpan(y);
PixelOperations<TPixel>.Instance.ToBgra32Bytes( PixelOperations<TPixel>.Instance.ToBgra32Bytes(
this.configuration, this.configuration,
pixelSpan, pixelSpan,
row.GetSpan(), rowSpan,
pixelSpan.Length); pixelSpan.Length);
stream.Write(row.Array, 0, row.Length()); stream.Write(rowSpan);
}
} }
} }
@ -294,8 +295,9 @@ namespace SixLabors.ImageSharp.Formats.Bmp
{ {
int width = pixels.Width; int width = pixels.Width;
int rowBytesWithoutPadding = width * 3; int rowBytesWithoutPadding = width * 3;
using (IManagedByteBuffer row = this.AllocateRow(width, 3)) using IMemoryOwner<byte> row = this.AllocateRow(width, 3);
{ Span<byte> rowSpan = row.GetSpan();
for (int y = pixels.Height - 1; y >= 0; y--) for (int y = pixels.Height - 1; y >= 0; y--)
{ {
Span<TPixel> pixelSpan = pixels.GetRowSpan(y); Span<TPixel> pixelSpan = pixels.GetRowSpan(y);
@ -304,8 +306,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
pixelSpan, pixelSpan,
row.Slice(0, rowBytesWithoutPadding), row.Slice(0, rowBytesWithoutPadding),
width); width);
stream.Write(row.Array, 0, row.Length()); stream.Write(rowSpan);
}
} }
} }
@ -320,8 +321,9 @@ namespace SixLabors.ImageSharp.Formats.Bmp
{ {
int width = pixels.Width; int width = pixels.Width;
int rowBytesWithoutPadding = width * 2; int rowBytesWithoutPadding = width * 2;
using (IManagedByteBuffer row = this.AllocateRow(width, 2)) using IMemoryOwner<byte> row = this.AllocateRow(width, 2);
{ Span<byte> rowSpan = row.GetSpan();
for (int y = pixels.Height - 1; y >= 0; y--) for (int y = pixels.Height - 1; y >= 0; y--)
{ {
Span<TPixel> pixelSpan = pixels.GetRowSpan(y); Span<TPixel> pixelSpan = pixels.GetRowSpan(y);
@ -332,8 +334,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
row.Slice(0, rowBytesWithoutPadding), row.Slice(0, rowBytesWithoutPadding),
pixelSpan.Length); pixelSpan.Length);
stream.Write(row.Array, 0, row.Length()); stream.Write(rowSpan);
}
} }
} }

49
src/ImageSharp/Formats/Tga/TgaDecoderCore.cs
View File

@ -373,22 +373,21 @@ namespace SixLabors.ImageSharp.Formats.Tga
return; return;
} }
using (IManagedByteBuffer row = this.memoryAllocator.AllocatePaddedPixelRowBuffer(width, 1, 0)) using IMemoryOwner<byte> row = this.memoryAllocator.AllocatePaddedPixelRowBuffer(width, 1, 0);
{ Span<byte> rowSpan = row.GetSpan();
bool invertY = InvertY(origin); bool invertY = InvertY(origin);
if (invertY) if (invertY)
{ {
for (int y = height - 1; y >= 0; y--) for (int y = height - 1; y >= 0; y--)
{ {
this.ReadL8Row(width, pixels, row, y); this.ReadL8Row(width, pixels, rowSpan, y);
} }
} }
else else
{ {
for (int y = 0; y < height; y++) for (int y = 0; y < height; y++)
{ {
this.ReadL8Row(width, pixels, row, y); this.ReadL8Row(width, pixels, rowSpan, y);
}
} }
} }
} }
@ -406,8 +405,9 @@ namespace SixLabors.ImageSharp.Formats.Tga
{ {
TPixel color = default; TPixel color = default;
bool invertX = InvertX(origin); bool invertX = InvertX(origin);
using (IManagedByteBuffer row = this.memoryAllocator.AllocatePaddedPixelRowBuffer(width, 2, 0)) using IMemoryOwner<byte> row = this.memoryAllocator.AllocatePaddedPixelRowBuffer(width, 2, 0);
{ Span<byte> rowSpan = row.GetSpan();
for (int y = 0; y < height; y++) for (int y = 0; y < height; y++)
{ {
int newY = InvertY(y, height, origin); int newY = InvertY(y, height, origin);
@ -437,8 +437,7 @@ namespace SixLabors.ImageSharp.Formats.Tga
} }
else else
{ {
this.currentStream.Read(row); this.currentStream.Read(rowSpan);
Span<byte> rowSpan = row.GetSpan();
if (!this.hasAlpha) if (!this.hasAlpha)
{ {
@ -460,7 +459,6 @@ namespace SixLabors.ImageSharp.Formats.Tga
} }
} }
} }
}
/// <summary> /// <summary>
/// Reads a uncompressed TGA image where each pixels has 24 bit. /// Reads a uncompressed TGA image where each pixels has 24 bit.
@ -490,23 +488,22 @@ namespace SixLabors.ImageSharp.Formats.Tga
return; return;
} }
using (IManagedByteBuffer row = this.memoryAllocator.AllocatePaddedPixelRowBuffer(width, 3, 0)) using IMemoryOwner<byte> row = this.memoryAllocator.AllocatePaddedPixelRowBuffer(width, 3, 0);
{ Span<byte> rowSpan = row.GetSpan();
bool invertY = InvertY(origin); bool invertY = InvertY(origin);
if (invertY) if (invertY)
{ {
for (int y = height - 1; y >= 0; y--) for (int y = height - 1; y >= 0; y--)
{ {
this.ReadBgr24Row(width, pixels, row, y); this.ReadBgr24Row(width, pixels, rowSpan, y);
} }
} }
else else
{ {
for (int y = 0; y < height; y++) for (int y = 0; y < height; y++)
{ {
this.ReadBgr24Row(width, pixels, row, y); this.ReadBgr24Row(width, pixels, rowSpan, y);
}
} }
} }
} }
@ -526,21 +523,21 @@ namespace SixLabors.ImageSharp.Formats.Tga
bool invertX = InvertX(origin); bool invertX = InvertX(origin);
if (this.tgaMetadata.AlphaChannelBits == 8 && !invertX) if (this.tgaMetadata.AlphaChannelBits == 8 && !invertX)
{ {
using (IManagedByteBuffer row = this.memoryAllocator.AllocatePaddedPixelRowBuffer(width, 4, 0)) using IMemoryOwner<byte> row = this.memoryAllocator.AllocatePaddedPixelRowBuffer(width, 4, 0);
{ Span<byte> rowSpan = row.GetSpan();
if (InvertY(origin)) if (InvertY(origin))
{ {
for (int y = height - 1; y >= 0; y--) for (int y = height - 1; y >= 0; y--)
{ {
this.ReadBgra32Row(width, pixels, row, y); this.ReadBgra32Row(width, pixels, rowSpan, y);
} }
} }
else else
{ {
for (int y = 0; y < height; y++) for (int y = 0; y < height; y++)
{ {
this.ReadBgra32Row(width, pixels, row, y); this.ReadBgra32Row(width, pixels, rowSpan, y);
}
} }
} }
@ -652,12 +649,12 @@ namespace SixLabors.ImageSharp.Formats.Tga
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
private void ReadL8Row<TPixel>(int width, Buffer2D<TPixel> pixels, IManagedByteBuffer row, int y) private void ReadL8Row<TPixel>(int width, Buffer2D<TPixel> pixels, Span<byte> row, int y)
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
this.currentStream.Read(row); this.currentStream.Read(row);
Span<TPixel> pixelSpan = pixels.GetRowSpan(y); Span<TPixel> pixelSpan = pixels.GetRowSpan(y);
PixelOperations<TPixel>.Instance.FromL8Bytes(this.Configuration, row.GetSpan(), pixelSpan, width); PixelOperations<TPixel>.Instance.FromL8Bytes(this.Configuration, row, pixelSpan, width);
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
@ -679,12 +676,12 @@ namespace SixLabors.ImageSharp.Formats.Tga
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
private void ReadBgr24Row<TPixel>(int width, Buffer2D<TPixel> pixels, IManagedByteBuffer row, int y) private void ReadBgr24Row<TPixel>(int width, Buffer2D<TPixel> pixels, Span<byte> row, int y)
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
this.currentStream.Read(row); this.currentStream.Read(row);
Span<TPixel> pixelSpan = pixels.GetRowSpan(y); Span<TPixel> pixelSpan = pixels.GetRowSpan(y);
PixelOperations<TPixel>.Instance.FromBgr24Bytes(this.Configuration, row.GetSpan(), pixelSpan, width); PixelOperations<TPixel>.Instance.FromBgr24Bytes(this.Configuration, row, pixelSpan, width);
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
@ -698,12 +695,12 @@ namespace SixLabors.ImageSharp.Formats.Tga
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
private void ReadBgra32Row<TPixel>(int width, Buffer2D<TPixel> pixels, IManagedByteBuffer row, int y) private void ReadBgra32Row<TPixel>(int width, Buffer2D<TPixel> pixels, Span<byte> row, int y)
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
this.currentStream.Read(row); this.currentStream.Read(row);
Span<TPixel> pixelSpan = pixels.GetRowSpan(y); Span<TPixel> pixelSpan = pixels.GetRowSpan(y);
PixelOperations<TPixel>.Instance.FromBgra32Bytes(this.Configuration, row.GetSpan(), pixelSpan, width); PixelOperations<TPixel>.Instance.FromBgra32Bytes(this.Configuration, row, pixelSpan, width);
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]

44
src/ImageSharp/Formats/Tga/TgaEncoderCore.cs
View File

@ -2,6 +2,7 @@
// Licensed under the Apache License, Version 2.0. // Licensed under the Apache License, Version 2.0.
using System; using System;
using System.Buffers;
using System.Buffers.Binary; using System.Buffers.Binary;
using System.IO; using System.IO;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
@ -258,7 +259,8 @@ namespace SixLabors.ImageSharp.Formats.Tga
return equalPixelCount; return equalPixelCount;
} }
private IManagedByteBuffer AllocateRow(int width, int bytesPerPixel) => this.memoryAllocator.AllocatePaddedPixelRowBuffer(width, bytesPerPixel, 0); private IMemoryOwner<byte> AllocateRow(int width, int bytesPerPixel)
=> this.memoryAllocator.AllocatePaddedPixelRowBuffer(width, bytesPerPixel, 0);
/// <summary> /// <summary>
/// Writes the 8bit pixels uncompressed to the stream. /// Writes the 8bit pixels uncompressed to the stream.
@ -269,18 +271,18 @@ namespace SixLabors.ImageSharp.Formats.Tga
private void Write8Bit<TPixel>(Stream stream, Buffer2D<TPixel> pixels) private void Write8Bit<TPixel>(Stream stream, Buffer2D<TPixel> pixels)
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
using (IManagedByteBuffer row = this.AllocateRow(pixels.Width, 1)) using IMemoryOwner<byte> row = this.AllocateRow(pixels.Width, 1);
{ Span<byte> rowSpan = row.GetSpan();
for (int y = pixels.Height - 1; y >= 0; y--) for (int y = pixels.Height - 1; y >= 0; y--)
{ {
Span<TPixel> pixelSpan = pixels.GetRowSpan(y); Span<TPixel> pixelSpan = pixels.GetRowSpan(y);
PixelOperations<TPixel>.Instance.ToL8Bytes( PixelOperations<TPixel>.Instance.ToL8Bytes(
this.configuration, this.configuration,
pixelSpan, pixelSpan,
row.GetSpan(), rowSpan,
pixelSpan.Length); pixelSpan.Length);
stream.Write(row.Array, 0, row.Length()); stream.Write(rowSpan);
}
} }
} }
@ -293,18 +295,18 @@ namespace SixLabors.ImageSharp.Formats.Tga
private void Write16Bit<TPixel>(Stream stream, Buffer2D<TPixel> pixels) private void Write16Bit<TPixel>(Stream stream, Buffer2D<TPixel> pixels)
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
using (IManagedByteBuffer row = this.AllocateRow(pixels.Width, 2)) using IMemoryOwner<byte> row = this.AllocateRow(pixels.Width, 2);
{ Span<byte> rowSpan = row.GetSpan();
for (int y = pixels.Height - 1; y >= 0; y--) for (int y = pixels.Height - 1; y >= 0; y--)
{ {
Span<TPixel> pixelSpan = pixels.GetRowSpan(y); Span<TPixel> pixelSpan = pixels.GetRowSpan(y);
PixelOperations<TPixel>.Instance.ToBgra5551Bytes( PixelOperations<TPixel>.Instance.ToBgra5551Bytes(
this.configuration, this.configuration,
pixelSpan, pixelSpan,
row.GetSpan(), rowSpan,
pixelSpan.Length); pixelSpan.Length);
stream.Write(row.Array, 0, row.Length()); stream.Write(rowSpan);
}
} }
} }
@ -317,18 +319,18 @@ namespace SixLabors.ImageSharp.Formats.Tga
private void Write24Bit<TPixel>(Stream stream, Buffer2D<TPixel> pixels) private void Write24Bit<TPixel>(Stream stream, Buffer2D<TPixel> pixels)
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
using (IManagedByteBuffer row = this.AllocateRow(pixels.Width, 3)) using IMemoryOwner<byte> row = this.AllocateRow(pixels.Width, 3);
{ Span<byte> rowSpan = row.GetSpan();
for (int y = pixels.Height - 1; y >= 0; y--) for (int y = pixels.Height - 1; y >= 0; y--)
{ {
Span<TPixel> pixelSpan = pixels.GetRowSpan(y); Span<TPixel> pixelSpan = pixels.GetRowSpan(y);
PixelOperations<TPixel>.Instance.ToBgr24Bytes( PixelOperations<TPixel>.Instance.ToBgr24Bytes(
this.configuration, this.configuration,
pixelSpan, pixelSpan,
row.GetSpan(), rowSpan,
pixelSpan.Length); pixelSpan.Length);
stream.Write(row.Array, 0, row.Length()); stream.Write(rowSpan);
}
} }
} }
@ -341,18 +343,18 @@ namespace SixLabors.ImageSharp.Formats.Tga
private void Write32Bit<TPixel>(Stream stream, Buffer2D<TPixel> pixels) private void Write32Bit<TPixel>(Stream stream, Buffer2D<TPixel> pixels)
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
using (IManagedByteBuffer row = this.AllocateRow(pixels.Width, 4)) using IMemoryOwner<byte> row = this.AllocateRow(pixels.Width, 4);
{ Span<byte> rowSpan = row.GetSpan();
for (int y = pixels.Height - 1; y >= 0; y--) for (int y = pixels.Height - 1; y >= 0; y--)
{ {
Span<TPixel> pixelSpan = pixels.GetRowSpan(y); Span<TPixel> pixelSpan = pixels.GetRowSpan(y);
PixelOperations<TPixel>.Instance.ToBgra32Bytes( PixelOperations<TPixel>.Instance.ToBgra32Bytes(
this.configuration, this.configuration,
pixelSpan, pixelSpan,
row.GetSpan(), rowSpan,
pixelSpan.Length); pixelSpan.Length);
stream.Write(row.Array, 0, row.Length()); stream.Write(rowSpan);
}
} }
} }

8
src/ImageSharp/Memory/MemoryAllocatorExtensions.cs
View File

@ -67,21 +67,21 @@ namespace SixLabors.ImageSharp.Memory
} }
/// <summary> /// <summary>
/// Allocates padded buffers for BMP encoder/decoder. (Replacing old PixelRow/PixelArea). /// Allocates padded buffers. Generally used by encoder/decoders.
/// </summary> /// </summary>
/// <param name="memoryAllocator">The <see cref="MemoryAllocator"/>.</param> /// <param name="memoryAllocator">The <see cref="MemoryAllocator"/>.</param>
/// <param name="width">Pixel count in the row</param> /// <param name="width">Pixel count in the row</param>
/// <param name="pixelSizeInBytes">The pixel size in bytes, eg. 3 for RGB.</param> /// <param name="pixelSizeInBytes">The pixel size in bytes, eg. 3 for RGB.</param>
/// <param name="paddingInBytes">The padding.</param> /// <param name="paddingInBytes">The padding.</param>
/// <returns>A <see cref="IManagedByteBuffer"/>.</returns> /// <returns>A <see cref="IMemoryOwner{Byte}"/>.</returns>
internal static IManagedByteBuffer AllocatePaddedPixelRowBuffer( internal static IMemoryOwner<byte> AllocatePaddedPixelRowBuffer(
this MemoryAllocator memoryAllocator, this MemoryAllocator memoryAllocator,
int width, int width,
int pixelSizeInBytes, int pixelSizeInBytes,
int paddingInBytes) int paddingInBytes)
{ {
int length = (width * pixelSizeInBytes) + paddingInBytes; int length = (width * pixelSizeInBytes) + paddingInBytes;
return memoryAllocator.AllocateManagedByteBuffer(length); return memoryAllocator.Allocate<byte>(length);
} }
/// <summary> /// <summary>

Write Preview
Loading…
Cancel
Save