From ce37f1cf98298bf1e88f1752634b346ef6e1f4bd Mon Sep 17 00:00:00 2001 From: Henry Schimke Date: Sat, 28 Jan 2023 17:10:54 -0600 Subject: [PATCH] cleanup --- .../detector/zxing_cpp_detector/bitmatrix_cursor.rs | 6 +++++- src/datamatrix/detector/zxing_cpp_detector/edge_tracer.rs | 5 +++-- tests/datamatrix_black_box_test_cases.rs | 8 ++++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/datamatrix/detector/zxing_cpp_detector/bitmatrix_cursor.rs b/src/datamatrix/detector/zxing_cpp_detector/bitmatrix_cursor.rs index 43c37ef..4c062d9 100644 --- a/src/datamatrix/detector/zxing_cpp_detector/bitmatrix_cursor.rs +++ b/src/datamatrix/detector/zxing_cpp_detector/bitmatrix_cursor.rs @@ -146,7 +146,11 @@ pub trait BitMatrixCursor { let mut steps; while { - steps = if range == 0 { 0 } else {self.stepToEdge(Some(1), Some(range), None)}; + steps = if range == 0 { + 0 + } else { + self.stepToEdge(Some(1), Some(range), None) + }; steps > 0 } { range -= steps; diff --git a/src/datamatrix/detector/zxing_cpp_detector/edge_tracer.rs b/src/datamatrix/detector/zxing_cpp_detector/edge_tracer.rs index 412b171..2d0254c 100644 --- a/src/datamatrix/detector/zxing_cpp_detector/edge_tracer.rs +++ b/src/datamatrix/detector/zxing_cpp_detector/edge_tracer.rs @@ -327,8 +327,9 @@ impl<'a> EdgeTracer<'_> { } // re-evaluate line with all the points up to here before projecting - if (!line.evaluate_max_distance(Some(1.5), None)) - {return Ok(false);} + if !line.evaluate_max_distance(Some(1.5), None) { + return Ok(false); + } let mut np = line.project(&self.p); // make sure we are making progress even when back-projecting: diff --git a/tests/datamatrix_black_box_test_cases.rs b/tests/datamatrix_black_box_test_cases.rs index 8027551..6c480f9 100644 --- a/tests/datamatrix_black_box_test_cases.rs +++ b/tests/datamatrix_black_box_test_cases.rs @@ -29,10 +29,10 @@ fn data_matrix_black_box1_test_case() { rxing::BarcodeFormat::DATA_MATRIX, ); // super("src/test/resources/blackbox/datamatrix-1", new MultiFormatReader(), BarcodeFormat.DATA_MATRIX); - tester.add_test(26, 28, 0.0); - tester.add_test(21, 26, 90.0); - tester.add_test(21, 26, 180.0); - tester.add_test(21, 26, 270.0); + tester.add_test(27, 29, 0.0); + tester.add_test(21, 27, 90.0); + tester.add_test(21, 27, 180.0); + tester.add_test(21, 27, 270.0); tester.test_black_box(); }