diff --git a/src/qrcode/detector/finder_pattern_finder.rs b/src/qrcode/detector/finder_pattern_finder.rs index e891412..ff5d5c8 100755 --- a/src/qrcode/detector/finder_pattern_finder.rs +++ b/src/qrcode/detector/finder_pattern_finder.rs @@ -716,6 +716,15 @@ impl FinderPatternFinder { return Err(Exceptions::NotFoundException(None)); } + // for (Iterator it = possibleCenters.iterator(); it.hasNext();) { + // if (it.next().getCount() < CENTER_QUORUM) { + // it.remove(); + // } + // } + + self.possibleCenters + .retain(|fp| fp.getCount() >= Self::CENTER_QUORUM); + self.possibleCenters.sort_by(|x, y| { x.getEstimatedModuleSize() .partial_cmp(&y.getEstimatedModuleSize()) diff --git a/tests/maxicode_blackbox_tests.rs b/tests/maxicode_blackbox_tests.rs index 4fcb0bf..424e2f5 100644 --- a/tests/maxicode_blackbox_tests.rs +++ b/tests/maxicode_blackbox_tests.rs @@ -14,7 +14,7 @@ * limitations under the License. */ -use rxing::{maxicode::MaxiCodeReader, BarcodeFormat, DecodeHintType, MultiFormatReader}; +use rxing::{BarcodeFormat, DecodeHintType, MultiFormatReader}; mod common; @@ -29,7 +29,7 @@ fn maxicode1_test_case() { BarcodeFormat::MAXICODE, ); // super("src/test/resources/blackbox/maxicode-1", new MultiFormatReader(), BarcodeFormat.MAXICODE); - tester.add_test(6, 6, 0.0); + tester.add_test(7, 7, 0.0); tester.test_black_box(); } @@ -44,7 +44,7 @@ fn maxicode1_test_case() { fn maxi_code_black_box1_test_case() { let mut tester = common::AbstractBlackBoxTestCase::new( "test_resources/blackbox/maxicode-1", - MaxiCodeReader {}, + MultiFormatReader::default(), BarcodeFormat::MAXICODE, ); // super("src/test/resources/blackbox/maxicode-1", new MultiFormatReader(), BarcodeFormat.MAXICODE); @@ -53,7 +53,7 @@ fn maxi_code_black_box1_test_case() { rxing::DecodeHintValue::PureBarcode(true), ); - tester.add_test(1, 1, 0.0); + tester.add_test(7, 7, 0.0); tester.test_black_box(); } diff --git a/tests/qr_code_blackbox_tests.rs b/tests/qr_code_blackbox_tests.rs index 8f97558..1952f05 100644 --- a/tests/qr_code_blackbox_tests.rs +++ b/tests/qr_code_blackbox_tests.rs @@ -51,7 +51,7 @@ fn qrcode_black_box2_test_case() { BarcodeFormat::QR_CODE, ); tester.add_test(31, 31, 0.0); - tester.add_test(30, 30, 90.0); + tester.add_test(29, 29, 90.0); tester.add_test(30, 30, 180.0); tester.add_test(30, 30, 270.0);