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

cleanup maxicode detector a bit

Browse Source
This commit is contained in:
Henry Schimke
2023-05-31 10:32:37 -05:00
parent 00fcb50b10
commit e633b10802
1 changed files with 22 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/maxicode/detector.rs
View File

@@ -520,19 +520,7 @@ fn verify_bullseye_vertical(image: &BitMatrix, row: u32, column: u32) -> (bool,
// look down // look down
let down_vector = get_column_vector(image, column, row, false); let down_vector = get_column_vector(image, column, row, false);
let potential_bullseye = [ let potential_bullseye = build_potential_bullsey_array(&down_vector, &up_vector);
down_vector[5],
down_vector[4],
down_vector[3],
down_vector[2],
down_vector[1],
down_vector[0] + up_vector[0],
up_vector[1],
up_vector[2],
up_vector[3],
up_vector[4],
up_vector[5],
];
if validate_bullseye_widths(&potential_bullseye) { if validate_bullseye_widths(&potential_bullseye) {
( (
@@ -547,19 +535,7 @@ fn verify_bullseye_vertical(image: &BitMatrix, row: u32, column: u32) -> (bool,
// look down // look down
let down_vector = get_column_vector(image, column + 1, row, false); let down_vector = get_column_vector(image, column + 1, row, false);
let potential_bullseye = [ let potential_bullseye = build_potential_bullsey_array(&down_vector, &up_vector);
down_vector[5],
down_vector[4],
down_vector[3],
down_vector[2],
down_vector[1],
down_vector[0] + up_vector[0],
up_vector[1],
up_vector[2],
up_vector[3],
up_vector[4],
up_vector[5],
];
if validate_bullseye_widths(&potential_bullseye) { if validate_bullseye_widths(&potential_bullseye) {
( (
@@ -573,19 +549,7 @@ fn verify_bullseye_vertical(image: &BitMatrix, row: u32, column: u32) -> (bool,
// look down // look down
let down_vector = get_column_vector(image, column - 1, row, false); let down_vector = get_column_vector(image, column - 1, row, false);
let potential_bullseye = [ let potential_bullseye = build_potential_bullsey_array(&down_vector, &up_vector);
down_vector[5],
down_vector[4],
down_vector[3],
down_vector[2],
down_vector[1],
down_vector[0] + up_vector[0],
up_vector[1],
up_vector[2],
up_vector[3],
up_vector[4],
up_vector[5],
];
if validate_bullseye_widths(&potential_bullseye) { if validate_bullseye_widths(&potential_bullseye) {
( (
@@ -599,6 +563,25 @@ fn verify_bullseye_vertical(image: &BitMatrix, row: u32, column: u32) -> (bool,
} }
} }
fn build_potential_bullsey_array<T: std::ops::Add<Output = T> + Copy>(
vector_1: &[T; 6],
vector_2: &[T; 6],
) -> [T; 11] {
[
vector_1[5],
vector_1[4],
vector_1[3],
vector_1[2],
vector_1[1],
vector_1[0] + vector_2[0],
vector_2[1],
vector_2[2],
vector_2[3],
vector_2[4],
vector_2[5],
]
}
fn get_column_vector(image: &BitMatrix, column: u32, start_row: u32, looking_up: bool) -> [u32; 6] { fn get_column_vector(image: &BitMatrix, column: u32, start_row: u32, looking_up: bool) -> [u32; 6] {
let mut buckets = [0_u32; 6]; let mut buckets = [0_u32; 6];