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

bring in updates from maxicode detection

Browse Source
This commit is contained in:
Henry Schimke
2023-01-27 15:12:49 -06:00
parent 6355dc1bfd
commit d2728e0414
6 changed files with 144 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/bit_matrix.rs
View File

@@ -226,6 +226,27 @@ impl BitMatrix {
Some(((self.bits[offset] >> (x & 0x1f)) & 1) != 0) Some(((self.bits[offset] >> (x & 0x1f)) & 1) != 0)
} }
pub fn try_get_area(&self, x: u32, y: u32, box_size: u32) -> Option<bool> {
let mut matrix = Vec::with_capacity((box_size * box_size) as usize);
let start_x = x - box_size / 2;
let end_x = x + box_size / 2;
let start_y = y - box_size / 2;
let end_y = y+ box_size / 2;
for get_x in start_x..=end_x {
for get_y in start_y..=end_y {
matrix.push(self.try_get(get_x, get_y)?);
}
}
let total_set = matrix.iter().filter(|bit| **bit ).count();
if (total_set as f32 / matrix.len() as f32) >=0.5 {
Some(true)
}else {
Some(false)
}
}
/// Confusingly returns true if the requested element is out of bounds /// Confusingly returns true if the requested element is out of bounds
pub fn check_in_bounds(&self, x: u32, y: u32) -> bool { pub fn check_in_bounds(&self, x: u32, y: u32) -> bool {
(self.get_offset(y, x)) > self.bits.len() (self.get_offset(y, x)) > self.bits.len()

220
src/maxicode/detector.rs
View File

@@ -2,7 +2,9 @@
use num::integer::Roots; use num::integer::Roots;
use crate::{ use crate::{
common::{BitMatrix, DefaultGridSampler, DetectorRXingResult, GridSampler}, common::{
detector::MathUtils, BitMatrix, DefaultGridSampler, DetectorRXingResult, GridSampler,
},
Exceptions, RXingResultPoint, Exceptions, RXingResultPoint,
}; };
@@ -338,13 +340,16 @@ pub fn detect(image: &BitMatrix, try_harder: bool) -> Result<MaxicodeDetectionRe
let [tl, bl, tr, br] = &symbol_box; let [tl, bl, tr, br] = &symbol_box;
let target_width = (tr.0 - tl.0).round() as u32; let target_width = MathUtils::distance_float(tl.0, tl.1, tr.0, tr.1);
let target_height = (br.1 - tr.1).round() as u32; let target_height = MathUtils::distance_float(br.0, br.1, tr.0, tr.1);
// let target_width = (tr.0 - tl.0).round().abs() as u32;
// let target_height = (br.1 - tr.1).round().abs() as u32;
let Ok(bits) = grid_sampler.sample_grid_detailed( let Ok(bits) = grid_sampler.sample_grid_detailed(
image, image,
target_width, target_width.round() as u32,
target_height, target_height.round() as u32,
0.0, 0.0,
0.0, 0.0,
target_width as f32 , target_width as f32 ,
@@ -653,11 +658,6 @@ fn validate_bullseye_widths(buckets: &[u32; 11]) -> bool {
let max_variance_even = estimated_module_size_even / 2.0; let max_variance_even = estimated_module_size_even / 2.0;
let max_variance_odd = estimated_module_size_odd / 2.0; let max_variance_odd = estimated_module_size_odd / 2.0;
// let total_width = buckets.iter().sum::<u32>() as f32;
// let estimated_module_size = total_width / (buckets.len() -1 ) as f32;
// let max_variance = estimated_module_size / 2.5;
let b1 = (estimated_module_size_even - buckets[0] as f32).abs(); let b1 = (estimated_module_size_even - buckets[0] as f32).abs();
let b2 = (estimated_module_size_odd - buckets[1] as f32).abs(); let b2 = (estimated_module_size_odd - buckets[1] as f32).abs();
let b3 = (estimated_module_size_even - buckets[2] as f32).abs(); let b3 = (estimated_module_size_even - buckets[2] as f32).abs();
@@ -685,18 +685,18 @@ fn validate_bullseye_widths(buckets: &[u32; 11]) -> bool {
/// returns the (center , radius) of the possible bullseye /// returns the (center , radius) of the possible bullseye
fn get_bullseye_metadata(buckets: &[u32; 11], column: u32) -> (u32, u32, [u32; 11]) { fn get_bullseye_metadata(buckets: &[u32; 11], column: u32) -> (u32, u32, [u32; 11]) {
let radius = ((buckets.iter().sum::<u32>() as f32) / 2.0).round() as u32; //buckets.iter().skip(6).sum::<u32>() + buckets[5] / 2; let radius = ((buckets.iter().sum::<u32>() as f32) / 2.0).round() as u32;
let center = column - radius; //buckets.iter().take(5).sum::<u32>() - (buckets[5] / 2); let center = column - radius;
(center, radius, *buckets) (center, radius, *buckets)
} }
const LEFT_SHIFT_PERCENT_ADJUST: f32 = 0.0; const LEFT_SHIFT_PERCENT_ADJUST: f32 = 0.03;
const RIGHT_SHIFT_PERCENT_ADJUST: f32 = 0.03; const RIGHT_SHIFT_PERCENT_ADJUST: f32 = 0.03;
const ACCEPTED_SCALES: [f64; 5] = [0.065, 0.069, 0.07, 0.075, 0.08]; const ACCEPTED_SCALES: [f64; 5] = [0.065, 0.069, 0.07, 0.075, 0.08];
fn box_symbol(image: &BitMatrix, circle: &mut Circle) -> Result<[(f32, f32); 4], Exceptions> { fn box_symbol(image: &BitMatrix, circle: &mut Circle) -> Result<[(f32, f32); 4], Exceptions> {
let (left_boundary, right_boundary, top_boundary, bottom_boundary) = let (left_boundary, right_boundary, top_boundary, bottom_boundary) =
calculate_simple_boundary(circle, Some(image), None); calculate_simple_boundary(circle, Some(image), None, false);
let naive_box = [ let naive_box = [
RXingResultPoint::new(left_boundary as f32, bottom_boundary as f32), RXingResultPoint::new(left_boundary as f32, bottom_boundary as f32),
@@ -717,7 +717,6 @@ fn box_symbol(image: &BitMatrix, circle: &mut Circle) -> Result<[(f32, f32); 4],
return Err(Exceptions::NotFoundException(None)); return Err(Exceptions::NotFoundException(None));
} }
#[cfg(feature = "experimental_features")]
for scale in ACCEPTED_SCALES { for scale in ACCEPTED_SCALES {
if let Some(found_rotation) = attempt_rotation_box(image, circle, &naive_box, scale) { if let Some(found_rotation) = attempt_rotation_box(image, circle, &naive_box, scale) {
result_box = found_rotation; result_box = found_rotation;
@@ -737,11 +736,12 @@ fn calculate_simple_boundary(
circle: &Circle, circle: &Circle,
image: Option<&BitMatrix>, image: Option<&BitMatrix>,
center_scale: Option<f64>, center_scale: Option<f64>,
tight: bool,
) -> (u32, u32, u32, u32) { ) -> (u32, u32, u32, u32) {
let (symbol_width, symbol_height) = if image.is_some() { let (symbol_width, symbol_height) = if !tight {
guess_barcode_size(circle) guess_barcode_size(circle)
} else if let Some(s) = center_scale { } else if let Some(s) = center_scale {
guess_barcode_size_general(circle, 0.03, s, 0.97) guess_barcode_size_general(circle, 0.05, s, 0.95)
} else { } else {
guess_barcode_size_tighter(circle) guess_barcode_size_tighter(circle)
}; };
@@ -763,12 +763,11 @@ fn calculate_simple_boundary(
(circle.center.0 as i32 - left_shift).clamp(0, image_width as i32 - 33) as u32; (circle.center.0 as i32 - left_shift).clamp(0, image_width as i32 - 33) as u32;
let right_boundary = let right_boundary =
(circle.center.0 as i32 + right_shift).clamp(33, image_width as i32) as u32; (circle.center.0 as i32 + right_shift).clamp(33, image_width as i32) as u32;
//symbol_width.clamp(30, image.getWidth());
let top_boundary = let top_boundary =
(circle.center.1 as i32 + up_down_shift).clamp(33, image_height as i32) as u32; (circle.center.1 as i32 + up_down_shift).clamp(33, image_height as i32) as u32;
//symbol_height.clamp(33, image.getHeight());
let bottom_boundary = let bottom_boundary =
(circle.center.1 as i32 - up_down_shift).clamp(0, image_height as i32 - 30) as u32; (circle.center.1 as i32 - up_down_shift).clamp(0, image_height as i32 - 30) as u32;
(left_boundary, right_boundary, top_boundary, bottom_boundary) (left_boundary, right_boundary, top_boundary, bottom_boundary)
} }
@@ -788,7 +787,9 @@ fn attempt_rotation_box(
naive_box: &[RXingResultPoint; 4], naive_box: &[RXingResultPoint; 4],
center_scale: f64, center_scale: f64,
) -> Option<[RXingResultPoint; 4]> { ) -> Option<[RXingResultPoint; 4]> {
// update our circle with a more accurate center point
circle.calculate_high_accuracy_center(); circle.calculate_high_accuracy_center();
// we know that the locator symbols should appear at 60 degree increments around the circle // we know that the locator symbols should appear at 60 degree increments around the circle
// top left // top left
@@ -816,96 +817,98 @@ fn attempt_rotation_box(
let mut found = false; let mut found = false;
let mut final_rotation = 0.0; let mut final_rotation = 0.0;
for int_rotation in 0..355 { for int_rotation in 0..175 {
let rotation = int_rotation as f32; let rotation = (int_rotation * 2) as f32;
// look for top left // look for top left
// * * // * *
// * // *
let p1_rot = get_point(circle.center, topl_p1, rotation); let p1_rot = get_point(circle.center, topl_p1, rotation);
let p2_rot = get_point(circle.center, topl_p2, rotation); let p2_rot = get_point(circle.center, topl_p2, rotation);
let p3_rot = get_point(circle.center, topl_p3, rotation); let p3_rot = get_point(circle.center, topl_p3, rotation);
let found_tl = image.try_get(p1_rot.0 as u32, p1_rot.1 as u32)? let found_tl = image.try_get_area(p1_rot.0 as u32, p1_rot.1 as u32,3)?
&& image.try_get(p2_rot.0 as u32, p2_rot.1 as u32)? && image.try_get_area(p2_rot.0 as u32, p2_rot.1 as u32,3)?
&& image.try_get(p3_rot.0 as u32, p3_rot.1 as u32)?; && image.try_get_area(p3_rot.0 as u32, p3_rot.1 as u32,3)?;
if !found_tl { if !found_tl {
continue; continue;
} }
// look for top right // look for top right
// /\ // /\
// __ // __
let p1_rot = get_point(circle.center, topr_p1, rotation); let p1_rot = get_point(circle.center, topr_p1, rotation);
let p2_rot = get_point(circle.center, topr_p2, rotation); let p2_rot = get_point(circle.center, topr_p2, rotation);
let p3_rot = get_point(circle.center, topr_p3, rotation); let p3_rot = get_point(circle.center, topr_p3, rotation);
let found_tr = !image.try_get(p1_rot.0 as u32, p1_rot.1 as u32)? let found_tr = !image.try_get_area(p1_rot.0 as u32, p1_rot.1 as u32,3)?
&& !image.try_get(p2_rot.0 as u32, p2_rot.1 as u32)? && !image.try_get_area(p2_rot.0 as u32, p2_rot.1 as u32,3)?
&& !image.try_get(p3_rot.0 as u32, p3_rot.1 as u32)?; && !image.try_get_area(p3_rot.0 as u32, p3_rot.1 as u32,3)?;
if !found_tr { if !found_tr {
continue; continue;
} }
// look for left // look for left
// * // *
// * // *
let p1_rot = get_point(circle.center, l_p1, rotation); let p1_rot = get_point(circle.center, l_p1, rotation);
let p2_rot = get_point(circle.center, l_p2, rotation); let p2_rot = get_point(circle.center, l_p2, rotation);
let p3_rot = get_point(circle.center, l_p3, rotation); let p3_rot = get_point(circle.center, l_p3, rotation);
let found_l = image.try_get(p1_rot.0 as u32, p1_rot.1 as u32)? let found_l = image.try_get_area(p1_rot.0 as u32, p1_rot.1 as u32,3)?
&& !image.try_get(p2_rot.0 as u32, p2_rot.1 as u32)? && !image.try_get_area(p2_rot.0 as u32, p2_rot.1 as u32,3)?
&& image.try_get(p3_rot.0 as u32, p3_rot.1 as u32)?; && image.try_get_area(p3_rot.0 as u32, p3_rot.1 as u32,3)?;
if !found_l { if !found_l {
continue; continue;
} }
// look for right // look for right
// * // *
// * // *
let p1_rot = get_point(circle.center, r_p1, rotation); let p1_rot = get_point(circle.center, r_p1, rotation);
let p2_rot = get_point(circle.center, r_p2, rotation); let p2_rot = get_point(circle.center, r_p2, rotation);
let p3_rot = get_point(circle.center, r_p3, rotation); let p3_rot = get_point(circle.center, r_p3, rotation);
let found_r = image.try_get(p1_rot.0 as u32, p1_rot.1 as u32)? let found_r = image.try_get_area(p1_rot.0 as u32, p1_rot.1 as u32,3)?
&& !image.try_get(p2_rot.0 as u32, p2_rot.1 as u32)? && !image.try_get_area(p2_rot.0 as u32, p2_rot.1 as u32,3)?
&& image.try_get(p3_rot.0 as u32, p3_rot.1 as u32)?; && image.try_get_area(p3_rot.0 as u32, p3_rot.1 as u32,3)?;
if !found_r { if !found_r {
continue; continue;
} }
// look for bottom left // look for bottom left
// * // *
// * // *
let p1_rot = get_point(circle.center, bottoml_p1, rotation); let p1_rot = get_point(circle.center, bottoml_p1, rotation);
let p2_rot = get_point(circle.center, bottoml_p2, rotation); let p2_rot = get_point(circle.center, bottoml_p2, rotation);
let p3_rot = get_point(circle.center, bottoml_p3, rotation); let p3_rot = get_point(circle.center, bottoml_p3, rotation);
let found_bl = image.try_get(p1_rot.0 as u32, p1_rot.1 as u32)? let found_bl = image.try_get_area(p1_rot.0 as u32, p1_rot.1 as u32,3)?
&& !image.try_get(p2_rot.0 as u32, p2_rot.1 as u32)? && !image.try_get_area(p2_rot.0 as u32, p2_rot.1 as u32,3)?
&& image.try_get(p3_rot.0 as u32, p3_rot.1 as u32)?; && image.try_get_area(p3_rot.0 as u32, p3_rot.1 as u32,3)?;
if !found_bl { if !found_bl {
continue; continue;
} }
// look for bottom right // look for bottom right
// * // *
// * // *
let p1_rot = get_point(circle.center, bottomr_p1, rotation); let p1_rot = get_point(circle.center, bottomr_p1, rotation);
let p2_rot = get_point(circle.center, bottomr_p2, rotation); let p2_rot = get_point(circle.center, bottomr_p2, rotation);
let p3_rot = get_point(circle.center, bottomr_p3, rotation); let p3_rot = get_point(circle.center, bottomr_p3, rotation);
let found_br = image.try_get(p1_rot.0 as u32, p1_rot.1 as u32)? let found_br = image.try_get_area(p1_rot.0 as u32, p1_rot.1 as u32,3)?
&& !image.try_get(p2_rot.0 as u32, p2_rot.1 as u32)? && !image.try_get_area(p2_rot.0 as u32, p2_rot.1 as u32,3)?
&& image.try_get(p3_rot.0 as u32, p3_rot.1 as u32)?; && image.try_get_area(p3_rot.0 as u32, p3_rot.1 as u32,3)?;
if !found_br { if !found_br {
continue; continue;
} }
// did we find it? // did we find it?
found = found_tl && found_tr && found_l && found_r && found_bl && found_br; found = found_tl && found_tr && found_l && found_r && found_bl && found_br;
if found { if found {
final_rotation = rotation; final_rotation = rotation;
break; break;
} }
} }
if found { if found {
// if final_rotation > 180.0 { final_rotation = final_rotation + 0.0 }
let new_1 = get_point( let new_1 = get_point(
circle.center, circle.center,
(naive_box[0].x as u32, naive_box[0].y as u32), (naive_box[0].x as u32, naive_box[0].y as u32),
@@ -926,6 +929,7 @@ fn attempt_rotation_box(
(naive_box[3].x as u32, naive_box[3].y as u32), (naive_box[3].x as u32, naive_box[3].y as u32),
final_rotation, final_rotation,
); );
Some([ Some([
RXingResultPoint::new(new_1.0, new_1.1), RXingResultPoint::new(new_1.0, new_1.1),
RXingResultPoint::new(new_2.0, new_2.1), RXingResultPoint::new(new_2.0, new_2.1),
@@ -959,12 +963,12 @@ fn get_point(center: (u32, u32), original: (u32, u32), angle: f32) -> (f32, f32)
+ radians.cos() * (original.1 as f32 - center.1 as f32) + radians.cos() * (original.1 as f32 - center.1 as f32)
+ center.1 as f32; + center.1 as f32;
(x, y) (x.abs(), y.abs())
} }
fn adjust_point_alternate(point: (u32, u32), circle: &Circle, center_scale: f64) -> (u32, u32) { fn adjust_point_alternate(point: (u32, u32), circle: &Circle, center_scale: f64) -> (u32, u32) {
let (left_boundary, right_boundary, top_boundary, bottom_boundary) = let (left_boundary, right_boundary, top_boundary, bottom_boundary) =
calculate_simple_boundary(circle, None, Some(center_scale)); calculate_simple_boundary(circle, Some(circle.image), Some(center_scale), true);
let top = bottom_boundary; let top = bottom_boundary;
let height = top_boundary - bottom_boundary; let height = top_boundary - bottom_boundary;
@@ -989,7 +993,7 @@ fn guess_barcode_size(circle: &Circle) -> (u32, u32) {
} }
fn guess_barcode_size_tighter(circle: &Circle) -> (u32, u32) { fn guess_barcode_size_tighter(circle: &Circle) -> (u32, u32) {
guess_barcode_size_general(circle, 0.03, 0.0695, 0.97) guess_barcode_size_general(circle, 0.025, 0.0695, 0.97)
} }
fn guess_barcode_size_general( fn guess_barcode_size_general(
@@ -1003,8 +1007,8 @@ fn guess_barcode_size_general(
let ideal_symbol_side = ideal_symbol_area.sqrt(); let ideal_symbol_side = ideal_symbol_area.sqrt();
( (
ideal_symbol_side.round() as u32, ideal_symbol_side.floor() as u32,
(ideal_symbol_side * height_final_adjust_percent).round() as u32, (ideal_symbol_side * height_final_adjust_percent).floor() as u32,
) )
} }
@@ -1072,6 +1076,14 @@ mod detector_test {
) )
} }
#[test]
fn mode_2_rot90() {
finder_test(
"test_resources/blackbox/maxicode-1/MODE2-rotate-90.png",
"test_resources/blackbox/maxicode-1/MODE2-rotate-90.txt",
)
}
#[test] #[test]
fn mode3() { fn mode3() {
finder_test( finder_test(

BIN
test_resources/blackbox/maxicode-1/MODE2-rotate-90.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.4 KiB

1
test_resources/blackbox/maxicode-1/MODE2-rotate-90.txt Normal file
View File

@@ -0,0 +1 @@
[)>0196123450000222111MODE2

5
tests/common/abstract_black_box_test_case.rs
View File

@@ -32,6 +32,8 @@ use rxing::{
use super::TestRXingResult; use super::TestRXingResult;
const POSSIBLE_EXTENSIONS: &str = "jpg,jpeg,gif,png,JPG,JPEG,GIF,PNG";
/** /**
* @author Sean Owen * @author Sean Owen
* @author dswitkin@google.com (Daniel Switkin) * @author dswitkin@google.com (Daniel Switkin)
@@ -115,7 +117,6 @@ impl<T: Reader> AbstractBlackBoxTestCase<T> {
); );
// let paths = Vec::new(); // let paths = Vec::new();
let path_search = read_dir(&self.test_base); let path_search = read_dir(&self.test_base);
const POSSIBLE_EXTENSIONS: &str = "jpg,jpeg,gif,png,JPG,JPEG,GIF,PNG";
let mut paths = path_search let mut paths = path_search
.unwrap() .unwrap()
@@ -123,7 +124,7 @@ impl<T: Reader> AbstractBlackBoxTestCase<T> {
.filter(|r| r.is_ok()) // Get rid of Err variants for Result<DirEntry> .filter(|r| r.is_ok()) // Get rid of Err variants for Result<DirEntry>
.map(|r| r.unwrap().path()) // This is safe, since we only have the Ok variants .map(|r| r.unwrap().path()) // This is safe, since we only have the Ok variants
.filter(|r| r.is_file()) // Filter out non-folders .filter(|r| r.is_file()) // Filter out non-folders
.filter(|r| POSSIBLE_EXTENSIONS.contains(r.extension().unwrap().to_str().unwrap())) .filter(|r| r.extension().is_some() && POSSIBLE_EXTENSIONS.contains(r.extension().unwrap().to_str().unwrap()))
// .map(|r| r.into_boxed_path()) // .map(|r| r.into_boxed_path())
.collect::<Vec<PathBuf>>(); .collect::<Vec<PathBuf>>();

4
tests/maxicode_blackbox_tests.rs
View File

@@ -29,7 +29,9 @@ fn maxicode1_test_case() {
BarcodeFormat::MAXICODE, BarcodeFormat::MAXICODE,
); );
// super("src/test/resources/blackbox/maxicode-1", new MultiFormatReader(), BarcodeFormat.MAXICODE); // super("src/test/resources/blackbox/maxicode-1", new MultiFormatReader(), BarcodeFormat.MAXICODE);
tester.add_test(7, 7, 0.0); tester.add_test(7, 8, 0.0);
tester.add_test(0, 4, 90.0);
tester.add_test(0, 3, 180.0);
tester.test_black_box(); tester.test_black_box();
} }