ak/rxing
1
0
Fork 0
mirror of https://github.com/starovoid/rxing.git synced 2026-07-28 05:12:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cargo fmt + Cargo clippy

Browse Source
This commit is contained in:
Steve Cook
2023-03-02 08:57:30 -05:00
parent f25f762564
commit e67c1070c7
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/multi_format_reader.rs
View File

@@ -37,7 +37,7 @@ pub struct MultiFormatReader {
hints: DecodingHintDictionary, hints: DecodingHintDictionary,
possible_formats: HashSet<BarcodeFormat>, possible_formats: HashSet<BarcodeFormat>,
try_harder: bool, try_harder: bool,
one_d_reader: MultiFormatOneDReader one_d_reader: MultiFormatOneDReader,
} }
impl Reader for MultiFormatReader { impl Reader for MultiFormatReader {
@@ -114,7 +114,7 @@ impl MultiFormatReader {
} else { } else {
HashSet::new() HashSet::new()
}; };
self.one_d_reader = MultiFormatOneDReader::new(&hints); self.one_d_reader = MultiFormatOneDReader::new(hints);
} }
pub fn decode_internal<B: Binarizer>( pub fn decode_internal<B: Binarizer>(
@@ -153,9 +153,7 @@ impl MultiFormatReader {
|| self.possible_formats.contains(&BarcodeFormat::RSS_14) || self.possible_formats.contains(&BarcodeFormat::RSS_14)
|| self.possible_formats.contains(&BarcodeFormat::RSS_EXPANDED); || self.possible_formats.contains(&BarcodeFormat::RSS_EXPANDED);
if one_d && !self.try_harder { if one_d && !self.try_harder {
if let Ok(res) = if let Ok(res) = self.one_d_reader.decode_with_hints(image, &self.hints) {
self.one_d_reader.decode_with_hints(image, &self.hints)
{
return Ok(res); return Ok(res);
} }
} }
@@ -183,17 +181,13 @@ impl MultiFormatReader {
} }
} }
if one_d && self.try_harder { if one_d && self.try_harder {
if let Ok(res) = if let Ok(res) = self.one_d_reader.decode_with_hints(image, &self.hints) {
self.one_d_reader.decode_with_hints(image, &self.hints)
{
return Ok(res); return Ok(res);
} }
} }
} else { } else {
if !self.try_harder { if !self.try_harder {
if let Ok(res) = if let Ok(res) = self.one_d_reader.decode_with_hints(image, &self.hints) {
self.one_d_reader.decode_with_hints(image, &self.hints)
{
return Ok(res); return Ok(res);
} }
} }
@@ -215,9 +209,7 @@ impl MultiFormatReader {
} }
if self.try_harder { if self.try_harder {
if let Ok(res) = if let Ok(res) = self.one_d_reader.decode_with_hints(image, &self.hints) {
self.one_d_reader.decode_with_hints(image, &self.hints)
{
return Ok(res); return Ok(res);
} }
} }

2
src/oned/multi_format_one_d_reader.rs
View File

@@ -38,7 +38,7 @@ pub struct MultiFormatOneDReader {
possible_formats: HashSet<BarcodeFormat>, possible_formats: HashSet<BarcodeFormat>,
use_code_39_check_digit: bool, use_code_39_check_digit: bool,
rss_14_reader: RSS14Reader, rss_14_reader: RSS14Reader,
rss_expanded_reader: RSSExpandedReader rss_expanded_reader: RSSExpandedReader,
} }
impl OneDReader for MultiFormatOneDReader { impl OneDReader for MultiFormatOneDReader {
fn decode_row( fn decode_row(