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

clippy --fix && fmt

Browse Source
This commit is contained in:
Henry Schimke
2023-03-04 14:17:56 -06:00
parent 8a0744e534
commit 69c0119c94
11 changed files with 64 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
benches/benchmarks.rs
View File

@@ -3,6 +3,7 @@ use rxing::aztec::AztecReader;
use rxing::common::HybridBinarizer; use rxing::common::HybridBinarizer;
use rxing::datamatrix::DataMatrixReader; use rxing::datamatrix::DataMatrixReader;
use rxing::maxicode::MaxiCodeReader; use rxing::maxicode::MaxiCodeReader;
use rxing::multi::{GenericMultipleBarcodeReader, MultipleBarcodeReader};
use rxing::oned::rss::expanded::RSSExpandedReader; use rxing::oned::rss::expanded::RSSExpandedReader;
use rxing::oned::rss::RSS14Reader; use rxing::oned::rss::RSS14Reader;
use rxing::oned::{ use rxing::oned::{
@@ -11,10 +12,9 @@ use rxing::oned::{
}; };
use rxing::pdf417::PDF417Reader; use rxing::pdf417::PDF417Reader;
use rxing::qrcode::QRCodeReader; use rxing::qrcode::QRCodeReader;
use rxing::MultiFormatReader;
use rxing::{BinaryBitmap, BufferedImageLuminanceSource, Reader}; use rxing::{BinaryBitmap, BufferedImageLuminanceSource, Reader};
use std::path::Path; use std::path::Path;
use rxing::multi::{GenericMultipleBarcodeReader, MultipleBarcodeReader};
use rxing::MultiFormatReader;
fn get_image( fn get_image(
path: impl AsRef<Path>, path: impl AsRef<Path>,
@@ -188,7 +188,7 @@ fn upce_benchmark(c: &mut Criterion) {
fn multi_barcode_benchmark(c: &mut Criterion) { fn multi_barcode_benchmark(c: &mut Criterion) {
let mut image = get_image("test_resources/blackbox/multi-1/1.png"); let mut image = get_image("test_resources/blackbox/multi-1/1.png");
c.bench_function("multi_barcode", |b| { c.bench_function("multi_barcode", |b| {
b.iter( || { b.iter(|| {
let mut reader = GenericMultipleBarcodeReader::new(MultiFormatReader::default()); let mut reader = GenericMultipleBarcodeReader::new(MultiFormatReader::default());
let _res = reader.decode_multiple(&mut image); let _res = reader.decode_multiple(&mut image);
}); });

4
src/aztec/decoder.rs
View File

@@ -19,7 +19,7 @@ use crate::{
reedsolomon::{ reedsolomon::{
get_predefined_genericgf, GenericGFRef, PredefinedGenericGF, ReedSolomonDecoder, get_predefined_genericgf, GenericGFRef, PredefinedGenericGF, ReedSolomonDecoder,
}, },
BitMatrix, CharacterSet, DecoderRXingResult, DetectorRXingResult, Result, Eci, BitMatrix, CharacterSet, DecoderRXingResult, DetectorRXingResult, Eci, Result,
}, },
exceptions::Exceptions, exceptions::Exceptions,
}; };
@@ -182,7 +182,7 @@ fn get_encoded_data(corrected_bits: &[bool]) -> Result<String> {
eci = eci * 10 + (next_digit - 2); eci = eci * 10 + (next_digit - 2);
n -= 1; n -= 1;
} }
let charset_eci : Eci= eci.into(); let charset_eci: Eci = eci.into();
if charset_eci == Eci::Unknown { if charset_eci == Eci::Unknown {
return Err(Exceptions::format_with("Charset must exist")); return Err(Exceptions::format_with("Charset must exist"));
} }

2
src/aztec/encoder/state.rs
View File

@@ -17,7 +17,7 @@
use std::fmt; use std::fmt;
use crate::{ use crate::{
common::{BitArray, CharacterSet, Result, Eci}, common::{BitArray, CharacterSet, Eci, Result},
exceptions::Exceptions, exceptions::Exceptions,
}; };

17
src/common/character_set.rs
View File

@@ -278,9 +278,9 @@ impl CharacterSet {
"iso-8859-3" => Some(CharacterSet::ISO8859_3), "iso-8859-3" => Some(CharacterSet::ISO8859_3),
"iso-8859-4" => Some(CharacterSet::ISO8859_4), "iso-8859-4" => Some(CharacterSet::ISO8859_4),
"iso-8859-5" => Some(CharacterSet::ISO8859_5), "iso-8859-5" => Some(CharacterSet::ISO8859_5),
"ISO-8859-6" => Some(CharacterSet::ISO8859_6), "iso-8859-6" => Some(CharacterSet::ISO8859_6),
"iso-8859-7" => Some(CharacterSet::ISO8859_7), "iso-8859-7" => Some(CharacterSet::ISO8859_7),
"ISO-8859-8" => Some(CharacterSet::ISO8859_8), "iso-8859-8" => Some(CharacterSet::ISO8859_8),
"iso-8859-9" => Some(CharacterSet::ISO8859_9), "iso-8859-9" => Some(CharacterSet::ISO8859_9),
"ISO-8859-10" => Some(CharacterSet::ISO8859_10), "ISO-8859-10" => Some(CharacterSet::ISO8859_10),
"ISO-8859-11" => Some(CharacterSet::ISO8859_11), "ISO-8859-11" => Some(CharacterSet::ISO8859_11),
@@ -300,9 +300,9 @@ impl CharacterSet {
"gb2312" => Some(CharacterSet::GB2312), "gb2312" => Some(CharacterSet::GB2312),
"gb18030" => Some(CharacterSet::GB18030), "gb18030" => Some(CharacterSet::GB18030),
"euc-kr" => Some(CharacterSet::EUC_KR), "euc-kr" => Some(CharacterSet::EUC_KR),
"utf-32be"=>Some(CharacterSet::UTF32BE) , "utf-32be" => Some(CharacterSet::UTF32BE),
"utf-32le"=>Some(CharacterSet::UTF32LE) , "utf-32le" => Some(CharacterSet::UTF32LE),
"binary"=>Some(CharacterSet::Binary) , "binary" => Some(CharacterSet::Binary),
"unknown" => Some(CharacterSet::Unknown), "unknown" => Some(CharacterSet::Unknown),
_ => None, _ => None,
} }
@@ -313,8 +313,11 @@ impl CharacterSet {
use codepage_437::ToCp437; use codepage_437::ToCp437;
use codepage_437::CP437_CONTROL; use codepage_437::CP437_CONTROL;
input.to_cp437(&CP437_CONTROL).map(|data| data.to_vec()).map_err(|e| Exceptions::format_with(format!("{e:?}"))) input
}else { .to_cp437(&CP437_CONTROL)
.map(|data| data.to_vec())
.map_err(|e| Exceptions::format_with(format!("{e:?}")))
} else {
self.get_base_encoder() self.get_base_encoder()
.encode(input, encoding::EncoderTrap::Strict) .encode(input, encoding::EncoderTrap::Strict)
.map_err(|e| Exceptions::format_with(e.to_string())) .map_err(|e| Exceptions::format_with(e.to_string()))

8
src/common/eci.rs
View File

@@ -2,7 +2,7 @@ use std::fmt::Display;
use super::CharacterSet; use super::CharacterSet;
#[derive(Copy,Clone,Debug,PartialEq, Eq)] #[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum Eci { pub enum Eci {
Unknown = -1, Unknown = -1,
Cp437 = 2, // obsolete Cp437 = 2, // obsolete
@@ -126,9 +126,9 @@ impl From<CharacterSet> for Eci {
CharacterSet::ISO8859_6 => Eci::ISO8859_6, CharacterSet::ISO8859_6 => Eci::ISO8859_6,
CharacterSet::ISO8859_8 => Eci::ISO8859_8, CharacterSet::ISO8859_8 => Eci::ISO8859_8,
CharacterSet::ISO8859_10 => Eci::ISO8859_10, CharacterSet::ISO8859_10 => Eci::ISO8859_10,
CharacterSet::ISO8859_11 =>Eci::ISO8859_11, CharacterSet::ISO8859_11 => Eci::ISO8859_11,
CharacterSet::ISO8859_14 => Eci::ISO8859_14, CharacterSet::ISO8859_14 => Eci::ISO8859_14,
_=>Eci::Unknown, _ => Eci::Unknown,
} }
} }
} }
@@ -176,6 +176,6 @@ impl From<Eci> for CharacterSet {
impl Display for Eci { impl Display for Eci {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f,"{}", *self as i32) write!(f, "{}", *self as i32)
} }
} }

6
src/datamatrix/decoder/decoded_bit_stream_parser.rs
View File

@@ -15,7 +15,7 @@
*/ */
use crate::{ use crate::{
common::{BitSource, CharacterSet, DecoderRXingResult, ECIStringBuilder, Result, Eci}, common::{BitSource, CharacterSet, DecoderRXingResult, ECIStringBuilder, Eci, Result},
Exceptions, Exceptions,
}; };
@@ -751,7 +751,9 @@ fn decodeECISegment(bits: &mut BitSource, result: &mut ECIStringBuilder) -> Resu
let thirdByte = bits.readBits(8)?; let thirdByte = bits.readBits(8)?;
result.appendECI(Eci::from((firstByte - 192) * 64516 + 16383 + (secondByte - 1) * 254 + thirdByte - 1))?; result.appendECI(Eci::from(
(firstByte - 192) * 64516 + 16383 + (secondByte - 1) * 254 + thirdByte - 1,
))?;
Ok((firstByte - 192) * 64516 + 16383 + (secondByte - 1) * 254 + thirdByte - 1 > 900) Ok((firstByte - 192) * 64516 + 16383 + (secondByte - 1) * 254 + thirdByte - 1 > 900)
} }

2
src/datamatrix/encoder/minimal_encoder.rs
View File

@@ -17,7 +17,7 @@
use std::{fmt, rc::Rc}; use std::{fmt, rc::Rc};
use crate::{ use crate::{
common::{CharacterSet, ECIInput, MinimalECIInput, Result, Eci}, common::{CharacterSet, ECIInput, Eci, MinimalECIInput, Result},
Exceptions, Exceptions,
}; };

2
src/pdf417/decoder/decoded_bit_stream_parser.rs
View File

@@ -19,7 +19,7 @@ use num::{self, bigint::ToBigUint, BigUint};
use std::rc::Rc; use std::rc::Rc;
use crate::{ use crate::{
common::{DecoderRXingResult, ECIStringBuilder, Result, Eci}, common::{DecoderRXingResult, ECIStringBuilder, Eci, Result},
pdf417::PDF417RXingResultMetadata, pdf417::PDF417RXingResultMetadata,
Exceptions, Exceptions,
}; };

11
src/pdf417/encoder/pdf_417_high_level_encoder.rs
View File

@@ -21,7 +21,7 @@
use std::{any::TypeId, fmt::Display, str::FromStr}; use std::{any::TypeId, fmt::Display, str::FromStr};
use crate::{ use crate::{
common::{CharacterSet, ECIInput, MinimalECIInput, Result, Eci}, common::{CharacterSet, ECIInput, Eci, MinimalECIInput, Result},
Exceptions, Exceptions,
}; };
@@ -802,7 +802,7 @@ fn encodingECI(eci: Eci, sb: &mut String) -> Result<()> {
if (0..900).contains(&(eci as i32)) { if (0..900).contains(&(eci as i32)) {
sb.push(char::from_u32(ECI_CHARSET).ok_or(Exceptions::PARSE)?); sb.push(char::from_u32(ECI_CHARSET).ok_or(Exceptions::PARSE)?);
sb.push(char::from_u32(eci as u32).ok_or(Exceptions::PARSE)?); sb.push(char::from_u32(eci as u32).ok_or(Exceptions::PARSE)?);
} else if (eci as i32 )< 810900 { } else if (eci as i32) < 810900 {
sb.push(char::from_u32(ECI_GENERAL_PURPOSE).ok_or(Exceptions::PARSE)?); sb.push(char::from_u32(ECI_GENERAL_PURPOSE).ok_or(Exceptions::PARSE)?);
sb.push(char::from_u32(((eci as i32) / 900 - 1) as u32).ok_or(Exceptions::PARSE)?); sb.push(char::from_u32(((eci as i32) / 900 - 1) as u32).ok_or(Exceptions::PARSE)?);
sb.push(char::from_u32(((eci as i32) % 900) as u32).ok_or(Exceptions::PARSE)?); sb.push(char::from_u32(((eci as i32) % 900) as u32).ok_or(Exceptions::PARSE)?);
@@ -908,12 +908,7 @@ mod PDF417EncoderTestCase {
#[test] #[test]
fn testEncodeNumeric() { fn testEncodeNumeric() {
let encoded = encodeHighLevel( let encoded = encodeHighLevel("1234", Compaction::NUMERIC, Some(CharacterSet::UTF8), false)
"1234",
Compaction::NUMERIC,
Some(CharacterSet::UTF8),
false,
)
.expect("encode"); .expect("encode");
assert_eq!("\u{039f}\u{001A}\u{0386}\u{C}\u{01b2}", encoded); assert_eq!("\u{039f}\u{001A}\u{0386}\u{C}\u{01b2}", encoded);
// converted \f to \u{0046} // converted \f to \u{0046}

4
src/qrcode/decoder/decoded_bit_stream_parser.rs
View File

@@ -15,7 +15,7 @@
*/ */
use crate::{ use crate::{
common::{BitSource, CharacterSet, DecoderRXingResult, Result, StringUtils, Eci}, common::{BitSource, CharacterSet, DecoderRXingResult, Eci, Result, StringUtils},
DecodingHintDictionary, Exceptions, DecodingHintDictionary, Exceptions,
}; };
@@ -91,7 +91,7 @@ pub fn decode(
Mode::ECI => { Mode::ECI => {
// Count doesn't apply to ECI // Count doesn't apply to ECI
let value = parseECIValue(&mut bits)?; let value = parseECIValue(&mut bits)?;
currentCharacterSetECI = CharacterSet::from(Eci::from(value)).into();//CharacterSet::get_character_set_by_eci(value).ok(); currentCharacterSetECI = CharacterSet::from(Eci::from(value)).into(); //CharacterSet::get_character_set_by_eci(value).ok();
if currentCharacterSetECI.is_none() { if currentCharacterSetECI.is_none() {
return Err(Exceptions::format_with(format!( return Err(Exceptions::format_with(format!(
"Value of {value} not valid" "Value of {value} not valid"

8
src/qrcode/encoder/qrcode_encoder.rs
View File

@@ -24,7 +24,7 @@ use unicode_segmentation::UnicodeSegmentation;
use crate::{ use crate::{
common::{ common::{
reedsolomon::{get_predefined_genericgf, PredefinedGenericGF, ReedSolomonEncoder}, reedsolomon::{get_predefined_genericgf, PredefinedGenericGF, ReedSolomonEncoder},
BitArray, CharacterSet, Result, Eci, BitArray, CharacterSet, Eci, Result,
}, },
qrcode::decoder::{ErrorCorrectionLevel, Mode, Version, VersionRef}, qrcode::decoder::{ErrorCorrectionLevel, Mode, Version, VersionRef},
EncodeHintType, EncodeHintValue, EncodingHintDictionary, Exceptions, EncodeHintType, EncodeHintValue, EncodingHintDictionary, Exceptions,
@@ -716,11 +716,7 @@ pub fn appendAlphanumericBytes(content: &str, bits: &mut BitArray) -> Result<()>
Ok(()) Ok(())
} }
pub fn append8BitBytes( pub fn append8BitBytes(content: &str, bits: &mut BitArray, encoding: CharacterSet) -> Result<()> {
content: &str,
bits: &mut BitArray,
encoding: CharacterSet,
) -> Result<()> {
let bytes = encoding let bytes = encoding
.encode(content) .encode(content)
.map_err(|e| Exceptions::writer_with(format!("error {e}")))?; .map_err(|e| Exceptions::writer_with(format!("error {e}")))?;