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

repurpose CharacterSetECI as encoding abstraction

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

22
src/aztec/encoder/high_level_encoder.rs
View File

@@ -35,7 +35,7 @@ use super::{State, Token};
*/
pub struct HighLevelEncoder {
text: Vec<u8>,
charset: encoding::EncodingRef,
charset: CharacterSetECI,
}
impl HighLevelEncoder {
@@ -229,11 +229,11 @@ impl HighLevelEncoder {
pub fn new(text: Vec<u8>) -> Self {
Self {
text,
charset: encoding::all::ISO_8859_1,
charset: CharacterSetECI::ISO8859_1,
}
}
pub fn with_charset(text: Vec<u8>, charset: encoding::EncodingRef) -> Self {
pub fn with_charset(text: Vec<u8>, charset: CharacterSetECI) -> Self {
Self { text, charset }
}
@@ -242,16 +242,16 @@ impl HighLevelEncoder {
*/
pub fn encode(&self) -> Result<BitArray> {
let mut initial_state = State::new(Token::new(), Self::MODE_UPPER as u32, 0, 0);
if let Some(eci) = CharacterSetECI::getCharacterSetECI(self.charset) {
if eci != CharacterSetECI::ISO8859_1 {
//if let Some(eci) = CharacterSetECI::getCharacterSetECI(self.charset) {
if self.charset != CharacterSetECI::ISO8859_1 {
//} && eci != CharacterSetECI::Cp1252 {
initial_state = initial_state.appendFLGn(CharacterSetECI::getValue(&eci))?;
initial_state = initial_state.appendFLGn(self.charset.getValue())?;
}
} else {
return Err(Exceptions::illegal_argument_with(
"No ECI code for character set",
));
}
// } else {
// return Err(Exceptions::illegal_argument_with(
// "No ECI code for character set",
// ));
// }
// if self.charset != null {
// CharacterSetECI eci = CharacterSetECI.getCharacterSetECI(charset);
// if (null == eci) {