ak/rxing
1
0
Fork 0
mirror of https://github.com/starovoid/rxing.git synced 2026-07-26 04:12:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove MathUtils::distance()

Browse Source
This commit is contained in:
Vukašin Stepanović
2023-02-16 09:28:22 +00:00
parent 844ffc3b81
commit 79d9b28d19
10 changed files with 92 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/common/detector/MathUtils.rs
View File

@@ -14,10 +14,7 @@
* limitations under the License.
*/
use std::{
f32, i32,
ops::{Add, Sub},
};
use std::{f32, i32, ops::Add};
/**
* General math-related and numeric utility functions.
@@ -66,16 +63,6 @@ pub fn round(d: f32) -> i32 {
// (xDiff * xDiff + yDiff * yDiff).sqrt() as f32
// }
#[inline(always)]
pub fn distance<T>(aX: T, aY: T, bX: T, bY: T) -> f32
where
T: Sub<T, Output = T> + Into<f64>,
{
let xDiff: f64 = (aX - bX).into();
let yDiff: f64 = (aY - bY).into();
(xDiff * xDiff + yDiff * yDiff).sqrt() as f32
}
/**
* @param array values to sum
* @return sum of values in array
@@ -119,25 +106,13 @@ mod tests {
assert_eq!(0, MathUtils::round(f32::NAN));
}
#[test]
fn testDistance() {
assert_eq!(
(8.0f32).sqrt(),
MathUtils::distance(1.0f32, 2.0f32, 3.0f32, 4.0f32)
);
assert_eq!(0.0f32, MathUtils::distance(1.0f32, 2.0f32, 1.0f32, 2.0f32));
assert_eq!((8.0f32).sqrt(), MathUtils::distance(1, 2, 3, 4));
assert_eq!(0.0f32, MathUtils::distance(1, 2, 1, 2));
}
#[test]
fn testSum() {
assert_eq!(0, MathUtils::sum(&[]));
assert_eq!(1, MathUtils::sum(&[1]));
assert_eq!(4, MathUtils::sum(&[1, 3]));
assert_eq!(0, MathUtils::sum(&[-1, 1]));
assert_eq!(0.0, MathUtils::sum(&[-1.0, 1.0]));
assert_eq!(4.0, MathUtils::sum(&[1.0, 3.0]));
}
// #[test]
// fn testSum() {
// assert_eq!(0, MathUtils::sum(&[]));
// assert_eq!(1, MathUtils::sum(&[1]));
// assert_eq!(4, MathUtils::sum(&[1, 3]));
// assert_eq!(0, MathUtils::sum(&[-1, 1]));
// assert_eq!(0.0, MathUtils::sum(&[-1.0, 1.0]));
// assert_eq!(4.0, MathUtils::sum(&[1.0, 3.0]));
// }
}

5
src/common/detector/white_rectangle_detector.rs
View File

@@ -290,7 +290,10 @@ impl<'a> WhiteRectangleDetector<'_> {
}
fn get_black_point_on_segment(&self, a_x: f32, a_y: f32, b_x: f32, b_y: f32) -> Option<Point> {
let dist = MathUtils::round(MathUtils::distance(a_x, a_y, b_x, b_y));
let a = Point::new(a_x, a_y);
let b = Point::new(b_x, b_y);
let dist = MathUtils::round(a.distance(b));
let x_step: f32 = (b_x - a_x) / dist as f32;
let y_step: f32 = (b_y - a_y) / dist as f32;