Browse Source

build fix after merge

af/merge-core
Anton Firszov 8 years ago
parent
commit
3f4cdf1685
  1. 10
      src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs
  2. 2
      src/ImageSharp/Processing/Processors/Transforms/ProjectiveTransformProcessor.cs

10
src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs

@ -74,11 +74,11 @@ namespace SixLabors.ImageSharp.Drawing.Processors
int width = maxX - minX;
MemoryManager memoryManager = this.Image.GetConfiguration().MemoryManager;
MemoryManager memoryManager = this.Image.GetConfiguration().MemoryManager;
using (IBuffer<float> amount = memoryManager.Allocate<float>(width))
{
amount.Span.Fill(this.Alpha);
using (IBuffer<float> amount = memoryManager.Allocate<float>(width))
{
amount.Span.Fill(this.Opacity);
Parallel.For(
minY,
@ -88,7 +88,7 @@ namespace SixLabors.ImageSharp.Drawing.Processors
{
Span<TPixel> background = source.GetPixelRowSpan(y).Slice(minX, width);
Span<TPixel> foreground = targetImage.GetPixelRowSpan(y - locationY).Slice(targetX, width);
this.blender.Blend(memoryManager, background, background, foreground, amount.Span);
blender.Blend(memoryManager, background, background, foreground, amount.Span);
});
}
}

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

@ -74,7 +74,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
IEnumerable<ImageFrame<TPixel>> frames = source.Frames.Select(
x => new ImageFrame<TPixel>(
source.GetMemoryManager(),
this.targetRectangle.Size,
this.targetDimensions,
x.MetaData.Clone()));
// Use the overload to prevent an extra frame being added

Loading…
Cancel
Save