From bbdf7233b356ad5b96fa96f43f82570dcc755e7f Mon Sep 17 00:00:00 2001
From: Dirk Lemstra <dirk@lemstra.org>
Date: Mon, 11 Nov 2024 21:06:45 +0100
Subject: [PATCH] Moved CannyEdge to IMagickImageCreateOperations.

---
 src/Magick.NET.Core/IMagickImage.cs              | 16 ----------------
 .../IMagickImageCreateOperations.cs              | 16 ++++++++++++++++
 src/Magick.NET/MagickImage.CloneMutator.cs       |  6 ++++++
 src/Magick.NET/MagickImage.cs                    | 10 ++++++++--
 src/Magick.NET/Native/MagickImage.cs             |  3 +--
 5 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/Magick.NET.Core/IMagickImage.cs b/src/Magick.NET.Core/IMagickImage.cs
index b0fa54b3cf..6d76972902 100644
--- a/src/Magick.NET.Core/IMagickImage.cs
+++ b/src/Magick.NET.Core/IMagickImage.cs
@@ -369,22 +369,6 @@ public partial interface IMagickImage : IMagickImageCreateOperations, IDisposabl
     /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
     void BrightnessContrast(Percentage brightness, Percentage contrast, Channels channels);
 
-    /// <summary>
-    /// Uses a multi-stage algorithm to detect a wide range of edges in images.
-    /// </summary>
-    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
-    void CannyEdge();
-
-    /// <summary>
-    /// Uses a multi-stage algorithm to detect a wide range of edges in images.
-    /// </summary>
-    /// <param name="radius">The radius of the gaussian smoothing filter.</param>
-    /// <param name="sigma">The sigma of the gaussian smoothing filter.</param>
-    /// <param name="lower">Percentage of edge pixels in the lower threshold.</param>
-    /// <param name="upper">Percentage of edge pixels in the upper threshold.</param>
-    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
-    void CannyEdge(double radius, double sigma, Percentage lower, Percentage upper);
-
     /// <summary>
     /// Charcoal effect image (looks like charcoal sketch).
     /// </summary>
diff --git a/src/Magick.NET.Core/IMagickImageCreateOperations.cs b/src/Magick.NET.Core/IMagickImageCreateOperations.cs
index 9858dc920a..675120858b 100644
--- a/src/Magick.NET.Core/IMagickImageCreateOperations.cs
+++ b/src/Magick.NET.Core/IMagickImageCreateOperations.cs
@@ -275,6 +275,22 @@ public interface IMagickImageCreateOperations
     /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
     void Border(Percentage percentage);
 
+    /// <summary>
+    /// Uses a multi-stage algorithm to detect a wide range of edges in images.
+    /// </summary>
+    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
+    void CannyEdge();
+
+    /// <summary>
+    /// Uses a multi-stage algorithm to detect a wide range of edges in images.
+    /// </summary>
+    /// <param name="radius">The radius of the gaussian smoothing filter.</param>
+    /// <param name="sigma">The sigma of the gaussian smoothing filter.</param>
+    /// <param name="lower">Percentage of edge pixels in the lower threshold.</param>
+    /// <param name="upper">Percentage of edge pixels in the upper threshold.</param>
+    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
+    void CannyEdge(double radius, double sigma, Percentage lower, Percentage upper);
+
     /// <summary>
     /// Resize image to specified size.
     /// <para />
diff --git a/src/Magick.NET/MagickImage.CloneMutator.cs b/src/Magick.NET/MagickImage.CloneMutator.cs
index 50c5331403..2f406fc323 100644
--- a/src/Magick.NET/MagickImage.CloneMutator.cs
+++ b/src/Magick.NET/MagickImage.CloneMutator.cs
@@ -141,6 +141,12 @@ public void Border(uint width, uint height)
         public void Border(Percentage percentage)
             => Border((uint)(NativeMagickImage.Width_Get() * percentage), (uint)(NativeMagickImage.Height_Get() * percentage));
 
+        public void CannyEdge()
+            => CannyEdge(0.0, 1.0, new Percentage(10), new Percentage(30));
+
+        public void CannyEdge(double radius, double sigma, Percentage lower, Percentage upper)
+            => SetResult(NativeMagickImage.CannyEdge(radius, sigma, lower.ToDouble() / 100, upper.ToDouble() / 100));
+
         public void Resize(uint width, uint height)
             => Resize(new MagickGeometry(width, height));
 
diff --git a/src/Magick.NET/MagickImage.cs b/src/Magick.NET/MagickImage.cs
index cdb077a110..78da972c3b 100644
--- a/src/Magick.NET/MagickImage.cs
+++ b/src/Magick.NET/MagickImage.cs
@@ -1440,7 +1440,10 @@ public void BrightnessContrast(Percentage brightness, Percentage contrast, Chann
     /// </summary>
     /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
     public void CannyEdge()
-        => CannyEdge(0.0, 1.0, new Percentage(10), new Percentage(30));
+    {
+        using var mutator = new Mutator(_nativeInstance);
+        mutator.CannyEdge();
+    }
 
     /// <summary>
     /// Uses a multi-stage algorithm to detect a wide range of edges in images.
@@ -1451,7 +1454,10 @@ public void CannyEdge()
     /// <param name="upper">Percentage of edge pixels in the upper threshold.</param>
     /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
     public void CannyEdge(double radius, double sigma, Percentage lower, Percentage upper)
-        => _nativeInstance.CannyEdge(radius, sigma, lower.ToDouble() / 100, upper.ToDouble() / 100);
+    {
+        using var mutator = new Mutator(_nativeInstance);
+        mutator.CannyEdge(radius, sigma, lower, upper);
+    }
 
     /// <summary>
     /// Charcoal effect image (looks like charcoal sketch).
diff --git a/src/Magick.NET/Native/MagickImage.cs b/src/Magick.NET/Native/MagickImage.cs
index 4af2f5d5be..a16c7304f8 100644
--- a/src/Magick.NET/Native/MagickImage.cs
+++ b/src/Magick.NET/Native/MagickImage.cs
@@ -281,8 +281,7 @@ private unsafe sealed partial class NativeMagickImage : NativeInstance, INativeM
         public partial void BrightnessContrast(double brightness, double contrast, Channels channels);
 
         [Throws]
-        [SetInstance]
-        public partial void CannyEdge(double radius, double sigma, double lower, double upper);
+        public partial IntPtr CannyEdge(double radius, double sigma, double lower, double upper);
 
         public partial nuint ChannelOffset(PixelChannel channel);