ak/rxing
1
0
Fork 0
mirror of https://github.com/starovoid/rxing.git synced 2026-07-27 04:42:35 +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

8
src/datamatrix/data_matrix_writer.rs
View File

@@ -17,10 +17,8 @@
use std::collections::HashMap;
use encoding::EncodingRef;
use crate::{
common::{BitMatrix, Result},
common::{BitMatrix, Result, CharacterSetECI},
qrcode::encoder::ByteMatrix,
BarcodeFormat, EncodeHintType, EncodeHintValue, Exceptions, Writer,
};
@@ -117,14 +115,14 @@ impl Writer for DataMatrixWriter {
false
};
let mut charset: Option<EncodingRef> = None;
let mut charset: Option<CharacterSetECI> = None;
let hasEncodingHint = hints.contains_key(&EncodeHintType::CHARACTER_SET);
if hasEncodingHint {
let Some(EncodeHintValue::CharacterSet(char_set_name)) =
hints.get(&EncodeHintType::CHARACTER_SET) else {
return Err(Exceptions::illegal_argument_with("charset does not exist"))
};
charset = encoding::label::encoding_from_whatwg_label(char_set_name);
charset = CharacterSetECI::getCharacterSetECIByName(char_set_name);//encoding::label::encoding_from_whatwg_label(char_set_name);
// charset = Charset.forName(hints.get(EncodeHintType.CHARACTER_SET).toString());
}
encoded = minimal_encoder::encodeHighLevelWithDetails(