Moved Chop to IMagickImageCreateOperations.

Author: dlemstra

src/Magick.NET.Core/IMagickImage.cs

@@ -369,29 +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>
-    /// Chop image (remove vertical or horizontal subregion of image) using the specified geometry.
-    /// </summary>
-    /// <param name="geometry">The geometry to use.</param>
-    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
-    void Chop(IMagickGeometry geometry);
-
-    /// <summary>
-    /// Chop image (remove horizontal subregion of image).
-    /// </summary>
-    /// <param name="offset">The X offset from origin.</param>
-    /// <param name="width">The width of the part to chop horizontally.</param>
-    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
-    void ChopHorizontal(int offset, uint width);
-
-    /// <summary>
-    /// Chop image (remove horizontal subregion of image).
-    /// </summary>
-    /// <param name="offset">The Y offset from origin.</param>
-    /// <param name="height">The height of the part to chop vertically.</param>
-    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
-    void ChopVertical(int offset, uint height);
-
     /// <summary>
     /// A variant of adaptive histogram equalization in which the contrast amplification is limited,
     /// so as to reduce this problem of noise amplification.

src/Magick.NET.Core/IMagickImageCreateOperations.cs

@@ -305,6 +305,29 @@ public interface IMagickImageCreateOperations
     /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
     void Charcoal(double radius, double sigma);
 
+    /// <summary>
+    /// Chop image (remove vertical or horizontal subregion of image) using the specified geometry.
+    /// </summary>
+    /// <param name="geometry">The geometry to use.</param>
+    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
+    void Chop(IMagickGeometry geometry);
+
+    /// <summary>
+    /// Chop image (remove horizontal subregion of image).
+    /// </summary>
+    /// <param name="offset">The X offset from origin.</param>
+    /// <param name="width">The width of the part to chop horizontally.</param>
+    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
+    void ChopHorizontal(int offset, uint width);
+
+    /// <summary>
+    /// Chop image (remove horizontal subregion of image).
+    /// </summary>
+    /// <param name="offset">The Y offset from origin.</param>
+    /// <param name="height">The height of the part to chop vertically.</param>
+    /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
+    void ChopVertical(int offset, uint height);
+
     /// <summary>
     /// Resize image to specified size.
     /// <para />

src/Magick.NET/MagickImage.CloneMutator.cs

@@ -153,6 +153,15 @@ public void Charcoal()
         public void Charcoal(double radius, double sigma)
             => SetResult(NativeMagickImage.Charcoal(radius, sigma));
 
+        public void Chop(IMagickGeometry geometry)
+            => SetResult(NativeMagickImage.Chop(MagickRectangle.FromGeometry(geometry, (uint)NativeMagickImage.Width_Get(), (uint)NativeMagickImage.Height_Get())));
+
+        public void ChopHorizontal(int offset, uint width)
+             => Chop(new MagickGeometry(offset, 0, width, 0));
+
+        public void ChopVertical(int offset, uint height)
+            => Chop(new MagickGeometry(0, offset, 0, height));
+
         public void Resize(uint width, uint height)
             => Resize(new MagickGeometry(width, height));
 

src/Magick.NET/MagickImage.cs

@@ -1487,7 +1487,10 @@ public void Charcoal(double radius, double sigma)
     /// <param name="geometry">The geometry to use.</param>
     /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
     public void Chop(IMagickGeometry geometry)
-        => _nativeInstance.Chop(MagickRectangle.FromGeometry(geometry, this));
+    {
+        using var mutator = new Mutator(_nativeInstance);
+        mutator.Chop(geometry);
+    }
 
     /// <summary>
     /// Chop image (remove horizontal subregion of image).
@@ -1496,7 +1499,10 @@ public void Chop(IMagickGeometry geometry)
     /// <param name="width">The width of the part to chop horizontally.</param>
     /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
     public void ChopHorizontal(int offset, uint width)
-        => Chop(new MagickGeometry(offset, 0, width, 0));
+    {
+        using var mutator = new Mutator(_nativeInstance);
+        mutator.ChopHorizontal(offset, width);
+    }
 
     /// <summary>
     /// Chop image (remove horizontal subregion of image).
@@ -1505,7 +1511,10 @@ public void ChopHorizontal(int offset, uint width)
     /// <param name="height">The height of the part to chop vertically.</param>
     /// <exception cref="MagickException">Thrown when an error is raised by ImageMagick.</exception>
     public void ChopVertical(int offset, uint height)
-        => Chop(new MagickGeometry(0, offset, 0, height));
+    {
+        using var mutator = new Mutator(_nativeInstance);
+        mutator.ChopVertical(offset, height);
+    }
 
     /// <summary>
     /// A variant of adaptive histogram equalization in which the contrast amplification is limited,

src/Magick.NET/Native/MagickImage.cs

@@ -289,8 +289,7 @@ private unsafe sealed partial class NativeMagickImage : NativeInstance, INativeM
         public partial IntPtr Charcoal(double radius, double sigma);
 
         [Throws]
-        [SetInstance]
-        public partial void Chop(MagickRectangle geometry);
+        public partial IntPtr Chop(MagickRectangle geometry);
 
         [Throws]
         public partial void Clahe(nuint xTiles, nuint yTiles, nuint numberBins, double clipLimit);

src/Magick.NET/Types/MagickRectangle.cs

@@ -35,6 +35,9 @@ private MagickRectangle(NativeMagickRectangle instance)
         => NativeMagickRectangle.FromPageSize(pageSize);
 
     public static MagickRectangle FromGeometry(IMagickGeometry geometry, MagickImage image)
+        => FromGeometry(geometry, image.Width, image.Height);
+
+    public static MagickRectangle FromGeometry(IMagickGeometry geometry, uint imageWidth, uint imageHeight)
     {
         Throw.IfNull(nameof(geometry), geometry);
 
@@ -43,8 +46,8 @@ public static MagickRectangle FromGeometry(IMagickGeometry geometry, MagickImage
 
         if (geometry.IsPercentage)
         {
-            width = (uint)(image.Width * new Percentage(geometry.Width));
-            height = (uint)(image.Height * new Percentage(geometry.Height));
+            width = (uint)(imageWidth * new Percentage(geometry.Width));
+            height = (uint)(imageHeight * new Percentage(geometry.Height));
         }
 
         return new MagickRectangle(geometry.X, geometry.Y, width, height);