style: cargo fmt over the new imgproc additions

Author: enthropy7

crates/yscv-imgproc/src/core.rs

@@ -105,8 +105,6 @@ pub use ops::connected_components_4;
 pub use ops::connected_components_with_stats;
 /// Connected-component labelling with statistics (8-connectivity).
 pub use ops::connected_components_with_stats_8;
-/// Minimum enclosing circle of a 2D point set (Welzl, exact).
-pub use ops::min_enclosing_circle;
 /// Compute contour area (signed, using shoelace formula).
 pub use ops::contour_area;
 /// Compute the convex hull of a set of 2D points.
@@ -124,24 +122,24 @@ pub use ops::detect_orb;
 pub use ops::detect_surf_keypoints;
 /// Morphological dilation with arbitrary structuring element.
 pub use ops::dilate;
-/// Dilation with an all-ones square kernel — separable, O(n) per pass.
-pub use ops::dilate_box;
-/// Binary dilation via sliding-window counts (~2 ops/pixel).
-pub use ops::dilate_binary_box;
-/// Binary erosion via sliding-window counts (~2 ops/pixel).
-pub use ops::erode_binary_box;
-/// Erosion with an all-ones square kernel — separable, O(n) per pass.
-pub use ops::erode_box;
 /// Morphological dilation with 3x3 square structuring element.
 /// Input: `[H, W]` grayscale f32.
 pub use ops::dilate_3x3;
+/// Binary dilation via sliding-window counts (~2 ops/pixel).
+pub use ops::dilate_binary_box;
+/// Dilation with an all-ones square kernel — separable, O(n) per pass.
+pub use ops::dilate_box;
 /// Euclidean distance transform. Input: `[H, W]` binary f32.
 pub use ops::distance_transform;
 /// Morphological erosion with arbitrary structuring element.
 pub use ops::erode;
 /// Morphological erosion with 3x3 square structuring element.
 /// Input: `[H, W]` grayscale f32.
 pub use ops::erode_3x3;
+/// Binary erosion via sliding-window counts (~2 ops/pixel).
+pub use ops::erode_binary_box;
+/// Erosion with an all-ones square kernel — separable, O(n) per pass.
+pub use ops::erode_box;
 /// Farneback dense optical flow between two frames.
 pub use ops::farneback_flow;
 /// FAST corner detection (configurable arc length).
@@ -208,6 +206,8 @@ pub use ops::median_blur_3x3;
 pub use ops::median_filter;
 /// Minimum area rotated rectangle of a set of 2D points.
 pub use ops::min_area_rect;
+/// Minimum enclosing circle of a 2D point set (Welzl, exact).
+pub use ops::min_enclosing_circle;
 /// Morphological black-hat transform (closing - input).
 pub use ops::morph_blackhat;
 /// Morphological gradient (dilation - erosion) with 3x3 element.

crates/yscv-imgproc/src/ops/contours.rs

@@ -639,7 +639,9 @@ pub fn min_enclosing_circle(points: &[(f32, f32)]) -> Option<((f32, f32), f32)>
     // без внешнего RNG, воспроизводимо между запусками.
     let mut state: u64 = 0x9E37_79B9_7F4A_7C15;
     for i in (1..pts.len()).rev() {
-        state = state.wrapping_mul(6364136223846793005).wrapping_add(1442695040888963407);
+        state = state
+            .wrapping_mul(6364136223846793005)
+            .wrapping_add(1442695040888963407);
         let j = (state >> 33) as usize % (i + 1);
         pts.swap(i, j);
     }
@@ -648,11 +650,7 @@ pub fn min_enclosing_circle(points: &[(f32, f32)]) -> Option<((f32, f32), f32)>
         let c = ((a.0 + b.0) / 2.0, (a.1 + b.1) / 2.0);
         (c, dist(c, a))
     }
-    fn circle_from3(
-        a: (f64, f64),
-        b: (f64, f64),
-        c: (f64, f64),
-    ) -> Option<((f64, f64), f64)> {
+    fn circle_from3(a: (f64, f64), b: (f64, f64), c: (f64, f64)) -> Option<((f64, f64), f64)> {
         let d = 2.0 * (a.0 * (b.1 - c.1) + b.0 * (c.1 - a.1) + c.0 * (a.1 - b.1));
         if d.abs() < 1e-12 {
             return None; // коллинеарны
@@ -696,10 +694,7 @@ pub fn min_enclosing_circle(points: &[(f32, f32)]) -> Option<((f32, f32), f32)>
     }
 
     #[allow(clippy::cast_possible_truncation)]
-    Some((
-        (circle.0.0 as f32, circle.0.1 as f32),
-        circle.1 as f32,
-    ))
+    Some(((circle.0.0 as f32, circle.0.1 as f32), circle.1 as f32))
 }
 
 /// Compute region properties from a label image.

crates/yscv-imgproc/src/ops/mod.rs

@@ -71,9 +71,9 @@ pub use color::{
 };
 pub use contours::{
     ComponentStats, Contour, RegionProp, approx_poly_dp, arc_length, bounding_rect,
-    connected_components_with_stats, connected_components_with_stats_8, contour_area,
-    convex_hull, find_contours, fit_ellipse, min_enclosing_circle,
-    homography_4pt, hu_moments, min_area_rect, ransac_homography, region_props,
+    connected_components_with_stats, connected_components_with_stats_8, contour_area, convex_hull,
+    find_contours, fit_ellipse, homography_4pt, hu_moments, min_area_rect, min_enclosing_circle,
+    ransac_homography, region_props,
 };
 pub use draw::{
     Detection as DrawDetection, draw_circle, draw_detections, draw_line, draw_polylines, draw_rect,
@@ -106,8 +106,9 @@ pub use inpaint::inpaint_telea;
 pub use intensity::{adjust_gamma, adjust_log, rescale_intensity};
 pub use io::{imread, imread_gray, imwrite};
 pub use morphology::{
-    closing_3x3, dilate, dilate_3x3, erode, erode_3x3, morph_blackhat, morph_gradient_3x3,
-    morph_tophat, opening_3x3, remove_small_objects, skeletonize, dilate_binary_box, dilate_box, erode_binary_box, erode_box,
+    closing_3x3, dilate, dilate_3x3, dilate_binary_box, dilate_box, erode, erode_3x3,
+    erode_binary_box, erode_box, morph_blackhat, morph_gradient_3x3, morph_tophat, opening_3x3,
+    remove_small_objects, skeletonize,
 };
 pub use nms::{BBox, TemplateMatchMethod, TemplateMatchResult, nms, template_match};
 pub use normalize::normalize;

crates/yscv-imgproc/src/ops/morphology.rs

@@ -1242,7 +1242,11 @@ fn box_filter_2d(
     for y in 0..h {
         row[r..r + w].copy_from_slice(&data[y * w..(y + 1) * w]);
         for (i, &v) in row.iter().enumerate() {
-            left[i] = if i % ksize == 0 { v } else { pick(left[i - 1], v) };
+            left[i] = if i % ksize == 0 {
+                v
+            } else {
+                pick(left[i - 1], v)
+            };
         }
         for i in (0..padded_w).rev() {
             right[i] = if (i + 1) % ksize == 0 || i + 1 == padded_w {

crates/yscv-imgproc/src/tests/contour.rs

@@ -281,14 +281,9 @@ fn min_enclosing_circle_exact_cases() {
     assert!((r - std::f32::consts::SQRT_2).abs() < 1e-5);
 
     // точка внутри не влияет
-    let ((_, _), r2) = min_enclosing_circle(&[
-        (0.0, 0.0),
-        (2.0, 0.0),
-        (2.0, 2.0),
-        (0.0, 2.0),
-        (1.0, 1.0),
-    ])
-    .unwrap();
+    let ((_, _), r2) =
+        min_enclosing_circle(&[(0.0, 0.0), (2.0, 0.0), (2.0, 2.0), (0.0, 2.0), (1.0, 1.0)])
+            .unwrap();
     assert!((r2 - std::f32::consts::SQRT_2).abs() < 1e-5);
 
     assert!(min_enclosing_circle(&[]).is_none());

crates/yscv-imgproc/src/tests/morphology.rs

@@ -387,7 +387,9 @@ fn box_morphology_matches_generic_ones_kernel() {
     let mut state = 0x1234_5678_u64;
     let mut data = Vec::with_capacity(h * w);
     for _ in 0..h * w {
-        state = state.wrapping_mul(6364136223846793005).wrapping_add(1442695040888963407);
+        state = state
+            .wrapping_mul(6364136223846793005)
+            .wrapping_add(1442695040888963407);
         data.push(((state >> 33) % 1000) as f32 / 100.0);
     }
     let img = Tensor::from_vec(vec![h, w, 1], data).unwrap();
@@ -417,7 +419,9 @@ fn binary_box_matches_generic_ones_kernel() {
     let mut state = 0xDEAD_BEEF_u64;
     let mut data = Vec::with_capacity(h * w);
     for _ in 0..h * w {
-        state = state.wrapping_mul(6364136223846793005).wrapping_add(1442695040888963407);
+        state = state
+            .wrapping_mul(6364136223846793005)
+            .wrapping_add(1442695040888963407);
         data.push(if (state >> 33) % 3 == 0 { 1.0f32 } else { 0.0 });
     }
     let img = Tensor::from_vec(vec![h, w, 1], data).unwrap();