diff --git a/src/common/bit_matrix.rs b/src/common/bit_matrix.rs index bb190b3..9bfdfb2 100644 --- a/src/common/bit_matrix.rs +++ b/src/common/bit_matrix.rs @@ -226,6 +226,27 @@ impl BitMatrix { Some(((self.bits[offset] >> (x & 0x1f)) & 1) != 0) } + pub fn try_get_area(&self, x: u32, y: u32, box_size: u32) -> Option { + 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 pub fn check_in_bounds(&self, x: u32, y: u32) -> bool { (self.get_offset(y, x)) > self.bits.len() diff --git a/src/maxicode/detector.rs b/src/maxicode/detector.rs index 1362ea4..2b18599 100644 --- a/src/maxicode/detector.rs +++ b/src/maxicode/detector.rs @@ -2,7 +2,9 @@ use num::integer::Roots; use crate::{ - common::{BitMatrix, DefaultGridSampler, DetectorRXingResult, GridSampler}, + common::{ + detector::MathUtils, BitMatrix, DefaultGridSampler, DetectorRXingResult, GridSampler, + }, Exceptions, RXingResultPoint, }; @@ -338,13 +340,16 @@ pub fn detect(image: &BitMatrix, try_harder: bool) -> Result bool { let max_variance_even = estimated_module_size_even / 2.0; let max_variance_odd = estimated_module_size_odd / 2.0; - // let total_width = buckets.iter().sum::() 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 b2 = (estimated_module_size_odd - buckets[1] 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 fn get_bullseye_metadata(buckets: &[u32; 11], column: u32) -> (u32, u32, [u32; 11]) { - let radius = ((buckets.iter().sum::() as f32) / 2.0).round() as u32; //buckets.iter().skip(6).sum::() + buckets[5] / 2; - let center = column - radius; //buckets.iter().take(5).sum::() - (buckets[5] / 2); + let radius = ((buckets.iter().sum::() as f32) / 2.0).round() as u32; + let center = column - radius; (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 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> { 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 = [ 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)); } - #[cfg(feature = "experimental_features")] for scale in ACCEPTED_SCALES { if let Some(found_rotation) = attempt_rotation_box(image, circle, &naive_box, scale) { result_box = found_rotation; @@ -737,11 +736,12 @@ fn calculate_simple_boundary( circle: &Circle, image: Option<&BitMatrix>, center_scale: Option, + tight: bool, ) -> (u32, u32, u32, u32) { - let (symbol_width, symbol_height) = if image.is_some() { + let (symbol_width, symbol_height) = if !tight { guess_barcode_size(circle) } 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 { 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; let right_boundary = (circle.center.0 as i32 + right_shift).clamp(33, image_width as i32) as u32; - //symbol_width.clamp(30, image.getWidth()); let top_boundary = (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 = (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) } @@ -788,7 +787,9 @@ fn attempt_rotation_box( naive_box: &[RXingResultPoint; 4], center_scale: f64, ) -> Option<[RXingResultPoint; 4]> { + // update our circle with a more accurate center point circle.calculate_high_accuracy_center(); + // we know that the locator symbols should appear at 60 degree increments around the circle // top left @@ -816,96 +817,98 @@ fn attempt_rotation_box( let mut found = false; let mut final_rotation = 0.0; - for int_rotation in 0..355 { - let rotation = int_rotation as f32; - // look for top left - // * * - // * - let p1_rot = get_point(circle.center, topl_p1, rotation); - let p2_rot = get_point(circle.center, topl_p2, 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)? - && image.try_get(p2_rot.0 as u32, p2_rot.1 as u32)? - && image.try_get(p3_rot.0 as u32, p3_rot.1 as u32)?; - if !found_tl { - continue; - } + for int_rotation in 0..175 { + let rotation = (int_rotation * 2) as f32; + // look for top left + // * * + // * + let p1_rot = get_point(circle.center, topl_p1, rotation); + let p2_rot = get_point(circle.center, topl_p2, rotation); + let p3_rot = get_point(circle.center, topl_p3, rotation); + let found_tl = image.try_get_area(p1_rot.0 as u32, p1_rot.1 as u32,3)? + && image.try_get_area(p2_rot.0 as u32, p2_rot.1 as u32,3)? + && image.try_get_area(p3_rot.0 as u32, p3_rot.1 as u32,3)?; + if !found_tl { + continue; + } - // look for top right - // /\ - // __ - let p1_rot = get_point(circle.center, topr_p1, rotation); - let p2_rot = get_point(circle.center, topr_p2, 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)? - && !image.try_get(p2_rot.0 as u32, p2_rot.1 as u32)? - && !image.try_get(p3_rot.0 as u32, p3_rot.1 as u32)?; - if !found_tr { - continue; - } + // look for top right + // /\ + // __ + let p1_rot = get_point(circle.center, topr_p1, rotation); + let p2_rot = get_point(circle.center, topr_p2, rotation); + let p3_rot = get_point(circle.center, topr_p3, rotation); + let found_tr = !image.try_get_area(p1_rot.0 as u32, p1_rot.1 as u32,3)? + && !image.try_get_area(p2_rot.0 as u32, p2_rot.1 as u32,3)? + && !image.try_get_area(p3_rot.0 as u32, p3_rot.1 as u32,3)?; + if !found_tr { + continue; + } - // look for left - // * - // * - let p1_rot = get_point(circle.center, l_p1, rotation); - let p2_rot = get_point(circle.center, l_p2, 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)? - && !image.try_get(p2_rot.0 as u32, p2_rot.1 as u32)? - && image.try_get(p3_rot.0 as u32, p3_rot.1 as u32)?; - if !found_l { - continue; - } + // look for left + // * + // * + let p1_rot = get_point(circle.center, l_p1, rotation); + let p2_rot = get_point(circle.center, l_p2, rotation); + let p3_rot = get_point(circle.center, l_p3, rotation); + let found_l = image.try_get_area(p1_rot.0 as u32, p1_rot.1 as u32,3)? + && !image.try_get_area(p2_rot.0 as u32, p2_rot.1 as u32,3)? + && image.try_get_area(p3_rot.0 as u32, p3_rot.1 as u32,3)?; + if !found_l { + continue; + } - // look for right - // * - // * - let p1_rot = get_point(circle.center, r_p1, rotation); - let p2_rot = get_point(circle.center, r_p2, 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)? - && !image.try_get(p2_rot.0 as u32, p2_rot.1 as u32)? - && image.try_get(p3_rot.0 as u32, p3_rot.1 as u32)?; - if !found_r { - continue; - } + // look for right + // * + // * + let p1_rot = get_point(circle.center, r_p1, rotation); + let p2_rot = get_point(circle.center, r_p2, rotation); + let p3_rot = get_point(circle.center, r_p3, rotation); + let found_r = image.try_get_area(p1_rot.0 as u32, p1_rot.1 as u32,3)? + && !image.try_get_area(p2_rot.0 as u32, p2_rot.1 as u32,3)? + && image.try_get_area(p3_rot.0 as u32, p3_rot.1 as u32,3)?; + if !found_r { + continue; + } - // look for bottom left - // * - // * - let p1_rot = get_point(circle.center, bottoml_p1, rotation); - let p2_rot = get_point(circle.center, bottoml_p2, 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)? - && !image.try_get(p2_rot.0 as u32, p2_rot.1 as u32)? - && image.try_get(p3_rot.0 as u32, p3_rot.1 as u32)?; - if !found_bl { - continue; - } + // look for bottom left + // * + // * + let p1_rot = get_point(circle.center, bottoml_p1, rotation); + let p2_rot = get_point(circle.center, bottoml_p2, rotation); + let p3_rot = get_point(circle.center, bottoml_p3, rotation); + let found_bl = image.try_get_area(p1_rot.0 as u32, p1_rot.1 as u32,3)? + && !image.try_get_area(p2_rot.0 as u32, p2_rot.1 as u32,3)? + && image.try_get_area(p3_rot.0 as u32, p3_rot.1 as u32,3)?; + if !found_bl { + continue; + } - // look for bottom right - // * - // * - let p1_rot = get_point(circle.center, bottomr_p1, rotation); - let p2_rot = get_point(circle.center, bottomr_p2, 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)? - && !image.try_get(p2_rot.0 as u32, p2_rot.1 as u32)? - && image.try_get(p3_rot.0 as u32, p3_rot.1 as u32)?; - if !found_br { - continue; - } + // look for bottom right + // * + // * + let p1_rot = get_point(circle.center, bottomr_p1, rotation); + let p2_rot = get_point(circle.center, bottomr_p2, rotation); + let p3_rot = get_point(circle.center, bottomr_p3, rotation); + let found_br = image.try_get_area(p1_rot.0 as u32, p1_rot.1 as u32,3)? + && !image.try_get_area(p2_rot.0 as u32, p2_rot.1 as u32,3)? + && image.try_get_area(p3_rot.0 as u32, p3_rot.1 as u32,3)?; + if !found_br { + continue; + } - // did we find it? - found = found_tl && found_tr && found_l && found_r && found_bl && found_br; + // did we find it? + found = found_tl && found_tr && found_l && found_r && found_bl && found_br; - if found { - final_rotation = rotation; - break; - } + if found { + final_rotation = rotation; + break; + } } if found { + // if final_rotation > 180.0 { final_rotation = final_rotation + 0.0 } + let new_1 = get_point( circle.center, (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), final_rotation, ); + Some([ RXingResultPoint::new(new_1.0, new_1.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) + center.1 as f32; - (x, y) + (x.abs(), y.abs()) } fn adjust_point_alternate(point: (u32, u32), circle: &Circle, center_scale: f64) -> (u32, u32) { 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 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) { - 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( @@ -1003,8 +1007,8 @@ fn guess_barcode_size_general( let ideal_symbol_side = ideal_symbol_area.sqrt(); ( - ideal_symbol_side.round() as u32, - (ideal_symbol_side * height_final_adjust_percent).round() as u32, + ideal_symbol_side.floor() 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] fn mode3() { finder_test( diff --git a/test_resources/blackbox/maxicode-1/MODE2-rotate-90.png b/test_resources/blackbox/maxicode-1/MODE2-rotate-90.png new file mode 100644 index 0000000..69e49dd Binary files /dev/null and b/test_resources/blackbox/maxicode-1/MODE2-rotate-90.png differ diff --git a/test_resources/blackbox/maxicode-1/MODE2-rotate-90.txt b/test_resources/blackbox/maxicode-1/MODE2-rotate-90.txt new file mode 100644 index 0000000..ad5f7f6 --- /dev/null +++ b/test_resources/blackbox/maxicode-1/MODE2-rotate-90.txt @@ -0,0 +1 @@ +[)>0196123450000222111MODE2 \ No newline at end of file diff --git a/tests/common/abstract_black_box_test_case.rs b/tests/common/abstract_black_box_test_case.rs index c8cc837..1ed84ee 100644 --- a/tests/common/abstract_black_box_test_case.rs +++ b/tests/common/abstract_black_box_test_case.rs @@ -32,6 +32,8 @@ use rxing::{ use super::TestRXingResult; +const POSSIBLE_EXTENSIONS: &str = "jpg,jpeg,gif,png,JPG,JPEG,GIF,PNG"; + /** * @author Sean Owen * @author dswitkin@google.com (Daniel Switkin) @@ -115,7 +117,6 @@ impl AbstractBlackBoxTestCase { ); // let paths = Vec::new(); 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 .unwrap() @@ -123,7 +124,7 @@ impl AbstractBlackBoxTestCase { .filter(|r| r.is_ok()) // Get rid of Err variants for Result .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| 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()) .collect::>(); diff --git a/tests/maxicode_blackbox_tests.rs b/tests/maxicode_blackbox_tests.rs index 424e2f5..fe2bbe0 100644 --- a/tests/maxicode_blackbox_tests.rs +++ b/tests/maxicode_blackbox_tests.rs @@ -29,7 +29,9 @@ fn maxicode1_test_case() { 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(); }