Add GravityType type

src/lib.rs

@@ -36,7 +36,6 @@ use libc::size_t;
 #[cfg(not(target_os = "freebsd"))]
 use libc::ssize_t;
 
-pub use bindings::GravityType;
 pub use conversions::ToMagick;
 pub use result::MagickError;
 use result::Result;

src/types/gravity_type.rs

@@ -0,0 +1,49 @@
+use crate::bindings;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[repr(u32)]
+pub enum GravityType {
+    Undefined = bindings::GravityType_UndefinedGravity,
+    /*
+     * Identical to `Undefined`
+     */
+    // Forget    = bindings::GravityType_ForgetGravity,
+    NorthWest = bindings::GravityType_NorthWestGravity,
+    North     = bindings::GravityType_NorthGravity,
+    NorthEast = bindings::GravityType_NorthEastGravity,
+    West      = bindings::GravityType_WestGravity,
+    Center    = bindings::GravityType_CenterGravity,
+    East      = bindings::GravityType_EastGravity,
+    SouthWest = bindings::GravityType_SouthWestGravity,
+    South     = bindings::GravityType_SouthGravity,
+    SouthEast = bindings::GravityType_SouthEastGravity,
+}
+
+impl Default for GravityType {
+    fn default() -> Self {
+        return GravityType::Undefined;
+    }
+}
+
+impl From<GravityType> for bindings::GravityType {
+    fn from(value: GravityType) -> Self {
+        return value as bindings::GravityType;
+    }
+}
+
+impl From<bindings::GravityType> for GravityType {
+    fn from(value: bindings::GravityType) -> Self {
+        /*
+         * SAFETY:
+         *
+         * `GravityType` has the same repr as `bindings::GravityType` - u32
+         *
+         * If `value` is less than SouthEast than it is in the vaild range and can be safely
+         * reinterpreted as `GravityType`
+         */
+        if value <= bindings::GravityType_SouthEastGravity {
+            return unsafe { std::mem::transmute(value) };
+        }
+        return GravityType::default();
+    }
+}

src/types/mod.rs

@@ -2,6 +2,7 @@ mod colorspace_type;
 mod composite_operator;
 mod dither_method;
 mod filter_type;
+mod gravity_type;
 mod metric_type;
 mod resource_type;
 
@@ -9,5 +10,6 @@ pub use self::colorspace_type::ColorspaceType;
 pub use self::composite_operator::CompositeOperator;
 pub use self::dither_method::DitherMethod;
 pub use self::filter_type::FilterType;
+pub use self::gravity_type::GravityType;
 pub use self::metric_type::MetricType;
 pub use self::resource_type::ResourceType;

src/wand/magick.rs

@@ -34,6 +34,7 @@ use crate::{
     CompositeOperator,
     DitherMethod,
     FilterType,
+    GravityType,
     MetricType,
     ResourceType
 };
@@ -271,14 +272,14 @@ impl MagickWand {
         &self,
         reference: &MagickWand,
         composition_operator: CompositeOperator,
-        gravity_type: bindings::GravityType,
+        gravity_type: GravityType,
     ) -> Result<()> {
         let result = unsafe {
             bindings::MagickCompositeImageGravity(
                 self.wand,
                 reference.wand,
                 composition_operator.into(),
-                gravity_type,
+                gravity_type.into(),
             )
         };
         match result {
@@ -1164,6 +1165,28 @@ impl MagickWand {
         }
     }
 
+    pub fn get_gravity(&self) -> GravityType {
+        return unsafe { bindings::MagickGetGravity(self.wand).into() };
+    }
+
+    pub fn set_gravity(&mut self, gravity: GravityType) -> Result<()> {
+        match unsafe { bindings::MagickSetGravity(self.wand, gravity.into()) } {
+            bindings::MagickBooleanType_MagickTrue => Ok(()),
+            _ => Err(MagickError("failed to set gravity")),
+        }
+    }
+
+    pub fn get_image_gravity(&self) -> GravityType {
+        return unsafe { bindings::MagickGetImageGravity(self.wand).into() };
+    }
+
+    pub fn set_image_gravity(&mut self, gravity: GravityType) -> Result<()> {
+        match unsafe { bindings::MagickSetImageGravity(self.wand, gravity.into()) } {
+            bindings::MagickBooleanType_MagickTrue => Ok(()),
+            _ => Err(MagickError("failed to set image gravity")),
+        }
+    }
+
     mutations!(
         /// Sets the image to the specified alpha level.
         MagickSetImageAlpha => set_image_alpha(alpha: f64)
@@ -1204,7 +1227,6 @@ impl MagickWand {
     set_get!(
         get_compression,                 set_compression,                 MagickGetCompression,              MagickSetCompression,             bindings::CompressionType
         get_compression_quality,         set_compression_quality,         MagickGetCompressionQuality,       MagickSetCompressionQuality,      size_t
-        get_gravity,                     set_gravity,                     MagickGetGravity,                  MagickSetGravity,                 bindings::GravityType
         get_image_compression,           set_image_compression,           MagickGetImageCompression,         MagickSetImageCompression,        bindings::CompressionType
         get_image_compression_quality,   set_image_compression_quality,   MagickGetImageCompressionQuality,  MagickSetImageCompressionQuality, size_t
         get_image_delay,                 set_image_delay,                 MagickGetImageDelay,               MagickSetImageDelay,              size_t
@@ -1213,7 +1235,6 @@ impl MagickWand {
         get_image_endian,                set_image_endian,                MagickGetImageEndian,              MagickSetImageEndian,             bindings::EndianType
         get_image_fuzz,                  set_image_fuzz,                  MagickGetImageFuzz,                MagickSetImageFuzz,               f64
         get_image_gamma,                 set_image_gamma,                 MagickGetImageGamma,               MagickSetImageGamma,              f64
-        get_image_gravity,               set_image_gravity,               MagickGetImageGravity,             MagickSetImageGravity,            bindings::GravityType
         get_image_interlace_scheme,      set_image_interlace_scheme,      MagickGetImageInterlaceScheme,     MagickSetImageInterlaceScheme,    bindings::InterlaceType
         get_image_interpolate_method,    set_image_interpolate_method,    MagickGetImageInterpolateMethod,   MagickSetImageInterpolateMethod,  bindings::PixelInterpolateMethod
         get_image_iterations,            set_image_iterations,            MagickGetImageIterations,          MagickSetImageIterations,         size_t