repurpose CharacterSetECI as encoding abstraction

This commit is contained in:
Henry Schimke
2023-03-02 15:50:56 -06:00
parent 37dc1be041
commit 5deb1ddbe2
29 changed files with 304 additions and 337 deletions

View File

@@ -23,9 +23,8 @@ use std::{
rc::Rc,
};
use encoding::Encoding;
use rxing::{
common::{HybridBinarizer, Result},
common::{HybridBinarizer, Result, CharacterSetECI},
multi::MultipleBarcodeReader,
pdf417::PDF417RXingResultMetadata,
BarcodeFormat, BinaryBitmap, BufferedImageLuminanceSource, DecodeHintType, DecodeHintValue,
@@ -646,9 +645,7 @@ impl<T: MultipleBarcodeReader + Reader> PDF417MultiImageSpanAbstractBlackBoxTest
if ext == "bin" {
let mut buffer: Vec<u8> = Vec::new();
File::open(&file)?.read_to_end(&mut buffer)?;
encoding::all::ISO_8859_1
.decode(&buffer, encoding::DecoderTrap::Replace)
.expect("decode")
CharacterSetECI::ISO8859_1.decode_replace(&buffer).expect("decode")
} else {
read_to_string(&file).expect("ok")
}