Moved Distort to IMagickImageCreateOperations.

Author: dlemstra

src/Magick.NET.Core/IMagickImage.cs

@@ -891,25 +891,6 @@ public partial interface IMagickImage : IMagickImageCreateOperations, IDisposabl
     /// <returns>The color type of the image.</returns>
     ColorType DetermineColorType();
 
-    /// <summary>
-    /// Distorts an image using various distortion methods, by mapping color lookups of the source
-    /// image to a new destination image of the same size as the source image.
-    /// </summary>
-    /// <param name="method">The distortion method to use.</param>
-    /// <param name="arguments">An array containing the arguments for the distortion.</param>
-    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
-    void Distort(DistortMethod method, params double[] arguments);
-
-    /// <summary>
-    /// Distorts an image using various distortion methods, by mapping color lookups of the source
-    /// image to a new destination image usually of the same size as the source image, unless
-    /// 'bestfit' is set to true.
-    /// </summary>
-    /// <param name="settings">The settings for the distort operation.</param>
-    /// <param name="arguments">An array containing the arguments for the distortion.</param>
-    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
-    void Distort(IDistortSettings settings, params double[] arguments);
-
     /// <summary>
     /// Draw on image using one or more drawables.
     /// </summary>

src/Magick.NET.Core/IMagickImageCreateOperations.cs

@@ -406,6 +406,25 @@ public interface IMagickImageCreateOperations
     /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
     void Despeckle();
 
+    /// <summary>
+    /// Distorts an image using various distortion methods, by mapping color lookups of the source
+    /// image to a new destination image of the same size as the source image.
+    /// </summary>
+    /// <param name="method">The distortion method to use.</param>
+    /// <param name="arguments">An array containing the arguments for the distortion.</param>
+    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
+    void Distort(DistortMethod method, params double[] arguments);
+
+    /// <summary>
+    /// Distorts an image using various distortion methods, by mapping color lookups of the source
+    /// image to a new destination image usually of the same size as the source image, unless
+    /// 'bestfit' is set to true.
+    /// </summary>
+    /// <param name="settings">The settings for the distort operation.</param>
+    /// <param name="arguments">An array containing the arguments for the distortion.</param>
+    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
+    void Distort(IDistortSettings settings, params double[] arguments);
+
     /// <summary>
     /// Resize image to specified size.
     /// <para />

src/Magick.NET/MagickImage.CloneMutator.cs

@@ -231,6 +231,21 @@ public double DeskewAndCrop(Percentage threshold)
         public void Despeckle()
             => SetResult(NativeMagickImage.Despeckle());
 
+        public void Distort(DistortMethod method, params double[] arguments)
+            => Distort(new DistortSettings(method), arguments);
+
+        public void Distort(IDistortSettings settings, params double[] arguments)
+        {
+            Throw.IfNull(nameof(settings), settings);
+            Throw.IfNullOrEmpty(nameof(arguments), arguments);
+
+            using var temporaryDefines = new TemporaryDefines(NativeMagickImage);
+            temporaryDefines.SetArtifact("distort:scale", settings.Scale);
+            temporaryDefines.SetArtifact("distort:viewport", settings.Viewport);
+
+            SetResult(NativeMagickImage.Distort(settings.Method, settings.Bestfit, arguments, (nuint)arguments.Length));
+        }
+
         public void Resize(uint width, uint height)
             => Resize(new MagickGeometry(width, height));
 

src/Magick.NET/MagickImage.cs

@@ -2594,7 +2594,10 @@ public void Dispose()
     /// <param name="arguments">An array containing the arguments for the distortion.</param>
     /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
     public void Distort(DistortMethod method, params double[] arguments)
-        => Distort(new DistortSettings(method), arguments);
+    {
+        using var mutator = new Mutator(_nativeInstance);
+        mutator.Distort(new DistortSettings(method), arguments);
+    }
 
     /// <summary>
     /// Distorts an image using various distortion methods, by mapping color lookups of the source
@@ -2606,14 +2609,8 @@ public void Distort(DistortMethod method, params double[] arguments)
     /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
     public void Distort(IDistortSettings settings, params double[] arguments)
     {
-        Throw.IfNull(nameof(settings), settings);
-        Throw.IfNullOrEmpty(nameof(arguments), arguments);
-
-        using var temporaryDefines = new TemporaryDefines(this);
-        temporaryDefines.SetArtifact("distort:scale", settings.Scale);
-        temporaryDefines.SetArtifact("distort:viewport", settings.Viewport);
-
-        _nativeInstance.Distort(settings.Method, settings.Bestfit, arguments, (nuint)arguments.Length);
+        using var mutator = new Mutator(_nativeInstance);
+        mutator.Distort(settings, arguments);
     }
 
     /// <summary>

src/Magick.NET/Native/MagickImage.cs

@@ -377,8 +377,7 @@ private unsafe sealed partial class NativeMagickImage : NativeInstance, INativeM
         public partial ColorType DetermineColorType();
 
         [Throws]
-        [SetInstance]
-        public partial void Distort(DistortMethod method, bool bestfit, double[] arguments, nuint length);
+        public partial IntPtr Distort(DistortMethod method, bool bestfit, double[] arguments, nuint length);
 
         [Throws]
         [SetInstance]