ak/rxing
1
0
Fork 0
mirror of https://github.com/starovoid/rxing.git synced 2026-07-27 21:02:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor aztec Detector::expand_square

Browse Source
This commit is contained in:
Vukašin Stepanović
2023-02-15 14:54:51 +00:00
parent 6b7099a03b
commit 049d27723d
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/aztec/detector.rs
View File

@@ -355,10 +355,10 @@ impl<'a> Detector<'_> {
* @return the center point * @return the center point
*/ */
fn get_matrix_center(&self) -> Point { fn get_matrix_center(&self) -> Point {
let mut point_a = RXingResultPoint::default(); // { x: 0.0, y: 0.0 }; let mut point_a = RXingResultPoint::default();
let mut point_b = RXingResultPoint::default(); // { x: 0.0, y: 0.0 }; let mut point_b = RXingResultPoint::default();
let mut point_c = RXingResultPoint::default(); // { x: 0.0, y: 0.0 }; let mut point_c = RXingResultPoint::default();
let mut point_d = RXingResultPoint::default(); // { x: 0.0, y: 0.0 }; let mut point_d = RXingResultPoint::default();
let mut fnd = false; let mut fnd = false;
@@ -702,20 +702,16 @@ impl<'a> Detector<'_> {
new_side: u32, new_side: u32,
) -> [RXingResultPoint; 4] { ) -> [RXingResultPoint; 4] {
let ratio = new_side as f32 / (2.0f32 * old_side as f32); let ratio = new_side as f32 / (2.0f32 * old_side as f32);
let mut dx = corner_points[0].getX() - corner_points[2].getX();
let mut dy = corner_points[0].getY() - corner_points[2].getY();
let mut centerx = (corner_points[0].getX() + corner_points[2].getX()) / 2.0f32;
let mut centery = (corner_points[0].getY() + corner_points[2].getY()) / 2.0f32;
let result0 = RXingResultPoint::new(centerx + ratio * dx, centery + ratio * dy); let d = corner_points[0] - corner_points[2];
let result2 = RXingResultPoint::new(centerx - ratio * dx, centery - ratio * dy); let middle = corner_points[0].middle(corner_points[2]);
let result0 = middle + ratio * d;
let result2 = middle - ratio * d;
dx = corner_points[1].getX() - corner_points[3].getX(); let d = corner_points[1] - corner_points[3];
dy = corner_points[1].getY() - corner_points[3].getY(); let middle = corner_points[1].middle(corner_points[3]);
centerx = (corner_points[1].getX() + corner_points[3].getX()) / 2.0f32; let result1 = middle + ratio * d;
centery = (corner_points[1].getY() + corner_points[3].getY()) / 2.0f32; let result3 = middle - ratio * d;
let result1 = RXingResultPoint::new(centerx + ratio * dx, centery + ratio * dy);
let result3 = RXingResultPoint::new(centerx - ratio * dx, centery - ratio * dy);
[result0, result1, result2, result3] [result0, result1, result2, result3]
} }

4
src/rxing_result_point.rs
View File

@@ -214,6 +214,10 @@ impl RXingResultPoint {
} }
} }
pub fn middle(self, p: Self) -> Self {
(self + p) / 2.0
}
pub fn normalized(self) -> Self { pub fn normalized(self) -> Self {
self / Self::length(self) self / Self::length(self)
} }