ak/rxing
1
0
Fork 0
mirror of https://github.com/starovoid/rxing.git synced 2026-07-27 21:02:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

automatic failover to utf8

Browse Source
This commit is contained in:
Henry Schimke
2022-10-15 10:50:30 -05:00
parent f7d20643f4
commit 7d8bee6ccc
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/qrcode/encoder/encoder.rs
View File

@@ -125,7 +125,7 @@ pub fn encode_with_hints(
// Determine what character encoding has been specified by the caller, if any // Determine what character encoding has been specified by the caller, if any
let mut encoding = None; //DEFAULT_BYTE_MODE_ENCODING; let mut encoding = None; //DEFAULT_BYTE_MODE_ENCODING;
let has_encoding_hint = hints.contains_key(&EncodeHintType::CHARACTER_SET); let mut has_encoding_hint = hints.contains_key(&EncodeHintType::CHARACTER_SET);
if has_encoding_hint { if has_encoding_hint {
if let EncodeHintValue::CharacterSet(v) = hints.get(&EncodeHintType::CHARACTER_SET).unwrap() if let EncodeHintValue::CharacterSet(v) = hints.get(&EncodeHintType::CHARACTER_SET).unwrap()
{ {
@@ -155,7 +155,12 @@ pub fn encode_with_hints(
let encoding = if encoding.is_some() { let encoding = if encoding.is_some() {
encoding.unwrap() encoding.unwrap()
} else { } else {
DEFAULT_BYTE_MODE_ENCODING if let Ok(encs) = DEFAULT_BYTE_MODE_ENCODING.encode(content, encoding::EncoderTrap::Strict){
DEFAULT_BYTE_MODE_ENCODING
}else {
has_encoding_hint = true;
encoding::all::UTF_8
}
}; };
// Pick an encoding mode appropriate for the content. Note that this will not attempt to use // Pick an encoding mode appropriate for the content. Note that this will not attempt to use