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

Merge pull request #1677 from SixLabors/js/managed-byte-buffer-2 

Remove IManagedByteBuffer Part 2
pull/1680/head
James Jackson-South 5 years ago
committed by GitHub
parent
5b5bb110ca 52fbad6aea
commit
d9472bce88
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 161 additions and 131 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. 140
      src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
  2. 25
      src/ImageSharp/Formats/Gif/GifDecoderCore.cs
  3. 8
      src/ImageSharp/Formats/Gif/GifEncoderCore.cs
  4. 21
      src/ImageSharp/Formats/Tga/TgaDecoderCore.cs
  5. 5
      src/ImageSharp/Formats/Tiff/Compression/Compressors/PackBitsCompressor.cs
  6. 3
      src/ImageSharp/Formats/Tiff/PhotometricInterpretation/RgbPlanarTiffColor{TPixel}.cs
  7. 29
      src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs
  8. 4
      src/ImageSharp/Formats/Tiff/Writers/TiffCompositeColorWriter{TPixel}.cs
  9. 35
      src/ImageSharp/IO/ChunkedMemoryStream.cs
  10. 6
      src/ImageSharp/Image.Decode.cs
  11. 16
      tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs

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

@ -817,31 +817,29 @@ namespace SixLabors.ImageSharp.Formats.Bmp
padding = 4 - padding; padding = 4 - padding;
} }
using (IManagedByteBuffer row = this.memoryAllocator.AllocateManagedByteBuffer(arrayWidth + padding, AllocationOptions.Clean)) using IMemoryOwner<byte> row = this.memoryAllocator.Allocate<byte>(arrayWidth + padding, AllocationOptions.Clean);
TPixel color = default;
Span<byte> rowSpan = row.GetSpan();
for (int y = 0; y < height; y++)
{ {
TPixel color = default; int newY = Invert(y, height, inverted);
Span<byte> rowSpan = row.GetSpan(); this.stream.Read(rowSpan);
int offset = 0;
Span<TPixel> pixelRow = pixels.GetRowSpan(newY);
for (int y = 0; y < height; y++) for (int x = 0; x < arrayWidth; x++)
{ {
int newY = Invert(y, height, inverted); int colOffset = x * ppb;
this.stream.Read(row.Array, 0, row.Length()); for (int shift = 0, newX = colOffset; shift < ppb && newX < width; shift++, newX++)
int offset = 0;
Span<TPixel> pixelRow = pixels.GetRowSpan(newY);
for (int x = 0; x < arrayWidth; x++)
{ {
int colOffset = x * ppb; int colorIndex = ((rowSpan[offset] >> (8 - bitsPerPixel - (shift * bitsPerPixel))) & mask) * bytesPerColorMapEntry;
for (int shift = 0, newX = colOffset; shift < ppb && newX < width; shift++, newX++)
{
int colorIndex = ((rowSpan[offset] >> (8 - bitsPerPixel - (shift * bitsPerPixel))) & mask) * bytesPerColorMapEntry;
color.FromBgr24(Unsafe.As<byte, Bgr24>(ref colors[colorIndex])); color.FromBgr24(Unsafe.As<byte, Bgr24>(ref colors[colorIndex]));
pixelRow[newX] = color; pixelRow[newX] = color;
}
offset++;
} }
offset++;
} }
} }
} }
@ -873,29 +871,29 @@ namespace SixLabors.ImageSharp.Formats.Bmp
int greenMaskBits = CountBits((uint)greenMask); int greenMaskBits = CountBits((uint)greenMask);
int blueMaskBits = CountBits((uint)blueMask); int blueMaskBits = CountBits((uint)blueMask);
using (IManagedByteBuffer buffer = this.memoryAllocator.AllocateManagedByteBuffer(stride)) using IMemoryOwner<byte> buffer = this.memoryAllocator.Allocate<byte>(stride);
Span<byte> bufferSpan = buffer.GetSpan();
for (int y = 0; y < height; y++)
{ {
for (int y = 0; y < height; y++) this.stream.Read(bufferSpan);
{ int newY = Invert(y, height, inverted);
this.stream.Read(buffer.Array, 0, stride); Span<TPixel> pixelRow = pixels.GetRowSpan(newY);
int newY = Invert(y, height, inverted);
Span<TPixel> pixelRow = pixels.GetRowSpan(newY);
int offset = 0; int offset = 0;
for (int x = 0; x < width; x++) for (int x = 0; x < width; x++)
{ {
short temp = BitConverter.ToInt16(buffer.Array, offset); short temp = BinaryPrimitives.ReadInt16LittleEndian(bufferSpan.Slice(offset));
// Rescale values, so the values range from 0 to 255. // Rescale values, so the values range from 0 to 255.
int r = (redMaskBits == 5) ? GetBytesFrom5BitValue((temp & redMask) >> rightShiftRedMask) : GetBytesFrom6BitValue((temp & redMask) >> rightShiftRedMask); int r = (redMaskBits == 5) ? GetBytesFrom5BitValue((temp & redMask) >> rightShiftRedMask) : GetBytesFrom6BitValue((temp & redMask) >> rightShiftRedMask);
int g = (greenMaskBits == 5) ? GetBytesFrom5BitValue((temp & greenMask) >> rightShiftGreenMask) : GetBytesFrom6BitValue((temp & greenMask) >> rightShiftGreenMask); int g = (greenMaskBits == 5) ? GetBytesFrom5BitValue((temp & greenMask) >> rightShiftGreenMask) : GetBytesFrom6BitValue((temp & greenMask) >> rightShiftGreenMask);
int b = (blueMaskBits == 5) ? GetBytesFrom5BitValue((temp & blueMask) >> rightShiftBlueMask) : GetBytesFrom6BitValue((temp & blueMask) >> rightShiftBlueMask); int b = (blueMaskBits == 5) ? GetBytesFrom5BitValue((temp & blueMask) >> rightShiftBlueMask) : GetBytesFrom6BitValue((temp & blueMask) >> rightShiftBlueMask);
var rgb = new Rgb24((byte)r, (byte)g, (byte)b); var rgb = new Rgb24((byte)r, (byte)g, (byte)b);
color.FromRgb24(rgb); color.FromRgb24(rgb);
pixelRow[x] = color; pixelRow[x] = color;
offset += 2; offset += 2;
}
} }
} }
} }
@ -1104,44 +1102,44 @@ namespace SixLabors.ImageSharp.Formats.Bmp
bool unusualBitMask = bitsRedMask > 8 || bitsGreenMask > 8 || bitsBlueMask > 8 || invMaxValueAlpha > 8; bool unusualBitMask = bitsRedMask > 8 || bitsGreenMask > 8 || bitsBlueMask > 8 || invMaxValueAlpha > 8;
using (IManagedByteBuffer buffer = this.memoryAllocator.AllocateManagedByteBuffer(stride)) using IMemoryOwner<byte> buffer = this.memoryAllocator.Allocate<byte>(stride);
Span<byte> bufferSpan = buffer.GetSpan();
for (int y = 0; y < height; y++)
{ {
for (int y = 0; y < height; y++) this.stream.Read(bufferSpan);
int newY = Invert(y, height, inverted);
Span<TPixel> pixelRow = pixels.GetRowSpan(newY);
int offset = 0;
for (int x = 0; x < width; x++)
{ {
this.stream.Read(buffer.Array, 0, stride); uint temp = BinaryPrimitives.ReadUInt32LittleEndian(bufferSpan.Slice(offset));
int newY = Invert(y, height, inverted);
Span<TPixel> pixelRow = pixels.GetRowSpan(newY);
int offset = 0; if (unusualBitMask)
for (int x = 0; x < width; x++)
{ {
uint temp = BitConverter.ToUInt32(buffer.Array, offset); uint r = (uint)(temp & redMask) >> rightShiftRedMask;
uint g = (uint)(temp & greenMask) >> rightShiftGreenMask;
if (unusualBitMask) uint b = (uint)(temp & blueMask) >> rightShiftBlueMask;
{ float alpha = alphaMask != 0 ? invMaxValueAlpha * ((uint)(temp & alphaMask) >> rightShiftAlphaMask) : 1.0f;
uint r = (uint)(temp & redMask) >> rightShiftRedMask; var vector4 = new Vector4(
uint g = (uint)(temp & greenMask) >> rightShiftGreenMask; r * invMaxValueRed,
uint b = (uint)(temp & blueMask) >> rightShiftBlueMask; g * invMaxValueGreen,
float alpha = alphaMask != 0 ? invMaxValueAlpha * ((uint)(temp & alphaMask) >> rightShiftAlphaMask) : 1.0f; b * invMaxValueBlue,
var vector4 = new Vector4( alpha);
r * invMaxValueRed, color.FromVector4(vector4);
g * invMaxValueGreen,
b * invMaxValueBlue,
alpha);
color.FromVector4(vector4);
}
else
{
byte r = (byte)((temp & redMask) >> rightShiftRedMask);
byte g = (byte)((temp & greenMask) >> rightShiftGreenMask);
byte b = (byte)((temp & blueMask) >> rightShiftBlueMask);
byte a = alphaMask != 0 ? (byte)((temp & alphaMask) >> rightShiftAlphaMask) : (byte)255;
color.FromRgba32(new Rgba32(r, g, b, a));
}
pixelRow[x] = color;
offset += 4;
} }
else
{
byte r = (byte)((temp & redMask) >> rightShiftRedMask);
byte g = (byte)((temp & greenMask) >> rightShiftGreenMask);
byte b = (byte)((temp & blueMask) >> rightShiftBlueMask);
byte a = alphaMask != 0 ? (byte)((temp & alphaMask) >> rightShiftAlphaMask) : (byte)255;
color.FromRgba32(new Rgba32(r, g, b, a));
}
pixelRow[x] = color;
offset += 4;
} }
} }
} }

25
src/ImageSharp/Formats/Gif/GifDecoderCore.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.IO; using System.IO;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
@ -33,7 +34,7 @@ namespace SixLabors.ImageSharp.Formats.Gif
/// <summary> /// <summary>
/// The global color table. /// The global color table.
/// </summary> /// </summary>
private IManagedByteBuffer globalColorTable; private IMemoryOwner<byte> globalColorTable;
/// <summary> /// <summary>
/// The area to restore. /// The area to restore.
@ -323,12 +324,12 @@ namespace SixLabors.ImageSharp.Formats.Gif
continue; continue;
} }
using (IManagedByteBuffer commentsBuffer = this.MemoryAllocator.AllocateManagedByteBuffer(length)) using IMemoryOwner<byte> commentsBuffer = this.MemoryAllocator.Allocate<byte>(length);
{ Span<byte> commentsSpan = commentsBuffer.GetSpan();
this.stream.Read(commentsBuffer.Array, 0, length);
string commentPart = GifConstants.Encoding.GetString(commentsBuffer.Array, 0, length); this.stream.Read(commentsSpan);
stringBuilder.Append(commentPart); string commentPart = GifConstants.Encoding.GetString(commentsSpan);
} stringBuilder.Append(commentPart);
} }
if (stringBuilder.Length > 0) if (stringBuilder.Length > 0)
@ -348,7 +349,7 @@ namespace SixLabors.ImageSharp.Formats.Gif
{ {
this.ReadImageDescriptor(); this.ReadImageDescriptor();
IManagedByteBuffer localColorTable = null; IMemoryOwner<byte> localColorTable = null;
Buffer2D<byte> indices = null; Buffer2D<byte> indices = null;
try try
{ {
@ -356,8 +357,8 @@ namespace SixLabors.ImageSharp.Formats.Gif
if (this.imageDescriptor.LocalColorTableFlag) if (this.imageDescriptor.LocalColorTableFlag)
{ {
int length = this.imageDescriptor.LocalColorTableSize * 3; int length = this.imageDescriptor.LocalColorTableSize * 3;
localColorTable = this.Configuration.MemoryAllocator.AllocateManagedByteBuffer(length, AllocationOptions.Clean); localColorTable = this.Configuration.MemoryAllocator.Allocate<byte>(length, AllocationOptions.Clean);
this.stream.Read(localColorTable.Array, 0, length); this.stream.Read(localColorTable.GetSpan());
} }
indices = this.Configuration.MemoryAllocator.Allocate2D<byte>(this.imageDescriptor.Width, this.imageDescriptor.Height, AllocationOptions.Clean); indices = this.Configuration.MemoryAllocator.Allocate2D<byte>(this.imageDescriptor.Width, this.imageDescriptor.Height, AllocationOptions.Clean);
@ -622,10 +623,10 @@ namespace SixLabors.ImageSharp.Formats.Gif
int globalColorTableLength = this.logicalScreenDescriptor.GlobalColorTableSize * 3; int globalColorTableLength = this.logicalScreenDescriptor.GlobalColorTableSize * 3;
this.gifMetadata.GlobalColorTableLength = globalColorTableLength; this.gifMetadata.GlobalColorTableLength = globalColorTableLength;
this.globalColorTable = this.MemoryAllocator.AllocateManagedByteBuffer(globalColorTableLength, AllocationOptions.Clean); this.globalColorTable = this.MemoryAllocator.Allocate<byte>(globalColorTableLength, AllocationOptions.Clean);
// Read the global color table data from the stream // Read the global color table data from the stream
stream.Read(this.globalColorTable.Array, 0, globalColorTableLength); stream.Read(this.globalColorTable.GetSpan());
} }
} }
} }

8
src/ImageSharp/Formats/Gif/GifEncoderCore.cs
View File

@ -470,14 +470,16 @@ namespace SixLabors.ImageSharp.Formats.Gif
// The maximum number of colors for the bit depth // The maximum number of colors for the bit depth
int colorTableLength = ColorNumerics.GetColorCountForBitDepth(this.bitDepth) * Unsafe.SizeOf<Rgb24>(); int colorTableLength = ColorNumerics.GetColorCountForBitDepth(this.bitDepth) * Unsafe.SizeOf<Rgb24>();
using IManagedByteBuffer colorTable = this.memoryAllocator.AllocateManagedByteBuffer(colorTableLength, AllocationOptions.Clean); using IMemoryOwner<byte> colorTable = this.memoryAllocator.Allocate<byte>(colorTableLength, AllocationOptions.Clean);
Span<byte> colorTableSpan = colorTable.GetSpan();
PixelOperations<TPixel>.Instance.ToRgb24Bytes( PixelOperations<TPixel>.Instance.ToRgb24Bytes(
this.configuration, this.configuration,
image.Palette.Span, image.Palette.Span,
colorTable.GetSpan(), colorTableSpan,
image.Palette.Length); image.Palette.Length);
stream.Write(colorTable.Array, 0, colorTableLength); stream.Write(colorTableSpan);
} }
/// <summary> /// <summary>

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

@ -114,9 +114,10 @@ namespace SixLabors.ImageSharp.Formats.Tga
int colorMapPixelSizeInBytes = this.fileHeader.CMapDepth / 8; int colorMapPixelSizeInBytes = this.fileHeader.CMapDepth / 8;
int colorMapSizeInBytes = this.fileHeader.CMapLength * colorMapPixelSizeInBytes; int colorMapSizeInBytes = this.fileHeader.CMapLength * colorMapPixelSizeInBytes;
using (IManagedByteBuffer palette = this.memoryAllocator.AllocateManagedByteBuffer(colorMapSizeInBytes, AllocationOptions.Clean)) using (IMemoryOwner<byte> palette = this.memoryAllocator.Allocate<byte>(colorMapSizeInBytes, AllocationOptions.Clean))
{ {
this.currentStream.Read(palette.Array, this.fileHeader.CMapStart, colorMapSizeInBytes); Span<byte> paletteSpan = palette.GetSpan();
this.currentStream.Read(paletteSpan, this.fileHeader.CMapStart, colorMapSizeInBytes);
if (this.fileHeader.ImageType == TgaImageType.RleColorMapped) if (this.fileHeader.ImageType == TgaImageType.RleColorMapped)
{ {
@ -124,7 +125,7 @@ namespace SixLabors.ImageSharp.Formats.Tga
this.fileHeader.Width, this.fileHeader.Width,
this.fileHeader.Height, this.fileHeader.Height,
pixels, pixels,
palette.Array, paletteSpan,
colorMapPixelSizeInBytes, colorMapPixelSizeInBytes,
origin); origin);
} }
@ -134,7 +135,7 @@ namespace SixLabors.ImageSharp.Formats.Tga
this.fileHeader.Width, this.fileHeader.Width,
this.fileHeader.Height, this.fileHeader.Height,
pixels, pixels,
palette.Array, paletteSpan,
colorMapPixelSizeInBytes, colorMapPixelSizeInBytes,
origin); origin);
} }
@ -224,7 +225,7 @@ namespace SixLabors.ImageSharp.Formats.Tga
/// <param name="palette">The color palette.</param> /// <param name="palette">The color palette.</param>
/// <param name="colorMapPixelSizeInBytes">Color map size of one entry in bytes.</param> /// <param name="colorMapPixelSizeInBytes">Color map size of one entry in bytes.</param>
/// <param name="origin">The image origin.</param> /// <param name="origin">The image origin.</param>
private void ReadPaletted<TPixel>(int width, int height, Buffer2D<TPixel> pixels, byte[] palette, int colorMapPixelSizeInBytes, TgaImageOrigin origin) private void ReadPaletted<TPixel>(int width, int height, Buffer2D<TPixel> pixels, Span<byte> palette, int colorMapPixelSizeInBytes, TgaImageOrigin origin)
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
TPixel color = default; TPixel color = default;
@ -304,7 +305,7 @@ namespace SixLabors.ImageSharp.Formats.Tga
/// <param name="palette">The color palette.</param> /// <param name="palette">The color palette.</param>
/// <param name="colorMapPixelSizeInBytes">Color map size of one entry in bytes.</param> /// <param name="colorMapPixelSizeInBytes">Color map size of one entry in bytes.</param>
/// <param name="origin">The image origin.</param> /// <param name="origin">The image origin.</param>
private void ReadPalettedRle<TPixel>(int width, int height, Buffer2D<TPixel> pixels, byte[] palette, int colorMapPixelSizeInBytes, TgaImageOrigin origin) private void ReadPalettedRle<TPixel>(int width, int height, Buffer2D<TPixel> pixels, Span<byte> palette, int colorMapPixelSizeInBytes, TgaImageOrigin origin)
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
int bytesPerPixel = 1; int bytesPerPixel = 1;
@ -704,7 +705,7 @@ namespace SixLabors.ImageSharp.Formats.Tga
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
private void ReadPalettedBgra16Pixel<TPixel>(byte[] palette, int colorMapPixelSizeInBytes, int x, TPixel color, Span<TPixel> pixelRow) private void ReadPalettedBgra16Pixel<TPixel>(Span<byte> palette, int colorMapPixelSizeInBytes, int x, TPixel color, Span<TPixel> pixelRow)
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
int colorIndex = this.currentStream.ReadByte(); int colorIndex = this.currentStream.ReadByte();
@ -713,7 +714,7 @@ namespace SixLabors.ImageSharp.Formats.Tga
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
private void ReadPalettedBgra16Pixel<TPixel>(byte[] palette, int index, int colorMapPixelSizeInBytes, ref TPixel color) private void ReadPalettedBgra16Pixel<TPixel>(Span<byte> palette, int index, int colorMapPixelSizeInBytes, ref TPixel color)
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
Bgra5551 bgra = default; Bgra5551 bgra = default;
@ -729,7 +730,7 @@ namespace SixLabors.ImageSharp.Formats.Tga
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
private void ReadPalettedBgr24Pixel<TPixel>(byte[] palette, int colorMapPixelSizeInBytes, int x, TPixel color, Span<TPixel> pixelRow) private void ReadPalettedBgr24Pixel<TPixel>(Span<byte> palette, int colorMapPixelSizeInBytes, int x, TPixel color, Span<TPixel> pixelRow)
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
int colorIndex = this.currentStream.ReadByte(); int colorIndex = this.currentStream.ReadByte();
@ -738,7 +739,7 @@ namespace SixLabors.ImageSharp.Formats.Tga
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
private void ReadPalettedBgra32Pixel<TPixel>(byte[] palette, int colorMapPixelSizeInBytes, int x, TPixel color, Span<TPixel> pixelRow) private void ReadPalettedBgra32Pixel<TPixel>(Span<byte> palette, int colorMapPixelSizeInBytes, int x, TPixel color, Span<TPixel> pixelRow)
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
int colorIndex = this.currentStream.ReadByte(); int colorIndex = this.currentStream.ReadByte();

5
src/ImageSharp/Formats/Tiff/Compression/Compressors/PackBitsCompressor.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.IO; using System.IO;
using SixLabors.ImageSharp.Formats.Tiff.Constants; using SixLabors.ImageSharp.Formats.Tiff.Constants;
using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.Memory;
@ -10,7 +11,7 @@ namespace SixLabors.ImageSharp.Formats.Tiff.Compression.Compressors
{ {
internal sealed class PackBitsCompressor : TiffBaseCompressor internal sealed class PackBitsCompressor : TiffBaseCompressor
{ {
private IManagedByteBuffer pixelData; private IMemoryOwner<byte> pixelData;
public PackBitsCompressor(Stream output, MemoryAllocator allocator, int width, int bitsPerPixel) public PackBitsCompressor(Stream output, MemoryAllocator allocator, int width, int bitsPerPixel)
: base(output, allocator, width, bitsPerPixel) : base(output, allocator, width, bitsPerPixel)
@ -24,7 +25,7 @@ namespace SixLabors.ImageSharp.Formats.Tiff.Compression.Compressors
public override void Initialize(int rowsPerStrip) public override void Initialize(int rowsPerStrip)
{ {
int additionalBytes = ((this.BytesPerRow + 126) / 127) + 1; int additionalBytes = ((this.BytesPerRow + 126) / 127) + 1;
this.pixelData = this.Allocator.AllocateManagedByteBuffer(this.BytesPerRow + additionalBytes); this.pixelData = this.Allocator.Allocate<byte>(this.BytesPerRow + additionalBytes);
} }
/// <inheritdoc/> /// <inheritdoc/>

3
src/ImageSharp/Formats/Tiff/PhotometricInterpretation/RgbPlanarTiffColor{TPixel}.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) Six Labors. // Copyright (c) Six Labors.
// Licensed under the Apache License, Version 2.0. // Licensed under the Apache License, Version 2.0.
using System.Buffers;
using System.Numerics; using System.Numerics;
using SixLabors.ImageSharp.Formats.Tiff.Utils; using SixLabors.ImageSharp.Formats.Tiff.Utils;
using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.Memory;
@ -46,7 +47,7 @@ namespace SixLabors.ImageSharp.Formats.Tiff.PhotometricInterpretation
/// <param name="top">The y-coordinate of the top of the image block.</param> /// <param name="top">The y-coordinate of the top of the image block.</param>
/// <param name="width">The width of the image block.</param> /// <param name="width">The width of the image block.</param>
/// <param name="height">The height of the image block.</param> /// <param name="height">The height of the image block.</param>
public void Decode(IManagedByteBuffer[] data, Buffer2D<TPixel> pixels, int left, int top, int width, int height) public void Decode(IMemoryOwner<byte>[] data, Buffer2D<TPixel> pixels, int left, int top, int width, int height)
{ {
var color = default(TPixel); var color = default(TPixel);

29
src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) Six Labors. // Copyright (c) Six Labors.
// Licensed under the Apache License, Version 2.0. // Licensed under the Apache License, Version 2.0.
using System.Buffers;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
@ -247,14 +248,14 @@ namespace SixLabors.ImageSharp.Formats.Tiff
Buffer2D<TPixel> pixels = frame.PixelBuffer; Buffer2D<TPixel> pixels = frame.PixelBuffer;
var stripBuffers = new IManagedByteBuffer[stripsPerPixel]; var stripBuffers = new IMemoryOwner<byte>[stripsPerPixel];
try try
{ {
for (int stripIndex = 0; stripIndex < stripBuffers.Length; stripIndex++) for (int stripIndex = 0; stripIndex < stripBuffers.Length; stripIndex++)
{ {
int uncompressedStripSize = this.CalculateStripBufferSize(frame.Width, rowsPerStrip, stripIndex); int uncompressedStripSize = this.CalculateStripBufferSize(frame.Width, rowsPerStrip, stripIndex);
stripBuffers[stripIndex] = this.memoryAllocator.AllocateManagedByteBuffer(uncompressedStripSize); stripBuffers[stripIndex] = this.memoryAllocator.Allocate<byte>(uncompressedStripSize);
} }
using TiffBaseDecompressor decompressor = TiffDecompressorsFactory.Create(this.CompressionType, this.memoryAllocator, this.PhotometricInterpretation, frame.Width, bitsPerPixel, this.Predictor, this.FaxCompressionOptions); using TiffBaseDecompressor decompressor = TiffDecompressorsFactory.Create(this.CompressionType, this.memoryAllocator, this.PhotometricInterpretation, frame.Width, bitsPerPixel, this.Predictor, this.FaxCompressionOptions);
@ -277,7 +278,7 @@ namespace SixLabors.ImageSharp.Formats.Tiff
} }
finally finally
{ {
foreach (IManagedByteBuffer buf in stripBuffers) foreach (IMemoryOwner<byte> buf in stripBuffers)
{ {
buf?.Dispose(); buf?.Dispose();
} }
@ -296,17 +297,27 @@ namespace SixLabors.ImageSharp.Formats.Tiff
int uncompressedStripSize = this.CalculateStripBufferSize(frame.Width, rowsPerStrip); int uncompressedStripSize = this.CalculateStripBufferSize(frame.Width, rowsPerStrip);
int bitsPerPixel = this.BitsPerPixel; int bitsPerPixel = this.BitsPerPixel;
using IManagedByteBuffer stripBuffer = this.memoryAllocator.AllocateManagedByteBuffer(uncompressedStripSize, AllocationOptions.Clean); using IMemoryOwner<byte> stripBuffer = this.memoryAllocator.Allocate<byte>(uncompressedStripSize, AllocationOptions.Clean);
System.Span<byte> stripBufferSpan = stripBuffer.GetSpan();
Buffer2D<TPixel> pixels = frame.PixelBuffer; Buffer2D<TPixel> pixels = frame.PixelBuffer;
using TiffBaseDecompressor decompressor = TiffDecompressorsFactory.Create(this.CompressionType, this.memoryAllocator, this.PhotometricInterpretation, frame.Width, bitsPerPixel, this.Predictor, this.FaxCompressionOptions); using TiffBaseDecompressor decompressor = TiffDecompressorsFactory.Create(
this.CompressionType,
this.memoryAllocator,
this.PhotometricInterpretation,
frame.Width,
bitsPerPixel,
this.Predictor,
this.FaxCompressionOptions);
TiffBaseColorDecoder<TPixel> colorDecoder = TiffColorDecoderFactory<TPixel>.Create(this.ColorType, this.BitsPerSample, this.ColorMap); TiffBaseColorDecoder<TPixel> colorDecoder = TiffColorDecoderFactory<TPixel>.Create(this.ColorType, this.BitsPerSample, this.ColorMap);
for (int stripIndex = 0; stripIndex < stripOffsets.Length; stripIndex++) for (int stripIndex = 0; stripIndex < stripOffsets.Length; stripIndex++)
{ {
int stripHeight = stripIndex < stripOffsets.Length - 1 || frame.Height % rowsPerStrip == 0 ? rowsPerStrip : frame.Height % rowsPerStrip; int stripHeight = stripIndex < stripOffsets.Length - 1 || frame.Height % rowsPerStrip == 0
? rowsPerStrip
: frame.Height % rowsPerStrip;
int top = rowsPerStrip * stripIndex; int top = rowsPerStrip * stripIndex;
if (top + stripHeight > frame.Height) if (top + stripHeight > frame.Height)
{ {
@ -314,9 +325,9 @@ namespace SixLabors.ImageSharp.Formats.Tiff
break; break;
} }
decompressor.Decompress(this.inputStream, (uint)stripOffsets[stripIndex], (uint)stripByteCounts[stripIndex], stripBuffer.GetSpan()); decompressor.Decompress(this.inputStream, (uint)stripOffsets[stripIndex], (uint)stripByteCounts[stripIndex], stripBufferSpan);
colorDecoder.Decode(stripBuffer.GetSpan(), pixels, 0, top, frame.Width, stripHeight); colorDecoder.Decode(stripBufferSpan, pixels, 0, top, frame.Width, stripHeight);
} }
} }

4
src/ImageSharp/Formats/Tiff/Writers/TiffCompositeColorWriter{TPixel}.cs
View File

@ -15,7 +15,7 @@ namespace SixLabors.ImageSharp.Formats.Tiff.Writers
internal abstract class TiffCompositeColorWriter<TPixel> : TiffBaseColorWriter<TPixel> internal abstract class TiffCompositeColorWriter<TPixel> : TiffBaseColorWriter<TPixel>
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
private IManagedByteBuffer rowBuffer; private IMemoryOwner<byte> rowBuffer;
protected TiffCompositeColorWriter(ImageFrame<TPixel> image, MemoryAllocator memoryAllocator, Configuration configuration, TiffEncoderEntriesCollector entriesCollector) protected TiffCompositeColorWriter(ImageFrame<TPixel> image, MemoryAllocator memoryAllocator, Configuration configuration, TiffEncoderEntriesCollector entriesCollector)
: base(image, memoryAllocator, configuration, entriesCollector) : base(image, memoryAllocator, configuration, entriesCollector)
@ -26,7 +26,7 @@ namespace SixLabors.ImageSharp.Formats.Tiff.Writers
{ {
if (this.rowBuffer == null) if (this.rowBuffer == null)
{ {
this.rowBuffer = this.MemoryAllocator.AllocateManagedByteBuffer(this.BytesPerRow * height); this.rowBuffer = this.MemoryAllocator.Allocate<byte>(this.BytesPerRow * height);
} }
this.rowBuffer.Clear(); this.rowBuffer.Clear();

35
src/ImageSharp/IO/ChunkedMemoryStream.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.IO; using System.IO;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.Memory;
@ -239,8 +240,8 @@ namespace SixLabors.ImageSharp.IO
Guard.MustBeGreaterThanOrEqualTo(offset, 0, nameof(offset)); Guard.MustBeGreaterThanOrEqualTo(offset, 0, nameof(offset));
Guard.MustBeGreaterThanOrEqualTo(count, 0, nameof(count)); Guard.MustBeGreaterThanOrEqualTo(count, 0, nameof(count));
const string BufferMessage = "Offset subtracted from the buffer length is less than count."; const string bufferMessage = "Offset subtracted from the buffer length is less than count.";
Guard.IsFalse(buffer.Length - offset < count, nameof(buffer), BufferMessage); Guard.IsFalse(buffer.Length - offset < count, nameof(buffer), bufferMessage);
return this.ReadImpl(buffer.AsSpan().Slice(offset, count)); return this.ReadImpl(buffer.AsSpan().Slice(offset, count));
} }
@ -266,7 +267,7 @@ namespace SixLabors.ImageSharp.IO
this.readOffset = 0; this.readOffset = 0;
} }
Span<byte> chunkBuffer = this.readChunk.Buffer.GetSpan(); IMemoryOwner<byte> chunkBuffer = this.readChunk.Buffer;
int chunkSize = this.readChunk.Length; int chunkSize = this.readChunk.Length;
if (this.readChunk.Next is null) if (this.readChunk.Next is null)
{ {
@ -288,7 +289,7 @@ namespace SixLabors.ImageSharp.IO
this.readChunk = this.readChunk.Next; this.readChunk = this.readChunk.Next;
this.readOffset = 0; this.readOffset = 0;
chunkBuffer = this.readChunk.Buffer.GetSpan(); chunkBuffer = this.readChunk.Buffer;
chunkSize = this.readChunk.Length; chunkSize = this.readChunk.Length;
if (this.readChunk.Next is null) if (this.readChunk.Next is null)
{ {
@ -324,7 +325,7 @@ namespace SixLabors.ImageSharp.IO
this.readOffset = 0; this.readOffset = 0;
} }
byte[] chunkBuffer = this.readChunk.Buffer.Array; IMemoryOwner<byte> chunkBuffer = this.readChunk.Buffer;
int chunkSize = this.readChunk.Length; int chunkSize = this.readChunk.Length;
if (this.readChunk.Next is null) if (this.readChunk.Next is null)
{ {
@ -341,10 +342,10 @@ namespace SixLabors.ImageSharp.IO
this.readChunk = this.readChunk.Next; this.readChunk = this.readChunk.Next;
this.readOffset = 0; this.readOffset = 0;
chunkBuffer = this.readChunk.Buffer.Array; chunkBuffer = this.readChunk.Buffer;
} }
return chunkBuffer[this.readOffset++]; return chunkBuffer.GetSpan()[this.readOffset++];
} }
/// <inheritdoc/> /// <inheritdoc/>
@ -355,8 +356,8 @@ namespace SixLabors.ImageSharp.IO
Guard.MustBeGreaterThanOrEqualTo(offset, 0, nameof(offset)); Guard.MustBeGreaterThanOrEqualTo(offset, 0, nameof(offset));
Guard.MustBeGreaterThanOrEqualTo(count, 0, nameof(count)); Guard.MustBeGreaterThanOrEqualTo(count, 0, nameof(count));
const string BufferMessage = "Offset subtracted from the buffer length is less than count."; const string bufferMessage = "Offset subtracted from the buffer length is less than count.";
Guard.IsFalse(buffer.Length - offset < count, nameof(buffer), BufferMessage); Guard.IsFalse(buffer.Length - offset < count, nameof(buffer), bufferMessage);
this.WriteImpl(buffer.AsSpan().Slice(offset, count)); this.WriteImpl(buffer.AsSpan().Slice(offset, count));
} }
@ -415,7 +416,7 @@ namespace SixLabors.ImageSharp.IO
this.writeOffset = 0; this.writeOffset = 0;
} }
byte[] chunkBuffer = this.writeChunk.Buffer.Array; IMemoryOwner<byte> chunkBuffer = this.writeChunk.Buffer;
int chunkSize = this.writeChunk.Length; int chunkSize = this.writeChunk.Length;
if (this.writeOffset == chunkSize) if (this.writeOffset == chunkSize)
@ -424,10 +425,10 @@ namespace SixLabors.ImageSharp.IO
this.writeChunk.Next = this.AllocateMemoryChunk(); this.writeChunk.Next = this.AllocateMemoryChunk();
this.writeChunk = this.writeChunk.Next; this.writeChunk = this.writeChunk.Next;
this.writeOffset = 0; this.writeOffset = 0;
chunkBuffer = this.writeChunk.Buffer.Array; chunkBuffer = this.writeChunk.Buffer;
} }
chunkBuffer[this.writeOffset++] = value; chunkBuffer.GetSpan()[this.writeOffset++] = value;
} }
/// <summary> /// <summary>
@ -473,7 +474,7 @@ namespace SixLabors.ImageSharp.IO
this.readOffset = 0; this.readOffset = 0;
} }
byte[] chunkBuffer = this.readChunk.Buffer.Array; IMemoryOwner<byte> chunkBuffer = this.readChunk.Buffer;
int chunkSize = this.readChunk.Length; int chunkSize = this.readChunk.Length;
if (this.readChunk.Next is null) if (this.readChunk.Next is null)
{ {
@ -495,7 +496,7 @@ namespace SixLabors.ImageSharp.IO
this.readChunk = this.readChunk.Next; this.readChunk = this.readChunk.Next;
this.readOffset = 0; this.readOffset = 0;
chunkBuffer = this.readChunk.Buffer.Array; chunkBuffer = this.readChunk.Buffer;
chunkSize = this.readChunk.Length; chunkSize = this.readChunk.Length;
if (this.readChunk.Next is null) if (this.readChunk.Next is null)
{ {
@ -504,7 +505,7 @@ namespace SixLabors.ImageSharp.IO
} }
int writeCount = chunkSize - this.readOffset; int writeCount = chunkSize - this.readOffset;
stream.Write(chunkBuffer, this.readOffset, writeCount); stream.Write(chunkBuffer.GetSpan(), this.readOffset, writeCount);
this.readOffset = chunkSize; this.readOffset = chunkSize;
} }
} }
@ -529,7 +530,7 @@ namespace SixLabors.ImageSharp.IO
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
private MemoryChunk AllocateMemoryChunk() private MemoryChunk AllocateMemoryChunk()
{ {
IManagedByteBuffer buffer = this.allocator.AllocateManagedByteBuffer(this.chunkLength); IMemoryOwner<byte> buffer = this.allocator.Allocate<byte>(this.chunkLength);
return new MemoryChunk return new MemoryChunk
{ {
Buffer = buffer, Buffer = buffer,
@ -551,7 +552,7 @@ namespace SixLabors.ImageSharp.IO
{ {
private bool isDisposed; private bool isDisposed;
public IManagedByteBuffer Buffer { get; set; } public IMemoryOwner<byte> Buffer { get; set; }
public MemoryChunk Next { get; set; } public MemoryChunk Next { get; set; }

6
src/ImageSharp/Image.Decode.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.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
@ -57,8 +58,9 @@ namespace SixLabors.ImageSharp
return null; return null;
} }
using (IManagedByteBuffer buffer = config.MemoryAllocator.AllocateManagedByteBuffer(headerSize, AllocationOptions.Clean)) using (IMemoryOwner<byte> buffer = config.MemoryAllocator.Allocate<byte>(headerSize, AllocationOptions.Clean))
{ {
Span<byte> bufferSpan = buffer.GetSpan();
long startPosition = stream.Position; long startPosition = stream.Position;
// Read doesn't always guarantee the full returned length so read a byte // Read doesn't always guarantee the full returned length so read a byte
@ -67,7 +69,7 @@ namespace SixLabors.ImageSharp
int i; int i;
do do
{ {
i = stream.Read(buffer.Array, n, headerSize - n); i = stream.Read(bufferSpan, n, headerSize - n);
n += i; n += i;
} }
while (n < headerSize && i > 0); while (n < headerSize && i > 0);

16
tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs
View File

@ -184,7 +184,13 @@ namespace SixLabors.ImageSharp.Tests.Formats.Bmp
// The Magick Reference Decoder can not decode 4-Bit bitmaps, so only execute this on windows. // The Magick Reference Decoder can not decode 4-Bit bitmaps, so only execute this on windows.
if (TestEnvironment.IsWindows) if (TestEnvironment.IsWindows)
{ {
TestBmpEncoderCore(provider, bitsPerPixel, supportTransparency: false); // Oddly the difference only happens locally but we'll not test for that.
// I suspect the issue is with the reference codec.
ImageComparer comparer = TestEnvironment.IsFramework
? ImageComparer.TolerantPercentage(0.0161F)
: ImageComparer.Exact;
TestBmpEncoderCore(provider, bitsPerPixel, supportTransparency: false, customComparer: comparer);
} }
} }
@ -198,7 +204,13 @@ namespace SixLabors.ImageSharp.Tests.Formats.Bmp
// The Magick Reference Decoder can not decode 4-Bit bitmaps, so only execute this on windows. // The Magick Reference Decoder can not decode 4-Bit bitmaps, so only execute this on windows.
if (TestEnvironment.IsWindows) if (TestEnvironment.IsWindows)
{ {
TestBmpEncoderCore(provider, bitsPerPixel, supportTransparency: true); // Oddly the difference only happens locally but we'll not test for that.
// I suspect the issue is with the reference codec.
ImageComparer comparer = TestEnvironment.IsFramework
? ImageComparer.TolerantPercentage(0.0161F)
: ImageComparer.Exact;
TestBmpEncoderCore(provider, bitsPerPixel, supportTransparency: true, customComparer: comparer);
} }
} }

Write Preview
Loading…
Cancel
Save