Browse Source

- Removed Configuration.Default.MemoryManager from PixelAccessor

af/merge-core
Lauri Kotilainen 8 years ago
parent
commit
d11aaf57ba
  1. 5
      src/ImageSharp/Image/PixelAccessor{TPixel}.cs
  2. 2
      src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor.cs
  3. 2
      src/ImageSharp/Processing/Processors/Convolution/Convolution2PassProcessor.cs
  4. 2
      src/ImageSharp/Processing/Processors/Convolution/ConvolutionProcessor.cs
  5. 2
      src/ImageSharp/Processing/Processors/Effects/OilPaintingProcessor.cs
  6. 2
      src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs
  7. 4
      src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs
  8. 8
      src/ImageSharp/Processing/Processors/Transforms/RotateProcessor.cs
  9. 2
      src/ImageSharp/Processing/Processors/Transforms/SkewProcessor.cs
  10. 2
      src/ImageSharp/Quantizers/Quantize.cs

5
src/ImageSharp/Image/PixelAccessor{TPixel}.cs

@ -52,10 +52,11 @@ namespace SixLabors.ImageSharp
/// <summary>
/// Initializes a new instance of the <see cref="PixelAccessor{TPixel}"/> class.
/// </summary>
/// <param name="memoryManager">The <see cref="MemoryManager"/> to use for buffer allocations.</param>
/// <param name="width">The width of the image represented by the pixel buffer.</param>
/// <param name="height">The height of the image represented by the pixel buffer.</param>
public PixelAccessor(int width, int height)
: this(width, height, Configuration.Default.MemoryManager.Allocate2D<TPixel>(width, height, true), true)
public PixelAccessor(MemoryManager memoryManager, int width, int height)
: this(width, height, memoryManager.Allocate2D<TPixel>(width, height, true), true)
{
}

2
src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor.cs

@ -56,7 +56,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
int maxY = endY - 1;
int maxX = endX - 1;
using (var targetPixels = new PixelAccessor<TPixel>(source.Width, source.Height))
using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, source.Width, source.Height))
{
source.CopyTo(targetPixels);

2
src/ImageSharp/Processing/Processors/Convolution/Convolution2PassProcessor.cs

@ -47,7 +47,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
int height = source.Height;
ParallelOptions parallelOptions = configuration.ParallelOptions;
using (var firstPassPixels = new PixelAccessor<TPixel>(width, height))
using (var firstPassPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, width, height))
using (PixelAccessor<TPixel> sourcePixels = source.Lock())
{
this.ApplyConvolution(firstPassPixels, sourcePixels, source.Bounds(), this.KernelX, parallelOptions);

2
src/ImageSharp/Processing/Processors/Convolution/ConvolutionProcessor.cs

@ -45,7 +45,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
int maxY = endY - 1;
int maxX = endX - 1;
using (var targetPixels = new PixelAccessor<TPixel>(source.Width, source.Height))
using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, source.Width, source.Height))
{
source.CopyTo(targetPixels);

2
src/ImageSharp/Processing/Processors/Effects/OilPaintingProcessor.cs

@ -65,7 +65,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
int radius = this.BrushSize >> 1;
int levels = this.Levels;
using (var targetPixels = new PixelAccessor<TPixel>(source.Width, source.Height))
using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, source.Width, source.Height))
{
source.CopyTo(targetPixels);

2
src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs

@ -44,7 +44,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
int minX = Math.Max(this.CropRectangle.X, sourceRectangle.X);
int maxX = Math.Min(this.CropRectangle.Right, sourceRectangle.Right);
using (var targetPixels = new PixelAccessor<TPixel>(this.CropRectangle.Width, this.CropRectangle.Height))
using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, this.CropRectangle.Width, this.CropRectangle.Height))
{
Parallel.For(
minY,

4
src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs

@ -58,7 +58,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
int height = source.Height;
int halfHeight = (int)Math.Ceiling(source.Height * .5F);
using (var targetPixels = new PixelAccessor<TPixel>(width, height))
using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, width, height))
{
Parallel.For(
0,
@ -92,7 +92,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
int height = source.Height;
int halfWidth = (int)Math.Ceiling(width * .5F);
using (var targetPixels = new PixelAccessor<TPixel>(width, height))
using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, width, height))
{
Parallel.For(
0,

8
src/ImageSharp/Processing/Processors/Transforms/RotateProcessor.cs

@ -48,7 +48,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
Matrix3x2 matrix = this.GetCenteredMatrix(source, this.processMatrix);
Rectangle sourceBounds = source.Bounds();
using (var targetPixels = new PixelAccessor<TPixel>(width, height))
using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, width, height))
{
Parallel.For(
0,
@ -159,7 +159,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
int width = source.Width;
int height = source.Height;
using (var targetPixels = new PixelAccessor<TPixel>(height, width))
using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, height, width))
{
using (PixelAccessor<TPixel> sourcePixels = source.Lock())
{
@ -193,7 +193,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
int width = source.Width;
int height = source.Height;
using (var targetPixels = new PixelAccessor<TPixel>(width, height))
using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, width, height))
{
Parallel.For(
0,
@ -224,7 +224,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
int width = source.Width;
int height = source.Height;
using (var targetPixels = new PixelAccessor<TPixel>(height, width))
using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, height, width))
{
Parallel.For(
0,

2
src/ImageSharp/Processing/Processors/Transforms/SkewProcessor.cs

@ -47,7 +47,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
Matrix3x2 matrix = this.GetCenteredMatrix(source, this.processMatrix);
Rectangle sourceBounds = source.Bounds();
using (var targetPixels = new PixelAccessor<TPixel>(width, height))
using (var targetPixels = new PixelAccessor<TPixel>(configuration.MemoryManager, width, height))
{
Parallel.For(
0,

2
src/ImageSharp/Quantizers/Quantize.cs

@ -61,7 +61,7 @@ namespace SixLabors.ImageSharp
QuantizedImage<TPixel> quantized = quantizer.Quantize(img.Frames.RootFrame, maxColors);
int palleteCount = quantized.Palette.Length - 1;
using (var pixels = new PixelAccessor<TPixel>(quantized.Width, quantized.Height))
using (var pixels = new PixelAccessor<TPixel>(source.GetMemoryManager(), quantized.Width, quantized.Height))
{
Parallel.For(
0,

Loading…
Cancel
Save