diff --git a/src/ImageSharp.Drawing/Processing/Processors/Drawing/DrawImageProcessor.cs b/src/ImageSharp.Drawing/Processing/Processors/Drawing/DrawImageProcessor.cs
index dc55112c9..e217fd9a6 100644
--- a/src/ImageSharp.Drawing/Processing/Processors/Drawing/DrawImageProcessor.cs
+++ b/src/ImageSharp.Drawing/Processing/Processors/Drawing/DrawImageProcessor.cs
@@ -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.PixelFormats;
using SixLabors.Primitives;
diff --git a/src/ImageSharp/Advanced/AdvancedImageExtensions.cs b/src/ImageSharp/Advanced/AdvancedImageExtensions.cs
index 4b1d4222c..22e6d47e9 100644
--- a/src/ImageSharp/Advanced/AdvancedImageExtensions.cs
+++ b/src/ImageSharp/Advanced/AdvancedImageExtensions.cs
@@ -15,6 +15,15 @@ namespace SixLabors.ImageSharp.Advanced
///
public static class AdvancedImageExtensions
{
+ ///
+ /// Accepts a to implement a double-dispatch pattern in order to
+ /// apply pixel-specific operations on non-generic instances
+ ///
+ /// The source.
+ /// The visitor.
+ public static void AcceptVisitor(this Image source, IImageVisitor visitor)
+ => source.Accept(visitor);
+
///
/// Gets the configuration for the image.
///
diff --git a/src/ImageSharp/IImageVisitor.cs b/src/ImageSharp/Advanced/IImageVisitor.cs
similarity index 64%
rename from src/ImageSharp/IImageVisitor.cs
rename to src/ImageSharp/Advanced/IImageVisitor.cs
index 971c4d37c..ba8b13e2e 100644
--- a/src/ImageSharp/IImageVisitor.cs
+++ b/src/ImageSharp/Advanced/IImageVisitor.cs
@@ -3,13 +3,13 @@
using SixLabors.ImageSharp.PixelFormats;
-namespace SixLabors.ImageSharp
+namespace SixLabors.ImageSharp.Advanced
{
///
- /// A visitor to implement double-dispatch pattern in order to apply pixel-specific operations
- /// on non-generic instances. The operation is dispatched by .
+ /// A visitor to implement a double-dispatch pattern in order to apply pixel-specific operations
+ /// on non-generic instances.
///
- internal interface IImageVisitor
+ public interface IImageVisitor
{
///
/// Provides a pixel-specific implementation for a given operation.
@@ -19,4 +19,4 @@ namespace SixLabors.ImageSharp
void Visit(Image image)
where TPixel : struct, IPixel;
}
-}
\ No newline at end of file
+}
diff --git a/src/ImageSharp/Image.cs b/src/ImageSharp/Image.cs
index 57f60f2e7..dbdbfbd8f 100644
--- a/src/ImageSharp/Image.cs
+++ b/src/ImageSharp/Image.cs
@@ -109,8 +109,7 @@ namespace SixLabors.ImageSharp
Guard.NotNull(encoder, nameof(encoder));
this.EnsureNotDisposed();
- EncodeVisitor visitor = new EncodeVisitor(encoder, stream);
- this.AcceptVisitor(visitor);
+ this.AcceptVisitor(new EncodeVisitor(encoder, stream));
}
///
@@ -131,11 +130,12 @@ namespace SixLabors.ImageSharp
where TPixel2 : struct, IPixel;
///
- /// Accept a .
+ /// Accepts a .
/// Implemented by invoking
/// with the pixel type of the image.
///
- internal abstract void AcceptVisitor(IImageVisitor visitor);
+ /// The visitor.
+ protected internal abstract void Accept(IImageVisitor visitor);
///
/// Update the size of the image after mutation.
diff --git a/src/ImageSharp/Image{TPixel}.cs b/src/ImageSharp/Image{TPixel}.cs
index a7ea58652..994a2c586 100644
--- a/src/ImageSharp/Image{TPixel}.cs
+++ b/src/ImageSharp/Image{TPixel}.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors and contributors.
+// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
using System;
@@ -188,7 +188,7 @@ namespace SixLabors.ImageSharp
protected override void DisposeImpl() => this.Frames.Dispose();
///
- internal override void AcceptVisitor(IImageVisitor visitor)
+ protected internal override void Accept(IImageVisitor visitor)
{
this.EnsureNotDisposed();
diff --git a/src/ImageSharp/Processing/Extensions/ProcessingExtensions.cs b/src/ImageSharp/Processing/Extensions/ProcessingExtensions.cs
index 48876251e..40b1c439e 100644
--- a/src/ImageSharp/Processing/Extensions/ProcessingExtensions.cs
+++ b/src/ImageSharp/Processing/Extensions/ProcessingExtensions.cs
@@ -25,8 +25,7 @@ namespace SixLabors.ImageSharp.Processing
Guard.NotNull(operation, nameof(operation));
source.EnsureNotDisposed();
- var visitor = new ProcessingVisitor(operation, true);
- source.AcceptVisitor(visitor);
+ source.AcceptVisitor(new ProcessingVisitor(operation, true));
}
///
@@ -42,8 +41,10 @@ namespace SixLabors.ImageSharp.Processing
Guard.NotNull(operation, nameof(operation));
source.EnsureNotDisposed();
- IInternalImageProcessingContext operationsRunner = source.GetConfiguration().ImageOperationsProvider
- .CreateImageProcessingContext(source, true);
+ IInternalImageProcessingContext operationsRunner
+ = source.GetConfiguration()
+ .ImageOperationsProvider.CreateImageProcessingContext(source, true);
+
operation(operationsRunner);
}
@@ -60,8 +61,10 @@ namespace SixLabors.ImageSharp.Processing
Guard.NotNull(operations, nameof(operations));
source.EnsureNotDisposed();
- IInternalImageProcessingContext operationsRunner = source.GetConfiguration().ImageOperationsProvider
- .CreateImageProcessingContext(source, true);
+ IInternalImageProcessingContext operationsRunner
+ = source.GetConfiguration()
+ .ImageOperationsProvider.CreateImageProcessingContext(source, true);
+
operationsRunner.ApplyProcessors(operations);
}
@@ -96,8 +99,10 @@ namespace SixLabors.ImageSharp.Processing
Guard.NotNull(operation, nameof(operation));
source.EnsureNotDisposed();
- IInternalImageProcessingContext operationsRunner = source.GetConfiguration().ImageOperationsProvider
- .CreateImageProcessingContext(source, false);
+ IInternalImageProcessingContext operationsRunner
+ = source.GetConfiguration()
+ .ImageOperationsProvider.CreateImageProcessingContext(source, false);
+
operation(operationsRunner);
return operationsRunner.GetResultImage();
}
@@ -116,8 +121,10 @@ namespace SixLabors.ImageSharp.Processing
Guard.NotNull(operations, nameof(operations));
source.EnsureNotDisposed();
- IInternalImageProcessingContext operationsRunner = source.GetConfiguration().ImageOperationsProvider
- .CreateImageProcessingContext(source, false);
+ IInternalImageProcessingContext operationsRunner
+ = source.GetConfiguration()
+ .ImageOperationsProvider.CreateImageProcessingContext(source, false);
+
operationsRunner.ApplyProcessors(operations);
return operationsRunner.GetResultImage();
}
@@ -157,8 +164,10 @@ namespace SixLabors.ImageSharp.Processing
public void Visit(Image image)
where TPixel : struct, IPixel
{
- IInternalImageProcessingContext operationsRunner = image.GetConfiguration()
- .ImageOperationsProvider.CreateImageProcessingContext(image, this.mutate);
+ IInternalImageProcessingContext operationsRunner =
+ image.GetConfiguration()
+ .ImageOperationsProvider.CreateImageProcessingContext(image, this.mutate);
+
this.operation(operationsRunner);
this.ResultImage = operationsRunner.GetResultImage();
}
diff --git a/src/ImageSharp/Processing/Processors/ImageProcessorExtensions.cs b/src/ImageSharp/Processing/Processors/ImageProcessorExtensions.cs
index 53eedfd20..feb4c9f19 100644
--- a/src/ImageSharp/Processing/Processors/ImageProcessorExtensions.cs
+++ b/src/ImageSharp/Processing/Processors/ImageProcessorExtensions.cs
@@ -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.PixelFormats;
using SixLabors.Primitives;