diff --git a/src/multi_format_reader.rs b/src/multi_format_reader.rs index 01c8a21..384b152 100644 --- a/src/multi_format_reader.rs +++ b/src/multi_format_reader.rs @@ -37,7 +37,7 @@ pub struct MultiFormatReader { hints: DecodingHintDictionary, possible_formats: HashSet, try_harder: bool, - one_d_reader: MultiFormatOneDReader + one_d_reader: MultiFormatOneDReader, } impl Reader for MultiFormatReader { @@ -114,7 +114,7 @@ impl MultiFormatReader { } else { HashSet::new() }; - self.one_d_reader = MultiFormatOneDReader::new(&hints); + self.one_d_reader = MultiFormatOneDReader::new(hints); } pub fn decode_internal( @@ -153,9 +153,7 @@ impl MultiFormatReader { || self.possible_formats.contains(&BarcodeFormat::RSS_14) || self.possible_formats.contains(&BarcodeFormat::RSS_EXPANDED); if one_d && !self.try_harder { - if let Ok(res) = - self.one_d_reader.decode_with_hints(image, &self.hints) - { + if let Ok(res) = self.one_d_reader.decode_with_hints(image, &self.hints) { return Ok(res); } } @@ -183,17 +181,13 @@ impl MultiFormatReader { } } if one_d && self.try_harder { - if let Ok(res) = - self.one_d_reader.decode_with_hints(image, &self.hints) - { + if let Ok(res) = self.one_d_reader.decode_with_hints(image, &self.hints) { return Ok(res); } } } else { if !self.try_harder { - if let Ok(res) = - self.one_d_reader.decode_with_hints(image, &self.hints) - { + if let Ok(res) = self.one_d_reader.decode_with_hints(image, &self.hints) { return Ok(res); } } @@ -215,9 +209,7 @@ impl MultiFormatReader { } if self.try_harder { - if let Ok(res) = - self.one_d_reader.decode_with_hints(image, &self.hints) - { + if let Ok(res) = self.one_d_reader.decode_with_hints(image, &self.hints) { return Ok(res); } } diff --git a/src/oned/multi_format_one_d_reader.rs b/src/oned/multi_format_one_d_reader.rs index 407de5d..f015dc5 100644 --- a/src/oned/multi_format_one_d_reader.rs +++ b/src/oned/multi_format_one_d_reader.rs @@ -38,7 +38,7 @@ pub struct MultiFormatOneDReader { possible_formats: HashSet, use_code_39_check_digit: bool, rss_14_reader: RSS14Reader, - rss_expanded_reader: RSSExpandedReader + rss_expanded_reader: RSSExpandedReader, } impl OneDReader for MultiFormatOneDReader { fn decode_row(