From 8870068f27845031037fa2d23b4226e29a126290 Mon Sep 17 00:00:00 2001 From: 5ohue <86558263+5ohue@users.noreply.github.com> Date: Sat, 11 May 2024 14:08:59 +0300 Subject: [PATCH] Add `DisposeType` type --- src/types/dispose_type.rs | 43 +++++++++++++++++++++++++++++++++++++++ src/types/mod.rs | 2 ++ src/wand/magick.rs | 3 ++- 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 src/types/dispose_type.rs diff --git a/src/types/dispose_type.rs b/src/types/dispose_type.rs new file mode 100644 index 0000000..46c632a --- /dev/null +++ b/src/types/dispose_type.rs @@ -0,0 +1,43 @@ +use crate::bindings; + +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +#[repr(u32)] +pub enum DisposeType { + /* + * Identical to `Undefined` + */ + // Unrecognized = bindings::DisposeType_UnrecognizedDispose, + Undefined = bindings::DisposeType_UndefinedDispose, + None = bindings::DisposeType_NoneDispose, + Background = bindings::DisposeType_BackgroundDispose, + Previous = bindings::DisposeType_PreviousDispose, +} + +impl Default for DisposeType { + fn default() -> Self { + return DisposeType::Undefined; + } +} + +impl From for bindings::DisposeType { + fn from(value: DisposeType) -> Self { + return value as bindings::DisposeType; + } +} + +impl From for DisposeType { + fn from(value: bindings::DisposeType) -> Self { + /* + * SAFETY: + * + * `DisposeType` has the same repr as `bindings::DisposeType` - u32 + * + * If `value` is less than Previous than it is in the vaild range and can be safely + * reinterpreted as `DisposeType` + */ + if value <= bindings::DisposeType_PreviousDispose { + return unsafe { std::mem::transmute(value) }; + } + return DisposeType::default(); + } +} diff --git a/src/types/mod.rs b/src/types/mod.rs index 463620c..5f01a35 100644 --- a/src/types/mod.rs +++ b/src/types/mod.rs @@ -2,6 +2,7 @@ mod alpha_channel_option; mod colorspace_type; mod composite_operator; mod compression_type; +mod dispose_type; mod dither_method; mod filter_type; mod gravity_type; @@ -13,6 +14,7 @@ pub use self::alpha_channel_option::AlphaChannelOption; pub use self::colorspace_type::ColorspaceType; pub use self::composite_operator::CompositeOperator; pub use self::compression_type::CompressionType; +pub use self::dispose_type::DisposeType; pub use self::dither_method::DitherMethod; pub use self::filter_type::FilterType; pub use self::gravity_type::GravityType; diff --git a/src/wand/magick.rs b/src/wand/magick.rs index 827deaf..5758dca 100644 --- a/src/wand/magick.rs +++ b/src/wand/magick.rs @@ -35,6 +35,7 @@ use crate::{ ColorspaceType, CompositeOperator, CompressionType, + DisposeType, DitherMethod, FilterType, GravityType, @@ -1181,7 +1182,7 @@ impl MagickWand { get_image_compression_quality, set_image_compression_quality, MagickGetImageCompressionQuality, MagickSetImageCompressionQuality, usize get_image_delay, set_image_delay, MagickGetImageDelay, MagickSetImageDelay, usize get_image_depth, set_image_depth, MagickGetImageDepth, MagickSetImageDepth, usize - get_image_dispose, set_image_dispose, MagickGetImageDispose, MagickSetImageDispose, bindings::DisposeType + get_image_dispose, set_image_dispose, MagickGetImageDispose, MagickSetImageDispose, DisposeType 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