mirror of
https://github.com/starovoid/rxing.git
synced 2026-07-27 12:52:34 +00:00
repurpose CharacterSetECI as encoding abstraction
This commit is contained in:
@@ -20,7 +20,7 @@ use regex::Regex;
|
||||
|
||||
use once_cell::sync::Lazy;
|
||||
|
||||
use crate::RXingResult;
|
||||
use crate::{RXingResult, common::CharacterSetECI};
|
||||
|
||||
use uriparse::URI;
|
||||
|
||||
@@ -404,9 +404,9 @@ fn maybeAppendFragment(fragmentBuffer: &mut Vec<u8>, charset: &str, result: &mut
|
||||
if charset.is_empty() {
|
||||
fragment = String::from_utf8(fragmentBytes).unwrap_or_else(|_| String::default());
|
||||
// fragment = new String(fragmentBytes, StandardCharsets.UTF_8);
|
||||
} else if let Some(enc) = encoding::label::encoding_from_whatwg_label(charset) {
|
||||
} else if let Some(enc) = CharacterSetECI::getCharacterSetECIByName(charset) {
|
||||
fragment = if let Ok(encoded_result) =
|
||||
enc.decode(&fragmentBytes, encoding::DecoderTrap::Strict)
|
||||
enc.decode(&fragmentBytes)
|
||||
{
|
||||
encoded_result
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user