From c925d32e78af2719dc9f8688556fb13f4533c352 Mon Sep 17 00:00:00 2001
From: Henry Schimke <henry@azule.info>
Date: Tue, 1 Nov 2022 08:52:53 -0500
Subject: [PATCH] basic high_level_encoder pass

---
 src/datamatrix/encoder/c40_encoder.rs  | 7 ++++---
 src/datamatrix/encoder/text_encoder.rs | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/datamatrix/encoder/c40_encoder.rs b/src/datamatrix/encoder/c40_encoder.rs
index 12cd6a7..de44215 100644
--- a/src/datamatrix/encoder/c40_encoder.rs
+++ b/src/datamatrix/encoder/c40_encoder.rs
@@ -26,7 +26,7 @@ pub struct C40Encoder;
 
 impl Encoder for C40Encoder {
     fn encode(&self, context: &mut super::EncoderContext) -> Result<(), Exceptions> {
-        self.encode_with_encode_char_fn(context, &Self::encodeChar_c40, &Self::handleEOD_c40)
+        self.encode_with_encode_char_fn(context, &Self::encodeChar_c40, &Self::handleEOD_c40, &||{self.getEncodingMode()})
     }
 
     fn getEncodingMode(&self) -> usize {
@@ -44,6 +44,7 @@ impl C40Encoder {
         context: &mut super::EncoderContext,
         encodeChar: &dyn Fn(char, &mut String) -> u32,
         handleEOD: &dyn Fn(&mut EncoderContext, &mut String) -> Result<(), Exceptions>,
+        getEncodingMode: &dyn Fn() -> usize,
     ) -> Result<(), Exceptions> {
         //step C
         let mut buffer = String::new();
@@ -89,9 +90,9 @@ impl C40Encoder {
                 let newMode = high_level_encoder::lookAheadTest(
                     context.getMessage(),
                     context.pos,
-                    self.getEncodingMode() as u32,
+                    getEncodingMode() as u32,
                 );
-                if newMode != self.getEncodingMode() {
+                if newMode != getEncodingMode() {
                     // Return to ASCII encodation, which will actually handle latch to new mode
                     context.signalEncoderChange(ASCII_ENCODATION);
                     break;
diff --git a/src/datamatrix/encoder/text_encoder.rs b/src/datamatrix/encoder/text_encoder.rs
index 14c783f..61d75fc 100644
--- a/src/datamatrix/encoder/text_encoder.rs
+++ b/src/datamatrix/encoder/text_encoder.rs
@@ -24,7 +24,7 @@ impl Encoder for TextEncoder {
 
     fn encode(&self, context: &mut super::EncoderContext) -> Result<(), crate::Exceptions> {
         self.0
-            .encode_with_encode_char_fn(context, &Self::encodeChar, &C40Encoder::handleEOD_c40)
+            .encode_with_encode_char_fn(context, &Self::encodeChar, &C40Encoder::handleEOD_c40, &||{self.getEncodingMode()})
     }
 }
 impl TextEncoder {