Moved Deskew to IMagickImageCreateOperations.

Author: dlemstra

src/Magick.NET.Core/IMagickImage.cs

@@ -867,28 +867,6 @@ public partial interface IMagickImage : IMagickImageCreateOperations, IDisposabl
     /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
     void Decipher(string passphrase);
 
-    /// <summary>
-    /// Removes skew from the image. Skew is an artifact that occurs in scanned images because of
-    /// the camera being misaligned, imperfections in the scanning or surface, or simply because
-    /// the paper was not placed completely flat when scanned. The value of threshold ranges
-    /// from 0 to QuantumRange.
-    /// </summary>
-    /// <param name="threshold">The threshold.</param>
-    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
-    /// <returns>The angle that was used.</returns>
-    double Deskew(Percentage threshold);
-
-    /// <summary>
-    /// Removes skew from the image. Skew is an artifact that occurs in scanned images because of
-    /// the camera being misaligned, imperfections in the scanning or surface, or simply because
-    /// the paper was not placed completely flat when scanned. The value of threshold ranges
-    /// from 0 to QuantumRange. After the image is deskewed, it is cropped.
-    /// </summary>
-    /// <param name="threshold">The threshold.</param>
-    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
-    /// <returns>The angle that was used.</returns>
-    double DeskewAndCrop(Percentage threshold);
-
     /// <summary>
     /// Despeckle image (reduce speckle noise).
     /// </summary>

src/Magick.NET.Core/IMagickImageCreateOperations.cs

@@ -378,6 +378,28 @@ public interface IMagickImageCreateOperations
     /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
     void Crop(IMagickGeometry geometry, Gravity gravity);
 
+    /// <summary>
+    /// Removes skew from the image. Skew is an artifact that occurs in scanned images because of
+    /// the camera being misaligned, imperfections in the scanning or surface, or simply because
+    /// the paper was not placed completely flat when scanned. The value of threshold ranges
+    /// from 0 to QuantumRange.
+    /// </summary>
+    /// <param name="threshold">The threshold.</param>
+    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
+    /// <returns>The angle that was used.</returns>
+    double Deskew(Percentage threshold);
+
+    /// <summary>
+    /// Removes skew from the image. Skew is an artifact that occurs in scanned images because of
+    /// the camera being misaligned, imperfections in the scanning or surface, or simply because
+    /// the paper was not placed completely flat when scanned. The value of threshold ranges
+    /// from 0 to QuantumRange. After the image is deskewed, it is cropped.
+    /// </summary>
+    /// <param name="threshold">The threshold.</param>
+    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
+    /// <returns>The angle that was used.</returns>
+    double DeskewAndCrop(Percentage threshold);
+
     /// <summary>
     /// Resize image to specified size.
     /// <para />

src/Magick.NET/MagickImage.CloneMutator.cs

@@ -215,6 +215,12 @@ public void Crop(uint width, uint height, Gravity gravity)
         public void Crop(IMagickGeometry geometry)
             => Crop(geometry, Gravity.Undefined);
 
+        public double Deskew(Percentage threshold)
+            => Deskew(threshold, autoCrop: false);
+
+        public double DeskewAndCrop(Percentage threshold)
+            => Deskew(threshold, autoCrop: true);
+
         public void Crop(IMagickGeometry geometry, Gravity gravity)
         {
             Throw.IfNull(nameof(geometry), geometry);
@@ -245,5 +251,19 @@ protected virtual void SetResult(IntPtr result)
 
             _result = result;
         }
+
+        private double Deskew(Percentage threshold, bool autoCrop)
+        {
+            using var temporaryDefines = new TemporaryDefines(NativeMagickImage);
+            temporaryDefines.SetArtifact("deskew:auto-crop", autoCrop);
+
+            SetResult(NativeMagickImage.Deskew(PercentageHelper.ToQuantum(nameof(threshold), threshold)));
+
+            var artifact = NativeMagickImage.GetArtifact("deskew:angle");
+            if (!double.TryParse(artifact, NumberStyles.Any, CultureInfo.InvariantCulture, out var result))
+                return 0.0;
+
+            return result;
+        }
     }
 }

src/Magick.NET/MagickImage.cs

@@ -2520,7 +2520,10 @@ public void Decipher(string passphrase)
     /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
     /// <returns>The angle that was used.</returns>
     public double Deskew(Percentage threshold)
-        => Deskew(threshold, autoCrop: false);
+    {
+        using var mutator = new Mutator(_nativeInstance);
+        return mutator.Deskew(threshold);
+    }
 
     /// <summary>
     /// Removes skew from the image. Skew is an artifact that occurs in scanned images because of
@@ -2532,7 +2535,10 @@ public double Deskew(Percentage threshold)
     /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
     /// <returns>The angle that was used.</returns>
     public double DeskewAndCrop(Percentage threshold)
-        => Deskew(threshold, autoCrop: true);
+    {
+        using var mutator = new Mutator(_nativeInstance);
+        return mutator.DeskewAndCrop(threshold);
+    }
 
     /// <summary>
     /// Despeckle image (reduce speckle noise).
@@ -7293,20 +7299,6 @@ private MagickReadSettings CreateReadSettings(IMagickReadSettings<QuantumType>?
         return newReadSettings;
     }
 
-    private double Deskew(Percentage threshold, bool autoCrop)
-    {
-        using var temporaryDefines = new TemporaryDefines(this);
-        temporaryDefines.SetArtifact("deskew:auto-crop", autoCrop);
-
-        _nativeInstance.Deskew(PercentageHelper.ToQuantum(nameof(threshold), threshold));
-
-        var artifact = GetArtifact("deskew:angle");
-        if (!double.TryParse(artifact, NumberStyles.Any, CultureInfo.InvariantCulture, out var result))
-            return 0.0;
-
-        return result;
-    }
-
     private void Dispose(bool disposing)
     {
         DisposeInstance();

src/Magick.NET/Native/MagickImage.cs

@@ -365,8 +365,7 @@ private unsafe sealed partial class NativeMagickImage : NativeInstance, INativeM
         public partial void Decipher(string passphrase);
 
         [Throws]
-        [SetInstance]
-        public partial void Deskew(double threshold);
+        public partial IntPtr Deskew(double threshold);
 
         [Throws]
         [SetInstance]