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

pixel agnostic Mutate/Clone defined

af/merge-core
Anton Firszov 7 years ago
parent
2fa57ff510
commit
0d2c0e78c8
4 changed files with 60 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      src/ImageSharp/Image.cs
  2. 19
      src/ImageSharp/Image{TPixel}.cs
  3. 20
      src/ImageSharp/Processing/IImageProcessingContext{TPixel}.cs
  4. 34
      src/ImageSharp/Processing/ProcessingExtensions.cs

15
src/ImageSharp/Image.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
using SixLabors.ImageSharp.Advanced;
using SixLabors.ImageSharp.Formats;
using SixLabors.ImageSharp.Metadata;
using SixLabors.ImageSharp.PixelFormats;
@ -13,8 +14,10 @@ namespace SixLabors.ImageSharp
where TPixel : struct, IPixel<TPixel>;
}
public abstract partial class Image : IImage
public abstract partial class Image : IImage, IConfigurable
{
protected readonly Configuration configuration;
/// <inheritdoc/>
public PixelTypeInfo PixelType { get; }
@ -27,14 +30,20 @@ namespace SixLabors.ImageSharp
/// <inheritdoc/>
public ImageMetadata Metadata { get; }
protected Image(PixelTypeInfo pixelType, ImageMetadata metadata)
/// <summary>
/// Gets the pixel buffer.
/// </summary>
Configuration IConfigurable.Configuration => this.configuration;
protected Image(Configuration configuration, PixelTypeInfo pixelType, ImageMetadata metadata)
{
this.configuration = configuration ?? Configuration.Default;
this.PixelType = pixelType;
this.Metadata = metadata ?? new ImageMetadata();
}
public abstract void Dispose();
internal abstract void ApplyVisitor(IImageVisitor visitor);
internal abstract void AcceptVisitor(IImageVisitor visitor);
}
}

19
src/ImageSharp/Image{TPixel}.cs
View File

@ -18,11 +18,9 @@ namespace SixLabors.ImageSharp
/// Encapsulates an image, which consists of the pixel data for a graphics image and its attributes.
/// </summary>
/// <typeparam name="TPixel">The pixel format.</typeparam>
public sealed class Image<TPixel> : IImage, IConfigurable
public sealed class Image<TPixel> : Image
where TPixel : struct, IPixel<TPixel>
{
private readonly Configuration configuration;
/// <summary>
/// Initializes a new instance of the <see cref="Image{TPixel}"/> class
/// with the height and the width of the image.
@ -68,8 +66,8 @@ namespace SixLabors.ImageSharp
/// <param name="height">The height of the image in pixels.</param>
/// <param name="metadata">The images metadata.</param>
internal Image(Configuration configuration, int width, int height, ImageMetadata metadata)
: base(configuration, PixelTypeInfo.Create<TPixel>(), metadata)
{
this.configuration = configuration ?? Configuration.Default;
this.PixelType = new PixelTypeInfo(Unsafe.SizeOf<TPixel>() * 8);
this.Metadata = metadata ?? new ImageMetadata();
this.Frames = new ImageFrameCollection<TPixel>(this, width, height, default(TPixel));
@ -85,8 +83,8 @@ namespace SixLabors.ImageSharp
/// <param name="height">The height of the image in pixels.</param>
/// <param name="metadata">The images metadata.</param>
internal Image(Configuration configuration, MemorySource<TPixel> memorySource, int width, int height, ImageMetadata metadata)
: base(configuration, PixelTypeInfo.Create<TPixel>(), metadata)
{
this.configuration = configuration;
this.PixelType = new PixelTypeInfo(Unsafe.SizeOf<TPixel>() * 8);
this.Metadata = metadata;
this.Frames = new ImageFrameCollection<TPixel>(this, width, height, memorySource);
@ -102,8 +100,8 @@ namespace SixLabors.ImageSharp
/// <param name="backgroundColor">The color to initialize the pixels with.</param>
/// <param name="metadata">The images metadata.</param>
internal Image(Configuration configuration, int width, int height, TPixel backgroundColor, ImageMetadata metadata)
: base(configuration, PixelTypeInfo.Create<TPixel>(), metadata)
{
this.configuration = configuration ?? Configuration.Default;
this.PixelType = new PixelTypeInfo(Unsafe.SizeOf<TPixel>() * 8);
this.Metadata = metadata ?? new ImageMetadata();
this.Frames = new ImageFrameCollection<TPixel>(this, width, height, backgroundColor);
@ -117,18 +115,14 @@ namespace SixLabors.ImageSharp
/// <param name="metadata">The images metadata.</param>
/// <param name="frames">The frames that will be owned by this image instance.</param>
internal Image(Configuration configuration, ImageMetadata metadata, IEnumerable<ImageFrame<TPixel>> frames)
: base(configuration,PixelTypeInfo.Create<TPixel>(), metadata)
{
this.configuration = configuration ?? Configuration.Default;
this.PixelType = new PixelTypeInfo(Unsafe.SizeOf<TPixel>() * 8);
this.Metadata = metadata ?? new ImageMetadata();
this.Frames = new ImageFrameCollection<TPixel>(this, frames);
}
/// <summary>
/// Gets the pixel buffer.
/// </summary>
Configuration IConfigurable.Configuration => this.configuration;
/// <inheritdoc/>
public PixelTypeInfo PixelType { get; }
@ -142,7 +136,6 @@ namespace SixLabors.ImageSharp
/// <inheritdoc/>
public ImageMetadata Metadata { get; }
/// <summary>
/// Gets the frames.
/// </summary>
public ImageFrameCollection<TPixel> Frames { get; }
@ -220,7 +213,7 @@ namespace SixLabors.ImageSharp
/// <inheritdoc/>
public void Dispose() => this.Frames.Dispose();
internal override void ApplyVisitor(IImageVisitor visitor)
internal override void AcceptVisitor(IImageVisitor visitor)
{
visitor.Visit(this);
}

20
src/ImageSharp/Processing/IImageProcessingContext{TPixel}.cs
View File

@ -9,16 +9,6 @@ using SixLabors.Primitives;
namespace SixLabors.ImageSharp.Processing
{
public interface IImageProcessingContext
{
}
/// <summary>
/// An interface to queue up image operations to apply to an image.
/// </summary>
/// <typeparam name="TPixel">The pixel format</typeparam>
public interface IImageProcessingContext<TPixel>
where TPixel : struct, IPixel<TPixel>
{
/// <summary>
/// Gets a reference to the <see cref="MemoryAllocator" /> used to allocate buffers
@ -31,7 +21,15 @@ namespace SixLabors.ImageSharp.Processing
/// </summary>
/// <returns>The <see cref="Rectangle"/></returns>
Size GetCurrentSize();
}
/// <summary>
/// An interface to queue up image operations to apply to an image.
/// </summary>
/// <typeparam name="TPixel">The pixel format</typeparam>
public interface IImageProcessingContext<TPixel> : IImageProcessingContext
where TPixel : struct, IPixel<TPixel>
{
/// <summary>
/// Adds the processor to the current set of image operations to be applied.
/// </summary>

34
src/ImageSharp/Processing/ProcessingExtensions.cs
View File

@ -13,9 +13,41 @@ namespace SixLabors.ImageSharp.Processing
/// </summary>
public static class ProcessingExtensions
{
public static void Mutate(this Image source, Action<IImageProcessingContext> operation)
class ProcessingVisitor : IImageVisitor
{
private readonly Action<IImageProcessingContext> operation;
private readonly bool mutate;
public Image ResultImage { get; private set; }
public ProcessingVisitor(Action<IImageProcessingContext> operation, bool mutate)
{
this.operation = operation;
this.mutate = mutate;
}
public void Visit<TPixel>(Image<TPixel> image)
where TPixel : struct, IPixel<TPixel>
{
IInternalImageProcessingContext<TPixel> operationsRunner = image.GetConfiguration()
.ImageOperationsProvider.CreateImageProcessingContext(image, this.mutate);
this.operation(operationsRunner);
this.ResultImage = operationsRunner.Apply();
}
}
public static void Mutate(this Image source, Action<IImageProcessingContext> operation)
{
ProcessingVisitor visitor = new ProcessingVisitor(operation, true);
source.AcceptVisitor(visitor);
}
public static Image Clone(this Image source, Action<IImageProcessingContext> operation)
{
ProcessingVisitor visitor = new ProcessingVisitor(operation, false);
source.AcceptVisitor(visitor);
return visitor.ResultImage;
}
/// <summary>

Write Preview
Loading…
Cancel
Save