repurpose CharacterSetECI as encoding abstraction

2026-07-26 12:22:34 +00:00 · 2023-03-02 15:50:56 -06:00
parent c4fec7d2ee
commit a0b8b68869
29 changed files with 304 additions and 337 deletions
--- a/src/datamatrix/decoder/decoded_bit_stream_parser.rs
+++ b/src/datamatrix/decoder/decoded_bit_stream_parser.rs
@@ -14,10 +14,8 @@
 * limitations under the License.
 */

-use encoding::Encoding;
-
 use crate::{
-    common::{BitSource, DecoderRXingResult, ECIStringBuilder, Result},
+    common::{BitSource, DecoderRXingResult, ECIStringBuilder, Result, CharacterSetECI},
    Exceptions,
 };

@@ -730,9 +728,10 @@ fn decodeBase256Segment(
        codewordPosition += 1;
    }
    result.append_string(
-        &encoding::all::ISO_8859_1
-            .decode(&bytes, encoding::DecoderTrap::Strict)
-            .map_err(Exceptions::parse_with)?,
+        
+        &CharacterSetECI::ISO8859_1
+            .decode(&bytes)
+            ?,
    );
    byteSegments.push(bytes);