Browse Source

fix build after merge

af/UniformUnmanagedMemoryPoolMemoryAllocator-02-MemoryGuards
Anton Firszov 4 years ago
parent
commit
a67cb01a5f
  1. 2
      src/ImageSharp/ImageFrame{TPixel}.cs
  2. 11
      src/ImageSharp/Memory/Buffer2D{T}.cs
  3. 1
      tests/ImageSharp.Tests.ProfilingSandbox/LoadResizeSaveParallelMemoryStress.cs
  4. 3
      tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestImageProvider.cs

2
src/ImageSharp/ImageFrame{TPixel}.cs

@ -12,8 +12,6 @@ using SixLabors.ImageSharp.PixelFormats;
namespace SixLabors.ImageSharp
{
/// <summary>
/// Represents a pixel-specific image frame containing all pixel data and <see cref="ImageFrameMetadata"/>.
/// In case of animated formats like gif, it contains the single frame in a animation.

11
src/ImageSharp/Memory/Buffer2D{T}.cs

@ -109,17 +109,6 @@ namespace SixLabors.ImageSharp.Memory
DebugGuard.MustBeLessThan(y, this.Height, nameof(y));
int stride = this.Width + padding;
if (this.cachedMemory.Length > 0)
{
paddedSpan = this.cachedMemory.Span.Slice(y * this.Width);
if (paddedSpan.Length < stride)
{
return false;
}
paddedSpan = paddedSpan.Slice(0, stride);
return true;
}
Memory<T> memory = this.FastMemoryGroup.GetRemainingSliceOfBuffer(y * (long)this.Width);

1
tests/ImageSharp.Tests.ProfilingSandbox/LoadResizeSaveParallelMemoryStress.cs

@ -133,7 +133,6 @@ namespace SixLabors.ImageSharp.Tests.ProfilingSandbox
lrs.SystemDrawingBenchmarkParallel();
break;
case ConsoleKey.D2:
Console.WriteLine($"Images: {lrs.benchmarks.Images.Length}");
lrs.ImageSharpBenchmarkParallel();
break;
case ConsoleKey.D3:

3
tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestImageProvider.cs

@ -27,9 +27,6 @@ namespace SixLabors.ImageSharp.Tests
this.Configuration.MemoryAllocator = Configuration.Default.MemoryAllocator;
}
return configuration;
}
public PixelTypes PixelType { get; private set; } = typeof(TPixel).GetPixelType();
public virtual string SourceFileOrDescription => string.Empty;

Loading…
Cancel
Save