Moved Frame back to IMagickImage.

Author: dlemstra

src/Magick.NET.Core/IMagickImage.cs

@@ -997,37 +997,6 @@ public partial interface IMagickImage : IMagickImageCreateOperations, IDisposabl
     /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
     string? FormatExpression(string expression);
 
-    /// <summary>
-    /// Frame image with the default geometry (25x25+6+6).
-    /// </summary>
-    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
-    void Frame();
-
-    /// <summary>
-    /// Frame image with the specified geometry.
-    /// </summary>
-    /// <param name="geometry">The geometry of the frame.</param>
-    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
-    void Frame(IMagickGeometry geometry);
-
-    /// <summary>
-    /// Frame image with the specified with and height.
-    /// </summary>
-    /// <param name="width">The width of the frame.</param>
-    /// <param name="height">The height of the frame.</param>
-    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
-    void Frame(uint width, uint height);
-
-    /// <summary>
-    /// Frame image with the specified with, height, innerBevel and outerBevel.
-    /// </summary>
-    /// <param name="width">The width of the frame.</param>
-    /// <param name="height">The height of the frame.</param>
-    /// <param name="innerBevel">The inner bevel of the frame.</param>
-    /// <param name="outerBevel">The outer bevel of the frame.</param>
-    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
-    void Frame(uint width, uint height, int innerBevel, int outerBevel);
-
     /// <summary>
     /// Applies a mathematical expression to the image.
     /// </summary>

src/Magick.NET.Core/IMagickImageCreateOperations.cs

@@ -506,6 +506,37 @@ public interface IMagickImageCreateOperations
     /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
     void Flop();
 
+    /// <summary>
+    /// Frame image with the default geometry (25x25+6+6).
+    /// </summary>
+    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
+    void Frame();
+
+    /// <summary>
+    /// Frame image with the specified geometry.
+    /// </summary>
+    /// <param name="geometry">The geometry of the frame.</param>
+    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
+    void Frame(IMagickGeometry geometry);
+
+    /// <summary>
+    /// Frame image with the specified with and height.
+    /// </summary>
+    /// <param name="width">The width of the frame.</param>
+    /// <param name="height">The height of the frame.</param>
+    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
+    void Frame(uint width, uint height);
+
+    /// <summary>
+    /// Frame image with the specified with, height, innerBevel and outerBevel.
+    /// </summary>
+    /// <param name="width">The width of the frame.</param>
+    /// <param name="height">The height of the frame.</param>
+    /// <param name="innerBevel">The inner bevel of the frame.</param>
+    /// <param name="outerBevel">The outer bevel of the frame.</param>
+    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
+    void Frame(uint width, uint height, int innerBevel, int outerBevel);
+
     /// <summary>
     /// Resize image to specified size.
     /// <para />

src/Magick.NET/MagickImage.CloneMutator.cs

@@ -305,6 +305,18 @@ public void Flip()
         public void Flop()
             => SetResult(NativeMagickImage.Flop());
 
+        public void Frame()
+            => Frame(new MagickGeometry(6, 6, 25, 25));
+
+        public void Frame(IMagickGeometry geometry)
+            => SetResult(NativeMagickImage.Frame(MagickRectangle.FromGeometry(geometry, (uint)NativeMagickImage.Width_Get(), (uint)NativeMagickImage.Height_Get())));
+
+        public void Frame(uint width, uint height)
+            => Frame(new MagickGeometry(6, 6, width, height));
+
+        public void Frame(uint width, uint height, int innerBevel, int outerBevel)
+            => Frame(new MagickGeometry(innerBevel, outerBevel, width, height));
+
         public void Resize(uint width, uint height)
             => Resize(new MagickGeometry(width, height));
 

src/Magick.NET/MagickImage.cs

@@ -3005,15 +3005,21 @@ public void Flop()
     /// </summary>
     /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
     public void Frame()
-        => Frame(new MagickGeometry(6, 6, 25, 25));
+    {
+        using var mutator = new Mutator(_nativeInstance);
+        mutator.Frame();
+    }
 
     /// <summary>
     /// Frame image with the specified geometry.
     /// </summary>
     /// <param name="geometry">The geometry of the frame.</param>
     /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
     public void Frame(IMagickGeometry geometry)
-        => _nativeInstance.Frame(MagickRectangle.FromGeometry(geometry, this));
+    {
+        using var mutator = new Mutator(_nativeInstance);
+        mutator.Frame(geometry);
+    }
 
     /// <summary>
     /// Frame image with the specified with and height.
@@ -3022,7 +3028,10 @@ public void Frame(IMagickGeometry geometry)
     /// <param name="height">The height of the frame.</param>
     /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
     public void Frame(uint width, uint height)
-        => Frame(new MagickGeometry(6, 6, width, height));
+    {
+        using var mutator = new Mutator(_nativeInstance);
+        mutator.Frame(width, height);
+    }
 
     /// <summary>
     /// Frame image with the specified with, height, innerBevel and outerBevel.
@@ -3033,7 +3042,10 @@ public void Frame(uint width, uint height)
     /// <param name="outerBevel">The outer bevel of the frame.</param>
     /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
     public void Frame(uint width, uint height, int innerBevel, int outerBevel)
-        => Frame(new MagickGeometry(innerBevel, outerBevel, width, height));
+    {
+        using var mutator = new Mutator(_nativeInstance);
+        mutator.Frame(width, height, innerBevel, outerBevel);
+    }
 
     /// <summary>
     /// Applies a mathematical expression to the image.

src/Magick.NET/Native/MagickImage.cs

@@ -426,8 +426,7 @@ private unsafe sealed partial class NativeMagickImage : NativeInstance, INativeM
         public partial string? FormatExpression(IMagickSettings<QuantumType>? settings, string expression);
 
         [Throws]
-        [SetInstance]
-        public partial void Frame(MagickRectangle geometry);
+        public partial IntPtr Frame(MagickRectangle geometry);
 
         [Throws]
         public partial IntPtr Fx(string expression, Channels channels);