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

rename character set and rename methods

Browse Source
This commit is contained in:
Henry Schimke
2023-03-04 11:47:39 -06:00
parent c81c6578d0
commit 15859b9f10
29 changed files with 329 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@
* limitations under the License.
*/
use crate::common::{BitArray, CharacterSetECI, Result};
use crate::common::{BitArray, CharacterSet, Result};
use super::{State, Token};
@@ -32,7 +32,7 @@ use super::{State, Token};
*/
pub struct HighLevelEncoder {
text: Vec<u8>,
charset: CharacterSetECI,
charset: CharacterSet,
}
impl HighLevelEncoder {
@@ -226,11 +226,11 @@ impl HighLevelEncoder {
pub fn new(text: Vec<u8>) -> Self {
Self {
text,
charset: CharacterSetECI::ISO8859_1,
charset: CharacterSet::ISO8859_1,
}
}
pub fn with_charset(text: Vec<u8>, charset: CharacterSetECI) -> Self {
pub fn with_charset(text: Vec<u8>, charset: CharacterSet) -> Self {
Self { text, charset }
}
@@ -240,9 +240,9 @@ 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 self.charset != CharacterSetECI::ISO8859_1 {
if self.charset != CharacterSet::ISO8859_1 {
//} && eci != CharacterSetECI::Cp1252 {
initial_state = initial_state.appendFLGn(self.charset.getValue())?;
initial_state = initial_state.appendFLGn(self.charset.get_eci_value())?;
}
// } else {
// return Err(Exceptions::illegal_argument_with(