Added new ops

Cargo.toml

@@ -2,7 +2,7 @@ workspace = { members = ["app"] }
 
 [package]
 name = "fast_morphology"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 description = "Fast morphological operations for images"
 readme = "README.md"
@@ -16,7 +16,6 @@ repository = "https://github.com/awxkee/fast_morphology.git"
 exclude = ["*.jpg", "*.png"]
 
 [dependencies]
-colorutils-rs = "0.5.12"
 num-traits = "0.2.19"
 rayon = "1.10.0"
 image = { version = "0.25.0", optional = true, default-features = false }

app/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 image = "0.25.2"
 fast_morphology = {path = "../", features = ["image"]}
 imageproc = "0.25.0"
-opencv = {version = "0.93.0", features = ["imgproc"]}
+opencv = {version = "0.93.0", features = ["imgproc", "clang-runtime"]}
 
 [dev-dependencies]
 criterion = {version = "0.5.1", features = ["html_reports"]}

app/src/main.rs

@@ -7,6 +7,7 @@ use opencv::core::{
     Mat, MatTrait, MatTraitConstManual, Point, Scalar, BORDER_REPLICATE, CV_8U, CV_8UC3,
 };
 use opencv::imgproc;
+use opencv::imgproc::{MORPH_BLACKHAT, MORPH_TOPHAT};
 use std::time::Instant;
 
 fn circle_se(radius: usize) -> Vec<u8> {
@@ -66,7 +67,7 @@ fn gaussian_kernel(size: usize, sigma: f32) -> Vec<Vec<f32>> {
 }
 
 fn main() {
-    let radius_size = 35;
+    let radius_size = 67;
     let mut structuring_element = circle_se(radius_size);
 
     opencv::core::set_use_opencl(false).expect("Failed to disable OpenCL");
@@ -208,9 +209,10 @@ fn main() {
     let exec_time = Instant::now();
 
     let mut dst_mat = Mat::default();
-    imgproc::erode(
+    imgproc::morphology_ex(
         &mat,
         &mut dst_mat,
+        MORPH_TOPHAT,
         &kernel,
         Point::new(-1, -1),
         1,
@@ -227,7 +229,7 @@ fn main() {
 
     let new_image = morphology_image(
         img,
-        MorphExOp::Closing,
+        MorphExOp::TopHat,
         &structuring_element,
         KernelShape::new(se_size, se_size),
         BorderMode::default(),

src/difference.rs

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) Radzivon Bartoshyk. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2.  Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * 3.  Neither the name of the copyright holder nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+use num_traits::SaturatingSub;
+use std::ops::Sub;
+
+pub trait MorphGradient<T> {
+    fn morph_gradient(dilation: &[T], erosion: &[T], dst: &mut [T]);
+}
+
+fn make_morph_gradient_sat<T>(dilation: &[T], erosion: &[T], dst: &mut [T])
+where
+    T: SaturatingSub + Default + Clone + Copy,
+{
+    for ((dilation, erosion), dst) in dilation.iter().zip(erosion.iter()).zip(dst.iter_mut()) {
+        *dst = dilation.saturating_sub(erosion);
+    }
+}
+
+fn make_morph_gradient<T>(dilation: &[T], erosion: &[T], dst: &mut [T])
+where
+    T: Sub<Output = T> + Default + Clone + Copy,
+{
+    for ((dilation, erosion), dst) in dilation.iter().zip(erosion.iter()).zip(dst.iter_mut()) {
+        *dst = *dilation - *erosion;
+    }
+}
+
+impl MorphGradient<u8> for u8 {
+    fn morph_gradient(dilation: &[u8], erosion: &[u8], dst: &mut [u8]) {
+        make_morph_gradient_sat(dilation, erosion, dst)
+    }
+}
+
+impl MorphGradient<u16> for u16 {
+    fn morph_gradient(dilation: &[u16], erosion: &[u16], dst: &mut [u16]) {
+        make_morph_gradient_sat(dilation, erosion, dst)
+    }
+}
+
+impl MorphGradient<f32> for f32 {
+    fn morph_gradient(dilation: &[f32], erosion: &[f32], dst: &mut [f32]) {
+        make_morph_gradient(dilation, erosion, dst)
+    }
+}

src/lib.rs

@@ -53,6 +53,7 @@ mod se_scan;
 mod structuring_element;
 mod thread_policy;
 mod unsafe_slice;
+mod difference;
 
 pub use border_mode::BorderMode;
 #[cfg(feature = "image")]