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

slight performance improvement, detector

Browse Source
This commit is contained in:
Henry Schimke
2022-12-31 17:01:10 -06:00
parent a111776032
commit a6727220fa
11 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/aztec/DetectorTest.rs
View File

@@ -70,7 +70,7 @@ fn test_error_in_parameter_locator_not_compact() {
#[test]
fn test_aztec_rxing_result_sample() {
let matrix = BitMatrix::parse_strings(TEST_BARCODE, "X ", " ").expect("string parse success");
let r = Detector::new(matrix).detect(false);
let r = Detector::new(&matrix).detect(false);
assert!(r.is_ok());
let r = r.expect("result already tested as ok");
let res = decoder::decode(&r).expect("decode success");
@@ -114,7 +114,7 @@ fn test_error_in_parameter_locator(data: &str) {
// dbg!(copy.to_string());
// dbg!(make_larger(&copy, 3).to_string());
// The detector doesn't seem to work when matrix bits are only 1x1. So magnify.
let r = Detector::new(make_larger(&copy, 3)).detect(isMirror);
let r = Detector::new(&make_larger(&copy, 3)).detect(isMirror);
assert!(r.is_ok());
let r = r.expect("result already tested as ok");
assert_eq!(r.getNbLayers(), layers);
@@ -144,14 +144,14 @@ fn test_error_in_parameter_locator(data: &str) {
// );
}
// try {
if let Err(res) = detector::Detector::new(make_larger(&copy, 3)).detect(false) {
if let Err(res) = detector::Detector::new(&make_larger(&copy, 3)).detect(false) {
if let Exceptions::NotFoundException(_msg) = res {
// all ok
} else {
panic!("Only Exceptions::NotFoundException allowed, got {}", res);
}
} else {
let r = Detector::new(make_larger(&copy, 3)).detect(false);
let r = Detector::new(&make_larger(&copy, 3)).detect(false);
assert!(r.is_ok());
let r = r.expect("result already tested as ok");
assert_eq!(r.getNbLayers(), layers);

2
src/aztec/aztec_reader.rs
View File

@@ -51,7 +51,7 @@ impl Reader for AztecReader {
) -> Result<RXingResult, Exceptions> {
// let notFoundException = None;
// let formatException = None;
let mut detector = Detector::new(image.getBlackMatrix().clone());
let mut detector = Detector::new(image.getBlackMatrix());
let points;
let decoderRXingResult: DecoderRXingResult;
// try {

10
src/aztec/detector.rs
View File

@@ -42,8 +42,8 @@ const EXPECTED_CORNER_BITS: [u32; 4] = [
* @author David Olivier
* @author Frank Yellin
*/
pub struct Detector {
image: BitMatrix,
pub struct Detector<'a> {
image: &'a BitMatrix,
compact: bool,
nb_layers: u32,
@@ -52,9 +52,9 @@ pub struct Detector {
shift: u32,
}
impl Detector {
pub fn new(image: BitMatrix) -> Self {
Self {
impl<'a> Detector<'_> {
pub fn new(image: &'a BitMatrix) -> Detector<'a> {
Detector {
image,
compact: false,
nb_layers: 0,