ak/rxing
1
0
Fork 0
mirror of https://github.com/starovoid/rxing.git synced 2026-07-27 21:02:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add default for most readers

Browse Source
This commit is contained in:
Henry Schimke
2023-01-03 06:39:00 -06:00
parent 7145934f84
commit e095de835d
11 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/oned/code_39_reader.rs
View File

@@ -27,7 +27,7 @@ use super::{one_d_reader, OneDReader};
* @author Sean Owen
* @see Code93Reader
*/
#[derive(OneDReader)]
#[derive(OneDReader,Default)]
pub struct Code39Reader {
usingCheckDigit: bool,
extendedMode: bool,

2
src/oned/code_93_reader.rs
View File

@@ -26,7 +26,7 @@ use super::{one_d_reader, OneDReader};
* @author Sean Owen
* @see Code39Reader
*/
#[derive(OneDReader)]
#[derive(OneDReader,Default)]
pub struct Code93Reader {
decodeRowRXingResult: String,
counters: [u32; 6],

27
src/oned/multi_format_one_d_reader.rs
View File

@@ -31,6 +31,7 @@ use crate::Exceptions;
* @author dswitkin@google.com (Daniel Switkin)
* @author Sean Owen
*/
#[derive(Default)]
pub struct MultiFormatOneDReader(Vec<Box<dyn OneDReader>>);
impl OneDReader for MultiFormatOneDReader {
fn decodeRow(
@@ -77,33 +78,33 @@ impl MultiFormatOneDReader {
)));
}
if possibleFormats.contains(&BarcodeFormat::CODE_93) {
readers.push(Box::new(Code93Reader::new()));
readers.push(Box::<Code93Reader>::default());
}
if possibleFormats.contains(&BarcodeFormat::CODE_128) {
readers.push(Box::new(Code128Reader {}));
readers.push(Box::<Code128Reader>::default());
}
if possibleFormats.contains(&BarcodeFormat::ITF) {
readers.push(Box::new(ITFReader::default()));
readers.push(Box::<ITFReader>::default());
}
if possibleFormats.contains(&BarcodeFormat::CODABAR) {
readers.push(Box::new(CodaBarReader::new()));
readers.push(Box::<CodaBarReader>::default());
}
if possibleFormats.contains(&BarcodeFormat::RSS_14) {
readers.push(Box::new(RSS14Reader::new()));
readers.push(Box::<RSS14Reader>::default());
}
if possibleFormats.contains(&BarcodeFormat::RSS_EXPANDED) {
readers.push(Box::new(RSSExpandedReader::new()));
readers.push(Box::<RSSExpandedReader>::default());
}
}
if readers.is_empty() {
readers.push(Box::new(MultiFormatUPCEANReader::new(hints)));
readers.push(Box::new(Code39Reader::new()));
readers.push(Box::new(CodaBarReader::new()));
readers.push(Box::new(Code93Reader::new()));
readers.push(Box::new(Code128Reader {}));
readers.push(Box::new(ITFReader::default()));
readers.push(Box::new(RSS14Reader::new()));
readers.push(Box::new(RSSExpandedReader::new()));
readers.push(Box::<Code39Reader>::default());
readers.push(Box::<CodaBarReader>::default());
readers.push(Box::<Code93Reader>::default());
readers.push(Box::<Code128Reader>::default());
readers.push(Box::<ITFReader>::default());
readers.push(Box::<RSS14Reader>::default());
readers.push(Box::<RSSExpandedReader>::default());
}
Self(readers)

1
src/oned/rss/rss_14_reader.rs
View File

@@ -30,6 +30,7 @@ use super::{
/**
* Decodes RSS-14, including truncated and stacked variants. See ISO/IEC 24724:2006.
*/
#[derive(Default)]
pub struct RSS14Reader {
possibleLeftPairs: Vec<Pair>,
possibleRightPairs: Vec<Pair>,