cargo fmt

This commit is contained in:
Henry Schimke
2022-12-01 16:23:22 -06:00
parent 0829b4b77a
commit 626a5962aa
4 changed files with 17 additions and 15 deletions

View File

@@ -76,7 +76,7 @@ impl<T: Reader> GenericMultipleBarcodeReader<T> {
xOffset: u32,
yOffset: u32,
currentDepth: u32,
) -> Result<(),Exceptions>{
) -> Result<(), Exceptions> {
if currentDepth > Self::MAX_DEPTH {
return Ok(());
}
@@ -89,8 +89,8 @@ impl<T: Reader> GenericMultipleBarcodeReader<T> {
//}
if let Err(Exceptions::ReaderException(_)) = result {
return Ok(());
}else if result.is_err(){
return Err(result.err().unwrap())
} else if result.is_err() {
return Err(result.err().unwrap());
}
let result = result.expect("must exist");

View File

@@ -9,4 +9,4 @@ mod generic_multiple_barcode_reader;
pub use generic_multiple_barcode_reader::*;
#[cfg(test)]
mod multi_test_case;
mod multi_test_case;

View File

@@ -16,7 +16,10 @@
use std::{path::PathBuf, rc::Rc};
use crate::{BufferedImageLuminanceSource, BinaryBitmap, common::HybridBinarizer, MultiFormatReader, BarcodeFormat};
use crate::{
common::HybridBinarizer, BarcodeFormat, BinaryBitmap, BufferedImageLuminanceSource,
MultiFormatReader,
};
use super::{GenericMultipleBarcodeReader, MultipleBarcodeReader};
@@ -24,20 +27,20 @@ use super::{GenericMultipleBarcodeReader, MultipleBarcodeReader};
* Tests {@link MultipleBarcodeReader}.
*/
#[test]
fn testMulti() {
#[test]
fn testMulti() {
// Very basic test for now
let mut testBase = PathBuf::from("test_resources/blackbox/multi-1");
testBase.push("1.png");
let image = image::io::Reader::open(testBase)
.expect("image must open")
.decode()
.expect("must decode");
let source = BufferedImageLuminanceSource::new(image);
let bitmap = BinaryBitmap::new( Rc::new(HybridBinarizer::new(Box::new(source))));
.expect("image must open")
.decode()
.expect("must decode");
let source = BufferedImageLuminanceSource::new(image);
let bitmap = BinaryBitmap::new(Rc::new(HybridBinarizer::new(Box::new(source))));
let mut reader = GenericMultipleBarcodeReader::new( MultiFormatReader::default());
let mut reader = GenericMultipleBarcodeReader::new(MultiFormatReader::default());
let results = reader.decodeMultiple(&bitmap).expect("must decode multi");
// assertNotNull(results);
assert_eq!(2, results.len());
@@ -47,4 +50,4 @@ use super::{GenericMultipleBarcodeReader, MultipleBarcodeReader};
assert_eq!("www.airtable.com/jobs", results[1].getText());
assert_eq!(&BarcodeFormat::QR_CODE, results[1].getBarcodeFormat());
}
}

View File

@@ -80,7 +80,6 @@ impl Reader for MultiFormatReader {
}
impl MultiFormatReader {
/**
* Decode an image using the state set up by calling setHints() previously. Continuous scan
* clients will get a <b>large</b> speed increase by using this instead of decode().