Remove dead dimensions code in fxbarcode.chromium/3084

Remove more exceptions.

Change-Id: I3b8b8b9837b0010b1e0060ddd56e93c78f9f0fb5
Reviewed-on: https://pdfium-review.googlesource.com/4410
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

1 files changed, 100 insertions, 97 deletions

diff --git a/fxbarcode/datamatrix/BC_EdifactEncoder.cpp b/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
index 954dcbcba6..9231b1e293 100644
--- a/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
+++ b/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
@@ -22,134 +22,137 @@
 
 #include "fxbarcode/datamatrix/BC_EdifactEncoder.h"
 
-#include "fxbarcode/BC_Dimension.h"
+#include <algorithm>
+
 #include "fxbarcode/common/BC_CommonBitMatrix.h"
 #include "fxbarcode/datamatrix/BC_Encoder.h"
 #include "fxbarcode/datamatrix/BC_EncoderContext.h"
 #include "fxbarcode/datamatrix/BC_HighLevelEncoder.h"
 #include "fxbarcode/datamatrix/BC_SymbolInfo.h"
 #include "fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+#include "fxbarcode/utils.h"
 
-CBC_EdifactEncoder::CBC_EdifactEncoder() {}
-CBC_EdifactEncoder::~CBC_EdifactEncoder() {}
-int32_t CBC_EdifactEncoder::getEncodingMode() {
-  return EDIFACT_ENCODATION;
-}
-void CBC_EdifactEncoder::Encode(CBC_EncoderContext& context, int32_t& e) {
-  CFX_WideString buffer;
-  while (context.hasMoreCharacters()) {
-    wchar_t c = context.getCurrentChar();
-    encodeChar(c, buffer, e);
-    if (e != BCExceptionNO) {
-      return;
-    }
-    context.m_pos++;
-    int32_t count = buffer.GetLength();
-    if (count >= 4) {
-      context.writeCodewords(encodeToCodewords(buffer, 0, e));
-      if (e != BCExceptionNO) {
-        return;
-      }
-      buffer.Delete(0, 4);
-      int32_t newMode = CBC_HighLevelEncoder::lookAheadTest(
-          context.m_msg, context.m_pos, getEncodingMode());
-      if (newMode != getEncodingMode()) {
-        context.signalEncoderChange(ASCII_ENCODATION);
-        break;
-      }
-    }
-  }
-  buffer += (wchar_t)31;
-  handleEOD(context, buffer, e);
+namespace {
+
+CFX_WideString EncodeToCodewords(const CFX_WideString& sb, int32_t startPos) {
+  int32_t len = sb.GetLength() - startPos;
+  if (len == 0)
+    return CFX_WideString();
+
+  wchar_t c1 = sb.GetAt(startPos);
+  wchar_t c2 = len >= 2 ? sb.GetAt(startPos + 1) : 0;
+  wchar_t c3 = len >= 3 ? sb.GetAt(startPos + 2) : 0;
+  wchar_t c4 = len >= 4 ? sb.GetAt(startPos + 3) : 0;
+  int32_t v = (c1 << 18) + (c2 << 12) + (c3 << 6) + c4;
+  constexpr int32_t kBuflen = 3;
+  wchar_t cw[kBuflen];
+  cw[0] = static_cast<wchar_t>((v >> 16) & 255);
+  cw[1] = static_cast<wchar_t>((v >> 8) & 255);
+  cw[2] = static_cast<wchar_t>(v & 255);
+  return CFX_WideString(cw, std::min(len, kBuflen));
 }
-void CBC_EdifactEncoder::handleEOD(CBC_EncoderContext& context,
-                                   CFX_WideString buffer,
-                                   int32_t& e) {
+
+bool HandleEOD(CBC_EncoderContext* context, const CFX_WideString& buffer) {
   int32_t count = buffer.GetLength();
-  if (count == 0) {
-    return;
-  }
+  if (count == 0)
+    return true;
+  if (count > 4)
+    return false;
+
   if (count == 1) {
-    context.updateSymbolInfo(e);
-    if (e != BCExceptionNO) {
-      return;
-    }
+    int32_t e = BCExceptionNO;
+    context->updateSymbolInfo(e);
+    if (e != BCExceptionNO)
+      return false;
+
     int32_t available =
-        context.m_symbolInfo->m_dataCapacity - context.getCodewordCount();
-    int32_t remaining = context.getRemainingCharacters();
-    if (remaining == 0 && available <= 2) {
-      return;
-    }
-  }
-  if (count > 4) {
-    e = BCExceptionIllegalStateCountMustNotExceed4;
-    return;
+        context->m_symbolInfo->m_dataCapacity - context->getCodewordCount();
+    int32_t remaining = context->getRemainingCharacters();
+    if (remaining == 0 && available <= 2)
+      return true;
   }
+
   int32_t restChars = count - 1;
-  CFX_WideString encoded = encodeToCodewords(buffer, 0, e);
-  if (e != BCExceptionNO) {
-    return;
-  }
-  bool endOfSymbolReached = !context.hasMoreCharacters();
+  CFX_WideString encoded = EncodeToCodewords(buffer, 0);
+  if (encoded.IsEmpty())
+    return false;
+
+  bool endOfSymbolReached = !context->hasMoreCharacters();
   bool restInAscii = endOfSymbolReached && restChars <= 2;
   if (restChars <= 2) {
-    context.updateSymbolInfo(context.getCodewordCount() + restChars, e);
-    if (e != BCExceptionNO) {
-      return;
-    }
+    int32_t e = BCExceptionNO;
+    context->updateSymbolInfo(context->getCodewordCount() + restChars, e);
+    if (e != BCExceptionNO)
+      return false;
+
     int32_t available =
-        context.m_symbolInfo->m_dataCapacity - context.getCodewordCount();
+        context->m_symbolInfo->m_dataCapacity - context->getCodewordCount();
     if (available >= 3) {
       restInAscii = false;
-      context.updateSymbolInfo(context.getCodewordCount() + encoded.GetLength(),
-                               e);
-      if (e != BCExceptionNO) {
-        return;
-      }
+      context->updateSymbolInfo(
+          context->getCodewordCount() + encoded.GetLength(), e);
+      if (e != BCExceptionNO)
+        return false;
     }
   }
+
   if (restInAscii) {
-    context.resetSymbolInfo();
-    context.m_pos -= restChars;
+    context->resetSymbolInfo();
+    context->m_pos -= restChars;
   } else {
-    context.writeCodewords(encoded);
+    context->writeCodewords(encoded);
   }
-  context.signalEncoderChange(ASCII_ENCODATION);
+  context->signalEncoderChange(ASCII_ENCODATION);
+  return true;
 }
 
-void CBC_EdifactEncoder::encodeChar(wchar_t c, CFX_WideString& sb, int32_t& e) {
+void encodeChar(wchar_t c, CFX_WideString* sb, int32_t& e) {
   if (c >= ' ' && c <= '?') {
-    sb += c;
+    *sb += c;
   } else if (c >= '@' && c <= '^') {
-    sb += (wchar_t)(c - 64);
+    *sb += (wchar_t)(c - 64);
   } else {
     e = BCExceptionIllegalArgument;
   }
 }
 
-CFX_WideString CBC_EdifactEncoder::encodeToCodewords(CFX_WideString sb,
-                                                     int32_t startPos,
-                                                     int32_t& e) {
-  int32_t len = sb.GetLength() - startPos;
-  if (len == 0) {
-    e = BCExceptionNoContents;
-    return CFX_WideString();
-  }
-  wchar_t c1 = sb.GetAt(startPos);
-  wchar_t c2 = len >= 2 ? sb.GetAt(startPos + 1) : 0;
-  wchar_t c3 = len >= 3 ? sb.GetAt(startPos + 2) : 0;
-  wchar_t c4 = len >= 4 ? sb.GetAt(startPos + 3) : 0;
-  int32_t v = (c1 << 18) + (c2 << 12) + (c3 << 6) + c4;
-  wchar_t cw1 = (wchar_t)((v >> 16) & 255);
-  wchar_t cw2 = (wchar_t)((v >> 8) & 255);
-  wchar_t cw3 = (wchar_t)(v & 255);
-  CFX_WideString res;
-  res += cw1;
-  if (len >= 2) {
-    res += cw2;
-  }
-  if (len >= 3) {
-    res += cw3;
+}  // namespace
+
+CBC_EdifactEncoder::CBC_EdifactEncoder() {}
+
+CBC_EdifactEncoder::~CBC_EdifactEncoder() {}
+
+int32_t CBC_EdifactEncoder::getEncodingMode() {
+  return EDIFACT_ENCODATION;
+}
+
+void CBC_EdifactEncoder::Encode(CBC_EncoderContext& context, int32_t& e) {
+  CFX_WideString buffer;
+  while (context.hasMoreCharacters()) {
+    wchar_t c = context.getCurrentChar();
+    encodeChar(c, &buffer, e);
+    if (e != BCExceptionNO) {
+      return;
+    }
+    context.m_pos++;
+    int32_t count = buffer.GetLength();
+    if (count >= 4) {
+      CFX_WideString encoded = EncodeToCodewords(buffer, 0);
+      if (encoded.IsEmpty()) {
+        e = BCExceptionGeneric;
+        return;
+      }
+      context.writeCodewords(encoded);
+      buffer.Delete(0, 4);
+      int32_t newMode = CBC_HighLevelEncoder::lookAheadTest(
+          context.m_msg, context.m_pos, getEncodingMode());
+      if (newMode != getEncodingMode()) {
+        context.signalEncoderChange(ASCII_ENCODATION);
+        break;
+      }
+    }
   }
-  return res;
+  buffer += static_cast<wchar_t>(31);
+  if (!HandleEOD(&context, buffer))
+    e = BCExceptionGeneric;
 }