2 files changed, 5 insertions, 5 deletions
diff --git a/fxbarcode/datamatrix/BC_C40Encoder.cpp b/fxbarcode/datamatrix/BC_C40Encoder.cpp
index 348315e149..bb8b11cc50 100644
--- a/fxbarcode/datamatrix/BC_C40Encoder.cpp
+++ b/fxbarcode/datamatrix/BC_C40Encoder.cpp
@@ -31,7 +31,7 @@
 
 namespace {
 
-WideString EncodeToCodewords(const WideString& sb, int32_t startPos) {
+WideString EncodeToC40Codewords(const WideString& sb, int32_t startPos) {
   wchar_t c1 = sb[startPos];
   wchar_t c2 = sb[startPos + 1];
   wchar_t c3 = sb[startPos + 2];
@@ -99,7 +99,7 @@ void CBC_C40Encoder::Encode(CBC_EncoderContext& context, int32_t& e) {
 }
 void CBC_C40Encoder::writeNextTriplet(CBC_EncoderContext& context,
                                       WideString& buffer) {
-  context.writeCodewords(EncodeToCodewords(buffer, 0));
+  context.writeCodewords(EncodeToC40Codewords(buffer, 0));
   buffer.Delete(0, 3);
 }
 void CBC_C40Encoder::handleEOD(CBC_EncoderContext& context,
diff --git a/fxbarcode/datamatrix/BC_EdifactEncoder.cpp b/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
index 438c87a38f..41180dcf51 100644
--- a/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
+++ b/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
@@ -33,7 +33,7 @@
 
 namespace {
 
-WideString EncodeToCodewords(const WideString& sb, int32_t startPos) {
+WideString EncodeToEdifactCodewords(const WideString& sb, int32_t startPos) {
   int32_t len = sb.GetLength() - startPos;
   if (len == 0)
     return WideString();
@@ -72,7 +72,7 @@ bool HandleEOD(CBC_EncoderContext* context, const WideString& buffer) {
   }
 
   int32_t restChars = count - 1;
-  WideString encoded = EncodeToCodewords(buffer, 0);
+  WideString encoded = EncodeToEdifactCodewords(buffer, 0);
   if (encoded.IsEmpty())
     return false;
 
@@ -136,7 +136,7 @@ void CBC_EdifactEncoder::Encode(CBC_EncoderContext& context, int32_t& e) {
     context.m_pos++;
     int32_t count = buffer.GetLength();
     if (count >= 4) {
-      WideString encoded = EncodeToCodewords(buffer, 0);
+      WideString encoded = EncodeToEdifactCodewords(buffer, 0);
       if (encoded.IsEmpty()) {
         e = BCExceptionGeneric;
         return;